Changeset 10758 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2016-08-07T17:39:42+02:00 (8 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java
r10626 r10758 79 79 80 80 @Test 81 public void test _copyMyNodesToTop_1() {81 public void testCopyMyNodesToTop1() { 82 82 NodeListMergeModel model = new NodeListMergeModel(); 83 83 … … 101 101 102 102 @Test 103 public void test _copyMyNodesToTop_2() {103 public void testCopyMyNodesToTop2() { 104 104 NodeListMergeModel model = new NodeListMergeModel(); 105 105 … … 127 127 128 128 @Test 129 public void test _copyMyNodesToTop_3() {129 public void testCopyMyNodesToTop3() { 130 130 NodeListMergeModel model = new NodeListMergeModel(); 131 131 … … 153 153 154 154 @Test 155 public void test _copyMyNodesToTop_4() {155 public void testCopyMyNodesToTop4() { 156 156 NodeListMergeModel model = new NodeListMergeModel(); 157 157 … … 180 180 181 181 @Test 182 public void test _copyMyNodesToEnd_1() {182 public void testCopyMyNodesToEnd1() { 183 183 NodeListMergeModel model = new NodeListMergeModel(); 184 184 … … 201 201 202 202 @Test 203 public void test _copyMyNodesToEnd_2() {203 public void testCopyMyNodesToEnd2() { 204 204 NodeListMergeModel model = new NodeListMergeModel(); 205 205 … … 226 226 227 227 @Test 228 public void test _copyMyNodesToEnd_3() {228 public void testCopyMyNodesToEnd3() { 229 229 NodeListMergeModel model = new NodeListMergeModel(); 230 230 … … 253 253 254 254 @Test 255 public void test _copyMyNodesToEnd_4() {255 public void testCopyMyNodesToEnd4() { 256 256 NodeListMergeModel model = new NodeListMergeModel(); 257 257 … … 286 286 287 287 @Test 288 public void test _copyMyNodesBeforeCurrent_1() {288 public void testCopyMyNodesBeforeCurrent1() { 289 289 NodeListMergeModel model = new NodeListMergeModel(); 290 290 … … 313 313 314 314 @Test 315 public void test _copyMyNodesBeforeCurrent_2() {315 public void testCopyMyNodesBeforeCurrent2() { 316 316 NodeListMergeModel model = new NodeListMergeModel(); 317 317 … … 341 341 342 342 @Test 343 public void test _copyMyNodesBeforeCurrent_3() {343 public void testCopyMyNodesBeforeCurrent3() { 344 344 NodeListMergeModel model = new NodeListMergeModel(); 345 345 … … 376 376 /* ----------------------------------------------------------------------------- */ 377 377 @Test 378 public void test _copyMyNodesAfterCurrent_1() {378 public void testCopyMyNodesAfterCurrent1() { 379 379 NodeListMergeModel model = new NodeListMergeModel(); 380 380 … … 403 403 404 404 @Test 405 public void test _copyMyNodesAfterCurrent_2() {405 public void testCopyMyNodesAfterCurrent2() { 406 406 NodeListMergeModel model = new NodeListMergeModel(); 407 407 … … 432 432 433 433 @Test 434 public void test _copyMyNodesAfterCurrent_3() {434 public void testCopyMyNodesAfterCurrent3() { 435 435 NodeListMergeModel model = new NodeListMergeModel(); 436 436 … … 465 465 /* ----------------------------------------------------------------------------- */ 466 466 @Test 467 public void test _moveUpMergedNodes_1() {467 public void testMoveUpMergedNodes1() { 468 468 NodeListMergeModel model = new NodeListMergeModel(); 469 469 … … 491 491 492 492 @Test 493 public void test _moveUpMergedNodes_2() {493 public void testMoveUpMergedNodes2() { 494 494 NodeListMergeModel model = new NodeListMergeModel(); 495 495 … … 521 521 522 522 @Test 523 public void test _moveUpMergedNodes_3() {523 public void testMoveUpMergedNodes3() { 524 524 NodeListMergeModel model = new NodeListMergeModel(); 525 525 … … 554 554 /* ----------------------------------------------------------------------------- */ 555 555 @Test 556 public void test _moveDownMergedNodes_1() {556 public void testMoveDownMergedNodes1() { 557 557 NodeListMergeModel model = new NodeListMergeModel(); 558 558 … … 580 580 581 581 @Test 582 public void test _moveDownMergedNodes_2() {582 public void testMoveDownMergedNodes2() { 583 583 NodeListMergeModel model = new NodeListMergeModel(); 584 584 … … 610 610 611 611 @Test 612 public void test _moveDownMergedNodes_3() {612 public void testMoveDownMergedNodes3() { 613 613 NodeListMergeModel model = new NodeListMergeModel(); 614 614 … … 644 644 @SuppressWarnings("unchecked") 645 645 @Test 646 public void addPropertyChangeListener() {646 public void testAddPropertyChangeListener() { 647 647 NodeListMergeModel model = new NodeListMergeModel(); 648 648 … … 666 666 @SuppressWarnings("unchecked") 667 667 @Test 668 public void removePropertyChangeListener() {668 public void testRemovePropertyChangeListener() { 669 669 NodeListMergeModel model = new NodeListMergeModel(); 670 670 … … 690 690 /* ----------------------------------------------------------------------------- */ 691 691 @Test 692 public void setFrozen() {692 public void testSetFrozen() { 693 693 NodeListMergeModel model = new NodeListMergeModel(); 694 694 model.setFrozen(true); … … 700 700 701 701 @Test 702 public void setFrozenWithPropertyChangeNotification() {702 public void testSetFrozenWithPropertyChangeNotification() { 703 703 NodeListMergeModel model = new NodeListMergeModel(); 704 704 -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java
r10210 r10758 63 63 64 64 @Test 65 public void populate() {65 public void testPopulate() { 66 66 DataSet d1 = new DataSet(); 67 67 DataSet d2 = new DataSet(); … … 86 86 87 87 @Test 88 public void decidingAboutCoords() {88 public void testDecidingAboutCoords() { 89 89 DataSet d1 = new DataSet(); 90 90 DataSet d2 = new DataSet(); -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java
r10626 r10758 27 27 28 28 @Test 29 public void test _TagMergeItem() {29 public void testTagMergeItem() { 30 30 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 31 31 assertEquals("key", item.getKey()); … … 36 36 37 37 @Test 38 public void test _TagMergeItem_2() {38 public void testTagMergeItem2() { 39 39 Node n1 = new Node(1); 40 40 Node n2 = new Node(1); … … 50 50 51 51 @Test 52 public void test _TagMergeItem_3() {52 public void testTagMergeItem3() { 53 53 Node n1 = new Node(1); 54 54 Node n2 = new Node(1); … … 64 64 65 65 @Test 66 public void test _TagMergeItem_4() {66 public void testTagMergeItem4() { 67 67 Node n1 = new Node(1); 68 68 Node n2 = new Node(1); … … 79 79 80 80 @Test 81 public void test _decide() {81 public void testDecide() { 82 82 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 83 83 item.decide(MergeDecisionType.KEEP_MINE); … … 86 86 87 87 @Test 88 public void test _decide_1() {88 public void testDecide1() { 89 89 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 90 90 try { … … 98 98 99 99 @Test 100 public void test _applyToMyPrimitive() {100 public void testApplyToMyPrimitive() { 101 101 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 102 102 item.decide(MergeDecisionType.KEEP_MINE); … … 113 113 114 114 @Test 115 public void test _applyToMyPrimitive_2() {115 public void testApplyToMyPrimitive2() { 116 116 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 117 117 item.decide(MergeDecisionType.KEEP_THEIR); … … 128 128 129 129 @Test 130 public void test _applyToMyPrimitive_3() {130 public void testApplyToMyPrimitive3() { 131 131 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 132 132 // item is undecided … … 145 145 146 146 @Test 147 public void test _applyToMyPrimitive_4() {147 public void testApplyToMyPrimitive4() { 148 148 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 149 149 -
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.