diff options
author | Alexander Kurtakov | 2015-12-17 08:14:08 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2015-12-17 08:14:08 +0000 |
commit | 122ce28aad692005501429b7470da4d056e90df6 (patch) | |
tree | fd751d2b319c9670dbbb8932d0ba1ee2c686e836 /tests | |
parent | 3662db272ba3f22c265ccb33ec1d70dc00da152e (diff) | |
download | eclipse.platform.swt-122ce28aad692005501429b7470da4d056e90df6.tar.gz eclipse.platform.swt-122ce28aad692005501429b7470da4d056e90df6.tar.xz eclipse.platform.swt-122ce28aad692005501429b7470da4d056e90df6.zip |
Bug 484541 - Adapt to Combo.setItems and PaletteData varargs
Update tests/snippets/examples to use the varargs methods to both test
and make their existence more visible.
Change-Id: Ic996678125f05880bdb93fd7e492c9c6911f845a
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'tests')
4 files changed, 49 insertions, 49 deletions
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java index 45ce8774bb..6e69e0bfcd 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java @@ -194,7 +194,7 @@ public void test_drawImageLorg_eclipse_swt_graphics_ImageII() { Color c2 = new Color(display, 0, 0, 0); Color c3 = new Color(display, 255, 255, 0); - PaletteData paletteData = new PaletteData(new RGB[] {c1.getRGB(), c2.getRGB(), c3.getRGB()}); + PaletteData paletteData = new PaletteData(c1.getRGB(), c2.getRGB(), c3.getRGB()); ImageData data = new ImageData(30,30, 8, paletteData); for (int y = 0; y < data.height; y++) { for (int x = 0; x < data.width; x++) { @@ -238,7 +238,7 @@ public void test_drawImageLorg_eclipse_swt_graphics_ImageIIIIIIII() { Color c2 = new Color(display, 0, 0, 0); Color c3 = new Color(display, 255, 255, 0); - PaletteData paletteData = new PaletteData(new RGB[] {c1.getRGB(), c2.getRGB(), c3.getRGB()}); + PaletteData paletteData = new PaletteData(c1.getRGB(), c2.getRGB(), c3.getRGB()); ImageData data = new ImageData(30,30, 8, paletteData); for (int y = 0; y < data.height; y++) { for (int x = 0; x < data.width; x++) { diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java index 1e2ff9cf41..05d048fc42 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java @@ -216,11 +216,11 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra // } catch (SWTException e) { // } - data = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + data = new ImageData(10, 10, 1, new PaletteData(new RGB(0, 0, 0))); image = new Image(null, data); image.dispose(); - data = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + data = new ImageData(10, 10, 1, new PaletteData(new RGB(0, 0, 0))); image = new Image(display, data); image.dispose(); @@ -242,7 +242,7 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra @Test public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageData() { ImageData data = null; - ImageData data1 = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + ImageData data1 = new ImageData(10, 10, 1, new PaletteData(new RGB(0, 0, 0))); Image image = null; try { @@ -253,7 +253,7 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra assertSWTProblem("Incorrect exception thrown for ImageData source == null", SWT.ERROR_NULL_ARGUMENT, e); } - data = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + data = new ImageData(10, 10, 1, new PaletteData(new RGB(0, 0, 0))); data1 = null; try { image = new Image(display, data, data1); @@ -263,8 +263,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra assertSWTProblem("Incorrect exception thrown for ImageData mask == null", SWT.ERROR_NULL_ARGUMENT, e); } - data = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); - data1 = new ImageData(1, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + data = new ImageData(10, 10, 1, new PaletteData(new RGB(0, 0, 0))); + data1 = new ImageData(1, 10, 1, new PaletteData(new RGB(0, 0, 0))); try { image = new Image(display, data, data1); image.dispose(); @@ -273,8 +273,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra assertSWTProblem("Incorrect exception thrown for ImageData source width != ImageData mask width", SWT.ERROR_INVALID_ARGUMENT, e); } - data = new ImageData(10, 1, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); - data1 = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + data = new ImageData(10, 1, 1, new PaletteData(new RGB(0, 0, 0))); + data1 = new ImageData(10, 10, 1, new PaletteData(new RGB(0, 0, 0))); try { image = new Image(display, data, data1); image.dispose(); @@ -283,15 +283,15 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra assertSWTProblem("Incorrect exception thrown for ImageData source height != ImageData mask height", SWT.ERROR_INVALID_ARGUMENT, e); } - data = new ImageData(10, 10, 8, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); - data1 = new ImageData(10, 10, 8, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + data = new ImageData(10, 10, 8, new PaletteData(new RGB(0, 0, 0))); + data1 = new ImageData(10, 10, 8, new PaletteData(new RGB(0, 0, 0))); image = new Image(display, data, data1); // Image now accepts masks where depth != 1 image.dispose(); data = new ImageData(10, 10, 8, new PaletteData(0x30, 0x0C, 0x03)); // set opaque red pixel at x=9, y=9 data.setPixel(9, 9, 0x30); - data1 = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0), new RGB(255, 255, 255)})); + data1 = new ImageData(10, 10, 1, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); data1.setPixel(9, 9, 1); image = new Image(display, data, data1); Image gcImage = new Image(display, 10, 10); @@ -624,7 +624,7 @@ public void test_equalsLjava_lang_Object() { assertTrue(":b:", image.equals(image1)); - ImageData imageData = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + ImageData imageData = new ImageData(10, 10, 1, new PaletteData(new RGB(0, 0, 0))); image.dispose(); image = new Image(display, imageData); image1 = new Image(display, imageData); @@ -718,7 +718,7 @@ public void test_getBounds() { assertEquals(":b:", bounds, bounds1); // create icon image - ImageData imageData = new ImageData(bounds.width, bounds.height, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + ImageData imageData = new ImageData(bounds.width, bounds.height, 1, new PaletteData(new RGB(0, 0, 0))); image = new Image(display, imageData); bounds1 = image.getBounds(); image.dispose(); @@ -743,7 +743,7 @@ public void test_hashCode() { assertEquals(":a:", image1.hashCode(), image.hashCode()); - ImageData imageData = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + ImageData imageData = new ImageData(10, 10, 1, new PaletteData(new RGB(0, 0, 0))); image.dispose(); image = new Image(display, imageData); image1 = new Image(display, imageData); @@ -836,7 +836,7 @@ public void test_setBackgroundLorg_eclipse_swt_graphics_Color() { image.dispose(); // create an image with transparency and then set the background color - ImageData imageData = new ImageData(10, 10, 2, new PaletteData(new RGB[] {new RGB(0, 0, 0), new RGB(255, 255, 255), new RGB(50, 100, 150)})); + ImageData imageData = new ImageData(10, 10, 2, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255), new RGB(50, 100, 150))); imageData.transparentPixel = 0; // transparent pixel is currently black image = new Image(display, imageData); image.setBackground(display.getSystemColor(SWT.COLOR_GREEN)); diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java index f3df8526c5..63c7898002 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java @@ -48,13 +48,13 @@ public void setUp() { @Test public void test_ConstructorIIILorg_eclipse_swt_graphics_PaletteData() { try { - new ImageData(-1, 1, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + new ImageData(-1, 1, 1, new PaletteData(new RGB(0, 0, 0))); fail("No exception thrown for width < 0"); } catch (IllegalArgumentException e) { } try { - new ImageData(1, -1, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + new ImageData(1, -1, 1, new PaletteData(new RGB(0, 0, 0))); fail("No exception thrown for height < 0"); } catch (IllegalArgumentException e) { } @@ -66,14 +66,14 @@ public void test_ConstructorIIILorg_eclipse_swt_graphics_PaletteData() { } try { - new ImageData(1, 1, 3, new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + new ImageData(1, 1, 3, new PaletteData(new RGB(0, 0, 0))); fail("No exception thrown for unsupported depth"); } catch (IllegalArgumentException e) { } int[] validDepths = {1, 2, 4, 8, 16, 24, 32}; for (int i = 0; i < validDepths.length; i++) { - new ImageData(1, 1, validDepths[i], new PaletteData(new RGB[] {new RGB(0, 0, 0)})); + new ImageData(1, 1, validDepths[i], new PaletteData(new RGB(0, 0, 0))); } } @@ -82,13 +82,13 @@ public void test_ConstructorIIILorg_eclipse_swt_graphics_PaletteDataI$B() { byte[] validData = new byte[] {0, 0x4f, 0x4f, 0}; try { - new ImageData(-1, 1, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)}), 1, validData); + new ImageData(-1, 1, 1, new PaletteData(new RGB(0, 0, 0)), 1, validData); fail("No exception thrown for width < 0"); } catch (IllegalArgumentException e) { } try { - new ImageData(1, -1, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)}), 1, validData); + new ImageData(1, -1, 1, new PaletteData(new RGB(0, 0, 0)), 1, validData); fail("No exception thrown for height < 0"); } catch (IllegalArgumentException e) { } @@ -100,37 +100,37 @@ public void test_ConstructorIIILorg_eclipse_swt_graphics_PaletteDataI$B() { } try { - new ImageData(1, 1, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)}), 1, null); + new ImageData(1, 1, 1, new PaletteData(new RGB(0, 0, 0)), 1, null); fail("No exception thrown for data == null"); } catch (IllegalArgumentException e) { } try { - new ImageData(1, 1, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)}), 1, new byte[] {}); + new ImageData(1, 1, 1, new PaletteData(new RGB(0, 0, 0)), 1, new byte[] {}); fail("No exception thrown for data array too small"); } catch (IllegalArgumentException e) { } try { - new ImageData(1, 1, 16, new PaletteData(new RGB[] {new RGB(0, 0, 0)}), 1, new byte[] {0x4f}); + new ImageData(1, 1, 16, new PaletteData(new RGB(0, 0, 0)), 1, new byte[] {0x4f}); fail("No exception thrown for data array too small"); } catch (IllegalArgumentException e) { } try { - new ImageData(1, 1, 32, new PaletteData(new RGB[] {new RGB(0, 0, 0)}), 1, new byte[] {0x4f, 0x4f}); + new ImageData(1, 1, 32, new PaletteData(new RGB(0, 0, 0)), 1, new byte[] {0x4f, 0x4f}); fail("No exception thrown for data array too small"); } catch (IllegalArgumentException e) { } try { - new ImageData(2, 2, 8, new PaletteData(new RGB[] {new RGB(0, 0, 0)}), 1, new byte[] {0x4f, 0x4f, 0x4f}); + new ImageData(2, 2, 8, new PaletteData(new RGB(0, 0, 0)), 1, new byte[] {0x4f, 0x4f, 0x4f}); fail("No exception thrown for data array too small"); } catch (IllegalArgumentException e) { } try { - new ImageData(1, 1, 3, new PaletteData(new RGB[] {new RGB(0, 0, 0)}), 1, validData); + new ImageData(1, 1, 3, new PaletteData(new RGB(0, 0, 0)), 1, validData); fail("No exception thrown for unsupported depth"); } catch (IllegalArgumentException e) { } @@ -138,12 +138,12 @@ public void test_ConstructorIIILorg_eclipse_swt_graphics_PaletteDataI$B() { // verify all valid depths int[] validDepths = {1, 2, 4, 8, 16, 24, 32}; for (int i = 0; i < validDepths.length; i++) { - new ImageData(1, 1, validDepths[i], new PaletteData(new RGB[] {new RGB(0, 0, 0)}), 1, validData); + new ImageData(1, 1, validDepths[i], new PaletteData(new RGB(0, 0, 0)), 1, validData); } // verify no divide by zero exception if scanlinePad == 0 try { - new ImageData(1, 1, 8, new PaletteData(new RGB[] {new RGB(0, 0, 0)}), 0, validData); + new ImageData(1, 1, 8, new PaletteData(new RGB(0, 0, 0)), 0, validData); fail("No exception thrown for scanlinePad == 0"); } catch (IllegalArgumentException e) { } @@ -374,7 +374,7 @@ public void test_getPixelII() { int depth = 4; byte pixelValue = 1; byte[] data = {(byte) ((pixelValue << 4) + pixelValue), (byte) (pixelValue << 4), (byte) ((pixelValue << 4) + pixelValue), (byte) (pixelValue << 4), (byte) ((pixelValue << 4) + pixelValue), (byte) (pixelValue << 4)}; - imageData = new ImageData(width, height, depth, new PaletteData(new RGB[] {new RGB(0, 0, 255), new RGB(111, 111, 111)}), 1, data); + imageData = new ImageData(width, height, depth, new PaletteData(new RGB(0, 0, 255), new RGB(111, 111, 111)), 1, data); for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { int pixel = imageData.getPixel(x, y); @@ -391,7 +391,7 @@ public void test_getPixelsIII$BI() { byte[] pixelData = new byte[SIZE]; // test 1 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 1, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 1, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); imageData.getPixels(0, 1, GET_WIDTH, pixelData, OFFSET); for (int i = 0; i < pixelData.length; i ++) { assertEquals(":a:", 0, pixelData[i]); @@ -411,7 +411,7 @@ public void test_getPixelsIII$BI() { } // test 2 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 2, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 2, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); imageData.getPixels(0, 1, GET_WIDTH, pixelData, OFFSET); for (int i = 0; i < pixelData.length; i ++) { assertEquals(":e:", 0, pixelData[i]); @@ -431,7 +431,7 @@ public void test_getPixelsIII$BI() { } // test 4 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 4, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 4, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); imageData.getPixels(0, 1, GET_WIDTH, pixelData, OFFSET); for (int i = 0; i < pixelData.length; i ++) { assertEquals(":i:", 0, pixelData[i]); @@ -451,7 +451,7 @@ public void test_getPixelsIII$BI() { } // test 8 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); imageData.getPixels(0, 1, GET_WIDTH, pixelData, OFFSET); for (int i = 0; i < pixelData.length; i ++) { assertEquals(":m:", 0, pixelData[i]); @@ -529,7 +529,7 @@ public void test_getPixelsIII$II() { int[] pixelData = new int[SIZE]; // test 1 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 1, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 1, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); imageData.getPixels(0, 1, GET_WIDTH, pixelData, OFFSET); for (int i = 0; i < pixelData.length; i ++) { assertEquals(":a:", 0, pixelData[i]); @@ -549,7 +549,7 @@ public void test_getPixelsIII$II() { } // test 2 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 2, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 2, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); imageData.getPixels(0, 1, GET_WIDTH, pixelData, OFFSET); for (int i = 0; i < pixelData.length; i ++) { assertEquals(":e:", 0, pixelData[i]); @@ -569,7 +569,7 @@ public void test_getPixelsIII$II() { } // test 4 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 4, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 4, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); imageData.getPixels(0, 1, GET_WIDTH, pixelData, OFFSET); for (int i = 0; i < pixelData.length; i ++) { assertEquals(":i:", 0, pixelData[i]); @@ -589,7 +589,7 @@ public void test_getPixelsIII$II() { } // test 8 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); imageData.getPixels(0, 1, GET_WIDTH, pixelData, OFFSET); for (int i = 0; i < pixelData.length; i ++) { assertEquals(":m:", 0, pixelData[i]); @@ -934,7 +934,7 @@ public void test_setPixelsIII$BI() { byte[] pixelData = new byte[SIZE]; // test 1 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 1, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 1, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); byte[] values = new byte[]{0x1, 0x1, 0x1, 0x1, 0x1}; imageData.setPixels(0, 1, values.length - OFFSET, values, OFFSET); imageData.getPixels(0, 1, IMAGE_DIMENSION, pixelData, 0); @@ -947,7 +947,7 @@ public void test_setPixelsIII$BI() { } // test 2 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 2, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 2, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); values = new byte[]{0x1, 0x2, 0x3, 0x2, 0x1}; imageData.setPixels(0, 1, values.length - OFFSET, values, OFFSET); imageData.getPixels(0, 1, IMAGE_DIMENSION, pixelData, 0); @@ -960,7 +960,7 @@ public void test_setPixelsIII$BI() { } // test 4 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 4, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 4, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); values = new byte[]{0x1, 0x2, 0x3, 0x4, 0xF}; imageData.setPixels(0, 1, values.length - OFFSET, values, OFFSET); imageData.getPixels(0, 1, IMAGE_DIMENSION, pixelData, 0); @@ -973,7 +973,7 @@ public void test_setPixelsIII$BI() { } // test 8 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); values = new byte[]{0x1, 0x2, 0x3, 0xF, (byte)0xFF}; imageData.setPixels(0, 1, values.length - OFFSET, values, OFFSET); imageData.getPixels(0, 1, IMAGE_DIMENSION, pixelData, 0); @@ -1043,7 +1043,7 @@ public void test_setPixelsIII$II() { int[] pixelData = new int[SIZE]; // test 1 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 1, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 1, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); int[] values = new int[]{0x1, 0x1, 0x1, 0x1, 0x1}; imageData.setPixels(0, 1, values.length - OFFSET, values, OFFSET); imageData.getPixels(0, 1, IMAGE_DIMENSION, pixelData, 0); @@ -1056,7 +1056,7 @@ public void test_setPixelsIII$II() { } // test 2 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 2, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 2, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); values = new int[]{0x1, 0x2, 0x3, 0x2, 0x1}; imageData.setPixels(0, 1, values.length - OFFSET, values, OFFSET); imageData.getPixels(0, 1, IMAGE_DIMENSION, pixelData, 0); @@ -1069,7 +1069,7 @@ public void test_setPixelsIII$II() { } // test 4 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 4, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 4, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); values = new int[]{0x1, 0x2, 0x3, 0x4, 0xF}; imageData.setPixels(0, 1, values.length - OFFSET, values, OFFSET); imageData.getPixels(0, 1, IMAGE_DIMENSION, pixelData, 0); @@ -1082,7 +1082,7 @@ public void test_setPixelsIII$II() { } // test 8 bit - imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, new PaletteData(new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)})); + imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255))); values = new int[]{0x1, 0x2, 0x3, 0xF, 0xFF}; imageData.setPixels(0, 1, values.length - OFFSET, values, OFFSET); imageData.getPixels(0, 1, IMAGE_DIMENSION, pixelData, 0); diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java index 59ba1a827d..9ec90854f1 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java @@ -45,7 +45,7 @@ public void test_Constructor$Lorg_eclipse_swt_graphics_RGB() { new PaletteData(new RGB[] {null, null}); assertFalse(":b:", data.isDirect); - new PaletteData(new RGB[] {new RGB(0, 0, 0), new RGB(255, 255, 255)}); + new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255)); assertFalse(":c:", data.isDirect); } |