Changeset 10758 in josm for trunk/test
- Timestamp:
- 2016-08-07T17:39:42+02:00 (8 years ago)
- Location:
- trunk/test
- Files:
-
- 80 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java
r9669 r10758 45 45 */ 46 46 @Test 47 public void checkPopularTags() throws SAXException, IOException, ParseException {47 public void testCheckPopularTags() throws SAXException, IOException, ParseException { 48 48 TaggingPresets.readFromPreferences(); 49 49 new TagChecker().initialize(); -
trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
r10222 r10758 271 271 272 272 @Test 273 public void multiGetWithNonExistingNode() throws OsmTransferException {273 public void testMultiGetWithNonExistingNode() throws OsmTransferException { 274 274 MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); 275 275 ArrayList<Node> nodes = new ArrayList<>(ds.getNodes()); -
trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
r10378 r10758 273 273 274 274 @Test 275 public void testBackreferenceForNode _Full() throws OsmTransferException {275 public void testBackreferenceForNodeFull() throws OsmTransferException { 276 276 Node n = lookupNode(ds, 0); 277 277 assertNotNull(n); … … 357 357 358 358 @Test 359 public void testBackreferenceForWay _Full() throws OsmTransferException {359 public void testBackreferenceForWayFull() throws OsmTransferException { 360 360 Way w = lookupWay(ds, 1); 361 361 assertNotNull(w); … … 506 506 507 507 @Test 508 public void testBackreferenceForRelation _Full() throws OsmTransferException {508 public void testBackreferenceForRelationFull() throws OsmTransferException { 509 509 Relation r = lookupRelation(ds, 1); 510 510 assertNotNull(r); -
trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
r10733 r10758 147 147 148 148 @Test 149 public void test 418() throws IOException {149 public void testHttp418() throws IOException { 150 150 // https://tools.ietf.org/html/rfc2324 151 151 final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/status/418")).connect(progress); -
trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
r10222 r10758 56 56 @Test 57 57 @SuppressFBWarnings(value = "DM_STRING_CTOR", justification = "test Strings that are interned and those that are not") 58 public void measureStringEqualsIntern() {58 public void testMeasureStringEqualsIntern() { 59 59 String str1Interned = "string1"; 60 60 String str1InternedB = "string1"; -
trunk/test/performance/org/openstreetmap/josm/data/osm/RoundingPerformanceTest.java
r10222 r10758 25 25 @Test 26 26 @SuppressFBWarnings(value = "RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT") 27 public void test () {27 public void testRounding() { 28 28 final int n = 1000000; 29 29 long start = System.nanoTime(); -
trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java
r10222 r10758 62 62 */ 63 63 @Test 64 public void test () throws Exception {64 public void testPlain() throws Exception { 65 65 runTest(".osm-file", true); 66 66 } -
trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java
r10436 r10758 45 45 */ 46 46 @Test 47 public void nodesOpenWay() {47 public void testNodesOpenWay() { 48 48 DataSet dataSet = new DataSet(); 49 49 OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null); … … 84 84 */ 85 85 @Test 86 public void nodesClosedWay() {86 public void testNodesClosedWay() { 87 87 DataSet dataSet = new DataSet(); 88 88 OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null); … … 124 124 */ 125 125 @Test 126 public void nodesOpenWays() {126 public void testNodesOpenWays() { 127 127 DataSet dataSet = new DataSet(); 128 128 OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null); -
trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
r9669 r10758 62 62 */ 63 63 @Test 64 public void equalsContract() {64 public void testEqualsContract() { 65 65 EqualsVerifier.forClass(NodePair.class).usingGetClass() 66 66 .withPrefabValues(Node.class, new Node(1), new Node(2)) -
trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
r10436 r10758 74 74 */ 75 75 @Test 76 public void test 7421_0() {76 public void testTicket7421case0() { 77 77 DataSet dataSet = new DataSet(); 78 78 OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null); … … 139 139 */ 140 140 @Test 141 public void test 7421_1() {141 public void testTicket7421case1() { 142 142 DataSet dataSet = new DataSet(); 143 143 OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null); -
trunk/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java
r10299 r10758 41 41 */ 42 42 @Test 43 public void equalsContract() {43 public void testEqualsContract() { 44 44 EqualsVerifier.forClass(ExtensionFileFilter.class).usingGetClass() 45 45 .verify(); -
trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java
r10436 r10758 50 50 */ 51 51 @Test 52 public void test 10396() {52 public void testTicket10396() { 53 53 DataSet dataSet = new DataSet(); 54 54 OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null); -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
r10436 r10758 86 86 @Test 87 87 @SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD") 88 public void test 10748() {88 public void testTicket10748() { 89 89 DataSet dataSet = new DataSet(); 90 90 OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null); -
trunk/test/unit/org/openstreetmap/josm/command/AddCommandTest.java
r10663 r10758 136 136 */ 137 137 @Test 138 public void equalsContract() {138 public void testEqualsContract() { 139 139 EqualsVerifier.forClass(AddCommand.class).usingGetClass() 140 140 .withPrefabValues(OsmPrimitive.class, -
trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java
r10663 r10758 257 257 */ 258 258 @Test 259 public void equalsContract() {259 public void testEqualsContract() { 260 260 EqualsVerifier.forClass(AddPrimitivesCommand.class).usingGetClass() 261 261 .withPrefabValues(DataSet.class, -
trunk/test/unit/org/openstreetmap/josm/command/ChangeCommandTest.java
r10663 r10758 152 152 */ 153 153 @Test 154 public void equalsContract() {154 public void testEqualsContract() { 155 155 EqualsVerifier.forClass(ChangeCommand.class).usingGetClass() 156 156 .withPrefabValues(DataSet.class, -
trunk/test/unit/org/openstreetmap/josm/command/ChangeNodesCommandTest.java
r10663 r10758 124 124 */ 125 125 @Test 126 public void equalsContract() {126 public void testEqualsContract() { 127 127 EqualsVerifier.forClass(ChangeNodesCommand.class).usingGetClass() 128 128 .withPrefabValues(Way.class, -
trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyCommandTest.java
r10663 r10758 278 278 */ 279 279 @Test 280 public void equalsContract() {280 public void testEqualsContract() { 281 281 EqualsVerifier.forClass(ChangePropertyCommand.class).usingGetClass() 282 282 .withPrefabValues(DataSet.class, -
trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyKeyCommandTest.java
r10663 r10758 148 148 */ 149 149 @Test 150 public void equalsContract() {150 public void testEqualsContract() { 151 151 EqualsVerifier.forClass(ChangePropertyKeyCommand.class).usingGetClass() 152 152 .withPrefabValues(DataSet.class, -
trunk/test/unit/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommandTest.java
r10663 r10758 145 145 */ 146 146 @Test 147 public void equalsContract() {147 public void testEqualsContract() { 148 148 EqualsVerifier.forClass(ChangeRelationMemberRoleCommand.class).usingGetClass() 149 149 .withPrefabValues(Relation.class, -
trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java
r10663 r10758 81 81 */ 82 82 @Test 83 public void equalsContract() {83 public void testEqualsContract() { 84 84 EqualsVerifier.forClass(Command.class).usingGetClass() 85 85 .withPrefabValues(DataSet.class, -
trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java
r10663 r10758 376 376 */ 377 377 @Test 378 public void equalsContract() {378 public void testEqualsContract() { 379 379 EqualsVerifier.forClass(DeleteCommand.class).usingGetClass() 380 380 .withPrefabValues(DataSet.class, -
trunk/test/unit/org/openstreetmap/josm/command/MoveCommandTest.java
r10663 r10758 259 259 */ 260 260 @Test 261 public void equalsContract() {261 public void testEqualsContract() { 262 262 EqualsVerifier.forClass(MoveCommand.class).usingGetClass() 263 263 .withPrefabValues(LatLon.class, -
trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java
r10663 r10758 144 144 */ 145 145 @Test 146 public void equalsContract() {146 public void testEqualsContract() { 147 147 EqualsVerifier.forClass(PurgeCommand.class).usingGetClass() 148 148 .withPrefabValues(DataSet.class, -
trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java
r10663 r10758 122 122 */ 123 123 @Test 124 public void equalsContract() {124 public void testEqualsContract() { 125 125 EqualsVerifier.forClass(RemoveNodesCommand.class).usingGetClass() 126 126 .withPrefabValues(Way.class, -
trunk/test/unit/org/openstreetmap/josm/command/RotateCommandTest.java
r10663 r10758 133 133 */ 134 134 @Test 135 public void equalsContract() {135 public void testEqualsContract() { 136 136 EqualsVerifier.forClass(RotateCommand.class).usingGetClass() 137 137 .withPrefabValues(LatLon.class, LatLon.ZERO, new LatLon(45, 45)) -
trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java
r10663 r10758 133 133 */ 134 134 @Test 135 public void equalsContract() {135 public void testEqualsContract() { 136 136 EqualsVerifier.forClass(ScaleCommand.class).usingGetClass() 137 137 .withPrefabValues(LatLon.class, -
trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java
r10663 r10758 147 147 */ 148 148 @Test 149 public void equalsContract() {149 public void testEqualsContract() { 150 150 EqualsVerifier.forClass(SelectCommand.class).usingGetClass() 151 151 .withPrefabValues(DataSet.class, -
trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java
r10663 r10758 170 170 */ 171 171 @Test 172 public void equalsContract() {172 public void testEqualsContract() { 173 173 EqualsVerifier.forClass(SequenceCommand.class).usingGetClass() 174 174 .withPrefabValues(Command.class, -
trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java
r9943 r10758 30 30 */ 31 31 @Test 32 public void equalsContract() {32 public void testEqualsContract() { 33 33 EqualsVerifier.forClass(TransformNodesCommand.class).usingGetClass() 34 34 .withPrefabValues(LatLon.class, -
trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java
r10436 r10758 76 76 */ 77 77 @Test 78 public void equalsContract() {78 public void testEqualsContract() { 79 79 EqualsVerifier.forClass(ConflictAddCommand.class).usingGetClass() 80 80 .withPrefabValues(DataSet.class, -
trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java
r9943 r10758 31 31 */ 32 32 @Test 33 public void equalsContract() {33 public void testEqualsContract() { 34 34 EqualsVerifier.forClass(ConflictResolveCommand.class).usingGetClass() 35 35 .withPrefabValues(Conflict.class, -
trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java
r10436 r10758 91 91 */ 92 92 @Test 93 public void equalsContract() {93 public void testEqualsContract() { 94 94 EqualsVerifier.forClass(CoordinateConflictResolveCommand.class).usingGetClass() 95 95 .withPrefabValues(Conflict.class, -
trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java
r9943 r10758 32 32 */ 33 33 @Test 34 public void equalsContract() {34 public void testEqualsContract() { 35 35 EqualsVerifier.forClass(DeletedStateConflictResolveCommand.class).usingGetClass() 36 36 .withPrefabValues(Conflict.class, -
trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java
r9943 r10758 32 32 */ 33 33 @Test 34 public void equalsContract() {34 public void testEqualsContract() { 35 35 EqualsVerifier.forClass(ModifiedConflictResolveCommand.class).usingGetClass() 36 36 .withPrefabValues(Conflict.class, -
trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java
r9943 r10758 32 32 */ 33 33 @Test 34 public void equalsContract() {34 public void testEqualsContract() { 35 35 EqualsVerifier.forClass(RelationMemberConflictResolverCommand.class).usingGetClass() 36 36 .withPrefabValues(Relation.class, -
trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java
r9943 r10758 32 32 */ 33 33 @Test 34 public void equalsContract() {34 public void testEqualsContract() { 35 35 EqualsVerifier.forClass(TagConflictResolveCommand.class).usingGetClass() 36 36 .withPrefabValues(Conflict.class, -
trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java
r9943 r10758 32 32 */ 33 33 @Test 34 public void equalsContract() {34 public void testEqualsContract() { 35 35 EqualsVerifier.forClass(VersionConflictResolveCommand.class).usingGetClass() 36 36 .withPrefabValues(Conflict.class, -
trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java
r9943 r10758 32 32 */ 33 33 @Test 34 public void equalsContract() {34 public void testEqualsContract() { 35 35 EqualsVerifier.forClass(WayNodesConflictResolverCommand.class).usingGetClass() 36 36 .withPrefabValues(Conflict.class, -
trunk/test/unit/org/openstreetmap/josm/data/BoundsTest.java
r9498 r10758 15 15 16 16 @Test 17 public void crossingTests() {17 public void testCrossing() { 18 18 Bounds b1 = new Bounds(0, 170, 50, -170); 19 19 assertTrue(b1.crosses180thMeridian()); -
trunk/test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java
r10334 r10758 28 28 */ 29 29 @Test 30 public void equalsContract() {30 public void testEqualsContract() { 31 31 EqualsVerifier.forClass(CachedLatLon.class).usingGetClass() 32 32 .suppress(Warning.NONFINAL_FIELDS) -
trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
r10378 r10758 130 130 */ 131 131 @Test 132 public void equalsContract() {132 public void testEqualsContract() { 133 133 EqualsVerifier.forClass(LatLon.class).usingGetClass() 134 134 .withPrefabValues(DecimalFormat.class, new DecimalFormat("00.0"), new DecimalFormat("00.000")) -
trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java
r10378 r10758 77 77 */ 78 78 @Test 79 public void testEPSG4326 _widebounds() {79 public void testEPSG4326widebounds() { 80 80 Main.setProjection(new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=-180,53,180,54")); 81 81 TemplatedWMSTileSource source = getSource(); … … 89 89 */ 90 90 @Test 91 public void testEPSG4326 _narrowbounds() {91 public void testEPSG4326narrowbounds() { 92 92 Main.setProjection(new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=18,-90,20,90")); 93 93 TemplatedWMSTileSource source = getSource(); … … 117 117 */ 118 118 @Test 119 public void testEPSG3006 _withbounds() {119 public void testEPSG3006withbounds() { 120 120 Main.setProjection( 121 121 new CustomProjection("+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 " … … 132 132 */ 133 133 @Test 134 public void testEPSG3006 _withoutbounds() {134 public void testEPSG3006withoutbounds() { 135 135 Main.setProjection( 136 136 new CustomProjection("+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 " -
trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
r10378 r10758 215 215 216 216 @Test 217 public void test 12168() throws IOException {217 public void testTicket12168() throws IOException { 218 218 Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); 219 219 WMTSTileSource testSource = new WMTSTileSource(testImagery12168); -
trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java
r10098 r10758 57 57 */ 58 58 @Test 59 public void equalsContract() {59 public void testEqualsContract() { 60 60 EqualsVerifier.forClass(Note.class).usingGetClass() 61 61 .withIgnoredFields("latLon", "createdAt", "closedAt", "state", "comments") -
trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java
r10222 r10758 58 58 */ 59 59 @Test 60 public void equalsContract() {60 public void testEqualsContract() { 61 61 EqualsVerifier.forClass(OAuthParameters.class).usingGetClass().verify(); 62 62 } -
trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthTokenTest.java
r10201 r10758 33 33 */ 34 34 @Test 35 public void equalsContract() {35 public void testEqualsContract() { 36 36 EqualsVerifier.forClass(OAuthToken.class).usingGetClass().verify(); 37 37 } -
trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
r8857 r10758 28 28 29 29 @Test 30 public void oneNewRelationOnly() {30 public void testOneNewRelationOnly() { 31 31 Relation r = new Relation(); 32 32 r.put("name", "r1"); … … 48 48 49 49 @Test 50 public void newParentChildPair() {50 public void testNewParentChildPair() { 51 51 DataSet ds = new DataSet(); 52 52 Relation r1 = new Relation(); … … 75 75 76 76 @Test 77 public void oneExistingAndThreNewInAChain() {77 public void testOneExistingAndThreNewInAChain() { 78 78 DataSet ds = new DataSet(); 79 79 … … 118 118 119 119 @Test 120 public void oneParentTwoNewChildren() {120 public void testOneParentTwoNewChildren() { 121 121 DataSet ds = new DataSet(); 122 122 Relation r1 = new Relation(); … … 151 151 152 152 @Test // for ticket #9624 153 public void deleteOneParentTwoNewChildren() {153 public void testDeleteOneParentTwoNewChildren() { 154 154 DataSet ds = new DataSet(); 155 155 Relation r1 = new Relation(1); … … 198 198 199 199 @Test // for ticket #9656 200 public void deleteWay() {200 public void testDeleteWay() { 201 201 DataSet ds = new DataSet(); 202 202 final Way way = new Way(1, 2); … … 239 239 240 240 @Test 241 public void oneCycle() {241 public void testOneCycle() { 242 242 DataSet ds = new DataSet(); 243 243 Relation r1 = new Relation(); -
trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
r10336 r10758 26 26 */ 27 27 @Test 28 public void equalsContract() {28 public void testEqualsContract() { 29 29 EqualsVerifier.forClass(BBox.class).usingGetClass() 30 30 .suppress(Warning.NONFINAL_FIELDS) -
trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
r10378 r10758 81 81 */ 82 82 @Test 83 public void nodeSimple_IdenticalNoConflict() {83 public void testNodeSimpleIdenticalNoConflict() { 84 84 Node n = new Node(LatLon.ZERO); 85 85 n.setOsmId(1, 1); … … 113 113 * two nodes, my is unmodified, their is updated and has a higher version 114 114 * => their version is going to be the merged version 115 * 116 */ 117 @Test 118 public void nodeSimple_locallyUnmodifiedNoConflict() { 115 */ 116 @Test 117 public void testNodeSimpleLocallyUnmodifiedNoConflict() { 119 118 Node n = new Node(LatLon.ZERO); 120 119 n.setOsmId(1, 1); … … 156 155 */ 157 156 @Test 158 public void nodeSimple_TagConflict() {157 public void testNodeSimpleTagConflict() { 159 158 Node n = new Node(LatLon.ZERO); 160 159 n.setOsmId(1, 1); … … 190 189 */ 191 190 @Test 192 public void nodeSimple_DeleteConflict() {191 public void testNodeSimpleDeleteConflict() { 193 192 Node n = new Node(1, 1); 194 193 n.setCoor(LatLon.ZERO); … … 218 217 * My node is deleted, their node has the same id and version and is not deleted. 219 218 * => mine has precedence 220 * 221 */ 222 @Test 223 public void nodeSimple_DeleteConflict_2() { 219 */ 220 @Test 221 public void testNodeSimpleDeleteConflict2() { 224 222 Node n = new Node(LatLon.ZERO); 225 223 n.setOsmId(1, 1); … … 249 247 */ 250 248 @Test 251 public void nodeSimple_DeleteConflict_3() {249 public void testNodeSimpleDeleteConflict3() { 252 250 Node n = new Node(new LatLon(1, 1)); 253 251 n.setDeleted(true); … … 270 268 * 271 269 * => take mine 272 * 273 */ 274 @Test 275 public void nodeSimple_DeleteConflict_4() { 270 */ 271 @Test 272 public void testNodeSimpleDeleteConflict4() { 276 273 Node n = new Node(new LatLon(1, 1)); 277 274 n.setDeleted(true); … … 282 279 their.addPrimitive(n1); 283 280 284 285 281 DataSetMerger visitor = new DataSetMerger(my, their); 286 282 visitor.merge(); … … 297 293 * 298 294 * => merge it onto my node. 299 * 300 */ 301 @Test 302 public void nodeSimple_NoIdSemanticallyEqual() { 295 */ 296 @Test 297 public void testNodeSimpleNoIdSemanticallyEqual() { 303 298 304 299 Calendar cal = GregorianCalendar.getInstance(); … … 341 336 * 342 337 * => merge it onto my node. My node becomes complete 343 * 344 */ 345 @Test 346 public void nodeSimple_IncompleteNode() { 338 */ 339 @Test 340 public void testNodeSimpleIncompleteNode() { 347 341 348 342 Node n = new Node(1); … … 373 367 * 374 368 * => merge it onto my way. 375 * 376 */ 377 @Test 378 public void waySimple_IdenicalNodesDifferentTags() { 369 */ 370 @Test 371 public void testWaySimpleIdenticalNodesDifferentTags() { 379 372 380 373 // -- the target dataset … … 446 439 * 447 440 * => merge it onto my way, no conflict 448 * 449 */ 450 @Test 451 public void waySimple_AdditionalNodesAndChangedNodes() { 441 */ 442 @Test 443 public void testWaySimpleAdditionalNodesAndChangedNodes() { 452 444 453 445 // -- my data set … … 516 508 * 517 509 * => merge onto my way not possible, create a conflict 518 * 519 */ 520 @Test 521 public void waySimple_DifferentNodesAndMyIsModified() { 510 */ 511 @Test 512 public void testWaySimpleDifferentNodesAndMyIsModified() { 522 513 523 514 // -- the target dataset … … 581 572 * 582 573 * => conflict 583 * 584 */ 585 @Test 586 public void waySimple_TheirVersionNotVisibleMyIsModified() { 574 */ 575 @Test 576 public void testWaySimpleTheirVersionNotVisibleMyIsModified() { 587 577 588 578 Node mn1 = new Node(LatLon.ZERO); … … 624 614 * my and their way are semantically equal. so technical attributes of 625 615 * their way can be merged on my way. No conflict. 626 * 627 */ 628 @Test 629 public void waySimple_twoWaysWithNoId_NodesWithId() { 616 */ 617 @Test 618 public void testWaySimpleTwoWaysWithNoIdNodesWithId() { 630 619 631 620 // -- my data set … … 682 671 * my and their way are semantically equal. so technical attributes of 683 672 * their way can be merged on my way. No conflict. 684 * 685 */ 686 @Test 687 public void waySimple_twoWaysWithNoId_NodesWithoutId() { 673 */ 674 @Test 675 public void testWaySimpleTwoWaysWithNoIdNodesWithoutId() { 688 676 689 677 // -- my data set … … 738 726 * => the merged way should include all three nodes. Deleted node should have deleted=false and 739 727 * special conflict with isDeleted should exist 740 * 741 */ 742 @Test 743 public void wayComplex_mergingADeletedNode() { 728 */ 729 @Test 730 public void testWayComplexMergingADeletedNode() { 744 731 745 732 // -- my dataset … … 793 780 * => the merged relation should include all three nodes. There should be conflict for deleted 794 781 * node with isMyDeleted set 795 * 796 */ 797 @Test 798 public void relationComplex_mergingADeletedNode() { 782 */ 783 @Test 784 public void testRelationComplexMergingADeletedNode() { 799 785 800 786 Node mn1 = new Node(LatLon.ZERO); … … 803 789 my.addPrimitive(mn1); 804 790 805 806 791 Node tn1 = new Node(LatLon.ZERO); 807 792 tn1.setOsmId(1, 1); … … 815 800 tn3.setOsmId(3, 1); 816 801 their.addPrimitive(tn3); 817 818 802 819 803 Relation theirRelation = new Relation(); … … 847 831 */ 848 832 @Test 849 public void newIncompleteWay() {833 public void testNewIncompleteWay() { 850 834 851 835 Node n1 = new Node(1); … … 889 873 */ 890 874 @Test 891 public void incompleteWayOntoCompleteWay() {875 public void testIncompleteWayOntoCompleteWay() { 892 876 893 877 // an incomplete node … … 944 928 */ 945 929 @Test 946 public void t woCompleteNodesOntoAnIncompleteWay() {930 public void testTwoCompleteNodesOntoAnIncompleteWay() { 947 931 948 932 // -- source dataset -
trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
r10222 r10758 6 6 7 7 import java.io.FileInputStream; 8 import java.io.IOException;9 8 import java.io.InputStream; 10 9 import java.util.Arrays; … … 21 20 import org.openstreetmap.josm.data.coor.LatLon; 22 21 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 23 import org.openstreetmap.josm.io.IllegalDataException;24 22 import org.openstreetmap.josm.io.OsmReader; 25 23 … … 38 36 39 37 @Test 40 public void basic() throws ParseError {38 public void testBasic() throws ParseError { 41 39 DataSet ds = new DataSet(); 42 40 Node n1 = new Node(LatLon.ZERO); … … 66 64 67 65 @Test 68 public void filter() throws ParseError, IllegalDataException, IOException {66 public void testFilter() throws Exception { 69 67 for (int i : new int[] {1, 2, 3, 11, 12, 13, 14, 15}) { 70 68 DataSet ds; -
trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java
r10222 r10758 31 31 */ 32 32 @Test 33 public void emptyNode() {33 public void testEmptyNode() { 34 34 Node n = new Node(); 35 35 testKeysSize(n, 0); … … 45 45 */ 46 46 @Test 47 public void put() {47 public void testPut() { 48 48 Node n = new Node(); 49 49 n.put("akey", "avalue"); … … 57 57 */ 58 58 @Test 59 public void put2() {59 public void testPut2() { 60 60 Node n = new Node(); 61 61 n.put("key.1", "value.1"); … … 75 75 @Test 76 76 @SuppressFBWarnings(value = "DM_STRING_CTOR", justification = "test that equals is used and not ==") 77 public void remove() {77 public void testRemove() { 78 78 Node n = new Node(); 79 79 n.put("key.1", "value.1"); … … 107 107 */ 108 108 @Test 109 public void removeAll() {109 public void testRemoveAll() { 110 110 Node n = new Node(); 111 111 … … 122 122 */ 123 123 @Test 124 public void hasEqualSemanticAttributes() {124 public void testHasEqualSemanticAttributes() { 125 125 Node n1 = new Node(1); 126 126 n1.setCoor(LatLon.ZERO); … … 140 140 */ 141 141 @Test 142 public void hasEqualSemanticAttributes_2() {142 public void testHasEqualSemanticAttributes_2() { 143 143 Node n1 = new Node(1); 144 144 n1.setCoor(LatLon.ZERO); -
trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java
r9489 r10758 42 42 43 43 @Test 44 public void simpleReferrersTest() {44 public void testSimpleReferrersTest() { 45 45 Node n1 = new Node(LatLon.ZERO); 46 46 Way w1 = new Way(); … … 52 52 53 53 @Test 54 public void addAndRemoveReferrer() {54 public void testAddAndRemoveReferrer() { 55 55 Node n1 = new Node(LatLon.ZERO); 56 56 Node n2 = new Node(LatLon.ZERO); … … 68 68 69 69 @Test 70 public void multipleReferrers() {70 public void testMultipleReferrers() { 71 71 Node n1 = new Node(LatLon.ZERO); 72 72 Way w1 = new Way(); … … 84 84 85 85 @Test 86 public void removeMemberFromRelationReferrerTest() {86 public void testRemoveMemberFromRelationReferrerTest() { 87 87 Node n1 = new Node(LatLon.ZERO); 88 88 Relation r1 = new Relation(); … … 96 96 97 97 @Test 98 public void setRelationMemberReferrerTest() {98 public void testSetRelationMemberReferrerTest() { 99 99 Node n1 = new Node(LatLon.ZERO); 100 100 Node n2 = new Node(LatLon.ZERO); … … 113 113 114 114 @Test 115 public void removePrimitiveReferrerTest() {115 public void testRemovePrimitiveReferrerTest() { 116 116 Node n1 = new Node(LatLon.ZERO); 117 117 Way w1 = new Way(); … … 135 135 136 136 @Test 137 public void nodeFromMultipleDatasets() {137 public void testNodeFromMultipleDatasets() { 138 138 // n has two referrers - w1 and w2. But only w1 is returned because it is in the same dataset as n 139 139 Node n = new Node(LatLon.ZERO); … … 150 150 151 151 @Test(expected = DataIntegrityProblemException.class) 152 public void checkMustBeInDatasate() {152 public void testCheckMustBeInDatasate() { 153 153 Node n = new Node(); 154 154 n.getReferrers(); -
trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java
r10222 r10758 23 23 24 24 @Test(expected = NullPointerException.class) 25 public void createNewRelation() {25 public void testCreateNewRelation() { 26 26 new Relation(null); 27 27 } 28 28 29 29 @Test 30 public void equalSemenaticsToNull() {30 public void testEqualSemanticsToNull() { 31 31 Relation relation = new Relation(); 32 32 assertFalse(relation.hasEqualTechnicalAttributes(null)); -
trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java
r9498 r10758 19 19 */ 20 20 @Test 21 public void latLon2Cart2LatLon() {21 public void testLatLon2Cart2LatLon() { 22 22 Random r = new Random(System.currentTimeMillis()); 23 23 double maxErrLat = 0, maxErrLon = 0; -
trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
r10222 r10758 278 278 279 279 @Test 280 public void test () throws IOException {280 public void testProjections() throws IOException { 281 281 StringBuilder fail = new StringBuilder(); 282 282 Set<String> allCodes = new HashSet<>(Projections.getAllProjectionCodes()); -
trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
r10065 r10758 164 164 */ 165 165 @Test 166 public void regressionTest() throws IOException {166 public void testNonRegression() throws IOException { 167 167 List<TestData> allData = readData(); 168 168 Set<String> dataCodes = new HashSet<>(); -
trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java
r9950 r10758 24 24 25 25 @Test 26 public void projections() {26 public void testProjections() { 27 27 error = false; 28 28 text = ""; … … 104 104 105 105 @Test 106 public void projs() {106 public void testProjs() { 107 107 error2 = false; 108 108 text2 = ""; -
trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java
r10378 r10758 13 13 14 14 public class SwissGridTest { 15 p ublicstatic final String SWISS_EPSG_CODE = "EPSG:21781";15 private static final String SWISS_EPSG_CODE = "EPSG:21781"; 16 16 private boolean debug = false; 17 17 … … 56 56 } 57 57 58 p ublicstatic final double EPSILON_APPROX = 1.5;59 p ublicstatic final double EPSILON_ACCURATE = 0.05;60 61 p ublicvoid projReferenceTest(final double epsilon) {58 private static final double EPSILON_APPROX = 1.5; 59 private static final double EPSILON_ACCURATE = 0.05; 60 61 private void projReferenceTest(final double epsilon) { 62 62 Projection swiss = Projections.getProjectionByCode("EPSG:21781"); // Swiss grid 63 63 StringBuilder errs = new StringBuilder(); … … 72 72 73 73 @Test 74 public void projReferenceTestApprox() {74 public void testProjReferenceTestApprox() { 75 75 projReferenceTest(EPSILON_APPROX); 76 76 } … … 78 78 @Test 79 79 @Ignore("high accuracy of epsilon=" + EPSILON_ACCURATE + " is not met") 80 public void projReferenceTestAccurate() {80 public void testProjReferenceTestAccurate() { 81 81 // TODO make this test pass 82 82 projReferenceTest(EPSILON_ACCURATE); … … 84 84 85 85 @Test 86 public void a_latlon2eastNorth_test() {86 public void testAlatlon2eastNorth() { 87 87 LatLon ll = new LatLon(46.518, 6.567); 88 88 EastNorth en = Main.getProjection().latlon2eastNorth(ll); … … 127 127 128 128 @Test 129 public void b_eastNorth2latlon_test() {129 public void testBeastNorth2latlon() { 130 130 EastNorth en = new EastNorth(533111.69, 152227.85); 131 131 LatLon ll = Main.getProjection().eastNorth2latlon(en); … … 173 173 */ 174 174 @Test 175 public void c_sendandreturn_test() {175 public void testCsendandreturn() { 176 176 EastNorth en = new EastNorth(533111.69, 152227.85); 177 177 LatLon ll = Main.getProjection().eastNorth2latlon(en); -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java
r7937 r10758 29 29 */ 30 30 @Test 31 public void test () {31 public void testDuplicateNode() { 32 32 DataSet ds = new DataSet(); 33 33 -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
r10710 r10758 86 86 87 87 @Test 88 public void test 10913() throws Exception {88 public void testTicket10913() throws Exception { 89 89 final OsmPrimitive p = OsmUtils.createPrimitive("way highway=tertiary construction=yes"); 90 90 final TagCheck check = TagCheck.readMapCSS(new StringReader("way {" + … … 101 101 102 102 @Test 103 public void test 9782() throws Exception {103 public void testTicket9782() throws Exception { 104 104 final MapCSSTagChecker test = buildTagChecker("*[/.+_name/][!name] {" + 105 105 "throwWarning: tr(\"has {0} but not {1}\", \"{0.key}\", \"{1.key}\");}"); … … 112 112 113 113 @Test 114 public void test 10859() throws Exception {114 public void testTicket10859() throws Exception { 115 115 final MapCSSTagChecker test = buildTagChecker("way[highway=footway][foot?!] {\n" + 116 116 " throwWarning: tr(\"{0} used with {1}\", \"{0.value}\", \"{1.tag}\");}"); -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java
r10218 r10758 35 35 */ 36 36 @Test 37 public void test 0() {37 public void testCase0() { 38 38 final List<TestError> errors = test("node name:de=Europa"); 39 39 assertEquals(1, errors.size()); … … 45 45 */ 46 46 @Test 47 public void test 1() {47 public void testCase1() { 48 48 final List<TestError> errors = test("node name=Europe name:de=Europa"); 49 49 assertEquals(1, errors.size()); … … 55 55 */ 56 56 @Test 57 public void test 2() {57 public void testCase2() { 58 58 final List<TestError> errors = test("node name=Europe name:de=Europa name:en=Europe"); 59 59 assertEquals(0, errors.size()); … … 64 64 */ 65 65 @Test 66 public void test 3() {66 public void testCase3() { 67 67 List<TestError> errors; 68 68 errors = test("node \"name\"=\"Italia - Italien - Italy\""); -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java
r10141 r10758 35 35 */ 36 36 @Test 37 public void test () {37 public void testVarious() { 38 38 final List<Node> nodes = Arrays.asList(new Node(), new Node(), new Node(), new Node(), new Node(), new Node()); 39 39 final Way w1 = TestUtils.newWay("", nodes.get(0), nodes.get(1)); -
trunk/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.java
r10225 r10758 55 55 */ 56 56 @Test 57 public void t ableCellRendererTest() {57 public void testTableCellRenderer() { 58 58 Reflections reflections = new Reflections("org.openstreetmap.josm"); 59 59 Set<Class<? extends TableCellRenderer>> renderers = reflections.getSubTypesOf(TableCellRenderer.class); -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java
r10626 r10758 79 79 80 80 @Test 81 public void test _copyMyNodesToTop_1() {81 public void testCopyMyNodesToTop1() { 82 82 NodeListMergeModel model = new NodeListMergeModel(); 83 83 … … 101 101 102 102 @Test 103 public void test _copyMyNodesToTop_2() {103 public void testCopyMyNodesToTop2() { 104 104 NodeListMergeModel model = new NodeListMergeModel(); 105 105 … … 127 127 128 128 @Test 129 public void test _copyMyNodesToTop_3() {129 public void testCopyMyNodesToTop3() { 130 130 NodeListMergeModel model = new NodeListMergeModel(); 131 131 … … 153 153 154 154 @Test 155 public void test _copyMyNodesToTop_4() {155 public void testCopyMyNodesToTop4() { 156 156 NodeListMergeModel model = new NodeListMergeModel(); 157 157 … … 180 180 181 181 @Test 182 public void test _copyMyNodesToEnd_1() {182 public void testCopyMyNodesToEnd1() { 183 183 NodeListMergeModel model = new NodeListMergeModel(); 184 184 … … 201 201 202 202 @Test 203 public void test _copyMyNodesToEnd_2() {203 public void testCopyMyNodesToEnd2() { 204 204 NodeListMergeModel model = new NodeListMergeModel(); 205 205 … … 226 226 227 227 @Test 228 public void test _copyMyNodesToEnd_3() {228 public void testCopyMyNodesToEnd3() { 229 229 NodeListMergeModel model = new NodeListMergeModel(); 230 230 … … 253 253 254 254 @Test 255 public void test _copyMyNodesToEnd_4() {255 public void testCopyMyNodesToEnd4() { 256 256 NodeListMergeModel model = new NodeListMergeModel(); 257 257 … … 286 286 287 287 @Test 288 public void test _copyMyNodesBeforeCurrent_1() {288 public void testCopyMyNodesBeforeCurrent1() { 289 289 NodeListMergeModel model = new NodeListMergeModel(); 290 290 … … 313 313 314 314 @Test 315 public void test _copyMyNodesBeforeCurrent_2() {315 public void testCopyMyNodesBeforeCurrent2() { 316 316 NodeListMergeModel model = new NodeListMergeModel(); 317 317 … … 341 341 342 342 @Test 343 public void test _copyMyNodesBeforeCurrent_3() {343 public void testCopyMyNodesBeforeCurrent3() { 344 344 NodeListMergeModel model = new NodeListMergeModel(); 345 345 … … 376 376 /* ----------------------------------------------------------------------------- */ 377 377 @Test 378 public void test _copyMyNodesAfterCurrent_1() {378 public void testCopyMyNodesAfterCurrent1() { 379 379 NodeListMergeModel model = new NodeListMergeModel(); 380 380 … … 403 403 404 404 @Test 405 public void test _copyMyNodesAfterCurrent_2() {405 public void testCopyMyNodesAfterCurrent2() { 406 406 NodeListMergeModel model = new NodeListMergeModel(); 407 407 … … 432 432 433 433 @Test 434 public void test _copyMyNodesAfterCurrent_3() {434 public void testCopyMyNodesAfterCurrent3() { 435 435 NodeListMergeModel model = new NodeListMergeModel(); 436 436 … … 465 465 /* ----------------------------------------------------------------------------- */ 466 466 @Test 467 public void test _moveUpMergedNodes_1() {467 public void testMoveUpMergedNodes1() { 468 468 NodeListMergeModel model = new NodeListMergeModel(); 469 469 … … 491 491 492 492 @Test 493 public void test _moveUpMergedNodes_2() {493 public void testMoveUpMergedNodes2() { 494 494 NodeListMergeModel model = new NodeListMergeModel(); 495 495 … … 521 521 522 522 @Test 523 public void test _moveUpMergedNodes_3() {523 public void testMoveUpMergedNodes3() { 524 524 NodeListMergeModel model = new NodeListMergeModel(); 525 525 … … 554 554 /* ----------------------------------------------------------------------------- */ 555 555 @Test 556 public void test _moveDownMergedNodes_1() {556 public void testMoveDownMergedNodes1() { 557 557 NodeListMergeModel model = new NodeListMergeModel(); 558 558 … … 580 580 581 581 @Test 582 public void test _moveDownMergedNodes_2() {582 public void testMoveDownMergedNodes2() { 583 583 NodeListMergeModel model = new NodeListMergeModel(); 584 584 … … 610 610 611 611 @Test 612 public void test _moveDownMergedNodes_3() {612 public void testMoveDownMergedNodes3() { 613 613 NodeListMergeModel model = new NodeListMergeModel(); 614 614 … … 644 644 @SuppressWarnings("unchecked") 645 645 @Test 646 public void addPropertyChangeListener() {646 public void testAddPropertyChangeListener() { 647 647 NodeListMergeModel model = new NodeListMergeModel(); 648 648 … … 666 666 @SuppressWarnings("unchecked") 667 667 @Test 668 public void removePropertyChangeListener() {668 public void testRemovePropertyChangeListener() { 669 669 NodeListMergeModel model = new NodeListMergeModel(); 670 670 … … 690 690 /* ----------------------------------------------------------------------------- */ 691 691 @Test 692 public void setFrozen() {692 public void testSetFrozen() { 693 693 NodeListMergeModel model = new NodeListMergeModel(); 694 694 model.setFrozen(true); … … 700 700 701 701 @Test 702 public void setFrozenWithPropertyChangeNotification() {702 public void testSetFrozenWithPropertyChangeNotification() { 703 703 NodeListMergeModel model = new NodeListMergeModel(); 704 704 -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModelTest.java
r10210 r10758 63 63 64 64 @Test 65 public void populate() {65 public void testPopulate() { 66 66 DataSet d1 = new DataSet(); 67 67 DataSet d2 = new DataSet(); … … 86 86 87 87 @Test 88 public void decidingAboutCoords() {88 public void testDecidingAboutCoords() { 89 89 DataSet d1 = new DataSet(); 90 90 DataSet d2 = new DataSet(); -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java
r10626 r10758 27 27 28 28 @Test 29 public void test _TagMergeItem() {29 public void testTagMergeItem() { 30 30 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 31 31 assertEquals("key", item.getKey()); … … 36 36 37 37 @Test 38 public void test _TagMergeItem_2() {38 public void testTagMergeItem2() { 39 39 Node n1 = new Node(1); 40 40 Node n2 = new Node(1); … … 50 50 51 51 @Test 52 public void test _TagMergeItem_3() {52 public void testTagMergeItem3() { 53 53 Node n1 = new Node(1); 54 54 Node n2 = new Node(1); … … 64 64 65 65 @Test 66 public void test _TagMergeItem_4() {66 public void testTagMergeItem4() { 67 67 Node n1 = new Node(1); 68 68 Node n2 = new Node(1); … … 79 79 80 80 @Test 81 public void test _decide() {81 public void testDecide() { 82 82 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 83 83 item.decide(MergeDecisionType.KEEP_MINE); … … 86 86 87 87 @Test 88 public void test _decide_1() {88 public void testDecide1() { 89 89 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 90 90 try { … … 98 98 99 99 @Test 100 public void test _applyToMyPrimitive() {100 public void testApplyToMyPrimitive() { 101 101 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 102 102 item.decide(MergeDecisionType.KEEP_MINE); … … 113 113 114 114 @Test 115 public void test _applyToMyPrimitive_2() {115 public void testApplyToMyPrimitive2() { 116 116 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 117 117 item.decide(MergeDecisionType.KEEP_THEIR); … … 128 128 129 129 @Test 130 public void test _applyToMyPrimitive_3() {130 public void testApplyToMyPrimitive3() { 131 131 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 132 132 // item is undecided … … 145 145 146 146 @Test 147 public void test _applyToMyPrimitive_4() {147 public void testApplyToMyPrimitive4() { 148 148 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 149 149 -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModelTest.java
r9547 r10758 32 32 33 33 @Test 34 public void addPropertyChangeListener() {34 public void testAddPropertyChangeListener() { 35 35 TagMergeModel model = new TagMergeModel(); 36 36 PropertyChangeListener listener = new PropertyChangeListener() { … … 50 50 51 51 @Test 52 public void removePropertyChangeListener() {52 public void testRemovePropertyChangeListener() { 53 53 TagMergeModel model = new TagMergeModel(); 54 54 PropertyChangeListener listener = new PropertyChangeListener() { … … 69 69 70 70 @Test 71 public void populateNoConflichts() {71 public void testPopulateNoConflichts() { 72 72 Node my = new Node(1); 73 73 Node their = new Node(1); … … 84 84 85 85 @Test 86 public void populateNoConflicts1() {86 public void testPopulateNoConflicts1() { 87 87 Node my = new Node(1); 88 88 my.put("key", "value"); … … 101 101 102 102 @Test 103 public void populateMissingKeyMine() {103 public void testPopulateMissingKeyMine() { 104 104 Node my = new Node(1); 105 105 Node their = new Node(1); … … 122 122 123 123 @Test 124 public void populateMissingKeyTheir() {124 public void testPopulateMissingKeyTheir() { 125 125 Node my = new Node(1); 126 126 my.put("key", "value"); … … 143 143 144 144 @Test 145 public void populateConflictingValues() {145 public void testPopulateConflictingValues() { 146 146 Node my = new Node(1); 147 147 my.put("key", "myvalue"); … … 165 165 166 166 @Test 167 public void addItem() {167 public void testAddItem() { 168 168 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 169 169 TagMergeModel model = new TagMergeModel(); … … 184 184 185 185 @Test 186 public void decide() {186 public void testDecide() { 187 187 TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue"); 188 188 TagMergeModel model = new TagMergeModel(); … … 211 211 212 212 @Test 213 public void decideMultiple() {213 public void testDecideMultiple() { 214 214 215 215 TagMergeModel model = new TagMergeModel(); -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollectionTest.java
r9958 r10758 36 36 */ 37 37 @Test 38 public void test () throws SearchCompiler.ParseError {38 public void testVarious() throws SearchCompiler.ParseError { 39 39 final RecentTagCollection recentTags = new RecentTagCollection(2); 40 40 assertTrue(recentTags.isEmpty()); … … 76 76 recentTags.ignoreTag(new Tag("name", /*all values */""), searchSetting); 77 77 assertEquals(Collections.emptyList(), recentTags.toList()); 78 79 78 } 80 79 } -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java
r9231 r10758 58 58 59 59 @Test 60 public void test 1() {60 public void testCase1() { 61 61 Map<String, Action> actions = new HashMap<>(); 62 62 actions.put("action", new TestAction()); -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java
r10378 r10758 54 54 */ 55 55 @Test 56 public void equalsContract() {56 public void testEqualsContract() { 57 57 EqualsVerifier.forClass(PrefEntry.class).usingGetClass() 58 58 .withIgnoredFields("value", "defaultValue", "isDefault", "changed") -
trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java
r10638 r10758 40 40 */ 41 41 @Test 42 public void test 8954() throws SAXException, IOException {42 public void testTicket8954() throws SAXException, IOException { 43 43 String presetfile = TestUtils.getRegressionDataFile(8954, "preset.xml"); 44 44 final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, false); … … 72 72 */ 73 73 @Test 74 public void readDefaulPresets() throws SAXException, IOException {74 public void testReadDefaulPresets() throws SAXException, IOException { 75 75 String presetfile = "resource://data/defaultpresets.xml"; 76 76 final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, true); -
trunk/test/unit/org/openstreetmap/josm/io/NmeaReaderTest.java
r10475 r10758 36 36 */ 37 37 @Test 38 public void equalsContract() {38 public void testEqualsContract() { 39 39 EqualsVerifier.forClass(NMEA_TYPE.class).verify(); 40 40 } -
trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameTest.java
r9958 r10758 39 39 */ 40 40 @Test 41 public void equalsContract() {41 public void testEqualsContract() { 42 42 EqualsVerifier.forClass(DNSName.class).suppress(Warning.NULL_FIELDS).verify(); 43 43 } -
trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
r10093 r10758 37 37 */ 38 38 @Test 39 public void equalsContract() {39 public void testEqualsContract() { 40 40 EqualsVerifier.forClass(DeprecatedPlugin.class).usingGetClass().verify(); 41 41 } -
trunk/test/unit/org/openstreetmap/josm/tools/MultiMapTest.java
r9764 r10758 20 20 */ 21 21 @Test 22 public void equalsContract() {22 public void testEqualsContract() { 23 23 EqualsVerifier.forClass(MultiMap.class).usingGetClass().verify(); 24 24 } -
trunk/test/unit/org/openstreetmap/josm/tools/PairTest.java
r9669 r10758 16 16 */ 17 17 @Test 18 public void equalsContract() {18 public void testEqualsContract() { 19 19 EqualsVerifier.forClass(Pair.class).suppress(Warning.NONFINAL_FIELDS).verify(); 20 20 } -
trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java
r10553 r10758 114 114 */ 115 115 @Test 116 public void errorDetect() {116 public void testErrorDetect() { 117 117 String txt = "a=2 b=3 4"; 118 118 Map<String, String> tags = TextTagParser.readTagsFromText(txt); -
trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
r10752 r10758 155 155 */ 156 156 @Test 157 public void joinAsHtmlUnorderedList() {157 public void testJoinAsHtmlUnorderedList() { 158 158 List<? extends Object> items = Arrays.asList("1", Integer.valueOf(2)); 159 159 assertEquals("<ul><li>1</li><li>2</li></ul>", Utils.joinAsHtmlUnorderedList(items)); -
trunk/test/unit/org/openstreetmap/josm/tools/WindowGeometryTest.java
r10553 r10758 146 146 */ 147 147 @Test 148 public void equalsContract() {148 public void testEqualsContract() { 149 149 EqualsVerifier.forClass(WindowGeometry.class).usingGetClass() 150 150 .suppress(Warning.NONFINAL_FIELDS)
Note:
See TracChangeset
for help on using the changeset viewer.