Changeset 8510 in josm for trunk/test/unit/org/openstreetmap/josm/gui
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/gui
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy
r7938 r8510 12 12 class JosmUserIdentityManagerTest { 13 13 14 final shouldFail = new GroovyTestCase().&shouldFail 15 16 @BeforeClass 17 public static void initTestCase() { 18 JOSMFixture.createUnitTestFixture().init() 19 } 20 21 @Test 22 public void test_SingletonAccess() { 23 24 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 25 26 // created ? 27 assert im != null 28 29 // registered as listener ? 30 assert Main.pref.@listeners.contains(im) 31 32 JosmUserIdentityManager im2 = JosmUserIdentityManager.getInstance() 33 34 // only one instance 35 assert im == im2 36 } 37 38 @Test 39 public void test_setAnonymouse() { 40 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 41 42 im.setPartiallyIdentified "test" 43 im.setAnonymous() 44 45 assert im.isAnonymous() 46 assert ! im.isPartiallyIdentified() 47 assert ! im.isFullyIdentified() 48 49 assert im.getUserId() == 0 50 assert im.getUserName() == null 51 assert im.getUserInfo() == null 52 } 53 54 @Test 55 public void test_setPartiallyIdentified() { 56 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 57 58 im.setPartiallyIdentified "test" 59 60 shouldFail(IllegalArgumentException) { 61 im.setPartiallyIdentified null 62 } 63 64 shouldFail(IllegalArgumentException) { 65 im.setPartiallyIdentified "" 66 } 67 68 shouldFail(IllegalArgumentException) { 69 im.setPartiallyIdentified " \t " 70 } 71 72 im.setPartiallyIdentified "test" 73 74 assert ! im.isAnonymous() 75 assert im.isPartiallyIdentified() 76 assert ! im.isFullyIdentified() 77 78 assert im.getUserId() == 0 79 assert im.getUserName() == "test" 80 assert im.getUserInfo() == null 81 } 82 83 84 @Test 85 public void test_setFullyIdentified() { 86 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 87 88 UserInfo userInfo = new UserInfo(id: 1, description: "a description") 89 90 im.setFullyIdentified "test", userInfo 91 92 shouldFail(IllegalArgumentException) { 93 im.setFullyIdentified null, userInfo 94 } 95 shouldFail(IllegalArgumentException) { 96 im.setFullyIdentified "", userInfo 97 } 98 shouldFail(IllegalArgumentException) { 99 im.setFullyIdentified " \t ", userInfo 100 } 101 shouldFail(IllegalArgumentException) { 102 im.setFullyIdentified "test", null 103 } 104 105 im.setFullyIdentified "test", userInfo 106 107 assert ! im.isAnonymous() 108 assert ! im.isPartiallyIdentified() 109 assert im.isFullyIdentified() 110 111 assert im.getUserId() == 1 112 assert im.getUserName() == "test" 113 assert im.getUserInfo() == userInfo 114 } 115 116 /** 117 * Preferences include neither an url nor a user name => we have 118 * an anonymous user 119 */ 120 @Test 121 public void initFromPreferences_1() { 122 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 123 124 // reset it 125 im.@userName = null 126 im.@userInfo = null 127 128 Main.pref.put "osm-server.url", null 129 Main.pref.put "osm-server.username", null 130 131 im.initFromPreferences() 132 133 assert im.isAnonymous() 134 } 135 136 /** 137 * Preferences include neither an url nor a user name => we have 138 * an annoymous user 139 */ 140 @Test 141 public void initFromPreferences_2() { 142 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 143 144 // reset it 145 im.@userName = null 146 im.@userInfo = null 147 148 // for this test we disable the listener 149 Main.pref.removePreferenceChangeListener im 150 151 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 152 Main.pref.put "osm-server.username", null 153 154 im.initFromPreferences() 155 156 assert im.isAnonymous() 157 } 158 159 /** 160 * Preferences include an user name => we have a partially identified user 161 */ 162 @Test 163 public void initFromPreferences_3() { 164 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 14 final shouldFail = new GroovyTestCase().&shouldFail 15 16 @BeforeClass 17 public static void initTestCase() { 18 JOSMFixture.createUnitTestFixture().init() 19 } 20 21 @Test 22 public void test_SingletonAccess() { 23 24 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 25 26 // created ? 27 assert im != null 28 29 // registered as listener ? 30 assert Main.pref.@listeners.contains(im) 31 32 JosmUserIdentityManager im2 = JosmUserIdentityManager.getInstance() 33 34 // only one instance 35 assert im == im2 36 } 37 38 @Test 39 public void test_setAnonymouse() { 40 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 41 42 im.setPartiallyIdentified "test" 43 im.setAnonymous() 44 45 assert im.isAnonymous() 46 assert ! im.isPartiallyIdentified() 47 assert ! im.isFullyIdentified() 48 49 assert im.getUserId() == 0 50 assert im.getUserName() == null 51 assert im.getUserInfo() == null 52 } 53 54 @Test 55 public void test_setPartiallyIdentified() { 56 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 57 58 im.setPartiallyIdentified "test" 59 60 shouldFail(IllegalArgumentException) { 61 im.setPartiallyIdentified null 62 } 63 64 shouldFail(IllegalArgumentException) { 65 im.setPartiallyIdentified "" 66 } 67 68 shouldFail(IllegalArgumentException) { 69 im.setPartiallyIdentified " \t " 70 } 71 72 im.setPartiallyIdentified "test" 73 74 assert ! im.isAnonymous() 75 assert im.isPartiallyIdentified() 76 assert ! im.isFullyIdentified() 77 78 assert im.getUserId() == 0 79 assert im.getUserName() == "test" 80 assert im.getUserInfo() == null 81 } 82 83 84 @Test 85 public void test_setFullyIdentified() { 86 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 87 88 UserInfo userInfo = new UserInfo(id: 1, description: "a description") 89 90 im.setFullyIdentified "test", userInfo 91 92 shouldFail(IllegalArgumentException) { 93 im.setFullyIdentified null, userInfo 94 } 95 shouldFail(IllegalArgumentException) { 96 im.setFullyIdentified "", userInfo 97 } 98 shouldFail(IllegalArgumentException) { 99 im.setFullyIdentified " \t ", userInfo 100 } 101 shouldFail(IllegalArgumentException) { 102 im.setFullyIdentified "test", null 103 } 104 105 im.setFullyIdentified "test", userInfo 106 107 assert ! im.isAnonymous() 108 assert ! im.isPartiallyIdentified() 109 assert im.isFullyIdentified() 110 111 assert im.getUserId() == 1 112 assert im.getUserName() == "test" 113 assert im.getUserInfo() == userInfo 114 } 115 116 /** 117 * Preferences include neither an url nor a user name => we have 118 * an anonymous user 119 */ 120 @Test 121 public void initFromPreferences_1() { 122 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 123 124 // reset it 125 im.@userName = null 126 im.@userInfo = null 127 128 Main.pref.put "osm-server.url", null 129 Main.pref.put "osm-server.username", null 130 131 im.initFromPreferences() 132 133 assert im.isAnonymous() 134 } 135 136 /** 137 * Preferences include neither an url nor a user name => we have 138 * an annoymous user 139 */ 140 @Test 141 public void initFromPreferences_2() { 142 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 143 144 // reset it 145 im.@userName = null 146 im.@userInfo = null 165 147 166 148 // for this test we disable the listener 167 Main.pref.removePreferenceChangeListener im 168 169 // reset it 170 im.@userName = null 171 im.@userInfo = null 172 173 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 174 Main.pref.put "osm-server.username", "test" 175 176 im.initFromPreferences() 177 178 assert im.isPartiallyIdentified() 179 } 180 181 /** 182 * Preferences include an user name which is different from the current 183 * user name and we are currently fully identifed => josm user becomes 184 * partially identified 185 */ 186 @Test 187 public void initFromPreferences_4() { 188 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 149 Main.pref.removePreferenceChangeListener im 150 151 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 152 Main.pref.put "osm-server.username", null 153 154 im.initFromPreferences() 155 156 assert im.isAnonymous() 157 } 158 159 /** 160 * Preferences include an user name => we have a partially identified user 161 */ 162 @Test 163 public void initFromPreferences_3() { 164 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 189 165 190 166 // for this test we disable the listener 191 Main.pref.removePreferenceChangeListener im 192 193 im.setFullyIdentified "test1", new UserInfo(id: 1) 194 195 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 196 Main.pref.put "osm-server.username", "test2" 197 198 im.initFromPreferences() 199 200 assert im.isPartiallyIdentified() 201 } 202 203 /** 204 * Preferences include an user name which is the same as the current 205 * user name and we are currently fully identifed => josm user remains 206 * fully identified 207 */ 208 @Test 209 public void initFromPreferences_5() { 210 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 167 Main.pref.removePreferenceChangeListener im 168 169 // reset it 170 im.@userName = null 171 im.@userInfo = null 172 173 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 174 Main.pref.put "osm-server.username", "test" 175 176 im.initFromPreferences() 177 178 assert im.isPartiallyIdentified() 179 } 180 181 /** 182 * Preferences include an user name which is different from the current 183 * user name and we are currently fully identifed => josm user becomes 184 * partially identified 185 */ 186 @Test 187 public void initFromPreferences_4() { 188 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 211 189 212 190 // for this test we disable the listener 213 Main.pref.removePreferenceChangeListener im 214 215 im.setFullyIdentified "test1", new UserInfo(id: 1) 216 217 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 218 Main.pref.put "osm-server.username", "test1" 219 220 im.initFromPreferences() 221 222 assert im.isFullyIdentified() 223 } 224 225 @Test 226 public void apiUrlChanged() { 227 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 228 229 // make sure im is a preference change listener 230 Main.pref.addPreferenceChangeListener im 231 232 // reset it 233 im.@userName = null 234 im.@userInfo = null 235 236 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 237 assert im.isAnonymous() 191 Main.pref.removePreferenceChangeListener im 192 193 im.setFullyIdentified "test1", new UserInfo(id: 1) 194 195 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 196 Main.pref.put "osm-server.username", "test2" 197 198 im.initFromPreferences() 199 200 assert im.isPartiallyIdentified() 201 } 202 203 /** 204 * Preferences include an user name which is the same as the current 205 * user name and we are currently fully identifed => josm user remains 206 * fully identified 207 */ 208 @Test 209 public void initFromPreferences_5() { 210 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 211 212 // for this test we disable the listener 213 Main.pref.removePreferenceChangeListener im 214 215 im.setFullyIdentified "test1", new UserInfo(id: 1) 216 217 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 218 Main.pref.put "osm-server.username", "test1" 219 220 im.initFromPreferences() 221 222 assert im.isFullyIdentified() 223 } 224 225 @Test 226 public void apiUrlChanged() { 227 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 228 229 // make sure im is a preference change listener 230 Main.pref.addPreferenceChangeListener im 231 232 // reset it 233 im.@userName = null 234 im.@userInfo = null 235 236 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 237 assert im.isAnonymous() 238 238 239 239 Main.pref.put "osm-server.url", null 240 240 assert im.isAnonymous() 241 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 242 // reset it 243 im.@userName = "test" 244 im.@userInfo = null 245 246 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 247 assert im.isPartiallyIdentified() 248 assert im.getUserName() == "test" 249 250 Main.pref.put "osm-server.url", null 251 assert im.isAnonymous() 252 253 // reset it 254 im.@userName = "test" 255 im.@userInfo = new UserInfo(id:1) 256 257 Main.pref.put "osm-server.url", "http://api.openstreetmap.org" 258 assert im.isPartiallyIdentified() 259 assert im.getUserName() == "test" 260 261 // reset it 262 im.@userName = "test" 263 im.@userInfo = new UserInfo(id:1) 264 265 266 Main.pref.put "osm-server.url", null 267 assert im.isAnonymous() 268 } 269 270 @Test 271 public void userNameChanged() { 272 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance() 273 274 // make sure im is a preference change listener 275 Main.pref.addPreferenceChangeListener im 276 277 // reset it 278 im.@userName = null 279 im.@userInfo = null 280 281 Main.pref.put "osm-server.username", "test" 282 assert im.isPartiallyIdentified() 283 assert im.getUserName() == "test" 284 285 Main.pref.put "osm-server.username", null 286 assert im.isAnonymous() 287 288 // reset it 289 im.@userName = "test1" 290 im.@userInfo = null 291 292 Main.pref.put "osm-server.username", "test2" 293 assert im.isPartiallyIdentified() 294 assert im.getUserName() == "test2" 295 296 Main.pref.put "osm-server.username", null 297 assert im.isAnonymous() 298 299 // reset it 300 im.@userName = "test1" 301 im.@userInfo = new UserInfo(id:1) 302 303 Main.pref.put "osm-server.username", "test2" 304 assert im.isPartiallyIdentified() 305 assert im.getUserName() == "test2" 306 307 // reset it 308 im.@userName = "test1" 309 im.@userInfo = new UserInfo(id:1) 310 311 312 Main.pref.put "osm-server.username", null 313 assert im.isAnonymous() 314 } 315 315 } -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
r8450 r8510 52 52 protected void ensureSelected(DefaultListSelectionModel model, Object... idx) { 53 53 if (idx == null) return; 54 for (int i =0; i < idx.length; i++) {54 for (int i = 0; i < idx.length; i++) { 55 55 if (idx[i] instanceof Integer) { 56 int j = (Integer) idx[i];56 int j = (Integer) idx[i]; 57 57 assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j)); 58 58 break; 59 59 } 60 60 try { 61 int rows[] = (int[]) idx[i];61 int rows[] = (int[]) idx[i]; 62 62 if (rows.length != 2) { 63 63 fail("illegal selection range. Either null or not length 2: " + Arrays.toString(rows)); … … 69 69 assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j)); 70 70 } 71 } catch (ClassCastException e) {71 } catch (ClassCastException e) { 72 72 fail("illegal selection range:" + idx[i]); 73 73 } … … 95 95 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 96 96 ensureSelected(mergedSelection, 0); 97 98 } 99 97 } 100 98 101 99 @Test … … 123 121 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 124 122 ensureSelected(mergedSelection, 0); 125 126 123 } 127 124 … … 167 164 mergedNodes.add(new Node(1)); 168 165 169 model.copyMyToTop(new int[]{1, 2}); // copy node 3 and 4166 model.copyMyToTop(new int[]{1, 2}); // copy node 3 and 4 170 167 171 168 mergedNodes = inspectNodeList(model, "Merged"); … … 176 173 177 174 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 178 ensureSelected(mergedSelection, 0,1); // first two rows selected 179 } 180 175 ensureSelected(mergedSelection, 0, 1); // first two rows selected 176 } 181 177 182 178 @Test … … 269 265 mergedNodes.add(new Node(1)); 270 266 271 model.copyMyToEnd(new int[]{1, 2}); // copy node 3 and 4267 model.copyMyToEnd(new int[]{1, 2}); // copy node 3 and 4 272 268 273 269 mergedNodes = inspectNodeList(model, "Merged"); … … 279 275 280 276 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 281 ensureSelected(mergedSelection, 1, 2); // last two rows selected277 ensureSelected(mergedSelection, 1, 2); // last two rows selected 282 278 } 283 279 … … 313 309 } 314 310 315 316 311 @Test 317 312 public void test_copyMyNodesBeforeCurrent_2() { … … 329 324 mergedNodes.add(new Node(12)); 330 325 331 model.copyMyBeforeCurrent(new int[]{0, 1}, 0);326 model.copyMyBeforeCurrent(new int[]{0, 1}, 0); 332 327 333 328 assertEquals(5, mergedNodes.size()); … … 339 334 340 335 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 341 ensureSelected(mergedSelection, 0, 1); // position 0 and 1 selected336 ensureSelected(mergedSelection, 0, 1); // position 0 and 1 selected 342 337 } 343 338 … … 358 353 359 354 try { 360 model.copyMyBeforeCurrent(new int[]{0, 1}, -1);355 model.copyMyBeforeCurrent(new int[]{0, 1}, -1); 361 356 fail("expected IllegalArgumentException"); 362 } catch (IllegalArgumentException e) {357 } catch (IllegalArgumentException e) { 363 358 // OK 364 359 } 365 360 366 361 try { 367 model.copyMyBeforeCurrent(new int[]{0, 1}, 4);362 model.copyMyBeforeCurrent(new int[]{0, 1}, 4); 368 363 fail("expected IllegalArgumentException"); 369 } catch (IllegalArgumentException e) {364 } catch (IllegalArgumentException e) { 370 365 // OK 371 366 } … … 402 397 } 403 398 404 405 399 @Test 406 400 public void test_copyMyNodesAfterCurrent_2() { … … 419 413 mergedNodes.add(new Node(12)); 420 414 421 model.copyMyAfterCurrent(new int[]{0, 1}, 2);415 model.copyMyAfterCurrent(new int[]{0, 1}, 2); 422 416 423 417 assertEquals(5, mergedNodes.size()); … … 428 422 assertEquals(2, mergedNodes.get(4).getId()); // copied node 2 at position 4 429 423 430 431 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 432 ensureSelected(mergedSelection, 3,4); // position 3,4 selected 424 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 425 ensureSelected(mergedSelection, 3, 4); // position 3,4 selected 433 426 } 434 427 … … 449 442 mergedNodes.add(new Node(12)); 450 443 451 model.copyMyAfterCurrent(new int[]{0, 2}, 0);444 model.copyMyAfterCurrent(new int[]{0, 2}, 0); 452 445 453 446 assertEquals(5, mergedNodes.size()); … … 459 452 460 453 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 461 ensureSelected(mergedSelection, 1, 2); // position 1,2 selected454 ensureSelected(mergedSelection, 1, 2); // position 1,2 selected 462 455 } 463 456 … … 509 502 mergedNodes.add(new Node(14)); 510 503 511 model.moveUpMerged(new int[]{1, 4});504 model.moveUpMerged(new int[]{1, 4}); 512 505 513 506 assertEquals(5, mergedNodes.size()); … … 519 512 520 513 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 521 ensureSelected(mergedSelection, 0, 3); // position 0 and 3 selecte0514 ensureSelected(mergedSelection, 0, 3); // position 0 and 3 selecte0 522 515 } 523 516 … … 539 532 mergedNodes.add(new Node(14)); 540 533 541 model.moveUpMerged(new int[]{1, 2,3,4});534 model.moveUpMerged(new int[]{1, 2, 3, 4}); 542 535 543 536 assertEquals(5, mergedNodes.size()); … … 549 542 550 543 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 551 ensureSelected(mergedSelection, 0, 1,2,3);544 ensureSelected(mergedSelection, 0, 1, 2, 3); 552 545 } 553 546 … … 598 591 mergedNodes.add(new Node(14)); 599 592 600 model.moveDownMerged(new int[]{1, 3});593 model.moveDownMerged(new int[]{1, 3}); 601 594 602 595 assertEquals(5, mergedNodes.size()); … … 608 601 609 602 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 610 ensureSelected(mergedSelection, 2, 4);603 ensureSelected(mergedSelection, 2, 4); 611 604 } 612 605 … … 628 621 mergedNodes.add(new Node(14)); 629 622 630 model.moveDownMerged(new int[]{1, 2,3});623 model.moveDownMerged(new int[]{1, 2, 3}); 631 624 632 625 assertEquals(5, mergedNodes.size()); … … 638 631 639 632 DefaultListSelectionModel mergedSelection = inspectListSelectionModel(model, "mergedEntriesSelectionModel"); 640 ensureSelected(mergedSelection, 2, 3,4);633 ensureSelected(mergedSelection, 2, 3, 4); 641 634 } 642 635 … … 712 705 } 713 706 } 707 714 708 MyListener listener = new MyListener(); 715 709 model.addPropertyChangeListener(listener); … … 722 716 assertEquals(!oldValue, listener.events.get(0).getNewValue()); 723 717 } 724 725 718 } -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
r7937 r8510 94 94 assertFalse(model.hasCoordConflict()); 95 95 96 n1.setCoor(new LatLon(1, 1));96 n1.setCoor(new LatLon(1, 1)); 97 97 populate(n1, n2); 98 98 assertTrue(model.hasCoordConflict()); … … 100 100 101 101 n1.cloneFrom(new Node(1)); 102 n2.setCoor(new LatLon(2, 2));102 n2.setCoor(new LatLon(2, 2)); 103 103 populate(n1, n2); 104 104 assertTrue(model.hasCoordConflict()); 105 105 106 n1.setCoor(new LatLon(1, 1));107 n2.setCoor(new LatLon(2, 2));106 n1.setCoor(new LatLon(1, 1)); 107 n2.setCoor(new LatLon(2, 2)); 108 108 populate(n1, n2); 109 109 assertTrue(model.hasCoordConflict()); -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java
r8509 r8510 68 68 assertEquals("key", item.getKey()); 69 69 assertNull(item.getMyTagValue()); 70 assertEquals("theirvalue", item.getTheirTagValue());70 assertEquals("theirvalue", item.getTheirTagValue()); 71 71 assertEquals(MergeDecisionType.UNDECIDED, item.getMergeDecision()); 72 72 } 73 74 73 75 74 @Test … … 86 85 item.decide(null); 87 86 fail("expected IllegalArgumentException not thrown"); 88 } catch (IllegalArgumentException e) {87 } catch (IllegalArgumentException e) { 89 88 // OK 90 89 } … … 104 103 item.applyToMyPrimitive(n1); 105 104 assertEquals("myvalue", n1.get("key")); 106 107 105 } 108 106 … … 133 131 item.applyToMyPrimitive(n1); 134 132 fail("expected IllegalStateException"); 135 } catch (IllegalStateException e) {133 } catch (IllegalStateException e) { 136 134 // OK 137 135 } … … 145 143 item.applyToMyPrimitive(null); 146 144 fail("expected IllegalArgumentException"); 147 } catch (IllegalArgumentException e) {145 } catch (IllegalArgumentException e) { 148 146 // OK 149 147 } -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
r8391 r8510 210 210 211 211 TagMergeModel model = new TagMergeModel(); 212 for (int i =0; i < 10; i++) {212 for (int i = 0; i < 10; i++) { 213 213 model.addItem(new TagMergeItem("key-" + i, "myvalue-" + i, "theirvalue-" +i)); 214 214 } … … 222 222 223 223 model.decide(new int[] {0, 3, 5}, MergeDecisionType.KEEP_MINE); 224 for (int i = 0; i < 10; i++) {224 for (int i = 0; i < 10; i++) { 225 225 TagMergeItem item = list.get(i); 226 226 if (i == 0 || i == 3 || i == 5) { -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java
r7937 r8510 43 43 private String[] getNames(List<RelationMember> members) { 44 44 String[] result = new String[members.size()]; 45 for (int i =0; i<result.length; i++) {45 for (int i = 0; i < result.length; i++) { 46 46 result[i] = members.get(i).getMember().get("name"); 47 47 } -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
r7937 r8510 44 44 private String getConnections(List<WayConnectionType> connections) { 45 45 String[] result = new String[connections.size()]; 46 for (int i =0; i<result.length; i++) {46 for (int i = 0; i < result.length; i++) { 47 47 WayConnectionType wc = connections.get(i); 48 48 -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java
r8509 r8510 44 44 private void checkAction(ActionDefinition a, Object... params) { 45 45 Map<String, Object> expected = new HashMap<>(); 46 for (int i =0; i<params.length; i+=2) {47 expected.put((String) params[i], params[i+1]);46 for (int i = 0; i < params.length; i += 2) { 47 expected.put((String) params[i], params[i+1]); 48 48 } 49 49 Assert.assertEquals(expected, a.getParameters()); -
trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java
r7937 r8510 67 67 String presetfile = "resource://data/defaultpresets.xml"; 68 68 final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, true); 69 Assert.assertTrue("Default presets are empty", presets.size() >0);69 Assert.assertTrue("Default presets are empty", presets.size() > 0); 70 70 } 71 71 }
Note:
See TracChangeset
for help on using the changeset viewer.