Changeset 8450 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java
- Timestamp:
- 2015-06-03T01:27:41+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java
r7937 r8450 2 2 package org.openstreetmap.josm.data.osm; 3 3 4 import static org.junit.Assert.assertFalse; 5 import static org.junit.Assert.assertNull; 6 import static org.junit.Assert.assertSame; 4 7 import static org.junit.Assert.assertTrue; 5 8 … … 27 30 public void emptyNode() { 28 31 Node n = new Node(); 29 assert True(n.getKeys().size() ==0);30 assert True(!n.hasKeys());31 assert True(!n.hasKey("nosuchkey"));32 assertSame(n.getKeys().size(), 0); 33 assertFalse(n.hasKeys()); 34 assertFalse(n.hasKey("nosuchkey")); 32 35 assertTrue(n.keySet().isEmpty()); 33 36 … … 43 46 n.put("akey", "avalue"); 44 47 assertTrue(n.get("akey").equals("avalue")); 45 assert True(n.getKeys().size() ==1);48 assertSame(n.getKeys().size(), 1); 46 49 47 assert True(n.keySet().size() ==1);50 assertSame(n.keySet().size(), 1); 48 51 assertTrue(n.keySet().contains("akey")); 49 52 } … … 59 62 assertTrue(n.get("key.1").equals("value.1")); 60 63 assertTrue(n.get("key.2").equals("value.2")); 61 assert True(n.getKeys().size() ==2);64 assertSame(n.getKeys().size(), 2); 62 65 assertTrue(n.hasKeys()); 63 66 assertTrue(n.hasKey("key.1")); 64 67 assertTrue(n.hasKey("key.2")); 65 assert True(!n.hasKey("nosuchkey"));68 assertFalse(n.hasKey("nosuchkey")); 66 69 } 67 70 … … 75 78 n.put("key.2", "value.2"); 76 79 77 n.remove("nosuchkey"); 78 assert True(n.getKeys().size() ==2); // still 2 tags ?80 n.remove("nosuchkey"); // should work 81 assertSame(n.getKeys().size(), 2); // still 2 tags ? 79 82 80 83 n.remove("key.1"); 81 assert True(n.getKeys().size() ==1);82 assert True(!n.hasKey("key.1"));83 assert True(n.get("key.1") == null);84 assertSame(n.getKeys().size(), 1); 85 assertFalse(n.hasKey("key.1")); 86 assertNull(n.get("key.1")); 84 87 assertTrue(n.hasKey("key.2")); 85 88 assertTrue(n.get("key.2").equals("value.2")); 86 89 87 90 n.remove("key.2"); 88 assert True(n.getKeys().size() ==0);89 assert True(!n.hasKey("key.1"));90 assert True(n.get("key.1") == null);91 assert True(!n.hasKey("key.2"));92 assert True(n.get("key.2") == null);91 assertSame(n.getKeys().size(), 0); 92 assertFalse(n.hasKey("key.1")); 93 assertNull(n.get("key.1")); 94 assertFalse(n.hasKey("key.2")); 95 assertNull(n.get("key.2")); 93 96 } 94 97 … … 104 107 105 108 n.removeAll(); 106 assert True(n.getKeys().size() ==0);109 assertSame(n.getKeys().size(), 0); 107 110 } 108 111 … … 141 144 n2.put("key.2", "value.4"); 142 145 143 assert True(!n1.hasEqualSemanticAttributes(n2));146 assertFalse(n1.hasEqualSemanticAttributes(n2)); 144 147 } 145 148 }
Note:
See TracChangeset
for help on using the changeset viewer.