Changeset 10937 in josm for trunk/test/unit/org/openstreetmap/josm/data
- Timestamp:
- 2016-09-03T12:24:18+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
r10758 r10937 28 28 29 29 @Test 30 public void testOneNewRelationOnly() {30 public void testOneNewRelationOnly() throws CyclicUploadDependencyException { 31 31 Relation r = new Relation(); 32 32 r.put("name", "r1"); … … 36 36 APIDataSet apiDataSet = new APIDataSet(); 37 37 apiDataSet.init(ds); 38 try { 39 apiDataSet.adjustRelationUploadOrder(); 40 } catch (CyclicUploadDependencyException e) { 41 fail("unexpected exception:" + e); 42 } 38 apiDataSet.adjustRelationUploadOrder(); 43 39 List<OsmPrimitive> toAdd = apiDataSet.getPrimitivesToAdd(); 44 40 … … 48 44 49 45 @Test 50 public void testNewParentChildPair() { 51 DataSet ds = new DataSet(); 52 Relation r1 = new Relation(); 53 ds.addPrimitive(r1); 54 r1.put("name", "r1"); 55 56 Relation r2 = new Relation(); 57 ds.addPrimitive(r2); 58 r2.put("name", "r2"); 59 60 r1.addMember(new RelationMember("", r2)); 61 62 APIDataSet apiDataSet = new APIDataSet(); 63 apiDataSet.init(ds); 64 try { 65 apiDataSet.adjustRelationUploadOrder(); 66 } catch (CyclicUploadDependencyException e) { 67 fail("unexpected exception:" + e); 68 } 46 public void testNewParentChildPair() throws CyclicUploadDependencyException { 47 DataSet ds = new DataSet(); 48 Relation r1 = new Relation(); 49 ds.addPrimitive(r1); 50 r1.put("name", "r1"); 51 52 Relation r2 = new Relation(); 53 ds.addPrimitive(r2); 54 r2.put("name", "r2"); 55 56 r1.addMember(new RelationMember("", r2)); 57 58 APIDataSet apiDataSet = new APIDataSet(); 59 apiDataSet.init(ds); 60 apiDataSet.adjustRelationUploadOrder(); 69 61 List<OsmPrimitive> toAdd = apiDataSet.getPrimitivesToAdd(); 70 62 … … 75 67 76 68 @Test 77 public void testOneExistingAndThreNewInAChain() {69 public void testOneExistingAndThreNewInAChain() throws CyclicUploadDependencyException { 78 70 DataSet ds = new DataSet(); 79 71 … … 100 92 APIDataSet apiDataSet = new APIDataSet(); 101 93 apiDataSet.init(ds); 102 try { 103 apiDataSet.adjustRelationUploadOrder(); 104 } catch (CyclicUploadDependencyException e) { 105 fail("unexpected exception:" + e); 106 } 94 apiDataSet.adjustRelationUploadOrder(); 107 95 List<OsmPrimitive> toAdd = apiDataSet.getPrimitivesToAdd(); 108 96 … … 118 106 119 107 @Test 120 public void testOneParentTwoNewChildren() {108 public void testOneParentTwoNewChildren() throws CyclicUploadDependencyException { 121 109 DataSet ds = new DataSet(); 122 110 Relation r1 = new Relation(); … … 138 126 APIDataSet apiDataSet = new APIDataSet(); 139 127 apiDataSet.init(ds); 140 try { 141 apiDataSet.adjustRelationUploadOrder(); 142 } catch (CyclicUploadDependencyException e) { 143 fail("unexpected exception:" + e); 144 } 128 apiDataSet.adjustRelationUploadOrder(); 145 129 List<OsmPrimitive> toAdd = apiDataSet.getPrimitivesToAdd(); 146 130 … … 151 135 152 136 @Test // for ticket #9624 153 public void testDeleteOneParentTwoNewChildren() {137 public void testDeleteOneParentTwoNewChildren() throws CyclicUploadDependencyException { 154 138 DataSet ds = new DataSet(); 155 139 Relation r1 = new Relation(1); … … 185 169 apiDataSet.getPrimitivesToDelete().add(r3); 186 170 apiDataSet.getPrimitivesToDelete().add(r4); 187 try { 188 apiDataSet.adjustRelationUploadOrder(); 189 } catch (CyclicUploadDependencyException e) { 190 fail("unexpected exception:" + e); 191 } 171 apiDataSet.adjustRelationUploadOrder(); 192 172 List<OsmPrimitive> toDelete = apiDataSet.getPrimitivesToDelete(); 193 173 … … 198 178 199 179 @Test // for ticket #9656 200 public void testDeleteWay() {180 public void testDeleteWay() throws CyclicUploadDependencyException { 201 181 DataSet ds = new DataSet(); 202 182 final Way way = new Way(1, 2); … … 225 205 APIDataSet apiDataSet = new APIDataSet(); 226 206 apiDataSet.init(ds); 227 try { 228 apiDataSet.adjustRelationUploadOrder(); 229 } catch (CyclicUploadDependencyException e) { 230 fail("unexpected exception:" + e); 231 } 207 apiDataSet.adjustRelationUploadOrder(); 232 208 List<OsmPrimitive> toDelete = apiDataSet.getPrimitivesToDelete(); 233 209
Note:
See TracChangeset
for help on using the changeset viewer.