Changeset 14092 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModelTest.java
- Timestamp:
- 2018-08-05T20:53:19+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModelTest.java
r10962 r14092 2 2 package org.openstreetmap.josm.gui.conflict.pair.tags; 3 3 4 import static org.fest.reflect.core.Reflection.field;5 4 import static org.junit.Assert.assertEquals; 6 5 import static org.junit.Assert.assertNull; 7 6 8 import java.beans.PropertyChangeEvent;9 7 import java.beans.PropertyChangeListener; 10 8 import java.util.List; … … 13 11 import org.junit.Rule; 14 12 import org.junit.Test; 13 import org.openstreetmap.josm.TestUtils; 15 14 import org.openstreetmap.josm.data.osm.Node; 16 15 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType; … … 32 31 public JOSMTestRules test = new JOSMTestRules(); 33 32 34 @Test 35 public void testAddPropertyChangeListener() { 36 TagMergeModel model = new TagMergeModel(); 37 PropertyChangeListener listener = new PropertyChangeListener() { 38 39 public void propertyChange(PropertyChangeEvent evt) { 40 } 33 protected Set<PropertyChangeListener> getListeners(TagMergeModel model) throws ReflectiveOperationException { 34 return (Set<PropertyChangeListener>) TestUtils.getPrivateField(model, "listeners"); 35 } 36 37 protected List<TagMergeItem> getTagMergeItems(TagMergeModel model) throws ReflectiveOperationException { 38 return (List<TagMergeItem>) TestUtils.getPrivateField(model, "tagMergeItems"); 39 } 40 41 @Test 42 public void testAddPropertyChangeListener() throws ReflectiveOperationException { 43 TagMergeModel model = new TagMergeModel(); 44 PropertyChangeListener listener = evt -> { 41 45 }; 42 46 model.addPropertyChangeListener(listener); 43 47 44 Set<?> list = field("listeners").ofType(Set.class) 45 .in(model) 46 .get(); 48 Set<?> list = getListeners(model); 47 49 48 50 assertEquals(1, list.size()); … … 51 53 52 54 @Test 53 public void testRemovePropertyChangeListener() { 54 TagMergeModel model = new TagMergeModel(); 55 PropertyChangeListener listener = new PropertyChangeListener() { 56 57 public void propertyChange(PropertyChangeEvent evt) { 58 } 55 public void testRemovePropertyChangeListener() throws ReflectiveOperationException { 56 TagMergeModel model = new TagMergeModel(); 57 PropertyChangeListener listener = evt -> { 59 58 }; 60 59 model.addPropertyChangeListener(listener); 61 60 model.removePropertyChangeListener(listener); 62 61 63 Set<?> list = field("listeners") 64 .ofType(Set.class) 65 .in(model) 66 .get(); 62 Set<?> list = getListeners(model); 67 63 68 64 assertEquals(0, list.size()); … … 70 66 71 67 @Test 72 public void testPopulateNoConflichts() { 73 Node my = new Node(1); 74 Node their = new Node(1); 75 TagMergeModel model = new TagMergeModel(); 76 model.populate(my, their); 77 78 List<TagMergeItem> list = field("tagMergeItems") 79 .ofType(List.class) 80 .in(model) 81 .get(); 68 public void testPopulateNoConflichts() throws ReflectiveOperationException { 69 Node my = new Node(1); 70 Node their = new Node(1); 71 TagMergeModel model = new TagMergeModel(); 72 model.populate(my, their); 73 74 List<TagMergeItem> list = getTagMergeItems(model); 82 75 83 76 assertEquals(0, list.size()); … … 85 78 86 79 @Test 87 public void testPopulateNoConflicts1() {80 public void testPopulateNoConflicts1() throws ReflectiveOperationException { 88 81 Node my = new Node(1); 89 82 my.put("key", "value"); … … 93 86 model.populate(my, their); 94 87 95 List<TagMergeItem> list = field("tagMergeItems") 96 .ofType(List.class) 97 .in(model) 98 .get(); 88 List<TagMergeItem> list = getTagMergeItems(model); 99 89 100 90 assertEquals(0, list.size()); … … 102 92 103 93 @Test 104 public void testPopulateMissingKeyMine() {94 public void testPopulateMissingKeyMine() throws ReflectiveOperationException { 105 95 Node my = new Node(1); 106 96 Node their = new Node(1); … … 109 99 model.populate(my, their); 110 100 111 List<TagMergeItem> list = field("tagMergeItems") 112 .ofType(List.class) 113 .in(model) 114 .get(); 101 List<TagMergeItem> list = getTagMergeItems(model); 115 102 116 103 assertEquals(1, list.size()); … … 123 110 124 111 @Test 125 public void testPopulateMissingKeyTheir() {112 public void testPopulateMissingKeyTheir() throws ReflectiveOperationException { 126 113 Node my = new Node(1); 127 114 my.put("key", "value"); … … 130 117 model.populate(my, their); 131 118 132 List<TagMergeItem> list = field("tagMergeItems") 133 .ofType(List.class) 134 .in(model) 135 .get(); 119 List<TagMergeItem> list = getTagMergeItems(model); 136 120 137 121 assertEquals(1, list.size()); … … 144 128 145 129 @Test 146 public void testPopulateConflictingValues() {130 public void testPopulateConflictingValues() throws ReflectiveOperationException { 147 131 Node my = new Node(1); 148 132 my.put("key", "myvalue"); … … 152 136 model.populate(my, their); 153 137 154 List<TagMergeItem> list = field("tagMergeItems") 155 .ofType(List.class) 156 .in(model) 157 .get(); 138 List<TagMergeItem> list = getTagMergeItems(model); 158 139 159 140 assertEquals(1, list.size()); … … 166 147 167 148 @Test 168 public void testAddItem() {149 public void testAddItem() throws ReflectiveOperationException { 169 150 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 170 151 TagMergeModel model = new TagMergeModel(); 171 152 model.addItem(item); 172 153 173 List<TagMergeItem> list = field("tagMergeItems") 174 .ofType(List.class) 175 .in(model) 176 .get(); 154 List<TagMergeItem> list = getTagMergeItems(model); 177 155 178 156 assertEquals(1, list.size()); … … 185 163 186 164 @Test 187 public void testDecide() {165 public void testDecide() throws ReflectiveOperationException { 188 166 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 189 167 TagMergeModel model = new TagMergeModel(); 190 168 model.addItem(item); 191 169 192 List<TagMergeItem> list = field("tagMergeItems") 193 .ofType(List.class) 194 .in(model) 195 .get(); 170 List<TagMergeItem> list = getTagMergeItems(model); 196 171 197 172 model.decide(0, MergeDecisionType.KEEP_MINE); … … 212 187 213 188 @Test 214 public void testDecideMultiple() {189 public void testDecideMultiple() throws ReflectiveOperationException { 215 190 216 191 TagMergeModel model = new TagMergeModel(); … … 219 194 } 220 195 221 List<TagMergeItem> list = field("tagMergeItems") 222 .ofType(List.class) 223 .in(model) 224 .get(); 196 List<TagMergeItem> list = getTagMergeItems(model); 225 197 226 198 assertEquals(10, list.size());
Note:
See TracChangeset
for help on using the changeset viewer.