Index: applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/FullGraphCreationTest.java =================================================================== --- applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/FullGraphCreationTest.java (revision 21609) +++ applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/FullGraphCreationTest.java (revision 23189) @@ -32,150 +32,150 @@ public class FullGraphCreationTest { - private static final AccessParameters ACCESS_PARAMS; - static { - Map, String> vehiclePropertyValues = - new HashMap, String>(); - vehiclePropertyValues.put(VehiclePropertyTypes.WIDTH, "3.0"); + private static final AccessParameters ACCESS_PARAMS; + static { + Map, String> vehiclePropertyValues = + new HashMap, String>(); + vehiclePropertyValues.put(VehiclePropertyTypes.WIDTH, "3.0"); - try { - ACCESS_PARAMS = new PreferenceAccessParameters( - "test_vehicle", - Arrays.asList(AccessType.UNDEFINED), - vehiclePropertyValues); - } catch (PropertyValueSyntaxException e) { - throw new Error(e); - } - } + try { + ACCESS_PARAMS = new PreferenceAccessParameters( + "test_vehicle", + Arrays.asList(AccessType.UNDEFINED), + vehiclePropertyValues); + } catch (PropertyValueSyntaxException e) { + throw new Error(e); + } + } - private static final AccessRuleset TEST_RULESET = new AccessRuleset() { - public java.util.List getAccessHierarchyAncestors(String transportMode) { - return Arrays.asList(transportMode); - } - public java.util.Collection getBaseTags() { - return Arrays.asList(new Tag("highway", "test")); - } - public java.util.List getImplications() { - return new LinkedList(); - } - }; + private static final AccessRuleset TEST_RULESET = new AccessRuleset() { + public java.util.List getAccessHierarchyAncestors(String transportMode) { + return Arrays.asList(transportMode); + } + public java.util.Collection getBaseTags() { + return Arrays.asList(new Tag("highway", "test")); + } + public java.util.List getImplications() { + return new LinkedList(); + } + }; - @Test - public void testTJunction() { + @Test + public void testTJunction() { - TestDataSource ds = new TestDataSource(); + TestDataSource ds = new TestDataSource(); - TestNode nodeN = new TestNode(2, 1); - TestNode nodeW = new TestNode(1, 0); - TestNode nodeS = new TestNode(0, 1); - TestNode nodeC = new TestNode(1, 1); + TestNode nodeN = new TestNode(2, 1); + TestNode nodeW = new TestNode(1, 0); + TestNode nodeS = new TestNode(0, 1); + TestNode nodeC = new TestNode(1, 1); - ds.nodes.addAll(Arrays.asList(nodeN, nodeW, nodeS, nodeC)); + ds.nodes.addAll(Arrays.asList(nodeN, nodeW, nodeS, nodeC)); - TestWay wayNC = new TestWay(); - wayNC.tags.put("highway", "test"); - wayNC.nodes.addAll(Arrays.asList(nodeN, nodeC)); - TestWay wayCS = new TestWay(); - wayCS.tags.put("highway", "test"); - wayCS.nodes.addAll(Arrays.asList(nodeC, nodeS)); - TestWay wayCW = new TestWay(); - wayCW.tags.put("highway", "test"); - wayCW.nodes.addAll(Arrays.asList(nodeC, nodeW)); + TestWay wayNC = new TestWay(); + wayNC.tags.put("highway", "test"); + wayNC.nodes.addAll(Arrays.asList(nodeN, nodeC)); + TestWay wayCS = new TestWay(); + wayCS.tags.put("highway", "test"); + wayCS.nodes.addAll(Arrays.asList(nodeC, nodeS)); + TestWay wayCW = new TestWay(); + wayCW.tags.put("highway", "test"); + wayCW.nodes.addAll(Arrays.asList(nodeC, nodeW)); - ds.ways.add(wayNC); - ds.ways.add(wayCS); - ds.ways.add(wayCW); + ds.ways.add(wayNC); + ds.ways.add(wayCS); + ds.ways.add(wayCW); - /* variant 1: no restrictions */ - { - TransitionStructure ts1 = createTestTransitionStructure(ds); + /* variant 1: no restrictions */ + { + TransitionStructure ts1 = createTestTransitionStructure(ds); - assertSame(4, size(ts1.getNodes())); - assertSame(6, size(ts1.getSegments())); - assertSame(0, size(ts1.getRestrictions())); + assertSame(4, size(ts1.getNodes())); + assertSame(6, size(ts1.getSegments())); + assertSame(0, size(ts1.getRestrictions())); - WayGraph graph1 = new TSBasedWayGraph(ts1); + WayGraph graph1 = new TSBasedWayGraph(ts1); - assertSame(12, graph1.getNodes().size()); - assertSame(24, graph1.getEdges().size()); - } - /* variant 2: no left turn from S to W */ - { - ds.relations.add(createTurnRestrictionRelation(wayCS, nodeC, wayCW, "no_left_turn")); - TransitionStructure ts2 = createTestTransitionStructure(ds); + assertSame(12, graph1.getNodes().size()); + assertSame(24, graph1.getEdges().size()); + } + /* variant 2: no left turn from S to W */ + { + ds.relations.add(createTurnRestrictionRelation(wayCS, nodeC, wayCW, "no_left_turn")); + TransitionStructure ts2 = createTestTransitionStructure(ds); - assertSame(4, size(ts2.getNodes())); - assertSame(6, size(ts2.getSegments())); - assertSame(1, size(ts2.getRestrictions())); + assertSame(4, size(ts2.getNodes())); + assertSame(6, size(ts2.getSegments())); + assertSame(1, size(ts2.getRestrictions())); - WayGraph graph2 = new TSBasedWayGraph(ts2); + WayGraph graph2 = new TSBasedWayGraph(ts2); - assertSame(12, graph2.getNodes().size()); - assertSame(23, graph2.getEdges().size()); - } + assertSame(12, graph2.getNodes().size()); + assertSame(23, graph2.getEdges().size()); + } - } + } - @Test - public void testBarrier() { + @Test + public void testBarrier() { - TestDataSource ds = new TestDataSource(); + TestDataSource ds = new TestDataSource(); - TestNode node1 = new TestNode(0, 1); - TestNode nodeB = new TestNode(0, 2); - nodeB.tags.put("width", "1"); - TestNode node2 = new TestNode(0, 3); + TestNode node1 = new TestNode(0, 1); + TestNode nodeB = new TestNode(0, 2); + nodeB.tags.put("width", "1"); + TestNode node2 = new TestNode(0, 3); - ds.nodes.addAll(Arrays.asList(node1, nodeB, node2)); + ds.nodes.addAll(Arrays.asList(node1, nodeB, node2)); - TestWay way = new TestWay(); - way.tags.put("highway", "test"); - way.tags.put("oneway", "yes"); - way.nodes.addAll(Arrays.asList(node1, nodeB, node2)); - ds.ways.add(way); + TestWay way = new TestWay(); + way.tags.put("highway", "test"); + way.tags.put("oneway", "yes"); + way.nodes.addAll(Arrays.asList(node1, nodeB, node2)); + ds.ways.add(way); - /* variant 1: no restrictions */ + /* variant 1: no restrictions */ - TransitionStructure ts = createTestTransitionStructure(ds); + TransitionStructure ts = createTestTransitionStructure(ds); - assertSame(3, size(ts.getNodes())); - assertSame(2, size(ts.getSegments())); - assertSame(1, size(ts.getRestrictions())); + assertSame(3, size(ts.getNodes())); + assertSame(2, size(ts.getSegments())); + assertSame(1, size(ts.getRestrictions())); - WayGraph graph = new TSBasedWayGraph(ts); + WayGraph graph = new TSBasedWayGraph(ts); - assertSame(4, graph.getNodes().size()); - assertSame(2, graph.getEdges().size()); + assertSame(4, graph.getNodes().size()); + assertSame(2, graph.getEdges().size()); - } + } - private TestRelation createTurnRestrictionRelation( - TestWay from, TestNode via, TestWay to, String restriction) { - TestRelation resultRelation = new TestRelation(); - resultRelation.tags.put("type", "restriction"); - resultRelation.tags.put("restriction", restriction); - resultRelation.members.add(new TestRelationMember("from", from)); - resultRelation.members.add(new TestRelationMember("via", via)); - resultRelation.members.add(new TestRelationMember("to", to)); - return resultRelation; - } + private TestRelation createTurnRestrictionRelation( + TestWay from, TestNode via, TestWay to, String restriction) { + TestRelation resultRelation = new TestRelation(); + resultRelation.tags.put("type", "restriction"); + resultRelation.tags.put("restriction", restriction); + resultRelation.members.add(new TestRelationMember("from", from)); + resultRelation.members.add(new TestRelationMember("via", via)); + resultRelation.members.add(new TestRelationMember("to", to)); + return resultRelation; + } - private TransitionStructure createTestTransitionStructure(TestDataSource dataSource) { + private TransitionStructure createTestTransitionStructure(TestDataSource dataSource) { - LinkedList> properties = new LinkedList>(); - properties.add(new RoadWidth()); + LinkedList> properties = new LinkedList>(); + properties.add(new RoadWidth()); - return new GenericTransitionStructure( - ACCESS_PARAMS, TEST_RULESET, dataSource, properties); - } + return new GenericTransitionStructure( + ACCESS_PARAMS, TEST_RULESET, dataSource, properties); + } - private static int size(Iterable iterable) { - Iterator iterator = iterable.iterator(); - int size = 0; - while (iterator.hasNext()) { - iterator.next(); - size ++; - } - return size; - } + private static int size(Iterable iterable) { + Iterator iterator = iterable.iterator(); + int size = 0; + while (iterator.hasNext()) { + iterator.next(); + size ++; + } + return size; + } } Index: applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/TestDataSource.java =================================================================== --- applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/TestDataSource.java (revision 21609) +++ applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/TestDataSource.java (revision 23189) @@ -14,131 +14,131 @@ public class TestDataSource implements DataSource { - public static class TestPrimitive { - public final Map tags = new HashMap(); - }; + public static class TestPrimitive { + public final Map tags = new HashMap(); + }; - public static class TestNode extends TestPrimitive { - public final double lat; - public final double lon; - public TestNode() { - this(0, 0); - } - public TestNode(double lat, double lon) { - this.lat = lat; - this.lon = lon; - } - @Override - public String toString() { - return "(" + lat + ", " + lon + "); " + tags; - } - } + public static class TestNode extends TestPrimitive { + public final double lat; + public final double lon; + public TestNode() { + this(0, 0); + } + public TestNode(double lat, double lon) { + this.lat = lat; + this.lon = lon; + } + @Override + public String toString() { + return "(" + lat + ", " + lon + "); " + tags; + } + } - public static class TestWay extends TestPrimitive { - public final List nodes = new LinkedList(); - @Override - public String toString() { - return nodes + "; " + tags; - } - } + public static class TestWay extends TestPrimitive { + public final List nodes = new LinkedList(); + @Override + public String toString() { + return nodes + "; " + tags; + } + } - public static class TestRelation extends TestPrimitive { - public final Collection members = new LinkedList(); - @Override - public String toString() { - return members + "; " + tags; - } - } + public static class TestRelation extends TestPrimitive { + public final Collection members = new LinkedList(); + @Override + public String toString() { + return members + "; " + tags; + } + } - public static class TestRelationMember { - public final String role; - public final TestPrimitive member; - public TestRelationMember(String role, TestPrimitive member) { - this.role = role; - this.member = member; - } - public TestPrimitive getMember() { - return member; - } - public String getRole() { - return role; - } - @Override - public String toString() { - return role + "=" + member; - } - } + public static class TestRelationMember { + public final String role; + public final TestPrimitive member; + public TestRelationMember(String role, TestPrimitive member) { + this.role = role; + this.member = member; + } + public TestPrimitive getMember() { + return member; + } + public String getRole() { + return role; + } + @Override + public String toString() { + return role + "=" + member; + } + } - public final Collection nodes = new LinkedList(); - public final Collection ways = new LinkedList(); - public final Collection relations = new LinkedList(); + public final Collection nodes = new LinkedList(); + public final Collection ways = new LinkedList(); + public final Collection relations = new LinkedList(); - public double getLat(TestNode node) { - return node.lat; - } - public double getLon(TestNode node) { - return node.lon; - } + public double getLat(TestNode node) { + return node.lat; + } + public double getLon(TestNode node) { + return node.lon; + } - public Iterable getMembers(TestRelation relation) { - return relation.members; - } + public Iterable getMembers(TestRelation relation) { + return relation.members; + } - public Iterable getNodes() { - return nodes; - } + public Iterable getNodes() { + return nodes; + } - public Iterable getNodes(TestWay way) { - return way.nodes; - } + public Iterable getNodes(TestWay way) { + return way.nodes; + } - public Iterable getWays() { - return ways; - } + public Iterable getWays() { + return ways; + } - public Iterable getRelations() { - return relations; - } + public Iterable getRelations() { + return relations; + } - public TagGroup getTagsN(TestNode node) { - return new MapBasedTagGroup(node.tags); - } + public TagGroup getTagsN(TestNode node) { + return new MapBasedTagGroup(node.tags); + } - public TagGroup getTagsW(TestWay way) { - return new MapBasedTagGroup(way.tags); - } + public TagGroup getTagsW(TestWay way) { + return new MapBasedTagGroup(way.tags); + } - public TagGroup getTagsR(TestRelation relation) { - return new MapBasedTagGroup(relation.tags); - } - - public Object getMember(TestRelationMember member) { - return member.getMember(); - } - - public String getRole(TestRelationMember member) { - return member.getRole(); - } - - public boolean isNMember(TestRelationMember member) { - return member.getMember() instanceof TestNode; - } - - public boolean isWMember(TestRelationMember member) { - return member.getMember() instanceof TestWay; - } - - public boolean isRMember(TestRelationMember member) { - return member.getMember() instanceof TestRelation; - } + public TagGroup getTagsR(TestRelation relation) { + return new MapBasedTagGroup(relation.tags); + } - public void addObserver(DataSourceObserver observer) { - // not needed for test - } + public Object getMember(TestRelationMember member) { + return member.getMember(); + } - public void deleteObserver(DataSourceObserver observer) { - // not needed for test - } + public String getRole(TestRelationMember member) { + return member.getRole(); + } + + public boolean isNMember(TestRelationMember member) { + return member.getMember() instanceof TestNode; + } + + public boolean isWMember(TestRelationMember member) { + return member.getMember() instanceof TestWay; + } + + public boolean isRMember(TestRelationMember member) { + return member.getMember() instanceof TestRelation; + } + + public void addObserver(DataSourceObserver observer) { + // not needed for test + } + + public void deleteObserver(DataSourceObserver observer) { + // not needed for test + } } Index: applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReaderTest.java =================================================================== --- applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReaderTest.java (revision 21609) +++ applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReaderTest.java (revision 23189) @@ -22,89 +22,89 @@ public class AccessRulesetReaderTest { - @Test - public void testReadAccessRuleset_valid_classes() throws IOException { + @Test + public void testReadAccessRuleset_valid_classes() throws IOException { - InputStream is = new FileInputStream("plugins/graphview/test/files/accessRuleset_valid.xml"); - AccessRuleset ruleset = AccessRulesetReader.readAccessRuleset(is); - assertNotNull(ruleset); + InputStream is = new FileInputStream("plugins/graphview/test/files/accessRuleset_valid.xml"); + AccessRuleset ruleset = AccessRulesetReader.readAccessRuleset(is); + assertNotNull(ruleset); - assertEquals("vehicle", ruleset.getAccessHierarchyAncestors("vehicle").get(0)); + assertEquals("vehicle", ruleset.getAccessHierarchyAncestors("vehicle").get(0)); - assertEquals("motor_vehicle", ruleset.getAccessHierarchyAncestors("motor_vehicle").get(0)); - assertEquals("vehicle", ruleset.getAccessHierarchyAncestors("motor_vehicle").get(1)); + assertEquals("motor_vehicle", ruleset.getAccessHierarchyAncestors("motor_vehicle").get(0)); + assertEquals("vehicle", ruleset.getAccessHierarchyAncestors("motor_vehicle").get(1)); - assertEquals("bus", ruleset.getAccessHierarchyAncestors("bus").get(0)); - assertEquals("motor_vehicle", ruleset.getAccessHierarchyAncestors("bus").get(1)); - assertEquals("vehicle", ruleset.getAccessHierarchyAncestors("bus").get(2)); + assertEquals("bus", ruleset.getAccessHierarchyAncestors("bus").get(0)); + assertEquals("motor_vehicle", ruleset.getAccessHierarchyAncestors("bus").get(1)); + assertEquals("vehicle", ruleset.getAccessHierarchyAncestors("bus").get(2)); - assertEquals("bicycle", ruleset.getAccessHierarchyAncestors("bicycle").get(0)); - assertEquals("vehicle", ruleset.getAccessHierarchyAncestors("bicycle").get(1)); + assertEquals("bicycle", ruleset.getAccessHierarchyAncestors("bicycle").get(0)); + assertEquals("vehicle", ruleset.getAccessHierarchyAncestors("bicycle").get(1)); - assertFalse(ruleset.getAccessHierarchyAncestors("bus").contains("bicycle")); + assertFalse(ruleset.getAccessHierarchyAncestors("bus").contains("bicycle")); - assertSame(ruleset.getAccessHierarchyAncestors("boat").size(), 0); + assertSame(ruleset.getAccessHierarchyAncestors("boat").size(), 0); - } + } - @Test - public void testReadAccessRuleset_valid_basetags() throws IOException { + @Test + public void testReadAccessRuleset_valid_basetags() throws IOException { - InputStream is = new FileInputStream("plugins/graphview/test/files/accessRuleset_valid.xml"); - AccessRuleset ruleset = AccessRulesetReader.readAccessRuleset(is); - assertNotNull(ruleset); + InputStream is = new FileInputStream("plugins/graphview/test/files/accessRuleset_valid.xml"); + AccessRuleset ruleset = AccessRulesetReader.readAccessRuleset(is); + assertNotNull(ruleset); - assertSame(2, ruleset.getBaseTags().size()); + assertSame(2, ruleset.getBaseTags().size()); - assertTrue(ruleset.getBaseTags().contains(new Tag("highway", "residential"))); - assertTrue(ruleset.getBaseTags().contains(new Tag("highway", "cycleway"))); - assertFalse(ruleset.getBaseTags().contains(new Tag("building", "residential"))); - assertFalse(ruleset.getBaseTags().contains(new Tag("highway", "stop"))); + assertTrue(ruleset.getBaseTags().contains(new Tag("highway", "residential"))); + assertTrue(ruleset.getBaseTags().contains(new Tag("highway", "cycleway"))); + assertFalse(ruleset.getBaseTags().contains(new Tag("building", "residential"))); + assertFalse(ruleset.getBaseTags().contains(new Tag("highway", "stop"))); - } + } - @Test - public void testReadAccessRuleset_valid_implications() throws IOException { + @Test + public void testReadAccessRuleset_valid_implications() throws IOException { - InputStream is = new FileInputStream("plugins/graphview/test/files/accessRuleset_valid.xml"); - AccessRuleset ruleset = AccessRulesetReader.readAccessRuleset(is); - assertNotNull(ruleset); + InputStream is = new FileInputStream("plugins/graphview/test/files/accessRuleset_valid.xml"); + AccessRuleset ruleset = AccessRulesetReader.readAccessRuleset(is); + assertNotNull(ruleset); - List implications = ruleset.getImplications(); + List implications = ruleset.getImplications(); - assertSame(3, implications.size()); + assertSame(3, implications.size()); - TagGroup[] tagGroups = new TagGroup[4]; - tagGroups[0] = createTagGroup(new Tag("highway", "cycleway")); - tagGroups[1] = createTagGroup(new Tag("highway", "steps")); - tagGroups[2] = createTagGroup(new Tag("highway", "steps"), new Tag("escalator", "yes")); - tagGroups[3] = createTagGroup(new Tag("disused", "yes"), new Tag("construction", "no")); + TagGroup[] tagGroups = new TagGroup[4]; + tagGroups[0] = createTagGroup(new Tag("highway", "cycleway")); + tagGroups[1] = createTagGroup(new Tag("highway", "steps")); + tagGroups[2] = createTagGroup(new Tag("highway", "steps"), new Tag("escalator", "yes")); + tagGroups[3] = createTagGroup(new Tag("disused", "yes"), new Tag("construction", "no")); - for (Implication implication : implications) { - for (int i = 0; i < tagGroups.length; i++) { - tagGroups[i] = implication.apply(tagGroups[i]); - } - } + for (Implication implication : implications) { + for (int i = 0; i < tagGroups.length; i++) { + tagGroups[i] = implication.apply(tagGroups[i]); + } + } - assertSame(2, tagGroups[0].size()); - assertTrue(tagGroups[0].contains(new Tag("bicycle", "designated"))); + assertSame(2, tagGroups[0].size()); + assertTrue(tagGroups[0].contains(new Tag("bicycle", "designated"))); - assertSame(2, tagGroups[1].size()); - assertTrue(tagGroups[1].contains(new Tag("normal_steps", "yes"))); + assertSame(2, tagGroups[1].size()); + assertTrue(tagGroups[1].contains(new Tag("normal_steps", "yes"))); - assertSame(2, tagGroups[2].size()); - assertFalse(tagGroups[2].contains(new Tag("normal_steps", "yes"))); + assertSame(2, tagGroups[2].size()); + assertFalse(tagGroups[2].contains(new Tag("normal_steps", "yes"))); - assertSame(3, tagGroups[3].size()); - assertTrue(tagGroups[3].contains(new Tag("usable", "no"))); - } + assertSame(3, tagGroups[3].size()); + assertTrue(tagGroups[3].contains(new Tag("usable", "no"))); + } - private static TagGroup createTagGroup(Tag... tags) { - Map tagMap = new HashMap(); - for (Tag tag : tags) { - tagMap.put(tag.key, tag.value); - } - return new MapBasedTagGroup(tagMap); - } + private static TagGroup createTagGroup(Tag... tags) { + Map tagMap = new HashMap(); + for (Tag tag : tags) { + tagMap.put(tag.key, tag.value); + } + return new MapBasedTagGroup(tagMap); + } } Index: applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/property/RoadInclineTest.java =================================================================== --- applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/property/RoadInclineTest.java (revision 21609) +++ applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/property/RoadInclineTest.java (revision 23189) @@ -6,19 +6,19 @@ public class RoadInclineTest extends RoadPropertyTest { - private static void testIncline(Float expectedInclineForward, Float expectedInclineBackward, - String inclineString) { + private static void testIncline(Float expectedInclineForward, Float expectedInclineBackward, + String inclineString) { - testEvaluateW(new RoadIncline(), - expectedInclineForward, expectedInclineBackward, - new Tag("incline", inclineString)); - } + testEvaluateW(new RoadIncline(), + expectedInclineForward, expectedInclineBackward, + new Tag("incline", inclineString)); + } - @Test - public void testEvaluate() { - testIncline(5f, -5f, "5 %"); - testIncline(9.5f, -9.5f, "9.5 %"); - testIncline(-2.5f, 2.5f, "-2.5%"); - testIncline(null, null, "steep"); - } + @Test + public void testEvaluate() { + testIncline(5f, -5f, "5 %"); + testIncline(9.5f, -9.5f, "9.5 %"); + testIncline(-2.5f, 2.5f, "-2.5%"); + testIncline(null, null, "steep"); + } } Index: applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/property/RoadMaxspeedTest.java =================================================================== --- applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/property/RoadMaxspeedTest.java (revision 21609) +++ applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/property/RoadMaxspeedTest.java (revision 23189) @@ -6,27 +6,27 @@ public class RoadMaxspeedTest extends RoadPropertyTest { - private static void testMaxspeed(float expectedMaxspeed, String maxspeedString) { - testEvaluateBoth(new RoadMaxspeed(), expectedMaxspeed, new Tag("maxspeed", maxspeedString)); - } + private static void testMaxspeed(float expectedMaxspeed, String maxspeedString) { + testEvaluateBoth(new RoadMaxspeed(), expectedMaxspeed, new Tag("maxspeed", maxspeedString)); + } - @Test - public void testEvaluate_numeric() { - testMaxspeed(30, "30"); - testMaxspeed(48.3f, "48.3"); - } + @Test + public void testEvaluate_numeric() { + testMaxspeed(30, "30"); + testMaxspeed(48.3f, "48.3"); + } - @Test - public void testEvaluate_kmh() { - testMaxspeed(50, "50 km/h"); - testMaxspeed(120, "120km/h"); - testMaxspeed(30, "30 km/h"); - } + @Test + public void testEvaluate_kmh() { + testMaxspeed(50, "50 km/h"); + testMaxspeed(120, "120km/h"); + testMaxspeed(30, "30 km/h"); + } - @Test - public void testEvaluate_mph() { - testMaxspeed(72.42048f, "45 mph"); - testMaxspeed(64.373764f, "40mph"); - testMaxspeed(24.14016f, "15 mph"); - } + @Test + public void testEvaluate_mph() { + testMaxspeed(72.42048f, "45 mph"); + testMaxspeed(64.373764f, "40mph"); + testMaxspeed(24.14016f, "15 mph"); + } } Index: applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/property/RoadPropertyTest.java =================================================================== --- applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/property/RoadPropertyTest.java (revision 21609) +++ applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/property/RoadPropertyTest.java (revision 23189) @@ -8,37 +8,37 @@ abstract public class RoadPropertyTest { - protected static

void testEvaluateW(RoadPropertyType

property, P expectedForward, P expectedBackward, Tag... wayTags) { + protected static

void testEvaluateW(RoadPropertyType

property, P expectedForward, P expectedBackward, Tag... wayTags) { - TestDataSource ds = new TestDataSource(); - TestDataSource.TestWay testWay = new TestDataSource.TestWay(); - for (Tag tag : wayTags) { - testWay.tags.put(tag.key, tag.value); - } - ds.ways.add(testWay); + TestDataSource ds = new TestDataSource(); + TestDataSource.TestWay testWay = new TestDataSource.TestWay(); + for (Tag tag : wayTags) { + testWay.tags.put(tag.key, tag.value); + } + ds.ways.add(testWay); - assertEquals(expectedForward, property.evaluateW(testWay, true, null, ds)); - assertEquals(expectedBackward, property.evaluateW(testWay, false, null, ds)); + assertEquals(expectedForward, property.evaluateW(testWay, true, null, ds)); + assertEquals(expectedBackward, property.evaluateW(testWay, false, null, ds)); - } + } - protected static

void testEvaluateN(RoadPropertyType

property, P expected, Tag... nodeTags) { + protected static

void testEvaluateN(RoadPropertyType

property, P expected, Tag... nodeTags) { - TestDataSource ds = new TestDataSource(); - TestDataSource.TestNode testNode = new TestDataSource.TestNode(); - for (Tag tag : nodeTags) { - testNode.tags.put(tag.key, tag.value); - } - ds.nodes.add(testNode); + TestDataSource ds = new TestDataSource(); + TestDataSource.TestNode testNode = new TestDataSource.TestNode(); + for (Tag tag : nodeTags) { + testNode.tags.put(tag.key, tag.value); + } + ds.nodes.add(testNode); - RoadMaxspeed m = new RoadMaxspeed(); + RoadMaxspeed m = new RoadMaxspeed(); - assertEquals(expected, m.evaluateN(testNode, null, ds)); + assertEquals(expected, m.evaluateN(testNode, null, ds)); - } + } - protected static

void testEvaluateBoth(RoadPropertyType

property, P expected, Tag... nodeTags) { - testEvaluateW(property, expected, expected, nodeTags); - testEvaluateN(property, expected, nodeTags); - } + protected static

void testEvaluateBoth(RoadPropertyType

property, P expected, Tag... nodeTags) { + testEvaluateW(property, expected, expected, nodeTags); + testEvaluateN(property, expected, nodeTags); + } } Index: applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogicTest.java =================================================================== --- applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogicTest.java (revision 21609) +++ applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogicTest.java (revision 23189) @@ -15,101 +15,101 @@ public class TagConditionLogicTest { - TagGroup groupA; - TagGroup groupB; + TagGroup groupA; + TagGroup groupB; - @Before - public void setUp() { - Map mapA = new HashMap(); - mapA.put("key1", "value1"); - mapA.put("key2", "value2"); - mapA.put("key3", "value1"); - groupA = new MapBasedTagGroup(mapA); + @Before + public void setUp() { + Map mapA = new HashMap(); + mapA.put("key1", "value1"); + mapA.put("key2", "value2"); + mapA.put("key3", "value1"); + groupA = new MapBasedTagGroup(mapA); - Map mapB = new HashMap(); - mapB.put("key1", "value1"); - mapB.put("key4", "value4"); - groupB = new MapBasedTagGroup(mapB); - } + Map mapB = new HashMap(); + mapB.put("key1", "value1"); + mapB.put("key4", "value4"); + groupB = new MapBasedTagGroup(mapB); + } - @Test - public void testTag() { - TagCondition condition = TagConditionLogic.tag(new Tag("key3", "value1")); - assertTrue(condition.matches(groupA)); - assertFalse(condition.matches(groupB)); - } + @Test + public void testTag() { + TagCondition condition = TagConditionLogic.tag(new Tag("key3", "value1")); + assertTrue(condition.matches(groupA)); + assertFalse(condition.matches(groupB)); + } - @Test - public void testKey() { - TagCondition condition = TagConditionLogic.key("key3"); - assertTrue(condition.matches(groupA)); - assertFalse(condition.matches(groupB)); - } + @Test + public void testKey() { + TagCondition condition = TagConditionLogic.key("key3"); + assertTrue(condition.matches(groupA)); + assertFalse(condition.matches(groupB)); + } - @Test - public void testAnd() { - TagCondition condition1 = TagConditionLogic.tag(new Tag("key2", "value2")); - TagCondition conditionAnd1a = TagConditionLogic.and(condition1); - TagCondition conditionAnd1b = TagConditionLogic.and(Arrays.asList(condition1)); + @Test + public void testAnd() { + TagCondition condition1 = TagConditionLogic.tag(new Tag("key2", "value2")); + TagCondition conditionAnd1a = TagConditionLogic.and(condition1); + TagCondition conditionAnd1b = TagConditionLogic.and(Arrays.asList(condition1)); - assertTrue(conditionAnd1a.matches(groupA)); - assertTrue(conditionAnd1b.matches(groupA)); - assertFalse(conditionAnd1a.matches(groupB)); - assertFalse(conditionAnd1b.matches(groupB)); + assertTrue(conditionAnd1a.matches(groupA)); + assertTrue(conditionAnd1b.matches(groupA)); + assertFalse(conditionAnd1a.matches(groupB)); + assertFalse(conditionAnd1b.matches(groupB)); - TagCondition condition2 = TagConditionLogic.tag(new Tag("key1", "value1")); - TagCondition conditionAnd2a = TagConditionLogic.and(condition1, condition2); - TagCondition conditionAnd2b = TagConditionLogic.and(Arrays.asList(condition1, condition2)); + TagCondition condition2 = TagConditionLogic.tag(new Tag("key1", "value1")); + TagCondition conditionAnd2a = TagConditionLogic.and(condition1, condition2); + TagCondition conditionAnd2b = TagConditionLogic.and(Arrays.asList(condition1, condition2)); - assertTrue(conditionAnd2a.matches(groupA)); - assertTrue(conditionAnd2b.matches(groupA)); - assertFalse(conditionAnd2a.matches(groupB)); - assertFalse(conditionAnd2b.matches(groupB)); + assertTrue(conditionAnd2a.matches(groupA)); + assertTrue(conditionAnd2b.matches(groupA)); + assertFalse(conditionAnd2a.matches(groupB)); + assertFalse(conditionAnd2b.matches(groupB)); - TagCondition condition3 = TagConditionLogic.tag(new Tag("key4", "value4")); - TagCondition conditionAnd3a = TagConditionLogic.and(condition1, condition2, condition3); - TagCondition conditionAnd3b = TagConditionLogic.and(Arrays.asList(condition1, condition2, condition3)); + TagCondition condition3 = TagConditionLogic.tag(new Tag("key4", "value4")); + TagCondition conditionAnd3a = TagConditionLogic.and(condition1, condition2, condition3); + TagCondition conditionAnd3b = TagConditionLogic.and(Arrays.asList(condition1, condition2, condition3)); - assertFalse(conditionAnd3a.matches(groupA)); - assertFalse(conditionAnd3b.matches(groupA)); - assertFalse(conditionAnd3a.matches(groupB)); - assertFalse(conditionAnd3b.matches(groupB)); - } + assertFalse(conditionAnd3a.matches(groupA)); + assertFalse(conditionAnd3b.matches(groupA)); + assertFalse(conditionAnd3a.matches(groupB)); + assertFalse(conditionAnd3b.matches(groupB)); + } - @Test - public void testOr() { - TagCondition condition1 = TagConditionLogic.tag(new Tag("key42", "value42")); - TagCondition conditionOr1a = TagConditionLogic.or(condition1); - TagCondition conditionOr1b = TagConditionLogic.or(Arrays.asList(condition1)); + @Test + public void testOr() { + TagCondition condition1 = TagConditionLogic.tag(new Tag("key42", "value42")); + TagCondition conditionOr1a = TagConditionLogic.or(condition1); + TagCondition conditionOr1b = TagConditionLogic.or(Arrays.asList(condition1)); - assertFalse(conditionOr1a.matches(groupA)); - assertFalse(conditionOr1b.matches(groupA)); - assertFalse(conditionOr1a.matches(groupB)); - assertFalse(conditionOr1b.matches(groupB)); + assertFalse(conditionOr1a.matches(groupA)); + assertFalse(conditionOr1b.matches(groupA)); + assertFalse(conditionOr1a.matches(groupB)); + assertFalse(conditionOr1b.matches(groupB)); - TagCondition condition2 = TagConditionLogic.tag(new Tag("key3", "value1")); - TagCondition conditionOr2a = TagConditionLogic.or(condition1, condition2); - TagCondition conditionOr2b = TagConditionLogic.or(Arrays.asList(condition1, condition2)); + TagCondition condition2 = TagConditionLogic.tag(new Tag("key3", "value1")); + TagCondition conditionOr2a = TagConditionLogic.or(condition1, condition2); + TagCondition conditionOr2b = TagConditionLogic.or(Arrays.asList(condition1, condition2)); - assertTrue(conditionOr2a.matches(groupA)); - assertTrue(conditionOr2b.matches(groupA)); - assertFalse(conditionOr2a.matches(groupB)); - assertFalse(conditionOr2b.matches(groupB)); + assertTrue(conditionOr2a.matches(groupA)); + assertTrue(conditionOr2b.matches(groupA)); + assertFalse(conditionOr2a.matches(groupB)); + assertFalse(conditionOr2b.matches(groupB)); - TagCondition condition3 = TagConditionLogic.tag(new Tag("key1", "value1")); - TagCondition conditionOr3a = TagConditionLogic.or(condition1, condition2, condition3); - TagCondition conditionOr3b = TagConditionLogic.or(Arrays.asList(condition1, condition2, condition3)); + TagCondition condition3 = TagConditionLogic.tag(new Tag("key1", "value1")); + TagCondition conditionOr3a = TagConditionLogic.or(condition1, condition2, condition3); + TagCondition conditionOr3b = TagConditionLogic.or(Arrays.asList(condition1, condition2, condition3)); - assertTrue(conditionOr3a.matches(groupA)); - assertTrue(conditionOr3b.matches(groupA)); - assertTrue(conditionOr3a.matches(groupB)); - assertTrue(conditionOr3b.matches(groupB)); - } + assertTrue(conditionOr3a.matches(groupA)); + assertTrue(conditionOr3b.matches(groupA)); + assertTrue(conditionOr3a.matches(groupB)); + assertTrue(conditionOr3b.matches(groupB)); + } - @Test - public void testNot() { - TagCondition condition = TagConditionLogic.not(TagConditionLogic.key("key3")); - assertFalse(condition.matches(groupA)); - assertTrue(condition.matches(groupB)); - } + @Test + public void testNot() { + TagCondition condition = TagConditionLogic.not(TagConditionLogic.key("key3")); + assertFalse(condition.matches(groupA)); + assertTrue(condition.matches(groupB)); + } } Index: applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/util/ValueStringParserTest.java =================================================================== --- applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/util/ValueStringParserTest.java (revision 21609) +++ applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/util/ValueStringParserTest.java (revision 23189) @@ -10,87 +10,87 @@ public class ValueStringParserTest { - /* speed */ + /* speed */ - @Test - public void testParseSpeedDefault() { - assertClose(50, parseSpeed("50")); - } + @Test + public void testParseSpeedDefault() { + assertClose(50, parseSpeed("50")); + } - @Test - public void testParseSpeedKmh() { - assertClose(30, parseSpeed("30 km/h")); - assertClose(100, parseSpeed("100km/h")); - } + @Test + public void testParseSpeedKmh() { + assertClose(30, parseSpeed("30 km/h")); + assertClose(100, parseSpeed("100km/h")); + } - @Test - public void testParseSpeedMph() { - assertClose(40.234f, parseSpeed("25mph")); - assertClose(40.234f, parseSpeed("25 mph")); - } + @Test + public void testParseSpeedMph() { + assertClose(40.234f, parseSpeed("25mph")); + assertClose(40.234f, parseSpeed("25 mph")); + } - @Test - public void testParseSpeedInvalid() { - assertNull(parseSpeed("lightspeed")); - } + @Test + public void testParseSpeedInvalid() { + assertNull(parseSpeed("lightspeed")); + } - /* measure */ + /* measure */ - @Test - public void testParseMeasureDefault() { - assertClose(3.5f, parseMeasure("3.5")); - } + @Test + public void testParseMeasureDefault() { + assertClose(3.5f, parseMeasure("3.5")); + } - @Test - public void testParseMeasureM() { - assertClose(2, parseMeasure("2m")); - assertClose(5.5f, parseMeasure("5.5 m")); - } + @Test + public void testParseMeasureM() { + assertClose(2, parseMeasure("2m")); + assertClose(5.5f, parseMeasure("5.5 m")); + } - @Test - public void testParseMeasureKm() { - assertClose(1000, parseMeasure("1 km")); - assertClose(7200, parseMeasure("7.2km")); - } + @Test + public void testParseMeasureKm() { + assertClose(1000, parseMeasure("1 km")); + assertClose(7200, parseMeasure("7.2km")); + } - @Test - public void testParseMeasureMi() { - assertClose(1609.344f, parseMeasure("1 mi")); - } + @Test + public void testParseMeasureMi() { + assertClose(1609.344f, parseMeasure("1 mi")); + } - @Test - public void testParseMeasureFeetInches() { - assertClose(3.6576f, parseMeasure("12'0\"")); - assertClose(1.9812f, parseMeasure("6' 6\"")); - } + @Test + public void testParseMeasureFeetInches() { + assertClose(3.6576f, parseMeasure("12'0\"")); + assertClose(1.9812f, parseMeasure("6' 6\"")); + } - @Test - public void testParseMeasureInvalid() { - assertNull(parseMeasure("very long")); - assertNull(parseMeasure("6' 16\"")); - } + @Test + public void testParseMeasureInvalid() { + assertNull(parseMeasure("very long")); + assertNull(parseMeasure("6' 16\"")); + } - /* weight */ + /* weight */ - @Test - public void testParseWeightDefault() { - assertClose(3.6f, parseWeight("3.6")); - } + @Test + public void testParseWeightDefault() { + assertClose(3.6f, parseWeight("3.6")); + } - @Test - public void testParseWeightT() { - assertClose(30, parseWeight("30t")); - assertClose(3.5f, parseWeight("3.5 t")); - } + @Test + public void testParseWeightT() { + assertClose(30, parseWeight("30t")); + assertClose(3.5f, parseWeight("3.5 t")); + } - @Test - public void testParseWeightInvalid() { - assertNull(parseWeight("heavy")); - } + @Test + public void testParseWeightInvalid() { + assertNull(parseWeight("heavy")); + } - private static final void assertClose(float expected, float actual) { - if (Math.abs(expected - actual) > 0.001) { - throw new AssertionError("expected " + expected + ", was " + actual); - } - } + private static final void assertClose(float expected, float actual) { + if (Math.abs(expected - actual) > 0.001) { + throw new AssertionError("expected " + expected + ", was " + actual); + } + } } Index: applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/visualisation/FloatPropertyColorSchemeTest.java =================================================================== --- applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/visualisation/FloatPropertyColorSchemeTest.java (revision 21609) +++ applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/visualisation/FloatPropertyColorSchemeTest.java (revision 23189) @@ -13,37 +13,37 @@ public class FloatPropertyColorSchemeTest { - private FloatPropertyColorScheme subject; + private FloatPropertyColorScheme subject; - @Before - public void setUp() { + @Before + public void setUp() { - Map colorMap = new HashMap(); - colorMap.put( 5f, new Color( 42, 42, 42)); - colorMap.put(10f, new Color(100, 100, 100)); - colorMap.put(20f, new Color(200, 200, 200)); + Map colorMap = new HashMap(); + colorMap.put( 5f, new Color( 42, 42, 42)); + colorMap.put(10f, new Color(100, 100, 100)); + colorMap.put(20f, new Color(200, 200, 200)); - subject = new FloatPropertyColorScheme(RoadMaxweight.class, colorMap, Color.RED); - } + subject = new FloatPropertyColorScheme(RoadMaxweight.class, colorMap, Color.RED); + } - @Test - public void testGetColorForValue_below() { - assertEquals(new Color(42, 42, 42), subject.getColorForValue(1f)); - assertEquals(new Color(42, 42, 42), subject.getColorForValue(5f)); - } + @Test + public void testGetColorForValue_below() { + assertEquals(new Color(42, 42, 42), subject.getColorForValue(1f)); + assertEquals(new Color(42, 42, 42), subject.getColorForValue(5f)); + } - @Test - public void testGetColorForValue_above() { - assertEquals(new Color(200, 200, 200), subject.getColorForValue(25f)); - } + @Test + public void testGetColorForValue_above() { + assertEquals(new Color(200, 200, 200), subject.getColorForValue(25f)); + } - @Test - public void testGetColorForValue_value() { - assertEquals(new Color(100, 100, 100), subject.getColorForValue(10f)); - } + @Test + public void testGetColorForValue_value() { + assertEquals(new Color(100, 100, 100), subject.getColorForValue(10f)); + } - @Test - public void testGetColorForValue_interpolate() { - assertEquals(new Color(150, 150, 150), subject.getColorForValue(15f)); - } + @Test + public void testGetColorForValue_interpolate() { + assertEquals(new Color(150, 150, 150), subject.getColorForValue(15f)); + } }