Changeset 9973 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java
- Timestamp:
- 2016-03-12T23:58:33+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java
r9547 r9973 24 24 public class PropertiesMergeModelTest { 25 25 26 p ublicabstract static class TestObserver implements Observer {26 private abstract static class TestObserver implements Observer { 27 27 public int numInvocations; 28 28 29 @Override 29 30 public void update(Observable o, Object arg) { 30 31 numInvocations++; 31 test();32 doTest(); 32 33 } 33 34 34 public abstract void test();35 public abstract void doTest(); 35 36 36 37 public void assertNumInvocations(int count) { … … 100 101 assertTrue(model.hasCoordConflict()); 101 102 102 103 103 n1.cloneFrom(new Node(1)); 104 104 n2.setCoor(new LatLon(2, 2)); … … 117 117 observerTest = new TestObserver() { 118 118 @Override 119 public void test() {119 public void doTest() { 120 120 assertTrue(model.isCoordMergeDecision(MergeDecisionType.KEEP_MINE)); 121 121 } … … 132 132 observerTest = new TestObserver() { 133 133 @Override 134 public void test() {134 public void doTest() { 135 135 assertTrue(model.isCoordMergeDecision(MergeDecisionType.KEEP_THEIR)); 136 136 }
Note:
See TracChangeset
for help on using the changeset viewer.