Changeset 1631 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags
- Timestamp:
- 2009-06-01T22:20:03+02:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
r1622 r1631 19 19 TagMergeModel model = new TagMergeModel(); 20 20 } 21 21 22 22 @Test 23 23 public void addPropertyChangeListener() { 24 24 TagMergeModel model = new TagMergeModel(); 25 25 PropertyChangeListener listener = new PropertyChangeListener() { 26 @Override 26 27 27 public void propertyChange(PropertyChangeEvent evt) { 28 28 } 29 29 }; 30 30 model.addPropertyChangeListener(listener); 31 31 32 32 ArrayList list = field("listeners").ofType(ArrayList.class) 33 34 35 36 assertEquals(1, list.size()); 37 assertEquals(listener, list.get(0)); 38 } 39 33 .in(model) 34 .get(); 35 36 assertEquals(1, list.size()); 37 assertEquals(listener, list.get(0)); 38 } 39 40 40 @Test 41 41 public void removePropertyChangeListener() { 42 42 TagMergeModel model = new TagMergeModel(); 43 43 PropertyChangeListener listener = new PropertyChangeListener() { 44 @Override 44 45 45 public void propertyChange(PropertyChangeEvent evt) { 46 46 } … … 48 48 model.addPropertyChangeListener(listener); 49 49 model.removePropertyChangeListener(listener); 50 50 51 51 ArrayList list = field("listeners") 52 53 54 55 56 57 } 58 52 .ofType(ArrayList.class) 53 .in(model) 54 .get(); 55 56 assertEquals(0, list.size()); 57 } 58 59 59 @Test 60 60 public void populateNoConflichts() { … … 63 63 TagMergeModel model = new TagMergeModel(); 64 64 model.populate(my, their); 65 66 ArrayList<TagMergeItem> list = field("tagMergeItems") 67 68 69 70 65 66 ArrayList<TagMergeItem> list = field("tagMergeItems") 67 .ofType(ArrayList.class) 68 .in(model) 69 .get(); 70 71 71 assertEquals(0, list.size()); 72 72 } 73 73 74 74 @Test 75 75 public void populateNoConflicts1() { … … 80 80 TagMergeModel model = new TagMergeModel(); 81 81 model.populate(my, their); 82 83 ArrayList<TagMergeItem> list = field("tagMergeItems") 84 85 86 87 82 83 ArrayList<TagMergeItem> list = field("tagMergeItems") 84 .ofType(ArrayList.class) 85 .in(model) 86 .get(); 87 88 88 assertEquals(0, list.size()); 89 89 } 90 90 91 91 @Test 92 92 public void populateMissingKeyMine() { … … 96 96 TagMergeModel model = new TagMergeModel(); 97 97 model.populate(my, their); 98 99 ArrayList<TagMergeItem> list = field("tagMergeItems") 100 101 102 103 98 99 ArrayList<TagMergeItem> list = field("tagMergeItems") 100 .ofType(ArrayList.class) 101 .in(model) 102 .get(); 103 104 104 assertEquals(1, list.size()); 105 105 TagMergeItem item = list.get(0); … … 109 109 assertEquals("value", item.getTheirTagValue()); 110 110 } 111 111 112 112 @Test 113 113 public void populateMissingKeyTheir() { 114 114 Node my = new Node(1); 115 115 my.put("key", "value"); 116 Node their = new Node(1); 117 TagMergeModel model = new TagMergeModel(); 118 model.populate(my, their); 119 120 ArrayList<TagMergeItem> list = field("tagMergeItems") 121 122 123 124 116 Node their = new Node(1); 117 TagMergeModel model = new TagMergeModel(); 118 model.populate(my, their); 119 120 ArrayList<TagMergeItem> list = field("tagMergeItems") 121 .ofType(ArrayList.class) 122 .in(model) 123 .get(); 124 125 125 assertEquals(1, list.size()); 126 126 TagMergeItem item = list.get(0); … … 130 130 assertEquals("value", item.getMyTagValue()); 131 131 } 132 132 133 133 @Test 134 134 public void populateConflictingValues() { … … 139 139 TagMergeModel model = new TagMergeModel(); 140 140 model.populate(my, their); 141 142 ArrayList<TagMergeItem> list = field("tagMergeItems") 143 144 145 146 141 142 ArrayList<TagMergeItem> list = field("tagMergeItems") 143 .ofType(ArrayList.class) 144 .in(model) 145 .get(); 146 147 147 assertEquals(1, list.size()); 148 148 TagMergeItem item = list.get(0); … … 152 152 assertEquals("theirvalue", item.getTheirTagValue()); 153 153 } 154 154 155 155 @Test 156 156 public void addItem() { … … 158 158 TagMergeModel model = new TagMergeModel(); 159 159 model.addItem(item); 160 161 ArrayList<TagMergeItem> list = field("tagMergeItems") 162 163 164 165 160 161 ArrayList<TagMergeItem> list = field("tagMergeItems") 162 .ofType(ArrayList.class) 163 .in(model) 164 .get(); 165 166 166 assertEquals(1, list.size()); 167 167 item = list.get(0); … … 171 171 assertEquals("theirvalue", item.getTheirTagValue()); 172 172 } 173 173 174 174 @Test 175 175 public void decide() { … … 177 177 TagMergeModel model = new TagMergeModel(); 178 178 model.addItem(item); 179 180 ArrayList<TagMergeItem> list = field("tagMergeItems") 181 182 183 184 185 model.decide(0, MergeDecisionType.KEEP_MINE); 179 180 ArrayList<TagMergeItem> list = field("tagMergeItems") 181 .ofType(ArrayList.class) 182 .in(model) 183 .get(); 184 185 model.decide(0, MergeDecisionType.KEEP_MINE); 186 186 assertEquals(1, list.size()); 187 187 item = list.get(0); 188 188 assertEquals(MergeDecisionType.KEEP_MINE, item.getMergeDecision()); 189 190 model.decide(0, MergeDecisionType.KEEP_THEIR); 189 190 model.decide(0, MergeDecisionType.KEEP_THEIR); 191 191 assertEquals(1, list.size()); 192 192 item = list.get(0); 193 193 assertEquals(MergeDecisionType.KEEP_THEIR, item.getMergeDecision()); 194 195 model.decide(0, MergeDecisionType.UNDECIDED); 196 assertEquals(1, list.size()); 197 item = list.get(0); 198 assertEquals(MergeDecisionType.UNDECIDED, item.getMergeDecision()); 199 } 200 194 195 model.decide(0, MergeDecisionType.UNDECIDED); 196 assertEquals(1, list.size()); 197 item = list.get(0); 198 assertEquals(MergeDecisionType.UNDECIDED, item.getMergeDecision()); 199 } 200 201 201 @Test 202 202 public void decideMultiple() { 203 203 204 204 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 205 205 TagMergeModel model = new TagMergeModel(); … … 207 207 model.addItem(new TagMergeItem("key-" + i, "myvalue-" + i, "theirvalue-" +i)); 208 208 } 209 210 ArrayList<TagMergeItem> list = field("tagMergeItems") 211 212 213 214 209 210 ArrayList<TagMergeItem> list = field("tagMergeItems") 211 .ofType(ArrayList.class) 212 .in(model) 213 .get(); 214 215 215 assertEquals(10, list.size()); 216 217 model.decide(new int[] {0, 3, 5}, MergeDecisionType.KEEP_MINE); 216 217 model.decide(new int[] {0, 3, 5}, MergeDecisionType.KEEP_MINE); 218 218 for (int i = 0; i< 10; i++) { 219 219 item = list.get(i);
Note:
See TracChangeset
for help on using the changeset viewer.