Changeset 96 for trunk/tests

Timestamp:

06/10/08 10:01:16 (16 years ago)

Author:

ra33

Message:

Updated tests

Location:

trunk/tests/org/expeditee

Files:

• gui/AttributeUtilsTest.java (modified) (2 diffs)
• io/ConversionTest.java (modified) (6 diffs)
• items/JustificationTest.java (added)

trunk/tests/org/expeditee/gui/AttributeUtilsTest.java

@@ -1 +1 @@
 package org.expeditee.gui;
 
+import java.awt.Color;
+
 import junit.framework.TestCase;
+
+import org.expeditee.items.Text;
 
 public class AttributeUtilsTest extends TestCase {
 
         public final void testExtractAttributes() {
-                //fail("Not yet implemented");
+                assertEquals(null, AttributeUtils.extractAttributes(null));
         }
 
         public final void testSetAttribute() {
-                //fail("Not yet implemented");
+                Text attributes = new Text(-1, "s:50");
+                
+                assertFalse( AttributeUtils.setAttribute(null,attributes));
+                assertFalse( AttributeUtils.setAttribute(attributes,null));
+                
+                assertTrue( AttributeUtils.setAttribute(attributes, attributes));
+                assertEquals(50, attributes.getSize());
+                attributes.setText("size:25");
+                assertTrue(AttributeUtils.setAttribute(attributes, attributes));
+                assertEquals(25, attributes.getSize());
+                
+                attributes.setText("c:red");
+                assertTrue(AttributeUtils.setAttribute(attributes, attributes));
+                assertEquals(Color.red, attributes.getColor());
+                attributes.setText("color:green");
+                assertTrue(AttributeUtils.setAttribute(attributes, attributes));
+                assertEquals(Color.green, attributes.getColor());
         }
 
         public final void testGetValue() {
-                String[][] data = new String[][]{
-                                {"Att: Value1", "Value1"},
-                                {"  Att  :  Value2  ", "Value2"},
-                                {"@NoValue",""},
-                                {" @VaLuE ", "@VaLuE"},
-                                {"@Value   : : : value3", "value3"},
-                                {"Att: value4 \nA comment", "value4 \nA comment"}
-                };
-                for(int i = 0; i < data.length; i++){
+                String[][] data = new String[][] {
+                                { "Att:Value1", "Value1" },
+                                { "  Att  :  Value2  ", "Value2" },
+                                { "@NoValue", "" },
+                                { " @NoVaLuE ", "" },
+                                { "@Value   : : : value3", "value3" },
+                                { "   ", "" },
+                                { "Att: value4 " + (char)Character.LINE_SEPARATOR + "A comment",
+                                                "value4" } };
+                for (int i = 0; i < data.length; i++) {
                         assertEquals(data[i][1], AttributeUtils.getValue(data[i][0]));
                 }
@@ -28 +49 @@
 
         public final void testGetAttribute() {
-                String[][] data = new String[][]{
-                                {"AtT1: Value1", "AtT1"},
-                                {"  Att2  :  Value2  ", "Att2"},
-                                {"@NoValue",null},
-                                {" @Att3 : Value ", "@Att3"},
-                                {" : value3", null},
-                                {"Att4 : test : value4", "Att4"}
-                };
-                for(int i = 0; i < data.length; i++){
+                String[][] data = new String[][] { { "AtT1: Value1", "AtT1" },
+                                { "  Att2  :  Value2  ", "Att2" }, { "@NoValue", null },
+                                { "@Att3 : Value", null }, { "@ Att3: Value", null },
+                                { " @Att3: Value ", "@Att3" }, { ": value3", null },
+                                { "@1Test: value3", null }, { "@t est: value3", null },
+                                { "Att4 : test : value4", "Att4" } };
+                for (int i = 0; i < data.length; i++) {
                         assertEquals(data[i][1], AttributeUtils.getAttribute(data[i][0]));
                 }
         }
 
-        public final void testSetSingleValue() {
-                //fail("Not yet implemented");
+        public final void testReplaceValue() {
+                String[][] data = new String[][] {
+                                { "AtT1: Value1", "NewValue", "AtT1: NewValue" },
+                                { "  Att2  :  Value2  ", "Att2", "Att2: Att2" },
+                                { " @NoValue ", " 15", "@NoValue:  15" } };
+                Text test = new Text(-1);
+
+                for (int i = 0; i < data.length; i++) {
+                        test.setText(data[i][0]);
+                        AttributeUtils.replaceValue(test, data[i][1]);
+                        assertEquals(data[i][2], test.getText());
+                }
         }
 
         public final void testGetDoubleValue() {
-                //fail("Not yet implemented");
+                Object[][] data = new Object[][] { { "AtT1: Value1", null },
+                                { "  Att2  :  3.5  ", 3.5 }, { "@NoValue", null } };
+                for (int i = 0; i < data.length; i++) {
+                        assertEquals(data[i][1], AttributeUtils.getDoubleValue(data[i][0]
+                                        .toString()));
+                }
         }
 

trunk/tests/org/expeditee/io/ConversionTest.java

@@ -11 +11 @@
 
 import org.expeditee.items.Item;
+import org.expeditee.items.Justification;
 import org.expeditee.items.Text;
 
@@ -105 +106 @@
 
         public final void testGetFrameset() {
-                assertTrue(Conversion.getFrameset("a1").equals("a"));
-                assertTrue(Conversion.getFrameset("a91").equals("a"));
-                assertTrue(Conversion.getFrameset("Aa1C1").equals("aa1c"));
-                assertTrue(Conversion.getFrameset("Aa1C1", false).equals("Aa1C"));
-                assertTrue(Conversion.getFrameset("Abc1C1", true).equals(
-                                Conversion.getFrameset("Abc1C1")));
-        }
-
-        public final void testGetJustification() {
-                assertEquals(Item.JUSTIFICATION_CENTER, Conversion
-                                .getJustification("center"));
-                assertEquals(Item.JUSTIFICATION_CENTER, Conversion
-                                .getJustification("c"));
-                assertEquals(Item.JUSTIFICATION_RIGHT, Conversion.getJustification("R"));
-                assertEquals(Item.JUSTIFICATION_RIGHT, Conversion
-                                .getJustification("RIGHT"));
-                assertEquals(Item.JUSTIFICATION_LEFT, Conversion.getJustification("L"));
-                assertEquals(Item.JUSTIFICATION_LEFT, Conversion
-                                .getJustification("lEfT"));
-                assertEquals(Item.JUSTIFICATION_FULL, Conversion.getJustification("f"));
-                assertEquals(Item.JUSTIFICATION_FULL, Conversion
-                                .getJustification("FuLl"));
-                assertEquals(Item.JUSTIFICATION_NONE, Conversion
-                                .getJustification("NONE"));
-        }
-
-        public final void testGetExpediteeJustificationCode() {
-                assertEquals("C", Conversion
-                                .getExpediteeJustificationCode(Item.JUSTIFICATION_CENTER));
-                assertEquals("L", Conversion
-                                .getExpediteeJustificationCode(Item.JUSTIFICATION_LEFT));
-                assertEquals("R", Conversion
-                                .getExpediteeJustificationCode(Item.JUSTIFICATION_RIGHT));
-                assertEquals("F", Conversion
-                                .getExpediteeJustificationCode(Item.JUSTIFICATION_FULL));
-                assertEquals(null, Conversion
-                                .getExpediteeJustificationCode(Item.JUSTIFICATION_NONE));
-                assertEquals(null, Conversion
-                                .getExpediteeJustificationCode(Integer.MAX_VALUE));
-                assertEquals(null, Conversion
-                                .getExpediteeJustificationCode(Integer.MIN_VALUE));
+                assertTrue(Conversion.getFramesetName("a1").equals("a"));
+                assertTrue(Conversion.getFramesetName("a91").equals("a"));
+                assertTrue(Conversion.getFramesetName("Aa1C1").equals("aa1c"));
+                assertTrue(Conversion.getFramesetName("Aa1C1", false).equals("Aa1C"));
+                assertTrue(Conversion.getFramesetName("Abc1C1", true).equals(
+                                Conversion.getFramesetName("Abc1C1")));
         }
 
@@ -228 +194 @@
                                         new Class[] { Point.class });
                         Method setJustification = Text.class.getMethod("setJustification",
-                                        new Class[] { int.class });
+                                        new Class[] { Justification.class });
                         Method setArrow = Text.class.getMethod("setArrow", new Class[] {
                                         int.class, double.class });
@@ -250 +216 @@
                                         null);
                         assertEquals(1, result.length);
-                        assertEquals(Conversion.getJustification(justificationCode),
+                        assertEquals(Justification.getJustification(justificationCode),
                                         result[0]);
 
@@ -257 +223 @@
                                         .Convert(setJustification, justificationCode, "");
                         assertEquals(1, result.length);
-                        assertEquals(Conversion.getJustification(justificationCode),
+                        assertEquals(Justification.getJustification(justificationCode),
                                         result[0]);
 
@@ -305 +271 @@
                                         "getJustification", new Class[] {});
 
-                        assertEquals("C", Conversion.ConvertToExpeditee(getJustification,
-                                        Item.JUSTIFICATION_CENTER));
+                        assertEquals('C', Conversion.ConvertToExpeditee(getJustification,
+                                        Justification.center));
 
                         assertEquals("Test", Conversion.ConvertToExpeditee(getPosition,