svn commit: r1739587 - in /poi/trunk/src/testcases/org/apache/poi/hssf/record: AllRecordTests.java TestPaletteRecord.java

[on...@apache.org]

Author: onealj
Date: Sun Apr 17 11:40:18 2016
New Revision: 1739587

URL: http://svn.apache.org/viewvc?rev=1739587&view=rev
Log:
upgrade TestPaletteRecord to junit4

Modified:
    poi/trunk/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
    poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java?rev=1739587&r1=1739586&r2=1739587&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java Sun Apr 17 11:40:18 2016
@@ -68,7 +68,7 @@ import org.junit.runners.Suite;
     TestNoteRecord.class,
     TestNoteStructureSubRecord.class,
     TestObjRecord.class,
-    TestPaletteRecord.class,
+    //TestPaletteRecord.class, //converted to junit4
     TestPaneRecord.class,
     TestPLVRecord.class,
     TestRecalcIdRecord.class,

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java?rev=1739587&r1=1739586&r2=1739587&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java Sun Apr 17 11:40:18 2016
@@ -17,33 +17,35 @@
 
 package org.apache.poi.hssf.record;
 
-import java.util.Iterator;
+import static org.junit.Assert.assertEquals;
+
 import java.util.Map;
-import junit.framework.TestCase;
+import java.util.Map.Entry;
+
 import org.apache.poi.hssf.util.HSSFColor;
+import org.junit.Test;
 
 /**
  * Verifies that custom palette editing works correctly
  *
  * @author Brian Sanders (bsanders at risklabs dot com)
  */
-public final class TestPaletteRecord extends TestCase {
+public final class TestPaletteRecord {
 
     /**
      * Tests that the default palette matches the constants of HSSFColor
      */
+    @Test
     public void testDefaultPalette() {
         PaletteRecord palette = new PaletteRecord();
 
         //make sure all the HSSFColor constants match
-        Map colors = HSSFColor.getIndexHash();
-        Iterator indexes = colors.keySet().iterator();
-        while (indexes.hasNext())
-        {
-            Integer index = (Integer) indexes.next();
-            HSSFColor c = (HSSFColor) colors.get(index);
+        Map<Integer, HSSFColor> colors = HSSFColor.getIndexHash();
+        for (Entry<Integer, HSSFColor> entry : colors.entrySet()) {
+            int index = entry.getKey();
+            HSSFColor c = entry.getValue();
             short[] rgbTriplet = c.getTriplet();
-            byte[] paletteTriplet = palette.getColor(index.shortValue());
+            byte[] paletteTriplet = palette.getColor((short) index);
             String msg = "Expected HSSFColor constant to match PaletteRecord at index 0x"
                 + Integer.toHexString(c.getIndex());
             assertEquals(msg, rgbTriplet[0], paletteTriplet[0] & 0xff);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org