Modify tests to no longer depend on obsolete files

This also narrows the return types as appropriate for each concrete
type.

Author: awalter17

src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java

@@ -31,6 +31,7 @@
 
 package org.scijava.convert;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 
 import org.scijava.convert.NumberConverters.BigIntegerToBigDecimalConverter;
@@ -40,11 +41,12 @@
  *
  * @author Alison Walter
  */
-public class BigIntegerToBigDecimalConverterTest extends NumberToBigDecimalTest
+public class BigIntegerToBigDecimalConverterTest extends
+	AbstractNumberConverterTests
 {
 
 	@Override
-	public Number getSrc() {
+	public BigInteger getSrc() {
 		return BigInteger.valueOf(7l);
 	}
 
@@ -54,7 +56,17 @@ public Number getSrc() {
 	}
 
 	@Override
-	public Number getInvalidInput() {
-		return new Long(46l);
+	public BigDecimal getExpectedValue() {
+		return new BigDecimal(7d);
+	}
+
+	@Override
+	public Long getInvalidInput() {
+		return 46l;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
 	}
 }

src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java

@@ -31,27 +31,41 @@
 
 package org.scijava.convert;
 
+import java.math.BigDecimal;
+
 import org.scijava.convert.NumberConverters.ByteToBigDecimalConverter;
 
 /**
  * Tests {@link ByteToBigDecimalConverter}.
  *
  * @author Alison Walter
  */
-public class ByteToBigDecimalConverterTest extends NumberToBigDecimalTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToBigDecimalConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Short((short) 101);
-  }
+public class ByteToBigDecimalConverterTest extends AbstractNumberConverterTests
+{
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToBigDecimalConverter();
+	}
+
+	@Override
+	public BigDecimal getExpectedValue() {
+		return new BigDecimal(7d);
+	}
+
+	@Override
+	public Short getInvalidInput() {
+		return (short) 101;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+
 }

src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java

@@ -31,28 +31,41 @@
 
 package org.scijava.convert;
 
+import java.math.BigInteger;
+
 import org.scijava.convert.NumberConverters.ByteToBigIntegerConverter;
 
 /**
  * Tests {@link ByteToBigIntegerConverter}.
  *
  * @author Alison Walter
  */
-public class ByteToBigIntegerConverterTest extends NumberToBigIntegerTest {
-
-		@Override
-		public Number getSrc() {
-			return new Byte((byte) 7);
-		}
-
-		@Override
-		public NumberToNumberConverter<?, ?> getConverter() {
-			return new NumberConverters.ByteToBigIntegerConverter();
-		}
-
-		@Override
-		public Number getInvalidInput() {
-			return new Short((short) 101);
-		}
+public class ByteToBigIntegerConverterTest extends AbstractNumberConverterTests
+{
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToBigIntegerConverter();
+	}
+
+	@Override
+	public BigInteger getExpectedValue() {
+		return BigInteger.valueOf(7l);
+	}
+
+	@Override
+	public Short getInvalidInput() {
+		return (short) 101;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
 	}
 
+}

src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java

@@ -38,20 +38,31 @@
  *
  * @author Alison Walter
  */
-public class ByteToDoubleConverterTest extends NumberToDoubleTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToDoubleConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Short((short) 101);
-  }
+public class ByteToDoubleConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToDoubleConverter();
+	}
+
+	@Override
+	public Double getExpectedValue() {
+		return 7.0d;
+	}
+
+	@Override
+	public Short getInvalidInput() {
+		return (short) 101;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
+	}
+
 }

src/test/java/org/scijava/convert/ByteToFloatConverterTest.java

@@ -38,20 +38,30 @@
  *
  * @author Alison Walter
  */
-public class ByteToFloatConverterTest extends NumberToFloatTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToFloatConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Double(7.67d);
-  }
+public class ByteToFloatConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToFloatConverter();
+	}
+
+	@Override
+	public Float getExpectedValue() {
+		return 7f;
+	}
+
+	@Override
+	public Double getInvalidInput() {
+		return 7.67d;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Long.class;
+	}
 }

src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java

@@ -38,20 +38,31 @@
  *
  * @author Alison Walter
  */
-public class ByteToIntegerConverterTest extends NumberToIntegerTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToIntegerConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Long(12l);
-  }
+public class ByteToIntegerConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToIntegerConverter();
+	}
+
+	@Override
+	public Integer getExpectedValue() {
+		return 7;
+	}
+
+	@Override
+	public Long getInvalidInput() {
+		return 12l;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Short.class;
+	}
+
 }

src/test/java/org/scijava/convert/ByteToLongConverterTest.java

@@ -38,20 +38,31 @@
  *
  * @author Alison Walter
  */
-public class ByteToLongConverterTest extends NumberToLongTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToLongConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Double(12d);
-  }
+public class ByteToLongConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToLongConverter();
+	}
+
+	@Override
+	public Long getExpectedValue() {
+		return 7l;
+	}
+
+	@Override
+	public Double getInvalidInput() {
+		return 12d;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+
 }

src/test/java/org/scijava/convert/ByteToShortConverterTest.java

@@ -38,21 +38,31 @@
  *
  * @author Alison Walter
  */
-public class ByteToShortConverterTest extends NumberToShortTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToShortConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Integer(12);
-  }
+public class ByteToShortConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToShortConverter();
+	}
+
+	@Override
+	public Short getExpectedValue() {
+		return (short) 7;
+	}
+
+	@Override
+	public Integer getInvalidInput() {
+		return 12;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
 
 }