upgrade TestPaletteRecord to junit4

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1739587 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
index cbf90186473a6a9739d29be6645ef821172acc81..b7598fd124b76110b0cd34bbfe1e0fb69d4c744a 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
+++ b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
@@ -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,

diff --git a/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java b/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
index be40e8fedbe65b56a49aa6adf612fcd0bbc85924..9fd3c2ad47cd017e82d64f9b6b4b859483b478e0 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
@@ -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);