Add generic types to casting to AbstractPdfFunction

Cleanup of PdfFunctionFactoryTest

DEVSIX-3538

Author: glenn.volckaert

kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfSpecialCs.java

@@ -154,7 +154,8 @@ public Separation(String name, PdfColorSpace alternateSpace, PdfFunction tintTra
          *                      to the alternate color space
          */
         public Separation(String name, PdfColorSpace alternateSpace, IPdfFunction tintTransform) {
-            this(new PdfName(name), alternateSpace.getPdfObject(), ((AbstractPdfFunction)tintTransform).getPdfObject());
+            this(new PdfName(name), alternateSpace.getPdfObject(),
+                    ((AbstractPdfFunction<PdfDictionary>)tintTransform).getPdfObject());
             if (!tintTransform.checkCompatibilityWithColorSpace(alternateSpace)) {
                 throw new PdfException(
                         KernelExceptionMessageConstant.FUNCTION_IS_NOT_COMPATIBLE_WITH_COLOR_SPACE, this);
@@ -237,7 +238,7 @@ public DeviceN(List<String> names, PdfColorSpace alternateSpace, PdfFunction tin
          */
         public DeviceN(List<String> names, PdfColorSpace alternateSpace, IPdfFunction tintTransform) {
             this(new PdfArray(names, true), alternateSpace.getPdfObject(),
-                    ((AbstractPdfFunction)tintTransform).getPdfObject());
+                    ((AbstractPdfFunction<PdfDictionary>)tintTransform).getPdfObject());
             if (tintTransform.getInputSize() != numOfComponents ||
                     tintTransform.getOutputSize() != alternateSpace.getNumberOfComponents()) {
                 throw new PdfException(
@@ -312,7 +313,7 @@ public NChannel(List<String> names, PdfColorSpace alternateSpace, PdfFunction ti
         public NChannel(List<String> names, PdfColorSpace alternateSpace, IPdfFunction tintTransform,
                 PdfDictionary attributes) {
             this(new PdfArray(names, true), alternateSpace.getPdfObject(),
-                    ((AbstractPdfFunction)tintTransform).getPdfObject(), attributes);
+                    ((AbstractPdfFunction<PdfDictionary>)tintTransform).getPdfObject(), attributes);
             if (tintTransform.getInputSize() != 1 ||
                     tintTransform.getOutputSize() != alternateSpace.getNumberOfComponents()) {
                 throw new PdfException(

kernel/src/test/java/com/itextpdf/kernel/pdf/function/BaseInputOutPutConvertorsTest.java

@@ -78,7 +78,8 @@ public void testInvalidOffsetAndLength() throws IOException {
 
     @Test
     public void testInvalidLengthForWordSize() throws IOException {
-        BaseInputOutPutConvertors.IInputConversionFunction inputConvertor = BaseInputOutPutConvertors.getInputConvertor(1, 1);
+        BaseInputOutPutConvertors.IInputConversionFunction inputConvertor = BaseInputOutPutConvertors.getInputConvertor(
+                1, 1);
 
         BaseInputOutPutConvertors.IOutputConversionFunction outputConvertor = BaseInputOutPutConvertors.getOutputConvertor(1, 1);
 

kernel/src/test/java/com/itextpdf/kernel/pdf/function/PdfFunctionFactoryTest.java

@@ -6,12 +6,15 @@
 import com.itextpdf.kernel.pdf.PdfName;
 import com.itextpdf.kernel.pdf.PdfNumber;
 import com.itextpdf.kernel.pdf.PdfStream;
+import com.itextpdf.test.ExtendedITextTest;
+import com.itextpdf.test.annotations.type.IntegrationTest;
 
-import junit.framework.TestCase;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
-public class PdfFunctionFactoryTest extends TestCase {
+@Category(IntegrationTest.class)
+public class PdfFunctionFactoryTest extends ExtendedITextTest {
 
     @Test
     public void testCreateFunctionType0() {
@@ -24,7 +27,7 @@ public void testCreateFunctionType0() {
         stream.put(PdfName.BitsPerSample, new PdfNumber(1));
         IPdfFunction function = PdfFunctionFactory.create(stream);
 
-        assertTrue(function instanceof PdfType0Function);
+        Assert.assertTrue(function instanceof PdfType0Function);
     }
 
     @Test
@@ -36,7 +39,7 @@ public void testCreateFunctionType2() {
         object.put(PdfName.N, new PdfNumber(2));
         IPdfFunction function = PdfFunctionFactory.create(object);
 
-        assertTrue(function instanceof PdfType2Function);
+        Assert.assertTrue(function instanceof PdfType2Function);
     }
 
     @Test
@@ -54,7 +57,7 @@ public void testCreateFunctionType3() {
         object.put(PdfName.Encode, new PdfArray(new double[] {0, 1, 0, 1}));
         IPdfFunction function = PdfFunctionFactory.create(object);
 
-        assertTrue(function instanceof PdfType3Function);
+        Assert.assertTrue(function instanceof PdfType3Function);
     }
 
 
@@ -69,7 +72,7 @@ public void testCreateFunctionType4() {
         stream.put(PdfName.BitsPerSample, new PdfNumber(1));
         IPdfFunction function = PdfFunctionFactory.create(stream);
 
-        assertTrue(function instanceof PdfType4Function);
+        Assert.assertTrue(function instanceof PdfType4Function);
     }
 
 
@@ -82,9 +85,9 @@ public void testInvalidFunctionTypeThrowsException() {
         stream.put(PdfName.Range, new PdfArray(
                 new double[] {1,2,3,4,5,6}));
         stream.put(PdfName.BitsPerSample, new PdfNumber(1));
-        PdfException ex = Assert.assertThrows(PdfException.class, () -> PdfFunctionFactory.create(stream));
+        Exception ex = Assert.assertThrows(PdfException.class, () -> PdfFunctionFactory.create(stream));
 
-        assertEquals("Invalid function type 1", ex.getMessage());
+        Assert.assertEquals("Invalid function type 1", ex.getMessage());
     }
 
     @Test
@@ -96,9 +99,9 @@ public void testDictionaryForType0Throws() {
         dict.put(PdfName.Range, new PdfArray(
                 new double[] {1,2,3,4,5,6}));
         dict.put(PdfName.BitsPerSample, new PdfNumber(1));
-        PdfException ex = Assert.assertThrows(PdfException.class, () -> PdfFunctionFactory.create(dict));
+        Exception ex = Assert.assertThrows(PdfException.class, () -> PdfFunctionFactory.create(dict));
 
-        assertEquals("Invalid object type, a function type 0 requires a stream object", ex.getMessage());
+        Assert.assertEquals("Invalid object type, a function type 0 requires a stream object", ex.getMessage());
     }
 
     @Test
@@ -110,16 +113,16 @@ public void testDictionaryForType4Throws() {
         dict.put(PdfName.Range, new PdfArray(
                 new double[] {1,2,3,4,5,6}));
         dict.put(PdfName.BitsPerSample, new PdfNumber(1));
-        PdfException ex = Assert.assertThrows(PdfException.class, () -> PdfFunctionFactory.create(dict));
+        Exception ex = Assert.assertThrows(PdfException.class, () -> PdfFunctionFactory.create(dict));
 
-        assertEquals("Invalid object type, a function type 4 requires a stream object", ex.getMessage());
+        Assert.assertEquals("Invalid object type, a function type 4 requires a stream object", ex.getMessage());
     }
 
     @Test
     public void testArrayThrows() {
         PdfArray array = new PdfArray();
-        PdfException ex = Assert.assertThrows(PdfException.class, () -> PdfFunctionFactory.create(array));
+        Exception ex = Assert.assertThrows(PdfException.class, () -> PdfFunctionFactory.create(array));
 
-        assertEquals("Invalid object type, a function must be either a Dictionary or a Stream", ex.getMessage());
+        Assert.assertEquals("Invalid object type, a function must be either a Dictionary or a Stream", ex.getMessage());
     }
 }