Changeset 114 for trunk/tests
- Timestamp:
- 07/02/08 12:34:43 (16 years ago)
- Location:
- trunk/tests/org/expeditee
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/tests/org/expeditee/gui/FrameTest.java
r110 r114 2 2 3 3 import java.awt.Dimension; 4 import java.util.Collection; 4 5 import java.util.LinkedList; 5 import java.util.List;6 6 7 7 import junit.framework.TestCase; … … 46 46 public void testAddGetSingleOverlay() { 47 47 Frame f = new Frame(); 48 List<Overlay> overlays = f.getOverlays();48 Collection<Overlay> overlays = f.getOverlays(); 49 49 assertNotNull(overlays); 50 50 assertEquals(0, overlays.size()); … … 56 56 assertNotNull(overlays); 57 57 assertEquals(1, overlays.size()); 58 assertEquals(o, overlays. get(0));58 assertEquals(o, overlays.iterator().next()); 59 59 } 60 60 … … 71 71 root.addOverlay(o1); 72 72 73 List<Overlay> overlays = root.getOverlays();73 Collection<Overlay> overlays = root.getOverlays(); 74 74 assertNotNull(overlays); 75 75 assertEquals(1, overlays.size()); 76 assertEquals(o1, overlays. get(0));76 assertEquals(o1, overlays.iterator().next()); 77 77 78 78 f3.addOverlay(o2); … … 81 81 overlays = root.getOverlays(); 82 82 assertNotNull(overlays); 83 assertEquals( 2, overlays.size());83 assertEquals(3, overlays.size()); 84 84 assertTrue(overlays.contains(o1)); 85 85 assertTrue(overlays.contains(o3)); … … 105 105 overlays = root.getOverlays(); 106 106 assertNotNull(overlays); 107 assertEquals( 8, overlays.size());107 assertEquals(9, overlays.size()); 108 108 assertTrue(overlays.contains(o1)); 109 109 assertTrue(overlays.contains(o3)); … … 117 117 FrameGraphics.setMaxSize(new Dimension(100,100)); 118 118 119 List<Overlay> overlays = new LinkedList<Overlay>();119 Collection<Overlay> overlays = new LinkedList<Overlay>(); 120 120 overlays.add(new Overlay(new Frame(), Permission.none)); 121 121 overlays.add(new Overlay(new Frame(), Permission.followLinks)); … … 144 144 FrameGraphics.setMaxSize(new Dimension(100,100)); 145 145 146 List<Overlay> overlays = new LinkedList<Overlay>();146 Collection<Overlay> overlays = new LinkedList<Overlay>(); 147 147 Overlay toRemove = new Overlay(new Frame(), Permission.followLinks); 148 148 overlays.add(new Overlay(new Frame(), Permission.none)); … … 187 187 188 188 root.addOverlay(o0); 189 List<Overlay> overlays = root.getOverlays(); 190 assertNotNull(overlays); 191 assertEquals(1, overlays.size()); 192 assertEquals(o0, overlays.get(0)); 193 194 overlays = root.getOverlaysDeep(); 189 Collection<Overlay> overlays = root.getOverlays(); 195 190 assertNotNull(overlays); 196 191 assertEquals(4, overlays.size()); … … 202 197 203 198 f3.addOverlay(o5); 204 overlays = root.getOverlaysDeep(); 199 root.clearOverlays(); 200 root.addOverlay(o0); 201 overlays = root.getOverlays(); 205 202 assertNotNull(overlays); 206 203 assertEquals(5, overlays.size()); … … 212 209 213 210 root.clearOverlays(); 214 215 overlays = root.getOverlaysDeep(); 211 overlays = root.getOverlays(); 216 212 assertNotNull(overlays); 217 213 assertEquals(0, overlays.size()); … … 235 231 root.addOverlay(o1); 236 232 237 overlays = root.getOverlaysDeep(); 238 assertNotNull(overlays); 239 assertEquals(10, overlays.size()); 233 Collection<Overlay> overlays2 = root.getOverlays(); 234 assertNotNull(overlays2); 235 assertEquals(10, overlays2.size()); 236 240 237 241 238 f2.removeOverlay(f3); 242 243 overlays = root.getOverlaysDeep(); 239 root.clearOverlays(); 240 root.addAllOverlays(overlays); 241 root.addOverlay(o1); 242 243 overlays = root.getOverlays(); 244 244 assertNotNull(overlays); 245 245 assertEquals(7, overlays.size()); -
trunk/tests/org/expeditee/io/ConversionTest.java
r110 r114 166 166 assertEquals(8.0, Conversion.Convert(double.class, "-2.0", 10.0)); 167 167 // Integer test 168 assertEquals(255, Conversion.Convert(int.class, "0xFF", null)); 169 assertEquals(5, Conversion.Convert(int.class, "+0xF", -10)); 168 170 assertEquals(2, Conversion.Convert(int.class, "2", null)); 169 171 assertEquals(-8, Conversion.Convert(int.class, "+2", -10)); -
trunk/tests/org/expeditee/simple/ContextTest.java
r80 r114 8 8 public class ContextTest extends TestCase { 9 9 10 10 private Context context; 11 11 12 protected void setUp() throws Exception { 13 super.setUp(); 14 context = new Context(); 15 try { 16 context.getPrimitives().setValue("$i.test", "5"); 17 context.getPrimitives().set("$r.test", "$i.test"); 18 context.getPointers().setObject("$ip.test", new Text(1, "test")); 19 context.getPointers().set("$ip.test2", "$ip.test"); 20 } catch (Exception e) { 12 protected void setUp() throws Exception { 13 super.setUp(); 14 context = new Context(); 15 try { 16 context.getPrimitives().setValue("$i.test", "5"); 17 context.getPrimitives().set("$r.test", "$i.test"); 18 context.getPointers().setObject("$ip.test", new Text(1, "test")); 19 context.getPointers().set("$ip.test2", "$ip.test"); 20 } catch (Exception e) { 21 } 21 22 } 22 }23 23 24 25 assertEquals(context.size(), 4);26 24 public void testSize() { 25 assertEquals(context.size(), 4); 26 } 27 27 28 29 context.clear();30 assertEquals(context.size(), 0);31 28 public void testClear() { 29 context.clear(); 30 assertEquals(context.size(), 0); 31 } 32 32 33 34 try {35 36 } catch (Exception e) {33 public void testEqualValues() { 34 try { 35 assertTrue(context.equalValues("$i.test", "$r.Test")); 36 } catch (Exception e) { 37 37 38 } 38 39 } 39 }40 40 } -
trunk/tests/org/expeditee/simple/PrimitivesTest.java
r80 r114 102 102 primitives.setValue("$i.Test", "15"); 103 103 assertEquals(primitives.getIntegerValue("$i.Test"), 15); 104 105 primitives.setValue("$i.Test", "0xff"); 106 assertEquals(primitives.getIntegerValue("$i.Test"), 255); 104 107 105 108 primitives.setValue("$r.Test", "10.0"); 106 109 primitives.setValue("$r.Test", "15.0"); 107 110 assertEquals(primitives.getDoubleValue("$r.Test"), 15.0); 111 112 primitives.setValue("$r.Test", "0xff"); 113 assertEquals(primitives.getDoubleValue("$r.Test"), 255.0); 108 114 109 115 primitives.setValue("$b.Test", "True");
Note:
See TracChangeset
for help on using the changeset viewer.