Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java (revision 8510) @@ -22,9 +22,9 @@ Node n1; w1.addNode(n1 = new Node(1)); - for (int i=0; i < 20; i++) { + for (int i = 0; i < 20; i++) { n1.put("key" + i, "value" + i); } StringBuilder note = new StringBuilder(); - for (int i=0; i < 50; i++) { + for (int i = 0; i < 50; i++) { note.append(" A very long text "); } @@ -49,5 +49,5 @@ Way w2 = new Way(); - for (int i = 1; i < 200; i+=2) { + for (int i = 1; i < 200; i += 2) { w2.addNode(new Node(i)); } @@ -72,5 +72,5 @@ static public void main(String args[]) { NodeListMergerTest test = new NodeListMergerTest(); - test.setSize(600,600); + test.setSize(600, 600); test.setVisible(true); } Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (revision 8510) @@ -28,9 +28,9 @@ protected void populate() { Node my = new Node(1); - my.setCoor(new LatLon(1,1)); + my.setCoor(new LatLon(1, 1)); my.setDeleted(true); Node their = new Node(2); - their.setCoor(new LatLon(10,10)); + their.setCoor(new LatLon(10, 10)); merger.getModel().populate(new Conflict(my, their)); Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java (revision 8510) @@ -51,5 +51,5 @@ static public void main(String args[]) { RelationMemberMergerTest test = new RelationMemberMergerTest(); - test.setSize(600,600); + test.setSize(600, 600); test.setVisible(true); } Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java (revision 8510) @@ -29,5 +29,5 @@ tagMerger.getModel().addItem(new TagMergeItem("a very long key asdfasdf asdfasdf", "a very long value asdfasdf", "a very long value asdfasdf")); - for (int i=0; i< 50; i++) { + for (int i = 0; i < 50; i++) { tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue")); } @@ -36,5 +36,5 @@ public static void main(String args[]) { TagMergerTest test = new TagMergerTest(); - test.setSize(600,600); + test.setSize(600, 600); test.setVisible(true); } Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (revision 8510) @@ -16,7 +16,7 @@ protected void build() { - setSize(100,100); + setSize(100, 100); dialog = new ConflictResolutionDialog(this); - dialog.setSize(600,600); + dialog.setSize(600, 600); } Index: trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (revision 8510) @@ -29,5 +29,5 @@ protected void build() { - setSize(500,500); + setSize(500, 500); getContentPane().setLayout(new BorderLayout()); browser = new HistoryBrowser(); @@ -40,5 +40,5 @@ try { ds = reader.parseHistory(NullProgressMonitor.INSTANCE); - } catch(OsmTransferException e) { + } catch (OsmTransferException e) { Main.error(e); return; @@ -51,9 +51,9 @@ * Constructs a new {@code HistoryBrowserTest}. */ - public HistoryBrowserTest(){ + public HistoryBrowserTest() { build(); //populate(OsmPrimitiveType.NODE,354117); //populate(OsmPrimitiveType.WAY,37951); - populate(OsmPrimitiveType.RELATION,5055); + populate(OsmPrimitiveType.RELATION, 5055); } Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (revision 8510) @@ -57,7 +57,7 @@ // create a set of nodes // - for (int i=0; i< numNodes; i++) { + for (int i = 0; i < numNodes; i++) { Node n = new Node(); - n.setCoor(new LatLon(-36.6,47.6)); + n.setCoor(new LatLon(-36.6, 47.6)); n.put("name", "node-"+i); ds.addPrimitive(n); @@ -65,12 +65,11 @@ } - // create a set of ways, each with a random number of - // nodes + // create a set of ways, each with a random number of nodes // - for (int i=0; i< numWays; i++) { + for (int i = 0; i < numWays; i++) { Way w = new Way(); - int numNodesInWay = 2 + (int)Math.round(Math.random() * 5); - int start = (int)Math.round(Math.random() * numNodes); - for (int j = 0; j < numNodesInWay;j++) { + int numNodesInWay = 2 + (int) Math.round(Math.random() * 5); + int start = (int) Math.round(Math.random() * numNodes); + for (int j = 0; j < numNodesInWay; j++) { int idx = (start + j) % numNodes; Node n = nodes.get(idx); @@ -82,20 +81,19 @@ } - // create a set of relations each with a random number of nodes, - // and ways + // create a set of relations each with a random number of nodes, and ways // - for (int i=0; i< numRelations; i++) { + for (int i = 0; i < numRelations; i++) { Relation r = new Relation(); r.put("name", "relation-" +i); - int numNodesInRelation = (int)Math.round(Math.random() * 10); - int start = (int)Math.round(Math.random() * numNodes); - for (int j = 0; j < numNodesInRelation;j++) { + int numNodesInRelation = (int) Math.round(Math.random() * 10); + int start = (int) Math.round(Math.random() * numNodes); + for (int j = 0; j < numNodesInRelation; j++) { int idx = (start + j) % 500; Node n = nodes.get(idx); r.addMember(new RelationMember("role-" + j, n)); } - int numWaysInRelation = (int)Math.round(Math.random() * 10); - start = (int)Math.round(Math.random() * numWays); - for (int j = 0; j < numWaysInRelation;j++) { + int numWaysInRelation = (int) Math.round(Math.random() * 10); + start = (int) Math.round(Math.random() * numWays); + for (int j = 0; j < numWaysInRelation; j++) { int idx = (start + j) % 500; Way w = ways.get(idx); @@ -167,5 +165,5 @@ w.footer(); } - } catch(IOException e) { + } catch (IOException e) { fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString())); } @@ -191,5 +189,5 @@ MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); ArrayList nodes = new ArrayList<>(ds.getNodes()); - for (int i =0; i< 10; i++) { + for (int i = 0; i < 10; i++) { reader.append(nodes.get(i)); } @@ -197,7 +195,7 @@ assertEquals(10, out.getNodes().size()); for (Node n1:out.getNodes()) { - Node n2 = (Node)ds.getPrimitiveById(n1); + Node n2 = (Node) ds.getPrimitiveById(n1); assertNotNull(n2); - assertEquals(n2.get("name"),n2.get("name")); + assertEquals(n2.get("name"), n2.get("name")); } assertTrue(reader.getMissingPrimitives().isEmpty()); @@ -207,6 +205,6 @@ public void testMultiGet10Ways() throws OsmTransferException { MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); - ArrayList ways= new ArrayList<>(ds.getWays()); - for (int i =0; i< 10; i++) { + ArrayList ways = new ArrayList<>(ds.getWays()); + for (int i = 0; i < 10; i++) { reader.append(ways.get(i)); } @@ -214,8 +212,8 @@ assertEquals(10, out.getWays().size()); for (Way w1: out.getWays()) { - Way w2 = (Way)ds.getPrimitiveById(w1); + Way w2 = (Way) ds.getPrimitiveById(w1); assertNotNull(w2); assertEquals(w2.getNodesCount(), w1.getNodesCount()); - assertEquals(w2.get("name"),w1.get("name")); + assertEquals(w2.get("name"), w1.get("name")); } assertTrue(reader.getMissingPrimitives().isEmpty()); @@ -225,6 +223,6 @@ public void testMultiGet10Relations() throws OsmTransferException { MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); - ArrayList relations= new ArrayList<>(ds.getRelations()); - for (int i =0; i< 10; i++) { + ArrayList relations = new ArrayList<>(ds.getRelations()); + for (int i = 0; i < 10; i++) { reader.append(relations.get(i)); } @@ -232,8 +230,8 @@ assertEquals(10, out.getRelations().size()); for (Relation r1: out.getRelations()) { - Relation r2 = (Relation)ds.getPrimitiveById(r1); + Relation r2 = (Relation) ds.getPrimitiveById(r1); assertNotNull(r2); assertEquals(r2.getMembersCount(), r1.getMembersCount()); - assertEquals(r2.get("name"),r2.get("name")); + assertEquals(r2.get("name"), r2.get("name")); } assertTrue(reader.getMissingPrimitives().isEmpty()); @@ -244,5 +242,5 @@ MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); ArrayList nodes = new ArrayList<>(ds.getNodes()); - for (int i =0; i< 812; i++) { + for (int i = 0; i < 812; i++) { reader.append(nodes.get(i)); } @@ -250,7 +248,7 @@ assertEquals(812, out.getNodes().size()); for (Node n1:out.getNodes()) { - Node n2 = (Node)ds.getPrimitiveById(n1); + Node n2 = (Node) ds.getPrimitiveById(n1); assertNotNull(n2); - assertEquals(n2.get("name"),n2.get("name")); + assertEquals(n2.get("name"), n2.get("name")); } assertTrue(reader.getMissingPrimitives().isEmpty()); @@ -261,5 +259,5 @@ MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); ArrayList nodes = new ArrayList<>(ds.getNodes()); - for (int i =0; i< 10; i++) { + for (int i = 0; i < 10; i++) { reader.append(nodes.get(i)); } @@ -269,7 +267,7 @@ assertEquals(10, out.getNodes().size()); for (Node n1:out.getNodes()) { - Node n2 = (Node)ds.getPrimitiveById(n1); + Node n2 = (Node) ds.getPrimitiveById(n1); assertNotNull(n2); - assertEquals(n2.get("name"),n2.get("name")); + assertEquals(n2.get("name"), n2.get("name")); } assertFalse(reader.getMissingPrimitives().isEmpty()); Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 8510) @@ -73,7 +73,7 @@ protected static void populateTestDataSetWithNodes(DataSet ds) { - for (int i=0;i<100;i++) { + for (int i = 0; i < 100; i++) { Node n = new Node(); - n.setCoor(new LatLon(-36.6,47.6)); + n.setCoor(new LatLon(-36.6, 47.6)); n.put("name", "node-"+i); ds.addPrimitive(n); @@ -82,7 +82,7 @@ protected static void populateTestDataSetWithWays(DataSet ds) { - for (int i=0;i<20;i++) { + for (int i = 0; i < 20; i++) { Way w = new Way(); - for (int j = 0; j < 10;j++) { + for (int j = 0; j < 10; j++) { w.addNode(lookupNode(ds, i+j)); } @@ -93,17 +93,17 @@ protected static void populateTestDataSetWithRelations(DataSet ds) { - for (int i=0;i<10;i++) { + for (int i = 0; i < 10; i++) { Relation r = new Relation(); r.put("name", "relation-" +i); - for (int j =0; j < 10; j++) { + for (int j = 0; j < 10; j++) { RelationMember member = new RelationMember("node-" + j, lookupNode(ds, i + j)); r.addMember(member); } - for (int j =0; j < 5; j++) { + for (int j = 0; j < 5; j++) { RelationMember member = new RelationMember("way-" + j, lookupWay(ds, i + j)); r.addMember(member); } if (i > 5) { - for (int j =0; j < 3; j++) { + for (int j = 0; j < 3; j++) { RelationMember member = new RelationMember("relation-" + j, lookupRelation(ds, j)); logger.info(MessageFormat.format("adding relation {0} to relation {1}", j, i)); @@ -185,5 +185,5 @@ w.footer(); } - } catch(IOException e) { + } catch (IOException e) { fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString())); } @@ -456,5 +456,5 @@ protected static Set getNodeIdsInWay(Way way) { HashSet ret = new HashSet<>(); - if (way == null)return ret; + if (way == null) return ret; for (Node n: way.getNodes()) { ret.add(n.getId()); Index: trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java (revision 8510) @@ -27,7 +27,6 @@ getContentPane().add(uploadStrategySelectionPanel, BorderLayout.CENTER); getContentPane().add(buildControlPanel(), BorderLayout.SOUTH); - setSize(400,400); + setSize(400, 400); } - protected JPanel buildControlPanel() { @@ -42,5 +41,5 @@ try { n = Integer.parseInt(tf.getText()); - } catch(NumberFormatException e) { + } catch (NumberFormatException e) { Main.error(e); return; @@ -61,5 +60,5 @@ } - public static void main(String args[]) throws OsmApiInitializationException, OsmTransferCanceledException{ + public static void main(String args[]) throws OsmApiInitializationException, OsmTransferCanceledException { OsmApi.getOsmApi().initialize(NullProgressMonitor.INSTANCE); new UploadStrategySelectionPanelTest().setVisible(true); Index: trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererPerformanceTest.java =================================================================== --- trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererPerformanceTest.java (revision 8509) +++ trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererPerformanceTest.java (revision 8510) @@ -35,5 +35,5 @@ JOSMFixture.createPerformanceTestFixture().init(); img = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, BufferedImage.TYPE_3BYTE_BGR); - g = (Graphics2D)img.getGraphics(); + g = (Graphics2D) img.getGraphics(); nc = new NavigatableComponent(); nc.setBounds(0, 0, IMG_WIDTH, IMG_HEIGHT); @@ -54,7 +54,7 @@ private static void test(int iterations, DataSet ds, Bounds bounds) throws Exception { - Rendering visitor = new StyledMapRenderer(g,nc,false); + Rendering visitor = new StyledMapRenderer(g, nc, false); nc.zoomTo(bounds); - for (int i=0; i { boolean isLeft; + ConstantTrafficHand(boolean isLeft) { this.isLeft = isLeft; } + @Override public Boolean get(LatLon ll) { return isLeft; } + @Override public Boolean get(BBox box) { Index: trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java (revision 8510) @@ -89,5 +89,5 @@ assertSame("Unselected way seems to have change during split action.", w1.getNodesCount(), 3); - for(int i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) { assertSame("Node change in unselected way during split action.", w1.getNode(i), w1NodesArray[i]); Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java (revision 8510) @@ -40,49 +40,66 @@ public OsmDataLayer layer; public DataSet currentDataSet; + + public Predicate isSelectablePredicate = + new Predicate() { + @Override + public boolean evaluate(OsmPrimitive prim) { + return true; + } + }; + MapViewMock(DataSet dataSet, OsmDataLayer layer) { super(null, null); this.layer = layer; this.currentDataSet = dataSet; - }; + } + @Override public EastNorth getEastNorth(int x, int y) { return new EastNorth(x, y); } + @Override public void addMouseListener(MouseListener ml) {} + @Override public void removeMouseListener(MouseListener ml) {} + public void addMouseMotionListener(MouseListener ml) {} + public void removeMouseMotionListener(MouseListener ml) {} + public void mvRepaint() {} + @Override public void setVirtualNodesEnabled(boolean enabled) {} + @Override public void setNewCursor(Cursor cursor, Object reference) {} + @Override public void setNewCursor(int cursor, Object reference) {} + @Override public boolean isActiveLayerVisible() { return true; } - public Predicate isSelectablePredicate = - new Predicate() { - @Override - public boolean evaluate(OsmPrimitive prim) { - return true; - } - }; + @Override public void requestClearRect() {} + @Override public Point2D getPoint2D(EastNorth p) { return new Point2D.Double(p.getX(), p.getY()); } + @Override public void setActiveLayer(Layer layer) {} + @Override public Layer getActiveLayer() { return layer; } + @Override protected DataSet getCurrentDataSet() { @@ -119,4 +136,5 @@ } } + @Override public void mergeNodes(OsmDataLayer layer, Collection nodes, Index: trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (revision 8510) @@ -32,5 +32,5 @@ try { apiDataSet.adjustRelationUploadOrder(); - } catch(CyclicUploadDependencyException e) { + } catch (CyclicUploadDependencyException e) { fail("unexpected exception:" + e); } @@ -58,5 +58,5 @@ try { apiDataSet.adjustRelationUploadOrder(); - } catch(CyclicUploadDependencyException e) { + } catch (CyclicUploadDependencyException e) { fail("unexpected exception:" + e); } @@ -96,5 +96,5 @@ try { apiDataSet.adjustRelationUploadOrder(); - } catch(CyclicUploadDependencyException e) { + } catch (CyclicUploadDependencyException e) { fail("unexpected exception:" + e); } @@ -134,5 +134,5 @@ try { apiDataSet.adjustRelationUploadOrder(); - } catch(CyclicUploadDependencyException e) { + } catch (CyclicUploadDependencyException e) { fail("unexpected exception:" + e); } @@ -181,5 +181,5 @@ try { apiDataSet.adjustRelationUploadOrder(); - } catch(CyclicUploadDependencyException e) { + } catch (CyclicUploadDependencyException e) { fail("unexpected exception:" + e); } @@ -256,5 +256,5 @@ apiDataSet.adjustRelationUploadOrder(); fail("expected cyclic upload dependency exception not thrown"); - } catch(CyclicUploadDependencyException e) { + } catch (CyclicUploadDependencyException e) { System.out.println(e); } Index: trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.groovy =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.groovy (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.groovy (revision 8510) @@ -2,166 +2,163 @@ package org.openstreetmap.josm.data.osm; -import java.net.InetAddress.Cache; -import org.junit.Test +import static org.junit.Assert.* + +import org.junit.Test + +class ChangesetCacheTest { + + @Test + public void test_Constructor() { + ChangesetCache cache = ChangesetCache.getInstance() + assert cache != null + } + + @Test + public void test_addAndRemoveListeners() { + ChangesetCache cache = ChangesetCache.getInstance() + cache.clear() + + // should work + cache.addChangesetCacheListener null + + // should work + def listener = new ChangesetCacheListener() { + public void changesetCacheUpdated(ChangesetCacheEvent event) {} + } + cache.addChangesetCacheListener listener + // adding a second time - should work too + cache.addChangesetCacheListener listener + assert cache.@listeners.size() == 1 // ... but only added once + + cache.removeChangesetCacheListener null + + cache.removeChangesetCacheListener listener + assert cache.@listeners.size() == 0 + } + + @Test + public void update_get_remove_cycle() { + ChangesetCache cache = ChangesetCache.getInstance() + cache.clear() + + cache.update new Changeset(1) + assert cache.size() == 1 + assert cache.get(1) != null + assert cache.get(1).id == 1 + cache.remove(1) + assert cache.size() == 0 + } + + @Test + public void updateTwice() { + ChangesetCache cache = ChangesetCache.getInstance() + cache.clear() + + Changeset cs = new Changeset(1) + cs.incomplete = false + cs.put "key1", "value1" + cs.open = true + cache.update cs + + Changeset cs2 = new Changeset(cs) + assert cs2 != null + cs2.put "key2", "value2" + cs2.open = false + cache.update(cs2) + + assert cache.size() == 1 + assert cache.get(1) != null + + cs = cache.get(1) + assert cs.get("key1") == "value1" + assert cs.get("key2") == "value2" + assert !cs.open + } -import static org.junit.Assert.*; + @Test + public void contains() { + ChangesetCache cache = ChangesetCache.getInstance() + cache.@listeners.clear() + cache.clear() -class ChangesetCacheTest { - - @Test - public void test_Constructor() { - ChangesetCache cache = ChangesetCache.getInstance() - assert cache != null - } - - @Test - public void test_addAndRemoveListeners() { - ChangesetCache cache = ChangesetCache.getInstance() - cache.clear() - - // should work - cache.addChangesetCacheListener null - - // should work - def listener = new ChangesetCacheListener() { - public void changesetCacheUpdated(ChangesetCacheEvent event) {} - } - cache.addChangesetCacheListener listener - // adding a second time - should work too - cache.addChangesetCacheListener listener - assert cache.@listeners.size() == 1 // ... but only added once - - cache.removeChangesetCacheListener null - - cache.removeChangesetCacheListener listener - assert cache.@listeners.size() == 0 - } - - @Test - public void update_get_remove_cycle() { - ChangesetCache cache = ChangesetCache.getInstance() - cache.clear() - - cache.update new Changeset(1) - assert cache.size() == 1 - assert cache.get(1) != null - assert cache.get(1).id == 1 - cache.remove(1) - assert cache.size() == 0 - } - - @Test - public void updateTwice() { - ChangesetCache cache = ChangesetCache.getInstance() - cache.clear() - Changeset cs = new Changeset(1) - cs.incomplete = false - cs.put "key1", "value1" - cs.open = true - cache.update cs - - Changeset cs2 = new Changeset(cs) - assert cs2 != null - cs2.put "key2", "value2" - cs2.open = false - cache.update(cs2) - - assert cache.size() == 1 - assert cache.get(1) != null - - cs = cache.get(1) - assert cs.get("key1") == "value1" - assert cs.get("key2") == "value2" - assert !cs.open - } - - - @Test - public void contains() { - ChangesetCache cache = ChangesetCache.getInstance() - cache.@listeners.clear() - cache.clear() - - - Changeset cs = new Changeset(1) - cache.update cs - - assert cache.contains(1) - assert cache.contains(cs) - assert cache.contains(new Changeset(cs)) - - assert ! cache.contains(2) - assert ! cache.contains(new Changeset(2)) - assert ! cache.contains(null) - } - - @Test - public void fireingEvents_AddAChangeset() { - ChangesetCache cache = ChangesetCache.getInstance() - cache.clear() - cache.@listeners.clear() - - // should work - def listener = new ChangesetCacheListener() { - public void changesetCacheUpdated(ChangesetCacheEvent event) { - assert event != null - assert event.getAddedChangesets().size() == 1 - assert event.getRemovedChangesets().empty - assert event.getUpdatedChangesets().empty - assert event.getSource() == cache - } - } - cache.addChangesetCacheListener listener - cache.update(new Changeset(1)) - cache.removeChangesetCacheListener listener - } - - @Test - public void fireingEvents_UpdateChangeset() { - ChangesetCache cache = ChangesetCache.getInstance() - cache.clear() - cache.@listeners.clear() - - // should work - def listener = new ChangesetCacheListener() { - public void changesetCacheUpdated(ChangesetCacheEvent event) { - assert event != null - assert event.getAddedChangesets().empty - assert event.getRemovedChangesets().empty - assert event.getUpdatedChangesets().size() == 1 - assert event.getSource() == cache - } - } - cache.update(new Changeset(1)) - - cache.addChangesetCacheListener listener - cache.update(new Changeset(1)) - cache.removeChangesetCacheListener listener - } - - @Test - public void fireingEvents_RemoveChangeset() { - ChangesetCache cache = ChangesetCache.getInstance() - cache.clear() - cache.@listeners.clear() - - // should work - def listener = new ChangesetCacheListener() { - public void changesetCacheUpdated(ChangesetCacheEvent event) { - assert event != null - assert event.getAddedChangesets().empty - assert event.getRemovedChangesets().size() == 1 - assert event.getUpdatedChangesets().empty - assert event.getSource() == cache - } - } - cache.update(new Changeset(1)) - - cache.addChangesetCacheListener listener - cache.remove 1 - cache.removeChangesetCacheListener listener - } - + Changeset cs = new Changeset(1) + cache.update cs + + assert cache.contains(1) + assert cache.contains(cs) + assert cache.contains(new Changeset(cs)) + + assert ! cache.contains(2) + assert ! cache.contains(new Changeset(2)) + assert ! cache.contains(null) + } + + @Test + public void fireingEvents_AddAChangeset() { + ChangesetCache cache = ChangesetCache.getInstance() + cache.clear() + cache.@listeners.clear() + + // should work + def listener = new ChangesetCacheListener() { + public void changesetCacheUpdated(ChangesetCacheEvent event) { + assert event != null + assert event.getAddedChangesets().size() == 1 + assert event.getRemovedChangesets().empty + assert event.getUpdatedChangesets().empty + assert event.getSource() == cache + } + } + cache.addChangesetCacheListener listener + cache.update(new Changeset(1)) + cache.removeChangesetCacheListener listener + } + + @Test + public void fireingEvents_UpdateChangeset() { + ChangesetCache cache = ChangesetCache.getInstance() + cache.clear() + cache.@listeners.clear() + + // should work + def listener = new ChangesetCacheListener() { + public void changesetCacheUpdated(ChangesetCacheEvent event) { + assert event != null + assert event.getAddedChangesets().empty + assert event.getRemovedChangesets().empty + assert event.getUpdatedChangesets().size() == 1 + assert event.getSource() == cache + } + } + cache.update(new Changeset(1)) + + cache.addChangesetCacheListener listener + cache.update(new Changeset(1)) + cache.removeChangesetCacheListener listener + } + + @Test + public void fireingEvents_RemoveChangeset() { + ChangesetCache cache = ChangesetCache.getInstance() + cache.clear() + cache.@listeners.clear() + + // should work + def listener = new ChangesetCacheListener() { + public void changesetCacheUpdated(ChangesetCacheEvent event) { + assert event != null + assert event.getAddedChangesets().empty + assert event.getRemovedChangesets().size() == 1 + assert event.getUpdatedChangesets().empty + assert event.getSource() == cache + } + } + cache.update(new Changeset(1)) + + cache.addChangesetCacheListener listener + cache.remove 1 + cache.removeChangesetCacheListener listener + } } Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 8510) @@ -75,12 +75,12 @@ @Test public void nodeSimple_IdenticalNoConflict() { - Node n = new Node(new LatLon(0,0)); - n.setOsmId(1,1); + Node n = new Node(new LatLon(0, 0)); + n.setOsmId(1, 1); n.setModified(false); n.put("key1", "value1"); my.addPrimitive(n); - Node n1 = new Node(new LatLon(0,0)); - n1.setOsmId(1,1); + Node n1 = new Node(new LatLon(0, 0)); + n1.setOsmId(1, 1); n1.setModified(false); n1.put("key1", "value1"); @@ -88,8 +88,8 @@ - DataSetMerger visitor = new DataSetMerger(my,their); - visitor.merge(); - - Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); + DataSetMerger visitor = new DataSetMerger(my, their); + visitor.merge(); + + Node n2 = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertTrue(visitor.getConflicts().isEmpty()); assertNotSame(n1, n2); // make sure we have a clone @@ -110,12 +110,12 @@ @Test public void nodeSimple_locallyUnmodifiedNoConflict() { - Node n = new Node(new LatLon(0,0)); - n.setOsmId(1,1); + Node n = new Node(new LatLon(0, 0)); + n.setOsmId(1, 1); n.setModified(false); n.put("key1", "value1"); my.addPrimitive(n); - Node n1 = new Node(new LatLon(0,0)); - n1.setOsmId(1,2); + Node n1 = new Node(new LatLon(0, 0)); + n1.setOsmId(1, 2); n1.setModified(false); n1.put("key1", "value1-new"); @@ -124,8 +124,8 @@ - DataSetMerger visitor = new DataSetMerger(my,their); - visitor.merge(); - - Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); + DataSetMerger visitor = new DataSetMerger(my, their); + visitor.merge(); + + Node n2 = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertTrue(visitor.getConflicts().isEmpty()); assertSame(n, n2); // make sure the merged node is still the original node @@ -150,6 +150,6 @@ @Test public void nodeSimple_TagConflict() { - Node n = new Node(new LatLon(0,0)); - n.setOsmId(1,1); + Node n = new Node(new LatLon(0, 0)); + n.setOsmId(1, 1); n.setModified(true); n.put("key1", "value1"); @@ -157,6 +157,6 @@ my.addPrimitive(n); - Node n1 = new Node(new LatLon(0,0)); - n1.setOsmId(1,2); + Node n1 = new Node(new LatLon(0, 0)); + n1.setOsmId(1, 2); n1.setModified(false); n1.put("key1", "value1-new"); @@ -165,9 +165,9 @@ - DataSetMerger visitor = new DataSetMerger(my,their); - visitor.merge(); - - Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); - assertEquals(1,visitor.getConflicts().size()); + DataSetMerger visitor = new DataSetMerger(my, their); + visitor.merge(); + + Node n2 = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE); + assertEquals(1, visitor.getConflicts().size()); assertSame(n, n2); assertNotSame(n1, n2); @@ -185,11 +185,11 @@ public void nodeSimple_DeleteConflict() { Node n = new Node(1, 1); - n.setCoor(new LatLon(0,0)); + n.setCoor(new LatLon(0, 0)); n.setDeleted(true); n.put("key1", "value1"); my.addPrimitive(n); - Node n1 = new Node(new LatLon(0,0)); - n1.setOsmId(1,2); + Node n1 = new Node(new LatLon(0, 0)); + n1.setOsmId(1, 2); n1.setModified(false); n1.put("key1", "value1-new"); @@ -198,9 +198,9 @@ - DataSetMerger visitor = new DataSetMerger(my,their); - visitor.merge(); - - Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); - assertEquals(1,visitor.getConflicts().size()); + DataSetMerger visitor = new DataSetMerger(my, their); + visitor.merge(); + + Node n2 = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE); + assertEquals(1, visitor.getConflicts().size()); assertSame(n, n2); assertNotSame(n1, n2); @@ -215,19 +215,19 @@ @Test public void nodeSimple_DeleteConflict_2() { - Node n = new Node(new LatLon(0,0)); - n.setOsmId(1,1); + Node n = new Node(new LatLon(0, 0)); + n.setOsmId(1, 1); n.setDeleted(true); my.addPrimitive(n); - Node n1 = new Node(new LatLon(0,0)); - n1.setOsmId(1,1); - their.addPrimitive(n1); - - - DataSetMerger visitor = new DataSetMerger(my,their); - visitor.merge(); - - Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); - assertEquals(0,visitor.getConflicts().size()); + Node n1 = new Node(new LatLon(0, 0)); + n1.setOsmId(1, 1); + their.addPrimitive(n1); + + + DataSetMerger visitor = new DataSetMerger(my, their); + visitor.merge(); + + Node n2 = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE); + assertEquals(0, visitor.getConflicts().size()); assertTrue(n2.isVisible()); assertSame(n, n2); @@ -243,13 +243,13 @@ @Test public void nodeSimple_DeleteConflict_3() { - Node n = new Node(new LatLon(1,1)); + Node n = new Node(new LatLon(1, 1)); n.setDeleted(true); my.addPrimitive(n); - Node n1 = new Node(new LatLon(1,1)); - their.addPrimitive(n1); - - - DataSetMerger visitor = new DataSetMerger(my,their); + Node n1 = new Node(new LatLon(1, 1)); + their.addPrimitive(n1); + + + DataSetMerger visitor = new DataSetMerger(my, their); visitor.merge(); @@ -267,18 +267,18 @@ @Test public void nodeSimple_DeleteConflict_4() { - Node n = new Node(new LatLon(1,1)); + Node n = new Node(new LatLon(1, 1)); n.setDeleted(true); my.addPrimitive(n); - Node n1 = new Node(new LatLon(1,1)); + Node n1 = new Node(new LatLon(1, 1)); n1.setDeleted(true); their.addPrimitive(n1); - DataSetMerger visitor = new DataSetMerger(my,their); - visitor.merge(); - - assertEquals(0,visitor.getConflicts().size()); - Node n2 = (Node)my.getNodes().toArray()[0]; + DataSetMerger visitor = new DataSetMerger(my, their); + visitor.merge(); + + assertEquals(0, visitor.getConflicts().size()); + Node n2 = (Node) my.getNodes().toArray()[0]; assertSame(n2, n); assertTrue(n2.isDeleted()); @@ -301,5 +301,5 @@ Node n = new Node(); - n.setCoor(new LatLon(0,0)); + n.setCoor(new LatLon(0, 0)); n.put("key1", "value1"); n.setUser(myUser); @@ -309,5 +309,5 @@ Node n1 = new Node(); - n1.setCoor(new LatLon(0,0)); + n1.setCoor(new LatLon(0, 0)); n1.put("key1", "value1"); cal.add(Calendar.HOUR, 1); @@ -318,12 +318,12 @@ - DataSetMerger visitor = new DataSetMerger(my,their); + DataSetMerger visitor = new DataSetMerger(my, their); visitor.merge(); Node n2 = my.getNodes().iterator().next(); - assertEquals(0,visitor.getConflicts().size()); - assertEquals("value1",n2.get("key1")); + assertEquals(0, visitor.getConflicts().size()); + assertEquals("value1", n2.get("key1")); assertTrue(n1.getTimestamp().equals(n2.getTimestamp())); - assertEquals(theirUser,n2.getUser()); + assertEquals(theirUser, n2.getUser()); assertSame(n2, n); assertNotSame(n2, n1); @@ -344,6 +344,6 @@ Node n1 = new Node(); - n1.setCoor(new LatLon(0,0)); - n1.setOsmId(1,1); + n1.setCoor(new LatLon(0, 0)); + n1.setOsmId(1, 1); n1.put("key1", "value1"); Date timestamp = new Date(); @@ -352,10 +352,10 @@ - DataSetMerger visitor = new DataSetMerger(my,their); + DataSetMerger visitor = new DataSetMerger(my, their); visitor.merge(); Node n2 = my.getNodes().iterator().next(); - assertEquals(0,visitor.getConflicts().size()); - assertEquals("value1",n2.get("key1")); + assertEquals(0, visitor.getConflicts().size()); + assertEquals("value1", n2.get("key1")); assertTrue(n1.getTimestamp().equals(n2.getTimestamp())); assertFalse(n2.isIncomplete()); @@ -376,16 +376,16 @@ Node n1 = new Node(); - n1.setCoor(new LatLon(0,0)); - n1.setOsmId(1,1); + n1.setCoor(new LatLon(0, 0)); + n1.setOsmId(1, 1); my.addPrimitive(n1); Node n2 = new Node(); - n2.setCoor(new LatLon(0,0)); - n2.setOsmId(2,1); + n2.setCoor(new LatLon(0, 0)); + n2.setOsmId(2, 1); my.addPrimitive(n2); Way myWay = new Way(); - myWay.setOsmId(3,1); + myWay.setOsmId(3, 1); myWay.put("key1", "value1"); myWay.addNode(n1); @@ -395,14 +395,14 @@ // -- the source data set - Node n3 = new Node(new LatLon(0,0)); - n3.setOsmId(1,1); + Node n3 = new Node(new LatLon(0, 0)); + n3.setOsmId(1, 1); their.addPrimitive(n3); - Node n4 = new Node(new LatLon(1,1)); - n4.setOsmId(2,1); + Node n4 = new Node(new LatLon(1, 1)); + n4.setOsmId(2, 1); their.addPrimitive(n4); Way theirWay = new Way(); - theirWay.setOsmId(3,2); + theirWay.setOsmId(3, 2); theirWay.put("key1", "value1"); theirWay.put("key2", "value2"); @@ -412,23 +412,23 @@ - DataSetMerger visitor = new DataSetMerger(my,their); + DataSetMerger visitor = new DataSetMerger(my, their); visitor.merge(); // -- tests - Way merged = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); - assertEquals(0,visitor.getConflicts().size()); - assertEquals("value1",merged.get("key1")); - assertEquals("value2",merged.get("key2")); - assertEquals(3,merged.getId()); - assertEquals(2,merged.getVersion()); - assertEquals(2,merged.getNodesCount()); - assertEquals(1,merged.getNode(0).getId()); - assertEquals(2,merged.getNode(1).getId()); + Way merged = (Way) my.getPrimitiveById(3, OsmPrimitiveType.WAY); + assertEquals(0, visitor.getConflicts().size()); + assertEquals("value1", merged.get("key1")); + assertEquals("value2", merged.get("key2")); + assertEquals(3, merged.getId()); + assertEquals(2, merged.getVersion()); + assertEquals(2, merged.getNodesCount()); + assertEquals(1, merged.getNode(0).getId()); + assertEquals(2, merged.getNode(1).getId()); assertSame(merged, myWay); assertSame(merged.getDataSet(), my); - Node mergedNode = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); + Node mergedNode = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertSame(mergedNode, n1); - mergedNode = (Node)my.getPrimitiveById(2, OsmPrimitiveType.NODE); + mergedNode = (Node) my.getPrimitiveById(2, OsmPrimitiveType.NODE); assertSame(mergedNode, n2); @@ -448,14 +448,14 @@ // -- my data set - Node n1 = new Node(new LatLon(0,0)); - n1.setOsmId(1,1); + Node n1 = new Node(new LatLon(0, 0)); + n1.setOsmId(1, 1); my.addPrimitive(n1); - Node n2 = new Node(new LatLon(1,1)); - n2.setOsmId(2,1); + Node n2 = new Node(new LatLon(1, 1)); + n2.setOsmId(2, 1); my.addPrimitive(n2); Way myWay = new Way(); - myWay.setOsmId(3,1); + myWay.setOsmId(3, 1); myWay.addNode(n1); myWay.addNode(n2); @@ -464,15 +464,15 @@ // --- their data set - Node n3 = new Node(new LatLon(0,0)); - n3.setOsmId(1,1); + Node n3 = new Node(new LatLon(0, 0)); + n3.setOsmId(1, 1); their.addPrimitive(n3); - Node n5 = new Node(new LatLon(1,1)); - n5.setOsmId(4,1); + Node n5 = new Node(new LatLon(1, 1)); + n5.setOsmId(4, 1); their.addPrimitive(n5); - Node n4 = new Node(new LatLon(2,2)); - n4.setOsmId(2,2); + Node n4 = new Node(new LatLon(2, 2)); + n4.setOsmId(2, 2); n4.put("key1", "value1"); their.addPrimitive(n4); @@ -480,5 +480,5 @@ Way theirWay = new Way(); - theirWay.setOsmId(3,2); + theirWay.setOsmId(3, 2); theirWay.addNode(n3); theirWay.addNode(n5); // insert a node @@ -486,17 +486,17 @@ their.addPrimitive(theirWay); - DataSetMerger visitor = new DataSetMerger(my,their); + DataSetMerger visitor = new DataSetMerger(my, their); visitor.merge(); // -- tests - Way merged = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); - assertEquals(0,visitor.getConflicts().size()); - assertEquals(3,merged.getId()); - assertEquals(2,merged.getVersion()); - assertEquals(3,merged.getNodesCount()); - assertEquals(1,merged.getNode(0).getId()); - assertEquals(4,merged.getNode(1).getId()); - assertEquals(2,merged.getNode(2).getId()); - assertEquals("value1",merged.getNode(2).get("key1")); + Way merged = (Way) my.getPrimitiveById(3, OsmPrimitiveType.WAY); + assertEquals(0, visitor.getConflicts().size()); + assertEquals(3, merged.getId()); + assertEquals(2, merged.getVersion()); + assertEquals(3, merged.getNodesCount()); + assertEquals(1, merged.getNode(0).getId()); + assertEquals(4, merged.getNode(1).getId()); + assertEquals(2, merged.getNode(2).getId()); + assertEquals("value1", merged.getNode(2).get("key1")); assertSame(merged.getNode(0), n1); @@ -518,14 +518,14 @@ // -- the target dataset - Node n1 = new Node(new LatLon(0,0)); - n1.setOsmId(1,1); + Node n1 = new Node(new LatLon(0, 0)); + n1.setOsmId(1, 1); my.addPrimitive(n1); - Node n2 = new Node(new LatLon(1,1)); - n2.setOsmId(2,1); + Node n2 = new Node(new LatLon(1, 1)); + n2.setOsmId(2, 1); my.addPrimitive(n2); Way myWay = new Way(); - myWay.setOsmId(3,1); + myWay.setOsmId(3, 1); myWay.addNode(n1); @@ -537,20 +537,19 @@ // -- the source dataset - Node n3 = new Node(new LatLon(0,0)); - n3.setOsmId(1,1); + Node n3 = new Node(new LatLon(0, 0)); + n3.setOsmId(1, 1); their.addPrimitive(n3); - Node n5 = new Node(new LatLon(1,1)); - n5.setOsmId(4,1); + Node n5 = new Node(new LatLon(1, 1)); + n5.setOsmId(4, 1); their.addPrimitive(n5); - Node n4 = new Node(new LatLon(2,2)); - n4.setOsmId(2,1); + Node n4 = new Node(new LatLon(2, 2)); + n4.setOsmId(2, 1); n4.put("key1", "value1"); their.addPrimitive(n4); - Way theirWay = new Way(); - theirWay.setOsmId(3,2); + theirWay.setOsmId(3, 2); theirWay.addNode(n3); @@ -563,14 +562,13 @@ visitor.merge(); - Way merged = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); - assertEquals(1,visitor.getConflicts().size()); - assertEquals(3,merged.getId()); - assertEquals(1,merged.getVersion()); - assertEquals(2,merged.getNodesCount()); - assertEquals(1,merged.getNode(0).getId()); - assertEquals(2,merged.getNode(1).getId()); - assertEquals("value1",merged.get("key1")); - } - + Way merged = (Way) my.getPrimitiveById(3, OsmPrimitiveType.WAY); + assertEquals(1, visitor.getConflicts().size()); + assertEquals(3, merged.getId()); + assertEquals(1, merged.getVersion()); + assertEquals(2, merged.getNodesCount()); + assertEquals(1, merged.getNode(0).getId()); + assertEquals(2, merged.getNode(1).getId()); + assertEquals("value1", merged.get("key1")); + } /** @@ -583,15 +581,14 @@ public void waySimple_TheirVersionNotVisibleMyIsModified() { - - Node mn1 = new Node(new LatLon(0,0)); - mn1.setOsmId(1,1); + Node mn1 = new Node(new LatLon(0, 0)); + mn1.setOsmId(1, 1); my.addPrimitive(mn1); - Node mn2 = new Node(new LatLon(1,1)); - mn2.setOsmId(2,1); + Node mn2 = new Node(new LatLon(1, 1)); + mn2.setOsmId(2, 1); my.addPrimitive(mn2); Way myWay = new Way(); - myWay.setOsmId(3,1); + myWay.setOsmId(3, 1); myWay.addNode(mn1); myWay.addNode(mn2); @@ -599,7 +596,6 @@ my.addPrimitive(myWay); - Way theirWay = new Way(); - theirWay.setOsmId(3,2); + theirWay.setOsmId(3, 2); theirWay.setVisible(false); /* Invisible objects fetched from the server should be marked as "deleted". @@ -609,12 +605,12 @@ their.addPrimitive(theirWay); - DataSetMerger visitor = new DataSetMerger(my,their); - visitor.merge(); - - Way merged = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); - assertEquals(1,visitor.getConflicts().size()); + DataSetMerger visitor = new DataSetMerger(my, their); + visitor.merge(); + + Way merged = (Way) my.getPrimitiveById(3, OsmPrimitiveType.WAY); + assertEquals(1, visitor.getConflicts().size()); assertTrue(visitor.getConflicts().hasConflictForMy(myWay)); assertTrue(visitor.getConflicts().hasConflictForTheir(theirWay)); - assertEquals(myWay,merged); + assertEquals(myWay, merged); } @@ -630,10 +626,10 @@ // -- my data set - Node n1 = new Node(new LatLon(0,0)); - n1.setOsmId(1,1); + Node n1 = new Node(new LatLon(0, 0)); + n1.setOsmId(1, 1); my.addPrimitive(n1); - Node n2 = new Node(new LatLon(1,1)); - n2.setOsmId(2,1); + Node n2 = new Node(new LatLon(1, 1)); + n2.setOsmId(2, 1); my.addPrimitive(n2); @@ -645,10 +641,10 @@ // -- their data set - Node n3 = new Node(new LatLon(0,0)); - n3.setOsmId(1,1); + Node n3 = new Node(new LatLon(0, 0)); + n3.setOsmId(1, 1); their.addPrimitive(n3); - Node n4 = new Node(new LatLon(1,1)); - n4.setOsmId(2,1); + Node n4 = new Node(new LatLon(1, 1)); + n4.setOsmId(2, 1); their.addPrimitive(n4); @@ -661,10 +657,10 @@ their.addPrimitive(theirWay); - DataSetMerger visitor = new DataSetMerger(my,their); + DataSetMerger visitor = new DataSetMerger(my, their); visitor.merge(); // -- tests - Way merged = (Way)my.getWays().toArray()[0]; - assertEquals(0,visitor.getConflicts().size()); + Way merged = (Way) my.getWays().toArray()[0]; + assertEquals(0, visitor.getConflicts().size()); assertEquals("their", merged.getUser().getName()); assertEquals(1111, merged.getUser().getId()); @@ -688,8 +684,8 @@ // -- my data set - Node n1 = new Node(new LatLon(0,0)); + Node n1 = new Node(new LatLon(0, 0)); my.addPrimitive(n1); - Node n2 = new Node(new LatLon(1,1)); + Node n2 = new Node(new LatLon(1, 1)); my.addPrimitive(n2); @@ -701,8 +697,8 @@ // -- their data set - Node n3 = new Node(new LatLon(0,0)); + Node n3 = new Node(new LatLon(0, 0)); their.addPrimitive(n3); - Node n4 = new Node(new LatLon(1,1)); + Node n4 = new Node(new LatLon(1, 1)); their.addPrimitive(n4); @@ -715,10 +711,10 @@ their.addPrimitive(theirWay); - DataSetMerger visitor = new DataSetMerger(my,their); + DataSetMerger visitor = new DataSetMerger(my, their); visitor.merge(); // -- tests - Way merged = (Way)my.getWays().toArray()[0]; - assertEquals(0,visitor.getConflicts().size()); + Way merged = (Way) my.getWays().toArray()[0]; + assertEquals(0, visitor.getConflicts().size()); assertEquals("their", merged.getUser().getName()); assertEquals(1111, merged.getUser().getId()); @@ -731,5 +727,4 @@ } - /** * My dataset includes a deleted node. @@ -745,25 +740,24 @@ // -- my dataset - Node mn1 = new Node(new LatLon(0,0)); - mn1.setOsmId(1,1); + Node mn1 = new Node(new LatLon(0, 0)); + mn1.setOsmId(1, 1); mn1.setDeleted(true); my.addPrimitive(mn1); - - Node tn1 = new Node(new LatLon(0,0)); - tn1.setOsmId(1,1); + Node tn1 = new Node(new LatLon(0, 0)); + tn1.setOsmId(1, 1); their.addPrimitive(tn1); - Node tn2 = new Node(new LatLon(1,1)); - tn2.setOsmId(2,1); + Node tn2 = new Node(new LatLon(1, 1)); + tn2.setOsmId(2, 1); their.addPrimitive(tn2); - Node tn3 = new Node(new LatLon(2,2)); - tn3.setOsmId(3,1); + Node tn3 = new Node(new LatLon(2, 2)); + tn3.setOsmId(3, 1); their.addPrimitive(tn3); // -- their data set Way theirWay = new Way(); - theirWay.setOsmId(4,1); + theirWay.setOsmId(4, 1); theirWay.addNode(tn1); theirWay.addNode(tn2); @@ -773,5 +767,5 @@ their.addPrimitive(theirWay); - DataSetMerger visitor = new DataSetMerger(my,their); + DataSetMerger visitor = new DataSetMerger(my, their); visitor.merge(); @@ -779,8 +773,8 @@ assertTrue(visitor.getConflicts().get(0).isMyDeleted()); - Way myWay = (Way)my.getPrimitiveById(4, OsmPrimitiveType.WAY); + Way myWay = (Way) my.getPrimitiveById(4, OsmPrimitiveType.WAY); assertEquals(3, myWay.getNodesCount()); - Node n = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE); + Node n = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertTrue(myWay.getNodes().contains(n)); @@ -799,26 +793,25 @@ public void relationComplex_mergingADeletedNode() { - - Node mn1 = new Node(new LatLon(0,0)); - mn1.setOsmId(1,1); + Node mn1 = new Node(new LatLon(0, 0)); + mn1.setOsmId(1, 1); mn1.setDeleted(true); my.addPrimitive(mn1); - Node tn1 = new Node(new LatLon(0,0)); - tn1.setOsmId(1,1); + Node tn1 = new Node(new LatLon(0, 0)); + tn1.setOsmId(1, 1); their.addPrimitive(tn1); - Node tn2 = new Node(new LatLon(1,1)); - tn2.setOsmId(2,1); + Node tn2 = new Node(new LatLon(1, 1)); + tn2.setOsmId(2, 1); their.addPrimitive(tn2); - Node tn3 = new Node(new LatLon(2,2)); - tn3.setOsmId(3,1); + Node tn3 = new Node(new LatLon(2, 2)); + tn3.setOsmId(3, 1); their.addPrimitive(tn3); Relation theirRelation = new Relation(); - theirRelation.setOsmId(4,1); + theirRelation.setOsmId(4, 1); theirRelation.addMember(new RelationMember("", tn1)); @@ -827,8 +820,8 @@ their.addPrimitive(theirRelation); - DataSetMerger visitor = new DataSetMerger(my,their); - visitor.merge(); - - Node n = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE); + DataSetMerger visitor = new DataSetMerger(my, their); + visitor.merge(); + + Node n = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(n); @@ -837,5 +830,5 @@ assertTrue(visitor.getConflicts().get(0).isMyDeleted()); - Relation r = (Relation)my.getPrimitiveById(4,OsmPrimitiveType.RELATION); + Relation r = (Relation) my.getPrimitiveById(4, OsmPrimitiveType.RELATION); assertEquals(3, r.getMembersCount()); @@ -858,25 +851,24 @@ Way w3 = new Way(3); - w3.setNodes(Arrays.asList(n1,n2)); + w3.setNodes(Arrays.asList(n1, n2)); their.addPrimitive(w3); assertTrue(w3.isIncomplete()); - - DataSetMerger visitor = new DataSetMerger(my, their); - visitor.merge(); - - assertEquals(0,visitor.getConflicts().size()); - - OsmPrimitive p= my.getPrimitiveById(1, OsmPrimitiveType.NODE); + DataSetMerger visitor = new DataSetMerger(my, their); + visitor.merge(); + + assertEquals(0, visitor.getConflicts().size()); + + OsmPrimitive p = my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(p); assertTrue(p.isIncomplete()); - p= my.getPrimitiveById(2, OsmPrimitiveType.NODE); + p = my.getPrimitiveById(2, OsmPrimitiveType.NODE); assertNotNull(p); assertTrue(p.isIncomplete()); - p= my.getPrimitiveById(3, OsmPrimitiveType.WAY); + p = my.getPrimitiveById(3, OsmPrimitiveType.WAY); assertNotNull(p); assertTrue(p.isIncomplete()); - Way w = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); + Way w = (Way) my.getPrimitiveById(3, OsmPrimitiveType.WAY); assertNotNull(w); assertTrue(p.isIncomplete()); @@ -904,36 +896,35 @@ // an incomplete way with two incomplete nodes Way w3 = new Way(3); - w3.setNodes(Arrays.asList(n1,n2)); + w3.setNodes(Arrays.asList(n1, n2)); their.addPrimitive(w3); - - Node n4 = new Node(new LatLon(0,0)); - n4.setOsmId(1,1); + Node n4 = new Node(new LatLon(0, 0)); + n4.setOsmId(1, 1); my.addPrimitive(n4); - Node n5 = new Node(new LatLon(1,1)); - n5.setOsmId(2,1); + Node n5 = new Node(new LatLon(1, 1)); + n5.setOsmId(2, 1); my.addPrimitive(n5); Way w6 = new Way(3, 1); - w6.setNodes(Arrays.asList(n4,n5)); + w6.setNodes(Arrays.asList(n4, n5)); my.addPrimitive(w6); - DataSetMerger visitor = new DataSetMerger(my,their); - visitor.merge(); - - assertEquals(0,visitor.getConflicts().size()); - - OsmPrimitive p= my.getPrimitiveById(1, OsmPrimitiveType.NODE); + DataSetMerger visitor = new DataSetMerger(my, their); + visitor.merge(); + + assertEquals(0, visitor.getConflicts().size()); + + OsmPrimitive p = my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(p); assertFalse(p.isIncomplete()); - p= my.getPrimitiveById(2, OsmPrimitiveType.NODE); + p = my.getPrimitiveById(2, OsmPrimitiveType.NODE); assertNotNull(p); assertFalse(p.isIncomplete()); - p= my.getPrimitiveById(3,OsmPrimitiveType.WAY); + p = my.getPrimitiveById(3, OsmPrimitiveType.WAY); assertNotNull(p); assertFalse(p.isIncomplete()); - Way w = (Way)my.getPrimitiveById(3,OsmPrimitiveType.WAY); + Way w = (Way) my.getPrimitiveById(3, OsmPrimitiveType.WAY); assertNotNull(w); assertFalse(p.isIncomplete()); @@ -954,10 +945,10 @@ // an complete node Node n1 = new Node(1, 1); - n1.setCoor(new LatLon(1,1)); + n1.setCoor(new LatLon(1, 1)); their.addPrimitive(n1); // another complete node Node n2 = new Node(2, 1); - n2.setCoor(new LatLon(2,2)); + n2.setCoor(new LatLon(2, 2)); their.addPrimitive(n2); @@ -980,15 +971,15 @@ // -- test it - assertEquals(0,visitor.getConflicts().size()); - - Node n = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); + assertEquals(0, visitor.getConflicts().size()); + + Node n = (Node) my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(n); assertFalse(n.isIncomplete()); - n = (Node)my.getPrimitiveById(2, OsmPrimitiveType.NODE); + n = (Node) my.getPrimitiveById(2, OsmPrimitiveType.NODE); assertNotNull(n); assertFalse(n.isIncomplete()); - Way w = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); + Way w = (Way) my.getPrimitiveById(3, OsmPrimitiveType.WAY); assertNotNull(w); assertFalse(w.hasIncompleteNodes()); Index: trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (revision 8510) @@ -64,5 +64,5 @@ @Test public void filter_test() throws ParseError, IllegalDataException, IOException { - for (int i : new int [] {1,2,3, 11,12,13,14, 15}) { + for (int i : new int[] {1, 2, 3, 11, 12, 13, 14, 15}) { DataSet ds; try (InputStream is = new FileInputStream("data_nodist/filterTests.osm")) { Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java (revision 8510) @@ -117,10 +117,10 @@ public void hasEqualSemanticAttributes() { Node n1 = new Node(1); - n1.setCoor(new LatLon(0,0)); + n1.setCoor(new LatLon(0, 0)); n1.put("key.1", "value.1"); n1.put("key.2", "value.2"); Node n2 = new Node(1); - n2.setCoor(new LatLon(0,0)); + n2.setCoor(new LatLon(0, 0)); n2.put("key.2", "value.2"); n2.put("key.1", "value.1"); @@ -135,10 +135,10 @@ public void hasEqualSemanticAttributes_2() { Node n1 = new Node(1); - n1.setCoor(new LatLon(0,0)); + n1.setCoor(new LatLon(0, 0)); n1.put("key.1", "value.1"); n1.put("key.2", "value.3"); Node n2 = new Node(1); - n2.setCoor(new LatLon(0,0)); + n2.setCoor(new LatLon(0, 0)); n2.put("key.1", "value.1"); n2.put("key.2", "value.4"); Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (revision 8510) @@ -143,9 +143,8 @@ } - @Test(expected=DataIntegrityProblemException.class) + @Test(expected = DataIntegrityProblemException.class) public void checkMustBeInDatasate() { Node n = new Node(); n.getReferrers(); } - } Index: trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (revision 8510) @@ -20,5 +20,5 @@ } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void createNewRelation() { new Relation(null); Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (revision 8510) @@ -24,5 +24,5 @@ 4l, d, - new LatLon(0,0) + new LatLon(0, 0) ); @@ -46,5 +46,5 @@ 4, d, - new LatLon(0,0) + new LatLon(0, 0) ); Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (revision 8510) @@ -71,5 +71,5 @@ way.getNodeId(1); fail("expected expection of type " + IndexOutOfBoundsException.class.toString()); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // OK } Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 8510) @@ -45,14 +45,14 @@ DataSet source = new DataSet(); Node n1 = new Node(1); - Node n2 = new Node(new LatLon(10.0,10.0)); - n2.put("name","n2"); + Node n2 = new Node(new LatLon(10.0, 10.0)); + n2.put("name", "n2"); Node n3 = new Node(3); - Node n4 = new Node(new LatLon(20.0,20.0)); - n4.put("name","n4"); + Node n4 = new Node(new LatLon(20.0, 20.0)); + n4.put("name", "n4"); source.addPrimitive(n1); source.addPrimitive(n2); source.addPrimitive(n3); source.addPrimitive(n4); - source.setSelected(n1,n2); + source.setSelected(n1, n2); MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(source); @@ -61,9 +61,9 @@ assertEquals(2, hull.getNodes().size()); - OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE); + OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(p); assertEquals(p.getClass(), Node.class); - p = hull.getPrimitiveById(3,OsmPrimitiveType.NODE); + p = hull.getPrimitiveById(3, OsmPrimitiveType.NODE); assertNull(p); @@ -74,5 +74,4 @@ assertNull(p); } - @Test @@ -95,9 +94,9 @@ assertEquals(2, hull.getNodes().size()); - OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE); + OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(p); assertEquals(p.getClass(), Node.class); - p = hull.getPrimitiveById(2,OsmPrimitiveType.NODE); + p = hull.getPrimitiveById(2, OsmPrimitiveType.NODE); assertNotNull(p); assertEquals(p.getClass(), Node.class); @@ -119,5 +118,5 @@ source.addPrimitive(n2); source.addPrimitive(w1); - source.setSelected(w1,n1,n2); + source.setSelected(w1, n1, n2); MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(source); @@ -127,5 +126,5 @@ assertEquals(2, hull.getNodes().size()); - OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE); + OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(p); assertEquals(p.getClass(), Node.class); @@ -135,5 +134,5 @@ assertEquals(p.getClass(), Node.class); - p = hull.getPrimitiveById(3,OsmPrimitiveType.WAY); + p = hull.getPrimitiveById(3, OsmPrimitiveType.WAY); assertNotNull(p); assertEquals(p.getClass(), Way.class); @@ -164,5 +163,5 @@ Node n20 = new Node(20, 1); n20.setCoor(new LatLon(0, 0)); - r1.addMember(new RelationMember("node-20",n20)); + r1.addMember(new RelationMember("node-20", n20)); Way w30 = new Way(30, 1); Node n21 = new Node(21); @@ -170,5 +169,5 @@ Node n22 = new Node(22); w30.addNode(n22); - r1.addMember(new RelationMember("way-30",w30)); + r1.addMember(new RelationMember("way-30", w30)); Relation r40 = new Relation(40); r1.addMember(new RelationMember("relation-40", r40)); @@ -179,5 +178,5 @@ source.addPrimitive(r40); source.addPrimitive(r1); - source.setSelected(r1,n20,w30,r40); + source.setSelected(r1, n20, w30, r40); MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(source); @@ -192,22 +191,22 @@ assertEquals(p.getClass(), Relation.class); - Way w = (Way)hull.getPrimitiveById(30,OsmPrimitiveType.WAY); + Way w = (Way) hull.getPrimitiveById(30, OsmPrimitiveType.WAY); assertNotNull(w); assertEquals(2, w.getNodesCount()); - Node n = (Node)hull.getPrimitiveById(21, OsmPrimitiveType.NODE); + Node n = (Node) hull.getPrimitiveById(21, OsmPrimitiveType.NODE); assertNotNull(n); assertTrue(w.containsNode(n)); - n = (Node)hull.getPrimitiveById(22,OsmPrimitiveType.NODE); + n = (Node) hull.getPrimitiveById(22, OsmPrimitiveType.NODE); assertNotNull(n); assertTrue(w.containsNode(n)); - Relation r = (Relation)hull.getPrimitiveById(40,OsmPrimitiveType.RELATION); - assertNotNull(r); - - r = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); + Relation r = (Relation) hull.getPrimitiveById(40, OsmPrimitiveType.RELATION); + assertNotNull(r); + + r = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); assertNotNull(r); assertEquals(3, r.getMembersCount()); - RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20,OsmPrimitiveType.NODE)); + RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20, OsmPrimitiveType.NODE)); assertTrue(r.getMembers().contains(m)); m = new RelationMember("way-30", hull.getPrimitiveById(30, OsmPrimitiveType.WAY)); @@ -222,5 +221,5 @@ Relation r1 = new Relation(1, 1); Node n20 = new Node(20); - r1.addMember(new RelationMember("node-20",n20)); + r1.addMember(new RelationMember("node-20", n20)); Way w30 = new Way(30, 1); Node n21; @@ -228,5 +227,5 @@ Node n22; w30.addNode(n22 = new Node(22)); - r1.addMember(new RelationMember("way-30",w30)); + r1.addMember(new RelationMember("way-30", w30)); Relation r40 = new Relation(40); r1.addMember(new RelationMember("relation-40", r40)); @@ -250,20 +249,20 @@ assertEquals(p.getClass(), Relation.class); - Way w = (Way)hull.getPrimitiveById(30, OsmPrimitiveType.WAY); + Way w = (Way) hull.getPrimitiveById(30, OsmPrimitiveType.WAY); assertNotNull(w); assertTrue(w.isIncomplete()); - Node n = (Node)hull.getPrimitiveById(21,OsmPrimitiveType.NODE); + Node n = (Node) hull.getPrimitiveById(21, OsmPrimitiveType.NODE); assertNull(n); - n = (Node)hull.getPrimitiveById(22, OsmPrimitiveType.NODE); + n = (Node) hull.getPrimitiveById(22, OsmPrimitiveType.NODE); assertNull(n); - Relation r = (Relation)hull.getPrimitiveById(40, OsmPrimitiveType.RELATION); + Relation r = (Relation) hull.getPrimitiveById(40, OsmPrimitiveType.RELATION); assertNotNull(r); assertTrue(r.isIncomplete()); - r = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); + r = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); assertNotNull(r); assertEquals(3, r.getMembersCount()); @@ -281,17 +280,17 @@ Relation r1 = new Relation(); r1.put("name", "r1"); - Node n20 = new Node(new LatLon(20.0,20.0)); + Node n20 = new Node(new LatLon(20.0, 20.0)); n20.put("name", "n20"); - r1.addMember(new RelationMember("node-20",n20)); + r1.addMember(new RelationMember("node-20", n20)); Way w30 = new Way(); w30.put("name", "w30"); Node n21; - w30.addNode(n21 = new Node(new LatLon(21.0,21.0))); - n21.put("name","n21"); + w30.addNode(n21 = new Node(new LatLon(21.0, 21.0))); + n21.put("name", "n21"); Node n22; - w30.addNode(n22 = new Node(new LatLon(22.0,22.0))); - n22.put("name","n22"); - r1.addMember(new RelationMember("way-30",w30)); + w30.addNode(n22 = new Node(new LatLon(22.0, 22.0))); + n22.put("name", "n22"); + r1.addMember(new RelationMember("way-30", w30)); Relation r40 = new Relation(); r40.put("name", "r40"); @@ -317,20 +316,20 @@ assertEquals(p.getClass(), Relation.class); - Way w = (Way)lookupByName(hull.getWays(), "w30"); + Way w = (Way) lookupByName(hull.getWays(), "w30"); assertNotNull(w); assertEquals(2, w.getNodesCount()); - Node n = (Node)lookupByName(hull.getNodes(), "n21"); + Node n = (Node) lookupByName(hull.getNodes(), "n21"); assertNotNull(n); assertTrue(w.containsNode(n)); - n = (Node)lookupByName(hull.getNodes(), "n22"); + n = (Node) lookupByName(hull.getNodes(), "n22"); assertNotNull(n); assertTrue(w.containsNode(n)); - Relation r = (Relation)lookupByName(hull.getRelations(), "r40"); - assertNotNull(r); - - r = (Relation)lookupByName(hull.getRelations(), "r1"); + Relation r = (Relation) lookupByName(hull.getRelations(), "r40"); + assertNotNull(r); + + r = (Relation) lookupByName(hull.getRelations(), "r1"); assertNotNull(r); assertEquals(3, r.getMembersCount()); @@ -347,5 +346,5 @@ DataSet source = new DataSet(); Relation r1 = new Relation(1, 1); - r1.addMember(new RelationMember("relation-1",r1)); + r1.addMember(new RelationMember("relation-1", r1)); source.addPrimitive(r1); source.setSelected(r1); @@ -356,8 +355,8 @@ assertEquals(1, hull.getRelations().size()); - Relation r = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); + Relation r = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); assertNotNull(r); assertEquals(1, r.getMembersCount()); - assertTrue(r.getMembers().contains(new RelationMember("relation-1",r))); + assertTrue(r.getMembers().contains(new RelationMember("relation-1", r))); } @@ -367,5 +366,5 @@ Relation r1 = new Relation(); r1.put("name", "r1"); - r1.addMember(new RelationMember("relation-1",r1)); + r1.addMember(new RelationMember("relation-1", r1)); source.addPrimitive(r1); source.setSelected(r1); @@ -376,8 +375,8 @@ assertEquals(1, hull.getRelations().size()); - Relation r = (Relation)lookupByName(hull.getRelations(), "r1"); + Relation r = (Relation) lookupByName(hull.getRelations(), "r1"); assertNotNull(r); assertEquals(1, r.getMembersCount()); - assertTrue(r.getMembers().contains(new RelationMember("relation-1",r))); + assertTrue(r.getMembers().contains(new RelationMember("relation-1", r))); } @@ -389,7 +388,7 @@ Relation r2 = new Relation(2, 3); source.addPrimitive(r2); - r1.addMember(new RelationMember("relation-2",r2)); - r2.addMember(new RelationMember("relation-1",r1)); - source.setSelected(r1,r2); + r1.addMember(new RelationMember("relation-2", r2)); + r2.addMember(new RelationMember("relation-1", r1)); + source.setSelected(r1, r2); MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(source); @@ -398,12 +397,12 @@ assertEquals(2, hull.getRelations().size()); - r1 = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); + r1 = (Relation) hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); assertNotNull(r1); - r2 = (Relation)hull.getPrimitiveById(2, OsmPrimitiveType.RELATION); + r2 = (Relation) hull.getPrimitiveById(2, OsmPrimitiveType.RELATION); assertNotNull(r2); assertEquals(1, r1.getMembersCount()); - assertTrue(r1.getMembers().contains(new RelationMember("relation-2",r2))); + assertTrue(r1.getMembers().contains(new RelationMember("relation-2", r2))); assertEquals(1, r2.getMembersCount()); - assertTrue(r2.getMembers().contains(new RelationMember("relation-1",r1))); + assertTrue(r2.getMembers().contains(new RelationMember("relation-1", r1))); } } Index: trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java (revision 8510) @@ -20,15 +20,15 @@ double maxErrLat = 0, maxErrLon = 0; Ellipsoid ellips = Ellipsoid.WGS84; - for (int num=0; num<1000; ++num) { + for (int num = 0; num < 1000; ++num) { double lat = r.nextDouble() * 180.0 - 90.0; double lon = r.nextDouble() * 360.0 - 180.0; - LatLon ll = new LatLon(lat,lon); + LatLon ll = new LatLon(lat, lon); - for (int i=0; i<1000; ++i) { + for (int i = 0; i < 1000; ++i) { double[] cart = ellips.latLon2Cart(ll); ll = ellips.cart2LatLon(cart); - if (!(Math.abs(lat - ll.lat()) prevCodesMap = new HashMap<>(); + Map prevCodesMap = new HashMap<>(); for (TestData data : prevData) { prevCodesMap.put(data.code, data); @@ -116,7 +116,7 @@ TestData next = new TestData(); - Pair ll = readLine("ll", in.readLine()); - Pair en = readLine("en", in.readLine()); - Pair ll2 = readLine("ll2", in.readLine()); + Pair ll = readLine("ll", in.readLine()); + Pair en = readLine("en", in.readLine()); + Pair ll2 = readLine("ll2", in.readLine()); next.code = line; @@ -131,5 +131,5 @@ } - private static Pair readLine(String expectedName, String input) { + private static Pair readLine(String expectedName, String input) { String[] fields = input.trim().split("[ ]+"); if (fields.length != 3) throw new AssertionError(); Index: trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java (revision 8510) @@ -28,9 +28,9 @@ } - for (int i=0; i<=3; ++i) { + for (int i = 0; i <= 3; ++i) { testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(27561+i))); // Lambert 4 Zones France } - for (int i=0; i<=4; ++i) { + for (int i = 0; i <= 4; ++i) { testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(2176+i))); // PUWG Poland } @@ -38,5 +38,5 @@ testProj(Projections.getProjectionByCode("EPSG:21781")); // Swiss grid - for (int i=0; i<=60; ++i) { + for (int i = 0; i <= 60; ++i) { testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(32601+i))); // UTM North testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(32701+i))); // UTM South @@ -44,10 +44,10 @@ if (!"yes".equals(System.getProperty("suppressPermanentFailure"))) { - for (int i=0; i<=4; ++i) { + for (int i = 0; i <= 4; ++i) { testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(2969+i))); // UTM France DOM } } - for (int i=0; i<=8; ++i) { + for (int i = 0; i <= 8; ++i) { testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(3942+i))); // Lambert CC9 Zones France } @@ -65,5 +65,5 @@ text += String.format("*** %s %s%n", p.toString(), p.toCode()); - for (int num=0; num < 1000; ++num) { + for (int num = 0; num < 1000; ++num) { double lat = rand.nextDouble() * (b.getMax().lat() - b.getMin().lat()) + b.getMin().lat(); @@ -72,5 +72,5 @@ LatLon ll = new LatLon(lat, lon); - for (int i=0; i<10; ++i) { + for (int i = 0; i < 10; ++i) { EastNorth en = p.latlon2eastNorth(ll); ll = p.eastNorth2latlon(en); Index: trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 8510) @@ -28,9 +28,9 @@ */ ProjData[] data = { - new ProjData("Zimmerwald", d(7,27,54.983506), d(46,52,37.540562), 947.149, 602030.680, 191775.030, 897.915), - new ProjData("Chrischona", d(7,40,6.983077), d(47,34, 1.385301), 504.935, 617306.300, 268507.300, 456.064), - new ProjData("Pfaender", d(9,47,3.697723), d(47,30,55.172797), 1089.372, 776668.105, 265372.681, 1042.624), - new ProjData("La Givrine", d(6,6,7.326361), d(46,27,14.690021), 1258.274, 497313.292, 145625.438, 1207.434), - new ProjData("Monte Generoso", d(9,1,16.389053), d(45,55,45.438020), 1685.027, 722758.810, 87649.670, 1636.600) }; + new ProjData("Zimmerwald", d(7, 27, 54.983506), d(46, 52, 37.540562), 947.149, 602030.680, 191775.030, 897.915), + new ProjData("Chrischona", d(7, 40, 6.983077), d(47, 34, 1.385301), 504.935, 617306.300, 268507.300, 456.064), + new ProjData("Pfaender", d(9, 47, 3.697723), d(47, 30, 55.172797), 1089.372, 776668.105, 265372.681, 1042.624), + new ProjData("La Givrine", d(6, 6, 7.326361), d(46, 27, 14.690021), 1258.274, 497313.292, 145625.438, 1207.434), + new ProjData("Monte Generoso", d(9, 1, 16.389053), d(45, 55, 45.438020), 1685.027, 722758.810, 87649.670, 1636.600) }; private double d(double deg, double min, double sec) { @@ -42,4 +42,5 @@ public LatLon ll; public EastNorth en; + public ProjData(String name, double lon, double lat, double h1, double x, double y, double h2) { this.name = name; @@ -128,5 +129,4 @@ } - @Test public void b_eastNorth2latlon_test() { Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java (revision 8510) @@ -42,5 +42,5 @@ nodes.add(new Node(new LatLon(0, 2))); - Way w = (Way)OsmUtils.createPrimitive("way "+tags); + Way w = (Way) OsmUtils.createPrimitive("way "+tags); w.setNodes(nodes); return w; Index: trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy (revision 8510) @@ -12,304 +12,304 @@ class JosmUserIdentityManagerTest { - final shouldFail = new GroovyTestCase().&shouldFail - - @BeforeClass - public static void initTestCase() { - JOSMFixture.createUnitTestFixture().init() - } - - @Test - public void test_SingletonAccess() { - - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() - - // created ? - assert im != null - - // registered as listener ? - assert Main.pref.@listeners.contains(im) - - JosmUserIdentityManager im2 = JosmUserIdentityManager.getInstance() - - // only one instance - assert im == im2 - } - - @Test - public void test_setAnonymouse() { - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() - - im.setPartiallyIdentified "test" - im.setAnonymous() - - assert im.isAnonymous() - assert ! im.isPartiallyIdentified() - assert ! im.isFullyIdentified() - - assert im.getUserId() == 0 - assert im.getUserName() == null - assert im.getUserInfo() == null - } - - @Test - public void test_setPartiallyIdentified() { - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() - - im.setPartiallyIdentified "test" - - shouldFail(IllegalArgumentException) { - im.setPartiallyIdentified null - } - - shouldFail(IllegalArgumentException) { - im.setPartiallyIdentified "" - } - - shouldFail(IllegalArgumentException) { - im.setPartiallyIdentified " \t " - } - - im.setPartiallyIdentified "test" - - assert ! im.isAnonymous() - assert im.isPartiallyIdentified() - assert ! im.isFullyIdentified() - - assert im.getUserId() == 0 - assert im.getUserName() == "test" - assert im.getUserInfo() == null - } - - - @Test - public void test_setFullyIdentified() { - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() - - UserInfo userInfo = new UserInfo(id: 1, description: "a description") - - im.setFullyIdentified "test", userInfo - - shouldFail(IllegalArgumentException) { - im.setFullyIdentified null, userInfo - } - shouldFail(IllegalArgumentException) { - im.setFullyIdentified "", userInfo - } - shouldFail(IllegalArgumentException) { - im.setFullyIdentified " \t ", userInfo - } - shouldFail(IllegalArgumentException) { - im.setFullyIdentified "test", null - } - - im.setFullyIdentified "test", userInfo - - assert ! im.isAnonymous() - assert ! im.isPartiallyIdentified() - assert im.isFullyIdentified() - - assert im.getUserId() == 1 - assert im.getUserName() == "test" - assert im.getUserInfo() == userInfo - } - - /** - * Preferences include neither an url nor a user name => we have - * an anonymous user - */ - @Test - public void initFromPreferences_1() { - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() - - // reset it - im.@userName = null - im.@userInfo = null - - Main.pref.put "osm-server.url", null - Main.pref.put "osm-server.username", null - - im.initFromPreferences() - - assert im.isAnonymous() - } - - /** - * Preferences include neither an url nor a user name => we have - * an annoymous user - */ - @Test - public void initFromPreferences_2() { - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() - - // reset it - im.@userName = null - im.@userInfo = null - - // for this test we disable the listener - Main.pref.removePreferenceChangeListener im - - Main.pref.put "osm-server.url", "http://api.openstreetmap.org" - Main.pref.put "osm-server.username", null - - im.initFromPreferences() - - assert im.isAnonymous() - } - - /** - * Preferences include an user name => we have a partially identified user - */ - @Test - public void initFromPreferences_3() { - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + final shouldFail = new GroovyTestCase().&shouldFail + + @BeforeClass + public static void initTestCase() { + JOSMFixture.createUnitTestFixture().init() + } + + @Test + public void test_SingletonAccess() { + + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + + // created ? + assert im != null + + // registered as listener ? + assert Main.pref.@listeners.contains(im) + + JosmUserIdentityManager im2 = JosmUserIdentityManager.getInstance() + + // only one instance + assert im == im2 + } + + @Test + public void test_setAnonymouse() { + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + + im.setPartiallyIdentified "test" + im.setAnonymous() + + assert im.isAnonymous() + assert ! im.isPartiallyIdentified() + assert ! im.isFullyIdentified() + + assert im.getUserId() == 0 + assert im.getUserName() == null + assert im.getUserInfo() == null + } + + @Test + public void test_setPartiallyIdentified() { + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + + im.setPartiallyIdentified "test" + + shouldFail(IllegalArgumentException) { + im.setPartiallyIdentified null + } + + shouldFail(IllegalArgumentException) { + im.setPartiallyIdentified "" + } + + shouldFail(IllegalArgumentException) { + im.setPartiallyIdentified " \t " + } + + im.setPartiallyIdentified "test" + + assert ! im.isAnonymous() + assert im.isPartiallyIdentified() + assert ! im.isFullyIdentified() + + assert im.getUserId() == 0 + assert im.getUserName() == "test" + assert im.getUserInfo() == null + } + + + @Test + public void test_setFullyIdentified() { + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + + UserInfo userInfo = new UserInfo(id: 1, description: "a description") + + im.setFullyIdentified "test", userInfo + + shouldFail(IllegalArgumentException) { + im.setFullyIdentified null, userInfo + } + shouldFail(IllegalArgumentException) { + im.setFullyIdentified "", userInfo + } + shouldFail(IllegalArgumentException) { + im.setFullyIdentified " \t ", userInfo + } + shouldFail(IllegalArgumentException) { + im.setFullyIdentified "test", null + } + + im.setFullyIdentified "test", userInfo + + assert ! im.isAnonymous() + assert ! im.isPartiallyIdentified() + assert im.isFullyIdentified() + + assert im.getUserId() == 1 + assert im.getUserName() == "test" + assert im.getUserInfo() == userInfo + } + + /** + * Preferences include neither an url nor a user name => we have + * an anonymous user + */ + @Test + public void initFromPreferences_1() { + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + + // reset it + im.@userName = null + im.@userInfo = null + + Main.pref.put "osm-server.url", null + Main.pref.put "osm-server.username", null + + im.initFromPreferences() + + assert im.isAnonymous() + } + + /** + * Preferences include neither an url nor a user name => we have + * an annoymous user + */ + @Test + public void initFromPreferences_2() { + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + + // reset it + im.@userName = null + im.@userInfo = null // for this test we disable the listener - Main.pref.removePreferenceChangeListener im - - // reset it - im.@userName = null - im.@userInfo = null - - Main.pref.put "osm-server.url", "http://api.openstreetmap.org" - Main.pref.put "osm-server.username", "test" - - im.initFromPreferences() - - assert im.isPartiallyIdentified() - } - - /** - * Preferences include an user name which is different from the current - * user name and we are currently fully identifed => josm user becomes - * partially identified - */ - @Test - public void initFromPreferences_4() { - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + Main.pref.removePreferenceChangeListener im + + Main.pref.put "osm-server.url", "http://api.openstreetmap.org" + Main.pref.put "osm-server.username", null + + im.initFromPreferences() + + assert im.isAnonymous() + } + + /** + * Preferences include an user name => we have a partially identified user + */ + @Test + public void initFromPreferences_3() { + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() // for this test we disable the listener - Main.pref.removePreferenceChangeListener im - - im.setFullyIdentified "test1", new UserInfo(id: 1) - - Main.pref.put "osm-server.url", "http://api.openstreetmap.org" - Main.pref.put "osm-server.username", "test2" - - im.initFromPreferences() - - assert im.isPartiallyIdentified() - } - - /** - * Preferences include an user name which is the same as the current - * user name and we are currently fully identifed => josm user remains - * fully identified - */ - @Test - public void initFromPreferences_5() { - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + Main.pref.removePreferenceChangeListener im + + // reset it + im.@userName = null + im.@userInfo = null + + Main.pref.put "osm-server.url", "http://api.openstreetmap.org" + Main.pref.put "osm-server.username", "test" + + im.initFromPreferences() + + assert im.isPartiallyIdentified() + } + + /** + * Preferences include an user name which is different from the current + * user name and we are currently fully identifed => josm user becomes + * partially identified + */ + @Test + public void initFromPreferences_4() { + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() // for this test we disable the listener - Main.pref.removePreferenceChangeListener im - - im.setFullyIdentified "test1", new UserInfo(id: 1) - - Main.pref.put "osm-server.url", "http://api.openstreetmap.org" - Main.pref.put "osm-server.username", "test1" - - im.initFromPreferences() - - assert im.isFullyIdentified() - } - - @Test - public void apiUrlChanged() { - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() - - // make sure im is a preference change listener - Main.pref.addPreferenceChangeListener im - - // reset it - im.@userName = null - im.@userInfo = null - - Main.pref.put "osm-server.url", "http://api.openstreetmap.org" - assert im.isAnonymous() + Main.pref.removePreferenceChangeListener im + + im.setFullyIdentified "test1", new UserInfo(id: 1) + + Main.pref.put "osm-server.url", "http://api.openstreetmap.org" + Main.pref.put "osm-server.username", "test2" + + im.initFromPreferences() + + assert im.isPartiallyIdentified() + } + + /** + * Preferences include an user name which is the same as the current + * user name and we are currently fully identifed => josm user remains + * fully identified + */ + @Test + public void initFromPreferences_5() { + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + + // for this test we disable the listener + Main.pref.removePreferenceChangeListener im + + im.setFullyIdentified "test1", new UserInfo(id: 1) + + Main.pref.put "osm-server.url", "http://api.openstreetmap.org" + Main.pref.put "osm-server.username", "test1" + + im.initFromPreferences() + + assert im.isFullyIdentified() + } + + @Test + public void apiUrlChanged() { + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + + // make sure im is a preference change listener + Main.pref.addPreferenceChangeListener im + + // reset it + im.@userName = null + im.@userInfo = null + + Main.pref.put "osm-server.url", "http://api.openstreetmap.org" + assert im.isAnonymous() Main.pref.put "osm-server.url", null assert im.isAnonymous() - // reset it - im.@userName = "test" - im.@userInfo = null - - Main.pref.put "osm-server.url", "http://api.openstreetmap.org" - assert im.isPartiallyIdentified() - assert im.getUserName() == "test" - - Main.pref.put "osm-server.url", null - assert im.isAnonymous() - - // reset it - im.@userName = "test" - im.@userInfo = new UserInfo(id:1) - - Main.pref.put "osm-server.url", "http://api.openstreetmap.org" - assert im.isPartiallyIdentified() - assert im.getUserName() == "test" - - // reset it - im.@userName = "test" - im.@userInfo = new UserInfo(id:1) - - - Main.pref.put "osm-server.url", null - assert im.isAnonymous() - } - - @Test - public void userNameChanged() { - JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() - - // make sure im is a preference change listener - Main.pref.addPreferenceChangeListener im - - // reset it - im.@userName = null - im.@userInfo = null - - Main.pref.put "osm-server.username", "test" - assert im.isPartiallyIdentified() - assert im.getUserName() == "test" - - Main.pref.put "osm-server.username", null - assert im.isAnonymous() - - // reset it - im.@userName = "test1" - im.@userInfo = null - - Main.pref.put "osm-server.username", "test2" - assert im.isPartiallyIdentified() - assert im.getUserName() == "test2" - - Main.pref.put "osm-server.username", null - assert im.isAnonymous() - - // reset it - im.@userName = "test1" - im.@userInfo = new UserInfo(id:1) - - Main.pref.put "osm-server.username", "test2" - assert im.isPartiallyIdentified() - assert im.getUserName() == "test2" - - // reset it - im.@userName = "test1" - im.@userInfo = new UserInfo(id:1) - - - Main.pref.put "osm-server.username", null - assert im.isAnonymous() - } + // reset it + im.@userName = "test" + im.@userInfo = null + + Main.pref.put "osm-server.url", "http://api.openstreetmap.org" + assert im.isPartiallyIdentified() + assert im.getUserName() == "test" + + Main.pref.put "osm-server.url", null + assert im.isAnonymous() + + // reset it + im.@userName = "test" + im.@userInfo = new UserInfo(id:1) + + Main.pref.put "osm-server.url", "http://api.openstreetmap.org" + assert im.isPartiallyIdentified() + assert im.getUserName() == "test" + + // reset it + im.@userName = "test" + im.@userInfo = new UserInfo(id:1) + + + Main.pref.put "osm-server.url", null + assert im.isAnonymous() + } + + @Test + public void userNameChanged() { + JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() + + // make sure im is a preference change listener + Main.pref.addPreferenceChangeListener im + + // reset it + im.@userName = null + im.@userInfo = null + + Main.pref.put "osm-server.username", "test" + assert im.isPartiallyIdentified() + assert im.getUserName() == "test" + + Main.pref.put "osm-server.username", null + assert im.isAnonymous() + + // reset it + im.@userName = "test1" + im.@userInfo = null + + Main.pref.put "osm-server.username", "test2" + assert im.isPartiallyIdentified() + assert im.getUserName() == "test2" + + Main.pref.put "osm-server.username", null + assert im.isAnonymous() + + // reset it + im.@userName = "test1" + im.@userInfo = new UserInfo(id:1) + + Main.pref.put "osm-server.username", "test2" + assert im.isPartiallyIdentified() + assert im.getUserName() == "test2" + + // reset it + im.@userName = "test1" + im.@userInfo = new UserInfo(id:1) + + + Main.pref.put "osm-server.username", null + assert im.isAnonymous() + } } Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (revision 8510) @@ -52,12 +52,12 @@ protected void ensureSelected(DefaultListSelectionModel model, Object... idx) { if (idx == null) return; - for (int i=0; i < idx.length; i++) { + for (int i = 0; i < idx.length; i++) { if (idx[i] instanceof Integer) { - int j = (Integer)idx[i]; + int j = (Integer) idx[i]; assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j)); break; } try { - int rows[] = (int[])idx[i]; + int rows[] = (int[]) idx[i]; if (rows.length != 2) { fail("illegal selection range. Either null or not length 2: " + Arrays.toString(rows)); @@ -69,5 +69,5 @@ assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j)); } - } catch(ClassCastException e) { + } catch (ClassCastException e) { fail("illegal selection range:" + idx[i]); } @@ -95,7 +95,5 @@ DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); ensureSelected(mergedSelection, 0); - - } - + } @Test @@ -123,5 +121,4 @@ DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); ensureSelected(mergedSelection, 0); - } @@ -167,5 +164,5 @@ mergedNodes.add(new Node(1)); - model.copyMyToTop(new int[]{1,2}); // copy node 3 and 4 + model.copyMyToTop(new int[]{1, 2}); // copy node 3 and 4 mergedNodes = inspectNodeList(model, "Merged"); @@ -176,7 +173,6 @@ DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); - ensureSelected(mergedSelection, 0,1); // first two rows selected - } - + ensureSelected(mergedSelection, 0, 1); // first two rows selected + } @Test @@ -269,5 +265,5 @@ mergedNodes.add(new Node(1)); - model.copyMyToEnd(new int[]{1,2}); // copy node 3 and 4 + model.copyMyToEnd(new int[]{1, 2}); // copy node 3 and 4 mergedNodes = inspectNodeList(model, "Merged"); @@ -279,5 +275,5 @@ DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); - ensureSelected(mergedSelection, 1,2); // last two rows selected + ensureSelected(mergedSelection, 1, 2); // last two rows selected } @@ -313,5 +309,4 @@ } - @Test public void test_copyMyNodesBeforeCurrent_2() { @@ -329,5 +324,5 @@ mergedNodes.add(new Node(12)); - model.copyMyBeforeCurrent(new int[]{0,1}, 0); + model.copyMyBeforeCurrent(new int[]{0, 1}, 0); assertEquals(5, mergedNodes.size()); @@ -339,5 +334,5 @@ DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); - ensureSelected(mergedSelection, 0,1); // position 0 and 1 selected + ensureSelected(mergedSelection, 0, 1); // position 0 and 1 selected } @@ -358,14 +353,14 @@ try { - model.copyMyBeforeCurrent(new int[]{0,1}, -1); + model.copyMyBeforeCurrent(new int[]{0, 1}, -1); fail("expected IllegalArgumentException"); - } catch(IllegalArgumentException e) { + } catch (IllegalArgumentException e) { // OK } try { - model.copyMyBeforeCurrent(new int[]{0,1}, 4); + model.copyMyBeforeCurrent(new int[]{0, 1}, 4); fail("expected IllegalArgumentException"); - } catch(IllegalArgumentException e) { + } catch (IllegalArgumentException e) { // OK } @@ -402,5 +397,4 @@ } - @Test public void test_copyMyNodesAfterCurrent_2() { @@ -419,5 +413,5 @@ mergedNodes.add(new Node(12)); - model.copyMyAfterCurrent(new int[]{0,1}, 2); + model.copyMyAfterCurrent(new int[]{0, 1}, 2); assertEquals(5, mergedNodes.size()); @@ -428,7 +422,6 @@ assertEquals(2, mergedNodes.get(4).getId()); // copied node 2 at position 4 - - DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); - ensureSelected(mergedSelection, 3,4); // position 3,4 selected + DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); + ensureSelected(mergedSelection, 3, 4); // position 3,4 selected } @@ -449,5 +442,5 @@ mergedNodes.add(new Node(12)); - model.copyMyAfterCurrent(new int[]{0,2}, 0); + model.copyMyAfterCurrent(new int[]{0, 2}, 0); assertEquals(5, mergedNodes.size()); @@ -459,5 +452,5 @@ DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); - ensureSelected(mergedSelection, 1,2); // position 1,2 selected + ensureSelected(mergedSelection, 1, 2); // position 1,2 selected } @@ -509,5 +502,5 @@ mergedNodes.add(new Node(14)); - model.moveUpMerged(new int[]{1,4}); + model.moveUpMerged(new int[]{1, 4}); assertEquals(5, mergedNodes.size()); @@ -519,5 +512,5 @@ DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); - ensureSelected(mergedSelection, 0,3); // position 0 and 3 selecte0 + ensureSelected(mergedSelection, 0, 3); // position 0 and 3 selecte0 } @@ -539,5 +532,5 @@ mergedNodes.add(new Node(14)); - model.moveUpMerged(new int[]{1,2,3,4}); + model.moveUpMerged(new int[]{1, 2, 3, 4}); assertEquals(5, mergedNodes.size()); @@ -549,5 +542,5 @@ DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); - ensureSelected(mergedSelection, 0,1,2,3); + ensureSelected(mergedSelection, 0, 1, 2, 3); } @@ -598,5 +591,5 @@ mergedNodes.add(new Node(14)); - model.moveDownMerged(new int[]{1,3}); + model.moveDownMerged(new int[]{1, 3}); assertEquals(5, mergedNodes.size()); @@ -608,5 +601,5 @@ DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); - ensureSelected(mergedSelection, 2,4); + ensureSelected(mergedSelection, 2, 4); } @@ -628,5 +621,5 @@ mergedNodes.add(new Node(14)); - model.moveDownMerged(new int[]{1,2,3}); + model.moveDownMerged(new int[]{1, 2, 3}); assertEquals(5, mergedNodes.size()); @@ -638,5 +631,5 @@ DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); - ensureSelected(mergedSelection, 2,3,4); + ensureSelected(mergedSelection, 2, 3, 4); } @@ -712,4 +705,5 @@ } } + MyListener listener = new MyListener(); model.addPropertyChangeListener(listener); @@ -722,4 +716,3 @@ assertEquals(!oldValue, listener.events.get(0).getNewValue()); } - } Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (revision 8510) @@ -94,5 +94,5 @@ assertFalse(model.hasCoordConflict()); - n1.setCoor(new LatLon(1,1)); + n1.setCoor(new LatLon(1, 1)); populate(n1, n2); assertTrue(model.hasCoordConflict()); @@ -100,10 +100,10 @@ n1.cloneFrom(new Node(1)); - n2.setCoor(new LatLon(2,2)); + n2.setCoor(new LatLon(2, 2)); populate(n1, n2); assertTrue(model.hasCoordConflict()); - n1.setCoor(new LatLon(1,1)); - n2.setCoor(new LatLon(2,2)); + n1.setCoor(new LatLon(1, 1)); + n2.setCoor(new LatLon(2, 2)); populate(n1, n2); assertTrue(model.hasCoordConflict()); Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java (revision 8510) @@ -68,8 +68,7 @@ assertEquals("key", item.getKey()); assertNull(item.getMyTagValue()); - assertEquals("theirvalue",item.getTheirTagValue()); + assertEquals("theirvalue", item.getTheirTagValue()); assertEquals(MergeDecisionType.UNDECIDED, item.getMergeDecision()); } - @Test @@ -86,5 +85,5 @@ item.decide(null); fail("expected IllegalArgumentException not thrown"); - } catch(IllegalArgumentException e) { + } catch (IllegalArgumentException e) { // OK } @@ -104,5 +103,4 @@ item.applyToMyPrimitive(n1); assertEquals("myvalue", n1.get("key")); - } @@ -133,5 +131,5 @@ item.applyToMyPrimitive(n1); fail("expected IllegalStateException"); - } catch(IllegalStateException e) { + } catch (IllegalStateException e) { // OK } @@ -145,5 +143,5 @@ item.applyToMyPrimitive(null); fail("expected IllegalArgumentException"); - } catch(IllegalArgumentException e) { + } catch (IllegalArgumentException e) { // OK } Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (revision 8510) @@ -210,5 +210,5 @@ TagMergeModel model = new TagMergeModel(); - for (int i=0; i < 10; i++) { + for (int i = 0; i < 10; i++) { model.addItem(new TagMergeItem("key-" + i, "myvalue-" + i, "theirvalue-" +i)); } @@ -222,5 +222,5 @@ model.decide(new int[] {0, 3, 5}, MergeDecisionType.KEEP_MINE); - for (int i = 0; i< 10; i++) { + for (int i = 0; i < 10; i++) { TagMergeItem item = list.get(i); if (i == 0 || i == 3 || i == 5) { Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java (revision 8510) @@ -43,5 +43,5 @@ private String[] getNames(List members) { String[] result = new String[members.size()]; - for (int i=0; i connections) { String[] result = new String[connections.size()]; - for (int i=0; i expected = new HashMap<>(); - for (int i=0; i presets = TaggingPresetReader.readAll(presetfile, true); - Assert.assertTrue("Default presets are empty", presets.size()>0); + Assert.assertTrue("Default presets are empty", presets.size() > 0); } } Index: trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy (revision 8510) @@ -2,191 +2,185 @@ package org.openstreetmap.josm.io; - -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.TimeZone; - -import org.junit.Test -import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlException; -import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlParser; - - -import static org.junit.Assert.*; +import static org.junit.Assert.* + +import org.junit.Test +import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlException +import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlParser class ChangesetQueryUrlParserTest { - final shouldFail = new GroovyTestCase().&shouldFail - - @Test - public void test_constructor() { - ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); - } - - @Test - public void test_parse_basic() { - ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); - - // OK - parser.parse "" - - // should be OK - ChangesetQuery q = parser.parse(null) - assert q != null - - // should be OK - q = parser.parse("") - assert q != null - } - - @Test - public void test_uid() { - ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); - def ChangesetQuery q - - // OK - q = parser.parse("uid=1234") - assert q != null - - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("uid=0") - } - - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("uid=-1") - } - - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("uid=abc") - } - } - - @Test - public void test_display_name() { - ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); - def ChangesetQuery q - - // OK - q = parser.parse("display_name=abcd") - assert q != null - assert q.@userName == "abcd" - } - - - @Test - public void test_open() { - ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); - def ChangesetQuery q - - // OK - q = parser.parse("open=true") - assert q != null - assert q.@open == true - - // OK - q = parser.parse("open=false") - assert q != null - assert q.@open == false - - // illegal value for open - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("open=abcd") - } - } - - @Test - public void test_closed() { - ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); - def ChangesetQuery q - - // OK - q = parser.parse("closed=true") - assert q != null - assert q.@closed == true - - // OK - q = parser.parse("closed=false") - assert q != null - assert q.@closed == false - - // illegal value for open - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("closed=abcd") - } - } - - - @Test - public void test_uid_and_display_name() { - ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); - def ChangesetQuery q - - // we can't have both an uid and a display name - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("uid=1&display_name=abcd") - } - } - - @Test - public void test_time() { - ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); - def ChangesetQuery q - - // OK - q = parser.parse("time=2009-12-25T10:00:00Z") - assert q != null - assert q.@closedAfter != null - Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("GMT+0")); - cal.setTime(q.@closedAfter); - assert cal.get(Calendar.YEAR) == 2009 - assert cal.get(Calendar.MONTH) == 11 // calendar is 0-based - assert cal.get(Calendar.DAY_OF_MONTH) == 25 - assert cal.get(Calendar.HOUR_OF_DAY) == 10 - assert cal.get(Calendar.MINUTE) == 0 - assert cal.get(Calendar.SECOND) == 0 - - // OK - q = parser.parse("time=2009-12-25T10:00:00Z,2009-11-25T10:00:00Z") - assert q!= null - assert q.@closedAfter != null - assert q.@createdBefore != null - - // should fail - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("time=asdf") - } - } - - @Test - public void test_bbox() { - ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); - def ChangesetQuery q - - // OK - q = parser.parse("bbox=-1,-1,1,1") - assert q != null - assert q.@bounds != null - - // should fail - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("bbox=-91,-1,1,1") - } - - // should fail - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("bbox=-1,-181,1,1") - } - - // should fail - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("bbox=-1,-1,91,1") - } - // should fail - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("bbox=-1,-1,1,181") - } - // should fail - shouldFail(ChangesetQueryUrlException) { - q = parser.parse("bbox=-1,-1,1") - } - } + final shouldFail = new GroovyTestCase().&shouldFail + + @Test + public void test_constructor() { + ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); + } + + @Test + public void test_parse_basic() { + ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); + + // OK + parser.parse "" + + // should be OK + ChangesetQuery q = parser.parse(null) + assert q != null + + // should be OK + q = parser.parse("") + assert q != null + } + + @Test + public void test_uid() { + ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); + def ChangesetQuery q + + // OK + q = parser.parse("uid=1234") + assert q != null + + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("uid=0") + } + + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("uid=-1") + } + + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("uid=abc") + } + } + + @Test + public void test_display_name() { + ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); + def ChangesetQuery q + + // OK + q = parser.parse("display_name=abcd") + assert q != null + assert q.@userName == "abcd" + } + + + @Test + public void test_open() { + ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); + def ChangesetQuery q + + // OK + q = parser.parse("open=true") + assert q != null + assert q.@open == true + + // OK + q = parser.parse("open=false") + assert q != null + assert q.@open == false + + // illegal value for open + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("open=abcd") + } + } + + @Test + public void test_closed() { + ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); + def ChangesetQuery q + + // OK + q = parser.parse("closed=true") + assert q != null + assert q.@closed == true + + // OK + q = parser.parse("closed=false") + assert q != null + assert q.@closed == false + + // illegal value for open + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("closed=abcd") + } + } + + + @Test + public void test_uid_and_display_name() { + ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); + def ChangesetQuery q + + // we can't have both an uid and a display name + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("uid=1&display_name=abcd") + } + } + + @Test + public void test_time() { + ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); + def ChangesetQuery q + + // OK + q = parser.parse("time=2009-12-25T10:00:00Z") + assert q != null + assert q.@closedAfter != null + Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("GMT+0")); + cal.setTime(q.@closedAfter); + assert cal.get(Calendar.YEAR) == 2009 + assert cal.get(Calendar.MONTH) == 11 // calendar is 0-based + assert cal.get(Calendar.DAY_OF_MONTH) == 25 + assert cal.get(Calendar.HOUR_OF_DAY) == 10 + assert cal.get(Calendar.MINUTE) == 0 + assert cal.get(Calendar.SECOND) == 0 + + // OK + q = parser.parse("time=2009-12-25T10:00:00Z,2009-11-25T10:00:00Z") + assert q!= null + assert q.@closedAfter != null + assert q.@createdBefore != null + + // should fail + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("time=asdf") + } + } + + @Test + public void test_bbox() { + ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser(); + def ChangesetQuery q + + // OK + q = parser.parse("bbox=-1,-1,1,1") + assert q != null + assert q.@bounds != null + + // should fail + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("bbox=-91,-1,1,1") + } + + // should fail + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("bbox=-1,-181,1,1") + } + + // should fail + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("bbox=-1,-1,91,1") + } + // should fail + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("bbox=-1,-1,1,181") + } + // should fail + shouldFail(ChangesetQueryUrlException) { + q = parser.parse("bbox=-1,-1,1") + } + } @Test Index: trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy (revision 8510) @@ -17,70 +17,37 @@ class DiffResultProcessorTest { + @Test + public void testConstructor() { + Node n = new Node(1) + // these calls should not fail + // + def DiffResultProcessor processor = new DiffResultProcessor(null) + processor = new DiffResultProcessor([]) + processor = new DiffResultProcessor([n]) + } - @Test - public void testConstructor() { - Node n = new Node(1) - // these calls should not fail - // - def DiffResultProcessor processor = new DiffResultProcessor(null) - processor = new DiffResultProcessor([]) - processor = new DiffResultProcessor([n]) - } + @Test + public void testParse_NOK_Cases() { + def DiffResultProcessor processor = new DiffResultProcessor([]) - @Test - public void testParse_NOK_Cases() { - def DiffResultProcessor processor = new DiffResultProcessor([]) + final shouldFail = new GroovyTestCase().&shouldFail - final shouldFail = new GroovyTestCase().&shouldFail + shouldFail(IllegalArgumentException) { + processor.parse null, NullProgressMonitor.INSTANCE + } - shouldFail(IllegalArgumentException) { - processor.parse null, NullProgressMonitor.INSTANCE - } + shouldFail(XmlParsingException) { + processor.parse "", NullProgressMonitor.INSTANCE + } - shouldFail(XmlParsingException) { - processor.parse "", NullProgressMonitor.INSTANCE - } + shouldFail(XmlParsingException) { + processor.parse "", NullProgressMonitor.INSTANCE + } + } - shouldFail(XmlParsingException) { - processor.parse "", NullProgressMonitor.INSTANCE - } - } - - @Test - public void testParse_OK_Cases() { - def DiffResultProcessor processor = new DiffResultProcessor([]) - String doc = """\ - - - - - - """ - - processor.parse doc, null - assert processor.@diffResults.size() == 3 - SimplePrimitiveId id = new SimplePrimitiveId(-1, OsmPrimitiveType.NODE) - def entry = processor.@diffResults[id] - assert entry != null - assert entry.newId == 1 - assert entry.newVersion == 1 - - id = new SimplePrimitiveId(-2, OsmPrimitiveType.WAY) - entry = processor.@diffResults[id] - assert entry != null - assert entry.newId == 2 - assert entry.newVersion == 1 - - id = new SimplePrimitiveId(-3, OsmPrimitiveType.RELATION) - entry = processor.@diffResults[id] - assert entry != null - assert entry.newId == 3 - assert entry.newVersion == 1 - } - - @Test - public void testPostProcess_Invocation_Variants() { - def DiffResultProcessor processor = new DiffResultProcessor([]) - String doc = """\ + @Test + public void testParse_OK_Cases() { + def DiffResultProcessor processor = new DiffResultProcessor([]) + String doc = """\ @@ -90,51 +57,83 @@ """ - processor.parse doc, null + processor.parse doc, null + assert processor.@diffResults.size() == 3 + SimplePrimitiveId id = new SimplePrimitiveId(-1, OsmPrimitiveType.NODE) + def entry = processor.@diffResults[id] + assert entry != null + assert entry.newId == 1 + assert entry.newVersion == 1 - // should all be ok - // - processor.postProcess null, null - processor.postProcess null, NullProgressMonitor.INSTANCE - processor.postProcess new Changeset(1), null - processor.postProcess new Changeset(1), NullProgressMonitor.INSTANCE - } + id = new SimplePrimitiveId(-2, OsmPrimitiveType.WAY) + entry = processor.@diffResults[id] + assert entry != null + assert entry.newId == 2 + assert entry.newVersion == 1 - @Test - public void testPostProcess_OK() { + id = new SimplePrimitiveId(-3, OsmPrimitiveType.RELATION) + entry = processor.@diffResults[id] + assert entry != null + assert entry.newId == 3 + assert entry.newVersion == 1 + } - Node n = new Node() - Way w = new Way() - Relation r = new Relation() + @Test + public void testPostProcess_Invocation_Variants() { + def DiffResultProcessor processor = new DiffResultProcessor([]) + String doc = """\ + + + + + + """ - String doc = """\ - - - - - - """ + processor.parse doc, null - def DiffResultProcessor processor = new DiffResultProcessor([n,w,r]) - processor.parse doc, null - def processed = processor.postProcess(new Changeset(5), null) - assert processed.size() == 3 - n = processed.find {it.uniqueId == 1} - assert n.changesetId == 5 - assert n.version == 10 + // should all be ok + // + processor.postProcess null, null + processor.postProcess null, NullProgressMonitor.INSTANCE + processor.postProcess new Changeset(1), null + processor.postProcess new Changeset(1), NullProgressMonitor.INSTANCE + } - w = processed.find {it.uniqueId == 2} - assert w.changesetId == 5 - assert w.version == 11 + @Test + public void testPostProcess_OK() { - r = processed.find {it.uniqueId == 3} - assert r.changesetId == 5 - assert r.version == 12 - } + Node n = new Node() + Way w = new Way() + Relation r = new Relation() - @Test - public void testPostProcess_ForCreatedElement() { + String doc = """\ + + + + + + """ - Node n = new Node() - String doc = """\ + def DiffResultProcessor processor = new DiffResultProcessor([n,w,r]) + processor.parse doc, null + def processed = processor.postProcess(new Changeset(5), null) + assert processed.size() == 3 + n = processed.find {it.uniqueId == 1} + assert n.changesetId == 5 + assert n.version == 10 + + w = processed.find {it.uniqueId == 2} + assert w.changesetId == 5 + assert w.version == 11 + + r = processed.find {it.uniqueId == 3} + assert r.changesetId == 5 + assert r.version == 12 + } + + @Test + public void testPostProcess_ForCreatedElement() { + + Node n = new Node() + String doc = """\ @@ -142,21 +141,21 @@ """ - def DiffResultProcessor processor = new DiffResultProcessor([n]) - processor.parse doc, null - def processed = processor.postProcess(new Changeset(5), null) - assert processed.size() == 1 - n = processed.find {it.uniqueId == 1} - assert n.changesetId == 5 - assert n.version == 1 - } + def DiffResultProcessor processor = new DiffResultProcessor([n]) + processor.parse doc, null + def processed = processor.postProcess(new Changeset(5), null) + assert processed.size() == 1 + n = processed.find {it.uniqueId == 1} + assert n.changesetId == 5 + assert n.version == 1 + } - @Test - public void testPostProcess_ForModifiedElement() { + @Test + public void testPostProcess_ForModifiedElement() { - Node n = new Node(1) - n.coor = new LatLon(1,1) - n.setOsmId 1, 2 - n.modified = true - String doc = """\ + Node n = new Node(1) + n.coor = new LatLon(1,1) + n.setOsmId 1, 2 + n.modified = true + String doc = """\ @@ -164,21 +163,21 @@ """ - def DiffResultProcessor processor = new DiffResultProcessor([n]) - processor.parse doc, null - def processed = processor.postProcess(new Changeset(5), null) - assert processed.size() == 1 - n = processed.find {it.uniqueId == 1} - assert n.changesetId == 5 - assert n.version == 3 - } + def DiffResultProcessor processor = new DiffResultProcessor([n]) + processor.parse doc, null + def processed = processor.postProcess(new Changeset(5), null) + assert processed.size() == 1 + n = processed.find {it.uniqueId == 1} + assert n.changesetId == 5 + assert n.version == 3 + } - @Test - public void testPostProcess_ForDeletedElement() { + @Test + public void testPostProcess_ForDeletedElement() { - Node n = new Node(1) - n.coor = new LatLon(1,1) - n.setOsmId 1, 2 - n.deleted = true - String doc = """\ + Node n = new Node(1) + n.coor = new LatLon(1,1) + n.setOsmId 1, 2 + n.deleted = true + String doc = """\ @@ -186,11 +185,11 @@ """ - def DiffResultProcessor processor = new DiffResultProcessor([n]) - processor.parse doc, null - def processed = processor.postProcess(new Changeset(5), null) - assert processed.size() == 1 - n = processed.find {it.uniqueId == 1} - assert n.changesetId == 5 - assert n.version == 2 - } + def DiffResultProcessor processor = new DiffResultProcessor([n]) + processor.parse doc, null + def processed = processor.postProcess(new Changeset(5), null) + assert processed.size() == 1 + n = processed.find {it.uniqueId == 1} + assert n.changesetId == 5 + assert n.version == 2 + } } Index: trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy (revision 8510) @@ -10,198 +10,198 @@ class OsmChangeBuilderTest { - /** - * Test various constructor invocations - */ - @Test - public void testConstructor() { - def Changeset cs = new Changeset(1) - // should not fail - OsmChangeBuilder builder = new OsmChangeBuilder(cs) - - // should not fail either - null allowed - builder = new OsmChangeBuilder(null) - - // should not fail - builder = new OsmChangeBuilder(cs, "0.5") - - builder = new OsmChangeBuilder(cs, null) - - builder = new OsmChangeBuilder(null, null) - } - - /** - * Test the sequence of method calls. Should throw IllegalStateException if - * the protocol start(),append()*, finish() is violated. - */ - @Test - public void testSequenceOfMethodCalls() { - def Changeset cs = new Changeset(1) - OsmChangeBuilder builder = new OsmChangeBuilder(cs) - - final shouldFail = new GroovyTestCase().&shouldFail - - // should be OK - builder.start() - Node n = new Node(new LatLon(0,0)) - builder.append n - builder.finish() - - shouldFail(IllegalStateException) { - builder = new OsmChangeBuilder(cs) - builder.append n - } - - shouldFail(IllegalStateException) { - builder = new OsmChangeBuilder(cs) - builder.append([n]) - } - - shouldFail(IllegalStateException) { - builder = new OsmChangeBuilder(cs) - builder.finish() - } - - shouldFail(IllegalStateException) { - builder = new OsmChangeBuilder(cs) - builder.start() - builder.start() - } - } - - @Test - public void testDocumentWithNewNode() { - def Changeset cs = new Changeset(1) - OsmChangeBuilder builder = new OsmChangeBuilder(cs) - Node n = new Node(new LatLon(0,0)) - - builder.start() - builder.append n - builder.finish() - - def doc = new XmlParser().parseText(builder.document) - assert doc.@version == "0.6" - assert doc.@generator == "JOSM" - assert doc.name() == "osmChange" - assert doc.children().size() == 1 - def create = doc.create - assert create != null - - assert create.size() == 1 - def nodes = create[0].node - assert nodes.size() == 1 - def node = nodes[0] - assert node.@id == n.uniqueId.toString() - assert node.@lat != null - assert node.@lon != null - assert node.@changeset == cs.id.toString() - } - - /** - * Test building a document with a modified node - */ - @Test - public void testDocumentWithModifiedNode() { - def Changeset cs = new Changeset(1) - OsmChangeBuilder builder = new OsmChangeBuilder(cs) - Node n = new Node(1) - n.coor = new LatLon(0,0) - n.incomplete = false - n.modified = true - - builder.start() - builder.append n - builder.finish() - - def doc = new XmlParser().parseText(builder.document) - assert doc.@version == "0.6" - assert doc.@generator == "JOSM" - assert doc.name() == "osmChange" - assert doc.children().size() == 1 - def modify = doc.modify - assert modify != null - - assert modify.size() == 1 - def nodes = modify[0].node - assert nodes.size() == 1 - def node = nodes[0] - assert node.@id == n.uniqueId.toString() - assert node.@lat != null - assert node.@lon != null - assert node.@changeset == cs.id.toString() - } - - /** - * Test building a document with a deleted node - */ - @Test - public void testDocumentWithDeletedNode() { - def Changeset cs = new Changeset(1) - OsmChangeBuilder builder = new OsmChangeBuilder(cs) - Node n = new Node(1) - n.coor = new LatLon(0,0) - n.incomplete = false - n.deleted = true - - builder.start() - builder.append n - builder.finish() - - def doc = new XmlParser().parseText(builder.document) - assert doc.@version == "0.6" - assert doc.@generator == "JOSM" - assert doc.name() == "osmChange" - assert doc.children().size() == 1 - def delete = doc.delete - assert delete != null - - assert delete.size() == 1 - def nodes = delete[0].node - assert nodes.size() == 1 - def node = nodes[0] - assert node.@id == n.uniqueId.toString() - assert node.@lat == null - assert node.@lon == null - assert node.@changeset == cs.id.toString() - } - - /** - * Test building a mixed document. - * - */ - @Test - public void testMixed() { - def Changeset cs = new Changeset(1) - OsmChangeBuilder builder = new OsmChangeBuilder(cs) - Node n1 = new Node(1) - n1.coor = new LatLon(0,0) - n1.incomplete = false - n1.deleted = true - - Node n2 = new Node(new LatLon(0,0)) - - Node n3 = new Node(2) - n3.coor = new LatLon(0,0) - n3.incomplete = false - n3.modified = true - - builder.start() - builder.append([n1,n2,n3]) - builder.finish() - - def doc = new XmlParser().parseText(builder.document) - - assert doc.children().size() == 3 - assert doc.children()[0].name() == "delete" - assert doc.children()[1].name() == "create" - assert doc.children()[2].name() == "modify" - - def node = doc.children()[0].node[0] - assert node.@id == n1.uniqueId.toString() - - node = doc.children()[1].node[0] - assert node.@id == n2.uniqueId.toString() - - node = doc.children()[2].node[0] - assert node.@id == n3.uniqueId.toString() - } + /** + * Test various constructor invocations + */ + @Test + public void testConstructor() { + def Changeset cs = new Changeset(1) + // should not fail + OsmChangeBuilder builder = new OsmChangeBuilder(cs) + + // should not fail either - null allowed + builder = new OsmChangeBuilder(null) + + // should not fail + builder = new OsmChangeBuilder(cs, "0.5") + + builder = new OsmChangeBuilder(cs, null) + + builder = new OsmChangeBuilder(null, null) + } + + /** + * Test the sequence of method calls. Should throw IllegalStateException if + * the protocol start(),append()*, finish() is violated. + */ + @Test + public void testSequenceOfMethodCalls() { + def Changeset cs = new Changeset(1) + OsmChangeBuilder builder = new OsmChangeBuilder(cs) + + final shouldFail = new GroovyTestCase().&shouldFail + + // should be OK + builder.start() + Node n = new Node(new LatLon(0,0)) + builder.append n + builder.finish() + + shouldFail(IllegalStateException) { + builder = new OsmChangeBuilder(cs) + builder.append n + } + + shouldFail(IllegalStateException) { + builder = new OsmChangeBuilder(cs) + builder.append([n]) + } + + shouldFail(IllegalStateException) { + builder = new OsmChangeBuilder(cs) + builder.finish() + } + + shouldFail(IllegalStateException) { + builder = new OsmChangeBuilder(cs) + builder.start() + builder.start() + } + } + + @Test + public void testDocumentWithNewNode() { + def Changeset cs = new Changeset(1) + OsmChangeBuilder builder = new OsmChangeBuilder(cs) + Node n = new Node(new LatLon(0,0)) + + builder.start() + builder.append n + builder.finish() + + def doc = new XmlParser().parseText(builder.document) + assert doc.@version == "0.6" + assert doc.@generator == "JOSM" + assert doc.name() == "osmChange" + assert doc.children().size() == 1 + def create = doc.create + assert create != null + + assert create.size() == 1 + def nodes = create[0].node + assert nodes.size() == 1 + def node = nodes[0] + assert node.@id == n.uniqueId.toString() + assert node.@lat != null + assert node.@lon != null + assert node.@changeset == cs.id.toString() + } + + /** + * Test building a document with a modified node + */ + @Test + public void testDocumentWithModifiedNode() { + def Changeset cs = new Changeset(1) + OsmChangeBuilder builder = new OsmChangeBuilder(cs) + Node n = new Node(1) + n.coor = new LatLon(0,0) + n.incomplete = false + n.modified = true + + builder.start() + builder.append n + builder.finish() + + def doc = new XmlParser().parseText(builder.document) + assert doc.@version == "0.6" + assert doc.@generator == "JOSM" + assert doc.name() == "osmChange" + assert doc.children().size() == 1 + def modify = doc.modify + assert modify != null + + assert modify.size() == 1 + def nodes = modify[0].node + assert nodes.size() == 1 + def node = nodes[0] + assert node.@id == n.uniqueId.toString() + assert node.@lat != null + assert node.@lon != null + assert node.@changeset == cs.id.toString() + } + + /** + * Test building a document with a deleted node + */ + @Test + public void testDocumentWithDeletedNode() { + def Changeset cs = new Changeset(1) + OsmChangeBuilder builder = new OsmChangeBuilder(cs) + Node n = new Node(1) + n.coor = new LatLon(0,0) + n.incomplete = false + n.deleted = true + + builder.start() + builder.append n + builder.finish() + + def doc = new XmlParser().parseText(builder.document) + assert doc.@version == "0.6" + assert doc.@generator == "JOSM" + assert doc.name() == "osmChange" + assert doc.children().size() == 1 + def delete = doc.delete + assert delete != null + + assert delete.size() == 1 + def nodes = delete[0].node + assert nodes.size() == 1 + def node = nodes[0] + assert node.@id == n.uniqueId.toString() + assert node.@lat == null + assert node.@lon == null + assert node.@changeset == cs.id.toString() + } + + /** + * Test building a mixed document. + * + */ + @Test + public void testMixed() { + def Changeset cs = new Changeset(1) + OsmChangeBuilder builder = new OsmChangeBuilder(cs) + Node n1 = new Node(1) + n1.coor = new LatLon(0,0) + n1.incomplete = false + n1.deleted = true + + Node n2 = new Node(new LatLon(0,0)) + + Node n3 = new Node(2) + n3.coor = new LatLon(0,0) + n3.incomplete = false + n3.modified = true + + builder.start() + builder.append([n1,n2,n3]) + builder.finish() + + def doc = new XmlParser().parseText(builder.document) + + assert doc.children().size() == 3 + assert doc.children()[0].name() == "delete" + assert doc.children()[1].name() == "create" + assert doc.children()[2].name() == "modify" + + def node = doc.children()[0].node[0] + assert node.@id == n1.uniqueId.toString() + + node = doc.children()[1].node[0] + assert node.@id == n2.uniqueId.toString() + + node = doc.children()[2].node[0] + assert node.@id == n3.uniqueId.toString() + } } Index: trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy (revision 8510) @@ -2,27 +2,25 @@ package org.openstreetmap.josm.io; +import java.nio.charset.StandardCharsets + import org.junit.Test - -import java.nio.charset.StandardCharsets - -import org.openstreetmap.josm.data.osm.ChangesetDataSet; -import org.openstreetmap.josm.data.osm.OsmPrimitiveType; -import org.openstreetmap.josm.data.osm.SimplePrimitiveId; -import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType; -import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive; -import org.openstreetmap.josm.data.osm.history.HistoryRelation; -import org.openstreetmap.josm.data.osm.history.HistoryWay; -import org.openstreetmap.josm.gui.progress.NullProgressMonitor; - +import org.openstreetmap.josm.data.osm.ChangesetDataSet +import org.openstreetmap.josm.data.osm.OsmPrimitiveType +import org.openstreetmap.josm.data.osm.SimplePrimitiveId +import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType +import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive +import org.openstreetmap.josm.data.osm.history.HistoryRelation +import org.openstreetmap.josm.data.osm.history.HistoryWay +import org.openstreetmap.josm.gui.progress.NullProgressMonitor class OsmChangesetContentParserTest { - final shouldFail = new GroovyTestCase().&shouldFail - - @Test - public void test_Constructor() { - OsmChangesetContentParser parser - - // should be OK - parser = new OsmChangesetContentParser(new ByteArrayInputStream("".bytes)) + final shouldFail = new GroovyTestCase().&shouldFail + + @Test + public void test_Constructor() { + OsmChangesetContentParser parser + + // should be OK + parser = new OsmChangesetContentParser(new ByteArrayInputStream("".bytes)) shouldFail(IllegalArgumentException) { @@ -33,69 +31,69 @@ parser = new OsmChangesetContentParser((InputStream) null) } - } - - - @Test - public void test_parse_arguments() { - OsmChangesetContentParser parser - - def String doc = """ - - - """ - - // should be OK - parser = new OsmChangesetContentParser(new ByteArrayInputStream(doc.getBytes(StandardCharsets.UTF_8))) - parser.parse null - - // should be OK - parser = new OsmChangesetContentParser(new ByteArrayInputStream(doc.getBytes(StandardCharsets.UTF_8))) - parser.parse NullProgressMonitor.INSTANCE - - // should be OK - parser = new OsmChangesetContentParser(doc) - parser.parse null - } - - /** - * A simple changeset content document with one created node - * - */ - @Test - public void test_OK_OneCreatedNode() { - OsmChangesetContentParser parser - - def String doc = """ - - - - - - """ - - // should be OK - parser = new OsmChangesetContentParser(doc) - ChangesetDataSet ds = parser.parse() - - assert ds.size() == 1 - HistoryOsmPrimitive p = ds.getPrimitive(new SimplePrimitiveId(1, OsmPrimitiveType.NODE)); - assert p != null - assert p.getId() == 1 - assert p.getVersion() == 1 - assert p.getChangesetId() == 1 - assert p.getTimestamp() != null - assert ds.getModificationType(p.getPrimitiveId()) == ChangesetModificationType.CREATED - assert ds.isCreated(p.getPrimitiveId()) - } - - /** - * A simple changeset content document with one updated node - * - */ - @Test - public void test_OK_OneUpdatedNode() { - OsmChangesetContentParser parser - - def String doc = """ + } + + + @Test + public void test_parse_arguments() { + OsmChangesetContentParser parser + + def String doc = """ + + + """ + + // should be OK + parser = new OsmChangesetContentParser(new ByteArrayInputStream(doc.getBytes(StandardCharsets.UTF_8))) + parser.parse null + + // should be OK + parser = new OsmChangesetContentParser(new ByteArrayInputStream(doc.getBytes(StandardCharsets.UTF_8))) + parser.parse NullProgressMonitor.INSTANCE + + // should be OK + parser = new OsmChangesetContentParser(doc) + parser.parse null + } + + /** + * A simple changeset content document with one created node + * + */ + @Test + public void test_OK_OneCreatedNode() { + OsmChangesetContentParser parser + + def String doc = """ + + + + + + """ + + // should be OK + parser = new OsmChangesetContentParser(doc) + ChangesetDataSet ds = parser.parse() + + assert ds.size() == 1 + HistoryOsmPrimitive p = ds.getPrimitive(new SimplePrimitiveId(1, OsmPrimitiveType.NODE)); + assert p != null + assert p.getId() == 1 + assert p.getVersion() == 1 + assert p.getChangesetId() == 1 + assert p.getTimestamp() != null + assert ds.getModificationType(p.getPrimitiveId()) == ChangesetModificationType.CREATED + assert ds.isCreated(p.getPrimitiveId()) + } + + /** + * A simple changeset content document with one updated node + * + */ + @Test + public void test_OK_OneUpdatedNode() { + OsmChangesetContentParser parser + + def String doc = """ @@ -104,29 +102,29 @@ """ - - // should be OK - parser = new OsmChangesetContentParser(doc) - ChangesetDataSet ds = parser.parse() - - assert ds.size() == 1 - HistoryOsmPrimitive p = ds.getPrimitive(new SimplePrimitiveId(1, OsmPrimitiveType.NODE)); - assert p != null - assert p.getId() == 1 - assert p.getVersion() == 1 - assert p.getChangesetId() == 1 - assert p.getTimestamp() != null - assert ds.getModificationType(p.getPrimitiveId()) == ChangesetModificationType.UPDATED - assert ds.isUpdated(p.getPrimitiveId()) - } - - /** - * A simple changeset content document with one deleted node - * - */ - @Test - public void test_OK_OneDeletedNode() { - OsmChangesetContentParser parser - - def String doc = """ + + // should be OK + parser = new OsmChangesetContentParser(doc) + ChangesetDataSet ds = parser.parse() + + assert ds.size() == 1 + HistoryOsmPrimitive p = ds.getPrimitive(new SimplePrimitiveId(1, OsmPrimitiveType.NODE)); + assert p != null + assert p.getId() == 1 + assert p.getVersion() == 1 + assert p.getChangesetId() == 1 + assert p.getTimestamp() != null + assert ds.getModificationType(p.getPrimitiveId()) == ChangesetModificationType.UPDATED + assert ds.isUpdated(p.getPrimitiveId()) + } + + /** + * A simple changeset content document with one deleted node + * + */ + @Test + public void test_OK_OneDeletedNode() { + OsmChangesetContentParser parser + + def String doc = """ @@ -135,82 +133,82 @@ """ - - // should be OK - parser = new OsmChangesetContentParser(doc) - ChangesetDataSet ds = parser.parse() - - assert ds.size() == 1 - HistoryOsmPrimitive p = ds.getPrimitive(new SimplePrimitiveId(1, OsmPrimitiveType.NODE)); - assert p != null - assert p.getId() == 1 - assert p.getVersion() == 1 - assert p.getChangesetId() == 1 - assert p.getTimestamp() != null - assert ds.getModificationType(p.getPrimitiveId()) == ChangesetModificationType.DELETED - assert ds.isDeleted(p.getPrimitiveId()) - } - - /** - * A more complex test with a document including nodes, ways, and relations. - * - */ - @Test - public void test_OK_ComplexTestCase() { - OsmChangesetContentParser parser - - def String doc = """ + + // should be OK + parser = new OsmChangesetContentParser(doc) + ChangesetDataSet ds = parser.parse() + + assert ds.size() == 1 + HistoryOsmPrimitive p = ds.getPrimitive(new SimplePrimitiveId(1, OsmPrimitiveType.NODE)); + assert p != null + assert p.getId() == 1 + assert p.getVersion() == 1 + assert p.getChangesetId() == 1 + assert p.getTimestamp() != null + assert ds.getModificationType(p.getPrimitiveId()) == ChangesetModificationType.DELETED + assert ds.isDeleted(p.getPrimitiveId()) + } + + /** + * A more complex test with a document including nodes, ways, and relations. + * + */ + @Test + public void test_OK_ComplexTestCase() { + OsmChangesetContentParser parser + + def String doc = """ - - + + - - - + + + - + """ - - // should be OK - parser = new OsmChangesetContentParser(doc) - ChangesetDataSet ds = parser.parse() - - assert ds.size() == 3 - - HistoryOsmPrimitive p = ds.getPrimitive(new SimplePrimitiveId(1, OsmPrimitiveType.NODE)); - assert p != null - assert p.getId() == 1 - assert p.getVersion() == 1 - assert p.getChangesetId() == 1 - assert p.getTimestamp() != null - assert ds.getModificationType(p.getPrimitiveId()) == ChangesetModificationType.CREATED - assert ds.isCreated(p.getPrimitiveId()) - assert p.get("a.key") == "a.value" - - HistoryWay w = (HistoryWay)ds.getPrimitive(new SimplePrimitiveId(2, OsmPrimitiveType.WAY)); - assert w != null - assert w.getId() == 2 - assert w.getVersion() == 2 - assert w.getChangesetId() == 1 - assert w.getTimestamp() != null - assert ds.getModificationType(w.getPrimitiveId()) == ChangesetModificationType.UPDATED - assert ds.isUpdated(w.getPrimitiveId()) - assert w.getNumNodes() == 2 - assert w.getNodes() == [21,22] - - HistoryRelation r = (HistoryRelation)ds.getPrimitive(new SimplePrimitiveId(3, OsmPrimitiveType.RELATION)); - assert r != null - assert r.getId() == 3 - assert r.getVersion() == 3 - assert r.getChangesetId() == 1 - assert r.getTimestamp() != null - assert ds.getModificationType(r.getPrimitiveId()) == ChangesetModificationType.DELETED - assert ds.isDeleted(r.getPrimitiveId()) - } + + // should be OK + parser = new OsmChangesetContentParser(doc) + ChangesetDataSet ds = parser.parse() + + assert ds.size() == 3 + + HistoryOsmPrimitive p = ds.getPrimitive(new SimplePrimitiveId(1, OsmPrimitiveType.NODE)); + assert p != null + assert p.getId() == 1 + assert p.getVersion() == 1 + assert p.getChangesetId() == 1 + assert p.getTimestamp() != null + assert ds.getModificationType(p.getPrimitiveId()) == ChangesetModificationType.CREATED + assert ds.isCreated(p.getPrimitiveId()) + assert p.get("a.key") == "a.value" + + HistoryWay w = (HistoryWay)ds.getPrimitive(new SimplePrimitiveId(2, OsmPrimitiveType.WAY)); + assert w != null + assert w.getId() == 2 + assert w.getVersion() == 2 + assert w.getChangesetId() == 1 + assert w.getTimestamp() != null + assert ds.getModificationType(w.getPrimitiveId()) == ChangesetModificationType.UPDATED + assert ds.isUpdated(w.getPrimitiveId()) + assert w.getNumNodes() == 2 + assert w.getNodes() == [21,22] + + HistoryRelation r = (HistoryRelation)ds.getPrimitive(new SimplePrimitiveId(3, OsmPrimitiveType.RELATION)); + assert r != null + assert r.getId() == 3 + assert r.getVersion() == 3 + assert r.getChangesetId() == 1 + assert r.getTimestamp() != null + assert ds.getModificationType(r.getPrimitiveId()) == ChangesetModificationType.DELETED + assert ds.isDeleted(r.getPrimitiveId()) + } } Index: trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy (revision 8510) @@ -20,10 +20,10 @@ } - /** - * A new node with a changeset id. Ignore it. - */ - @Test - public void test_1() { - String doc = """\ + /** + * A new node with a changeset id. Ignore it. + */ + @Test + public void test_1() { + String doc = """\ @@ -33,95 +33,95 @@ """ - DataSet ds = getDataSet(doc) - Node n = ds.nodes.find {it.get("external-id") == "-1"} - assert n != null - assert n.changesetId == 0 - } - - /** - * A new node with an invalid changeset id. Ignore it. - */ - @Test - public void test_11() { - String doc = """\ + DataSet ds = getDataSet(doc) + Node n = ds.nodes.find {it.get("external-id") == "-1"} + assert n != null + assert n.changesetId == 0 + } + + /** + * A new node with an invalid changeset id. Ignore it. + */ + @Test + public void test_11() { + String doc = """\ - - - - """ - - DataSet ds = getDataSet(doc) - Node n = ds.nodes.find {it.get("external-id") == "-1"} - assert n != null - assert n.changesetId == 0 - } - - /** - * A new node with an invalid changeset id. Ignore it. - */ - @Test - public void test_12() { - String doc = """\ + + + + """ + + DataSet ds = getDataSet(doc) + Node n = ds.nodes.find {it.get("external-id") == "-1"} + assert n != null + assert n.changesetId == 0 + } + + /** + * A new node with an invalid changeset id. Ignore it. + */ + @Test + public void test_12() { + String doc = """\ - - - - """ - - DataSet ds = getDataSet(doc) - Node n = ds.nodes.find {it.get("external-id") == "-1"} - assert n != null - assert n.changesetId == 0 - } - - /** - * A new node with an invalid changeset id. Ignore it. - */ - @Test - public void test_13() { - String doc = """\ + + + + """ + + DataSet ds = getDataSet(doc) + Node n = ds.nodes.find {it.get("external-id") == "-1"} + assert n != null + assert n.changesetId == 0 + } + + /** + * A new node with an invalid changeset id. Ignore it. + */ + @Test + public void test_13() { + String doc = """\ - - - - """ - - DataSet ds = getDataSet(doc) - Node n = ds.nodes.find {it.get("external-id") == "-1"} - assert n != null - assert n.changesetId == 0 - } - - /** - * A new node with a missing changeset id. That's fine. The changeset id - * is reset to 0. - */ - @Test - public void test_14() { - String doc = """\ + + + + """ + + DataSet ds = getDataSet(doc) + Node n = ds.nodes.find {it.get("external-id") == "-1"} + assert n != null + assert n.changesetId == 0 + } + + /** + * A new node with a missing changeset id. That's fine. The changeset id + * is reset to 0. + */ + @Test + public void test_14() { + String doc = """\ - - - - """ - - DataSet ds = getDataSet(doc) - Node n = ds.nodes.find {it.get("external-id") == "-1"} - assert n != null - assert n.changesetId == 0 - } - - - /** - * An existing node with a missing changeset id. That's fine. The changeset id - * is reset to 0. - */ - @Test - public void test_2() { - String doc = """\ + + + + """ + + DataSet ds = getDataSet(doc) + Node n = ds.nodes.find {it.get("external-id") == "-1"} + assert n != null + assert n.changesetId == 0 + } + + + /** + * An existing node with a missing changeset id. That's fine. The changeset id + * is reset to 0. + */ + @Test + public void test_2() { + String doc = """\ @@ -130,17 +130,17 @@ DataSet ds = getDataSet(doc) - Node n = ds.getPrimitiveById(1, OsmPrimitiveType.NODE) - assert n != null - assert n.uniqueId == 1 - assert n.changesetId == 0 - } - - /** + Node n = ds.getPrimitiveById(1, OsmPrimitiveType.NODE) + assert n != null + assert n.uniqueId == 1 + assert n.changesetId == 0 + } + + /** * An existing node with a valid changeset id id. That's fine. The changeset id * is applied. */ - @Test - public void test_3() { - String doc = """\ + @Test + public void test_3() { + String doc = """\ @@ -149,17 +149,17 @@ DataSet ds = getDataSet(doc) - Node n = ds.getPrimitiveById(1, OsmPrimitiveType.NODE) - assert n != null - assert n.uniqueId == 1 - assert n.changesetId == 4 - } - - /** - * An existing node with an invalid changeset id. That's a problem. An exception - * is thrown. - */ - @Test - public void test_4() { - String doc = """\ + Node n = ds.getPrimitiveById(1, OsmPrimitiveType.NODE) + assert n != null + assert n.uniqueId == 1 + assert n.changesetId == 4 + } + + /** + * An existing node with an invalid changeset id. That's a problem. An exception + * is thrown. + */ + @Test + public void test_4() { + String doc = """\ @@ -167,17 +167,17 @@ """ - final shouldFail = new GroovyTestCase().&shouldFail - - shouldFail(IllegalDataException) { + final shouldFail = new GroovyTestCase().&shouldFail + + shouldFail(IllegalDataException) { DataSet ds = getDataSet(doc) - } - } - /** - * An existing node with an invalid changeset id. That's a problem. An exception - * is thrown. - */ - @Test - public void test_5() { - String doc = """\ + } + } + /** + * An existing node with an invalid changeset id. That's a problem. An exception + * is thrown. + */ + @Test + public void test_5() { + String doc = """\ @@ -185,27 +185,27 @@ """ - final shouldFail = new GroovyTestCase().&shouldFail - - shouldFail(IllegalDataException) { + final shouldFail = new GroovyTestCase().&shouldFail + + shouldFail(IllegalDataException) { DataSet ds = getDataSet(doc) - } - } - /** - * An existing node with an invalid changeset id. That's a problem. An exception - * is thrown. - */ - @Test - public void test_6() { - String doc = """\ - - - - """ - - final shouldFail = new GroovyTestCase().&shouldFail - - shouldFail(IllegalDataException) { + } + } + /** + * An existing node with an invalid changeset id. That's a problem. An exception + * is thrown. + */ + @Test + public void test_6() { + String doc = """\ + + + + """ + + final shouldFail = new GroovyTestCase().&shouldFail + + shouldFail(IllegalDataException) { DataSet ds = getDataSet(doc) - } - } + } + } } Index: trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java (revision 8510) @@ -72,6 +72,8 @@ return null; } + public void checkClientTrusted(X509Certificate[] certs, String authType) { } + public void checkServerTrusted(X509Certificate[] certs, String authType) { } @@ -137,5 +139,5 @@ try (BufferedReader in = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) { String s; - while((s = in.readLine()) != null) { + while ((s = in.readLine()) != null) { responseBody.append(s); responseBody.append("\n"); Index: trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java (revision 8510) @@ -43,5 +43,4 @@ } - @Test public void testRequestParameter1() { Index: trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (revision 8510) @@ -33,4 +33,5 @@ super(layer); } + @Override public boolean requiresZip() { @@ -43,4 +44,5 @@ super(layer); } + @Override public boolean requiresZip() { @@ -93,5 +95,5 @@ } SessionWriter sw = new SessionWriter(layers, -1, exporters, new MultiMap(), zip); - File file = new File(System.getProperty("java.io.tmpdir"), getClass().getName()+(zip?".joz":".jos")); + File file = new File(System.getProperty("java.io.tmpdir"), getClass().getName()+(zip ? ".joz" : ".jos")); try { sw.write(file); Index: trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java (revision 8510) @@ -42,5 +42,5 @@ Map correctTags = new HashMap() { { put("a", "1"); put("b", "2"); put("c", "the value with \"quotes\""); - }}; + } }; Map tags = TextTagParser.readTagsFromText(txt); Assert.assertEquals(correctTags, tags); @@ -53,5 +53,5 @@ put("key1", "value"); put("key2", "long value"); put("tag3", "hotel \"Quote\""); - }}; + } }; Map tags = TextTagParser.readTagsFromText(txt); Assert.assertEquals(correctTags, tags); @@ -63,15 +63,15 @@ Map tags, correctTags; txt = "{ \"a\":\"1\", \"b\":\"2 3 4\" }"; - correctTags= new HashMap() { { put("a", "1"); put("b", "2 3 4"); }}; + correctTags = new HashMap() { { put("a", "1"); put("b", "2 3 4"); } }; tags = TextTagParser.readTagsFromText(txt); Assert.assertEquals(correctTags, tags); txt = "\"a\" : \"1 1 1\", \"b2\" :\"2 \\\"3 qwe\\\" 4\""; - correctTags= new HashMap() { { put("a", "1 1 1"); put("b2", "2 \"3 qwe\" 4");}}; + correctTags = new HashMap() { { put("a", "1 1 1"); put("b2", "2 \"3 qwe\" 4"); } }; tags = TextTagParser.readTagsFromText(txt); Assert.assertEquals(correctTags, tags); txt = " \"aыыы\" : \"val\\\"\\\"\\\"ue1\""; - correctTags= new HashMap() { { put("aыыы", "val\"\"\"ue1");} }; + correctTags = new HashMap() { { put("aыыы", "val\"\"\"ue1"); } }; tags = TextTagParser.readTagsFromText(txt); Assert.assertEquals(correctTags, tags); @@ -83,5 +83,5 @@ Map correctTags = new HashMap() { { put("a", "1"); put("b", "2"); put("c", "hello === \"\"world"); - }}; + } }; Map tags = TextTagParser.readTagsFromText(txt); Assert.assertEquals(correctTags, tags); Index: trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (revision 8510) @@ -70,9 +70,9 @@ */ @Test - public void testToHexString(){ + public void testToHexString() { Assert.assertEquals("", Utils.toHexString(null)); Assert.assertEquals("", Utils.toHexString(new byte[0])); Assert.assertEquals("01", Utils.toHexString(new byte[]{0x1})); - Assert.assertEquals("0102", Utils.toHexString(new byte[]{0x1,0x2})); + Assert.assertEquals("0102", Utils.toHexString(new byte[]{0x1, 0x2})); Assert.assertEquals("12", Utils.toHexString(new byte[]{0x12})); Assert.assertEquals("127f", Utils.toHexString(new byte[]{0x12, 0x7f})); Index: trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java (revision 8509) +++ trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java (revision 8510) @@ -93,8 +93,10 @@ } } + @Override public boolean evaluateCondition(Match condition) { return true; } + @Override public List getTemplateKeys() { @@ -245,5 +247,5 @@ } - @Test(expected=ParseError.class) + @Test(expected = ParseError.class) public void testErrorsNot() throws ParseError { TemplateParser parser = new TemplateParser("!{-parent() '{name}'}"); @@ -251,5 +253,5 @@ } - @Test(expected=ParseError.class) + @Test(expected = ParseError.class) public void testErrorOr() throws ParseError { TemplateParser parser = new TemplateParser("!{parent() | type=type1 '{name}'}");