VladPolskiy/osmosis
1
0
Fork 0
mirror of https://github.com/openstreetmap/osmosis.git synced 2026-01-14 00:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ChangeSimplifierTest to close ChangeSimplifier

Browse Source 
ChangeSimplifier doesn't contain any heavyweight resources so this
change just eliminates warnings.
This commit is contained in:
Brett Henderson
2023-05-15 20:03:16 +10:00
parent 26fa26c864
commit c2cfcd1bad
1 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
osmosis-set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
View File

@ -123,22 +123,23 @@ public class ChangeSimplifierTest extends AbstractDataTest {
*/
@Test
public void badSortOrderVersion() throws Exception {
ChangeSimplifier simplifier = new ChangeSimplifier();
simplifier.setChangeSink(new NullChangeWriter());
simplifier.initialize(new HashMap<String, Object>());
Node node;
try (ChangeSimplifier simplifier = new ChangeSimplifier()) {
simplifier.setChangeSink(new NullChangeWriter());
simplifier.initialize(new HashMap<String, Object>());
Node node;
node = new Node(new CommonEntityData(1, 2, new Date(), OsmUser.NONE, 2), 1, 1);
simplifier.process(new ChangeContainer(new NodeContainer(node), ChangeAction.Modify));
try {
node = new Node(new CommonEntityData(1, 1, new Date(), OsmUser.NONE, 1), 1, 1);
node = new Node(new CommonEntityData(1, 2, new Date(), OsmUser.NONE, 2), 1, 1);
simplifier.process(new ChangeContainer(new NodeContainer(node), ChangeAction.Modify));
} catch (OsmosisRuntimeException e) {
if (e.getMessage().startsWith("Pipeline entities are not sorted")) {
return;
try {
node = new Node(new CommonEntityData(1, 1, new Date(), OsmUser.NONE, 1), 1, 1);
simplifier.process(new ChangeContainer(new NodeContainer(node), ChangeAction.Modify));
} catch (OsmosisRuntimeException e) {
if (e.getMessage().startsWith("Pipeline entities are not sorted")) {
return;
}
throw e;
}
throw e;
}
Assert.fail("Expected exception not thrown");
}
@ -151,22 +152,23 @@ public class ChangeSimplifierTest extends AbstractDataTest {
*/
@Test
public void badSortOrderId() throws Exception {
ChangeSimplifier simplifier = new ChangeSimplifier();
simplifier.setChangeSink(new NullChangeWriter());
simplifier.initialize(new HashMap<String, Object>());
Node node;
try (ChangeSimplifier simplifier = new ChangeSimplifier()) {
simplifier.setChangeSink(new NullChangeWriter());
simplifier.initialize(new HashMap<String, Object>());
Node node;
node = new Node(new CommonEntityData(2, 2, new Date(), OsmUser.NONE, 2), 1, 1);
simplifier.process(new ChangeContainer(new NodeContainer(node), ChangeAction.Modify));
try {
node = new Node(new CommonEntityData(1, 2, new Date(), OsmUser.NONE, 1), 1, 1);
node = new Node(new CommonEntityData(2, 2, new Date(), OsmUser.NONE, 2), 1, 1);
simplifier.process(new ChangeContainer(new NodeContainer(node), ChangeAction.Modify));
} catch (OsmosisRuntimeException e) {
if (e.getMessage().startsWith("Pipeline entities are not sorted")) {
return;
try {
node = new Node(new CommonEntityData(1, 2, new Date(), OsmUser.NONE, 1), 1, 1);
simplifier.process(new ChangeContainer(new NodeContainer(node), ChangeAction.Modify));
} catch (OsmosisRuntimeException e) {
if (e.getMessage().startsWith("Pipeline entities are not sorted")) {
return;
}
throw e;
}
throw e;
}
Assert.fail("Expected exception not thrown");
}
@ -179,23 +181,24 @@ public class ChangeSimplifierTest extends AbstractDataTest {
*/
@Test
public void badSortOrderType() throws Exception {
ChangeSimplifier simplifier = new ChangeSimplifier();
simplifier.setChangeSink(new NullChangeWriter());
simplifier.initialize(new HashMap<String, Object>());
Node node;
Way way;
try (ChangeSimplifier simplifier = new ChangeSimplifier()) {
simplifier.setChangeSink(new NullChangeWriter());
simplifier.initialize(new HashMap<String, Object>());
Node node;
Way way;
way = new Way(new CommonEntityData(2, 2, new Date(), OsmUser.NONE, 2));
simplifier.process(new ChangeContainer(new WayContainer(way), ChangeAction.Modify));
way = new Way(new CommonEntityData(2, 2, new Date(), OsmUser.NONE, 2));
simplifier.process(new ChangeContainer(new WayContainer(way), ChangeAction.Modify));
try {
node = new Node(new CommonEntityData(1, 2, new Date(), OsmUser.NONE, 1), 1, 1);
simplifier.process(new ChangeContainer(new NodeContainer(node), ChangeAction.Modify));
} catch (OsmosisRuntimeException e) {
if (e.getMessage().startsWith("Pipeline entities are not sorted")) {
return;
try {
node = new Node(new CommonEntityData(1, 2, new Date(), OsmUser.NONE, 1), 1, 1);
simplifier.process(new ChangeContainer(new NodeContainer(node), ChangeAction.Modify));
} catch (OsmosisRuntimeException e) {
if (e.getMessage().startsWith("Pipeline entities are not sorted")) {
return;
}
throw e;
}
throw e;
}
Assert.fail("Expected exception not thrown");
}