Changeset 7081 in josm for trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy
- Timestamp:
- 2014-05-09T04:49:54+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy
r2605 r7081 2 2 package org.openstreetmap.josm.io; 3 3 4 import static org.junit.Assert.* 4 5 5 import org.junit.Test 6 import org.openstreetmap.josm.data.osm.Node; 7 import org.openstreetmap.josm.data.osm.Way; 8 import org.openstreetmap.josm.data.osm.Relation; 9 import org.openstreetmap.josm.data.osm.Changeset; 6 import org.junit.Test 10 7 import org.openstreetmap.josm.data.coor.LatLon 11 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 12 import org.openstreetmap.josm.data.osm.SimplePrimitiveId; 13 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 14 15 import static org.junit.Assert.*; 8 import org.openstreetmap.josm.data.osm.Changeset 9 import org.openstreetmap.josm.data.osm.Node 10 import org.openstreetmap.josm.data.osm.OsmPrimitiveType 11 import org.openstreetmap.josm.data.osm.Relation 12 import org.openstreetmap.josm.data.osm.SimplePrimitiveId 13 import org.openstreetmap.josm.data.osm.Way 14 import org.openstreetmap.josm.gui.progress.NullProgressMonitor 15 import org.openstreetmap.josm.tools.XmlParsingException 16 16 17 17 class DiffResultProcessorTest { 18 19 18 19 20 20 @Test 21 21 public void testConstructor() { 22 22 Node n = new Node(1) 23 // these calls should not fail 23 // these calls should not fail 24 24 // 25 25 def DiffResultProcessor processor = new DiffResultProcessor(null) … … 27 27 processor = new DiffResultProcessor([n]) 28 28 } 29 29 30 30 @Test 31 31 public void testParse_NOK_Cases() { 32 32 def DiffResultProcessor processor = new DiffResultProcessor([]) 33 33 34 34 final shouldFail = new GroovyTestCase().&shouldFail 35 35 36 36 shouldFail(IllegalArgumentException) { 37 37 processor.parse null, NullProgressMonitor.INSTANCE 38 38 } 39 40 shouldFail( OsmDataParsingException) {39 40 shouldFail(XmlParsingException) { 41 41 processor.parse "", NullProgressMonitor.INSTANCE 42 42 } 43 44 shouldFail( OsmDataParsingException) {43 44 shouldFail(XmlParsingException) { 45 45 processor.parse "<x></x>", NullProgressMonitor.INSTANCE 46 } 46 } 47 47 } 48 49 @Test 48 49 @Test 50 50 public void testParse_OK_Cases() { 51 51 def DiffResultProcessor processor = new DiffResultProcessor([]) … … 57 57 </diffResult> 58 58 """ 59 59 60 60 processor.parse doc, null 61 61 assert processor.@diffResults.size() == 3 … … 65 65 assert entry.new_id == 1 66 66 assert entry.new_version == 1 67 67 68 68 id = new SimplePrimitiveId(-2, OsmPrimitiveType.WAY) 69 69 entry = processor.@diffResults[id] … … 71 71 assert entry.new_id == 2 72 72 assert entry.new_version == 1 73 73 74 74 id = new SimplePrimitiveId(-3, OsmPrimitiveType.RELATION) 75 75 entry = processor.@diffResults[id] 76 76 assert entry != null 77 77 assert entry.new_id == 3 78 assert entry.new_version == 1 78 assert entry.new_version == 1 79 79 } 80 80 81 81 @Test 82 82 public void testPostProcess_Invocation_Variants() { … … 89 89 </diffResult> 90 90 """ 91 91 92 92 processor.parse doc, null 93 93 94 94 // should all be ok 95 95 // … … 99 99 processor.postProcess new Changeset(1), NullProgressMonitor.INSTANCE 100 100 } 101 101 102 102 @Test 103 103 public void testPostProcess_OK() { 104 104 105 105 Node n = new Node() 106 106 Way w = new Way() 107 107 Relation r = new Relation() 108 108 109 109 String doc = """\ 110 110 <diffResult version="0.6" generator="Test Data"> … … 114 114 </diffResult> 115 115 """ 116 116 117 117 def DiffResultProcessor processor = new DiffResultProcessor([n,w,r]) 118 118 processor.parse doc, null … … 122 122 assert n.changesetId == 5 123 123 assert n.version == 10 124 124 125 125 w = processed.find {it.uniqueId == 2} 126 126 assert w.changesetId == 5 127 127 assert w.version == 11 128 128 129 129 r = processed.find {it.uniqueId == 3} 130 130 assert r.changesetId == 5 131 assert r.version == 12 131 assert r.version == 12 132 132 } 133 133 134 134 @Test 135 135 public void testPostProcess_ForCreatedElement() { 136 137 Node n = new Node() 136 137 Node n = new Node() 138 138 String doc = """\ 139 139 <diffResult version="0.6" generator="Test Data"> … … 141 141 </diffResult> 142 142 """ 143 143 144 144 def DiffResultProcessor processor = new DiffResultProcessor([n]) 145 145 processor.parse doc, null … … 150 150 assert n.version == 1 151 151 } 152 152 153 153 @Test 154 154 public void testPostProcess_ForModifiedElement() { 155 155 156 156 Node n = new Node(1) 157 157 n.coor = new LatLon(1,1) … … 163 163 </diffResult> 164 164 """ 165 165 166 166 def DiffResultProcessor processor = new DiffResultProcessor([n]) 167 167 processor.parse doc, null … … 172 172 assert n.version == 3 173 173 } 174 174 175 175 @Test 176 176 public void testPostProcess_ForDeletedElement() { 177 177 178 178 Node n = new Node(1) 179 179 n.coor = new LatLon(1,1) … … 185 185 </diffResult> 186 186 """ 187 187 188 188 def DiffResultProcessor processor = new DiffResultProcessor([n]) 189 189 processor.parse doc, null
Note:
See TracChangeset
for help on using the changeset viewer.