Changeset 10758 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModelTest.java
- Timestamp:
- 2016-08-07T17:39:42+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModelTest.java
r9547 r10758 32 32 33 33 @Test 34 public void addPropertyChangeListener() {34 public void testAddPropertyChangeListener() { 35 35 TagMergeModel model = new TagMergeModel(); 36 36 PropertyChangeListener listener = new PropertyChangeListener() { … … 50 50 51 51 @Test 52 public void removePropertyChangeListener() {52 public void testRemovePropertyChangeListener() { 53 53 TagMergeModel model = new TagMergeModel(); 54 54 PropertyChangeListener listener = new PropertyChangeListener() { … … 69 69 70 70 @Test 71 public void populateNoConflichts() {71 public void testPopulateNoConflichts() { 72 72 Node my = new Node(1); 73 73 Node their = new Node(1); … … 84 84 85 85 @Test 86 public void populateNoConflicts1() {86 public void testPopulateNoConflicts1() { 87 87 Node my = new Node(1); 88 88 my.put("key", "value"); … … 101 101 102 102 @Test 103 public void populateMissingKeyMine() {103 public void testPopulateMissingKeyMine() { 104 104 Node my = new Node(1); 105 105 Node their = new Node(1); … … 122 122 123 123 @Test 124 public void populateMissingKeyTheir() {124 public void testPopulateMissingKeyTheir() { 125 125 Node my = new Node(1); 126 126 my.put("key", "value"); … … 143 143 144 144 @Test 145 public void populateConflictingValues() {145 public void testPopulateConflictingValues() { 146 146 Node my = new Node(1); 147 147 my.put("key", "myvalue"); … … 165 165 166 166 @Test 167 public void addItem() {167 public void testAddItem() { 168 168 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 169 169 TagMergeModel model = new TagMergeModel(); … … 184 184 185 185 @Test 186 public void decide() {186 public void testDecide() { 187 187 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 188 188 TagMergeModel model = new TagMergeModel(); … … 211 211 212 212 @Test 213 public void decideMultiple() {213 public void testDecideMultiple() { 214 214 215 215 TagMergeModel model = new TagMergeModel();
Note:
See TracChangeset
for help on using the changeset viewer.