Changeset 234 for trunk/tests

Timestamp:

08/19/08 14:11:51 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/tests/org/expeditee/gui/AttributeValuePairTest.java (moved) (moved from trunk/tests/org/expeditee/gui/AttributeUtilsTest.java ) (6 diffs)

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

@@ -7 +7 @@
 import org.expeditee.items.Text;
 
-public class AttributeUtilsTest extends TestCase {
+public class AttributeValuePairTest extends TestCase {
 
         public final void testExtractAttributes() {
@@ -14 +14 @@
 
         public final void testSetAttribute() {
-                Text attributes = new Text("s:50");
-                
-                assertFalse( AttributeUtils.setAttribute(null,attributes));
-                assertFalse( AttributeUtils.setAttribute(attributes,null));
-                
-                assertTrue( AttributeUtils.setAttribute(attributes, attributes));
+                Text attributes = new Text("");
+                Text text = new Text("Test");
+
+                assertFalse(AttributeUtils.setAttribute(text, attributes));
+
+                // Do a test with no attribute value pairs
+                attributes.setText("NO_AVP");
+                assertFalse(AttributeUtils.setAttribute(text, attributes));
+
+                assertFalse(AttributeUtils.setAttribute(null, attributes));
+                assertFalse(AttributeUtils.setAttribute(attributes, null));
+
+                attributes.setText("s:50");
+                assertTrue(AttributeUtils.setAttribute(attributes, attributes));
                 assertEquals(50.0F, attributes.getSize());
                 attributes.setText("size:25");
                 assertTrue(AttributeUtils.setAttribute(attributes, attributes));
                 assertEquals(25.0F, attributes.getSize());
-                
+
                 attributes.setText("c:red");
                 assertTrue(AttributeUtils.setAttribute(attributes, attributes));
@@ -39 +47 @@
                                 { "@NoValue", "" },
                                 { " @NoVaLuE ", "" },
-                                { "@Value   : : : value3", "value3" },
+                                { "@Value   : : : value3", "" },
+                                { "@Value:  value3", "value3" },
                                 { "   ", "" },
-                                { "Att: value4 " + (char)Character.LINE_SEPARATOR + "A comment",
-                                                "value4" } };
+                                {
+                                                "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]));
+                        AttributeValuePair avp = new AttributeValuePair(data[i][0]);
+                        assertEquals(data[i][1], avp.getValue());
                 }
         }
@@ -50 +61 @@
         public final void testGetAttribute() {
                 String[][] data = new String[][] { { "AtT1: Value1", "AtT1" },
-                                { "  Att2  :  Value2  ", "Att2" }, { "@NoValue", "@NoValue" },
+                                { "  Att2  :  Value2  ", "Att2" }, { "@NoValue", "NoValue" },
                                 { "@Att3 : Value", null }, { "@ Att3: Value", null },
                                 { " @Att3: Value ", "@Att3" }, { ": value3", null },
                                 { "@1Test: value3", null }, { "@t est: value3", null },
-                                { "Att4 : test : value4", "Att4" },{ "@", null },{ "a", null }, { "*!*", null } };
+                                { "Att4 : test : value4", "Att4 : test" }, { "@", null },
+                                { "a", null }, { "*!*", null }, { "*!*: @%@", "*!*" } };
                 for (int i = 0; i < data.length; i++) {
-                        assertEquals(data[i][1], AttributeUtils.getAttribute(data[i][0]));
+                        // System.out.println("i = " + i);
+                        AttributeValuePair avp = new AttributeValuePair(data[i][0]);
+                        assertEquals(data[i][1], avp.getAttribute());
                 }
         }
@@ -64 +78 @@
                                 { "AtT1: Value1", "NewValue", "AtT1: NewValue" },
                                 { "  Att2  :  Value2  ", "Att2", "Att2: Att2" },
-                                { " @NoValue ", " 15", "@NoValue:  15" } };
+                                { " @NoValue ", " 15", "@NoValue: 15" },
+                                { " 54 ", " 15", "54: 15" } };
                 Text test = new Text(-1);
 
@@ -75 +90 @@
 
         public final void testGetDoubleValue() {
-                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()));
+                Object[][] validData = new Object[][] { { "  Att2  :  3.5  ", 3.5 } };
+                for (int i = 0; i < validData.length; i++) {
+                        AttributeValuePair avp = new AttributeValuePair(validData[i][0]
+                                        .toString());
+                        assertEquals(validData[i][1], avp.getDoubleValue());
+                }
+                Object[][] invalidData = new Object[][] { { "AtT1: Value1", null },
+                                { "@NoValue", null } };
+                for (int i = 0; i < invalidData.length; i++) {
+                        try {
+                                AttributeValuePair avp = new AttributeValuePair(
+                                                invalidData[i][0].toString());
+                                avp.getDoubleValue();
+                        } catch (Exception e) {
+                                continue;
+                        }
+                        fail();
                 }
         }