Changeset 8509 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2015-06-20T14:36:00+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java
r7937 r8509 80 80 } 81 81 82 @Test ()82 @Test 83 83 public void test_decide_1() { 84 84 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); … … 91 91 } 92 92 93 @Test ()93 @Test 94 94 public void test_applyToMyPrimitive() { 95 95 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); … … 107 107 } 108 108 109 @Test ()109 @Test 110 110 public void test_applyToMyPrimitive_2() { 111 111 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); … … 122 122 } 123 123 124 @Test ()124 @Test 125 125 public void test_applyToMyPrimitive_3() { 126 126 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); … … 138 138 } 139 139 140 @Test ()140 @Test 141 141 public void test_applyToMyPrimitive_4() { 142 142 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
Note:
See TracChangeset
for help on using the changeset viewer.