Changeset 12849 in josm for trunk/test/unit/org/openstreetmap/josm/data/UserIdentityManagerTest.java
- Timestamp:
- 2017-09-14T00:22:37+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/UserIdentityManagerTest.java
r12747 r12849 11 11 import org.junit.Rule; 12 12 import org.junit.Test; 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.data.osm.User; 15 14 import org.openstreetmap.josm.data.osm.UserInfo; 15 import org.openstreetmap.josm.spi.preferences.Config; 16 16 import org.openstreetmap.josm.testutils.JOSMTestRules; 17 17 … … 188 188 189 189 // for this test we disable the listener 190 Main.pref.removePreferenceChangeListener(im);191 192 try { 193 Main.pref.put("osm-server.url", null);194 Main.pref.put("osm-server.username", null);190 Config.getPref().removePreferenceChangeListener(im); 191 192 try { 193 Config.getPref().put("osm-server.url", null); 194 Config.getPref().put("osm-server.username", null); 195 195 196 196 im.initFromPreferences(); … … 198 198 assertTrue(im.isAnonymous()); 199 199 } finally { 200 Main.pref.addPreferenceChangeListener(im);200 Config.getPref().addPreferenceChangeListener(im); 201 201 } 202 202 } … … 213 213 214 214 // for this test we disable the listener 215 Main.pref.removePreferenceChangeListener(im);216 217 try { 218 Main.pref.put("osm-server.url", "http://api.openstreetmap.org");219 Main.pref.put("osm-server.username", null);215 Config.getPref().removePreferenceChangeListener(im); 216 217 try { 218 Config.getPref().put("osm-server.url", "http://api.openstreetmap.org"); 219 Config.getPref().put("osm-server.username", null); 220 220 221 221 im.initFromPreferences(); … … 223 223 assertTrue(im.isAnonymous()); 224 224 } finally { 225 Main.pref.addPreferenceChangeListener(im);225 Config.getPref().addPreferenceChangeListener(im); 226 226 } 227 227 } … … 235 235 236 236 // for this test we disable the listener 237 Main.pref.removePreferenceChangeListener(im);237 Config.getPref().removePreferenceChangeListener(im); 238 238 239 239 try { … … 241 241 im.setAnonymous(); 242 242 243 Main.pref.put("osm-server.url", "http://api.openstreetmap.org");244 Main.pref.put("osm-server.username", "test");243 Config.getPref().put("osm-server.url", "http://api.openstreetmap.org"); 244 Config.getPref().put("osm-server.username", "test"); 245 245 246 246 im.initFromPreferences(); … … 248 248 assertTrue(im.isPartiallyIdentified()); 249 249 } finally { 250 Main.pref.addPreferenceChangeListener(im);250 Config.getPref().addPreferenceChangeListener(im); 251 251 } 252 252 } … … 262 262 263 263 // for this test we disable the listener 264 Main.pref.removePreferenceChangeListener(im);264 Config.getPref().removePreferenceChangeListener(im); 265 265 266 266 try { 267 267 im.setFullyIdentified("test1", newUserInfo()); 268 268 269 Main.pref.put("osm-server.url", "http://api.openstreetmap.org");270 Main.pref.put("osm-server.username", "test2");269 Config.getPref().put("osm-server.url", "http://api.openstreetmap.org"); 270 Config.getPref().put("osm-server.username", "test2"); 271 271 272 272 im.initFromPreferences(); … … 274 274 assertTrue(im.isPartiallyIdentified()); 275 275 } finally { 276 Main.pref.addPreferenceChangeListener(im);276 Config.getPref().addPreferenceChangeListener(im); 277 277 } 278 278 } … … 288 288 289 289 // for this test we disable the listener 290 Main.pref.removePreferenceChangeListener(im);290 Config.getPref().removePreferenceChangeListener(im); 291 291 292 292 try { 293 293 im.setFullyIdentified("test1", new UserInfo()); 294 294 295 Main.pref.put("osm-server.url", "http://api.openstreetmap.org");296 Main.pref.put("osm-server.username", "test1");295 Config.getPref().put("osm-server.url", "http://api.openstreetmap.org"); 296 Config.getPref().put("osm-server.username", "test1"); 297 297 298 298 im.initFromPreferences(); … … 300 300 assertTrue(im.isFullyIdentified()); 301 301 } finally { 302 Main.pref.addPreferenceChangeListener(im);302 Config.getPref().addPreferenceChangeListener(im); 303 303 } 304 304 } … … 311 311 im.setAnonymous(); 312 312 313 Main.pref.put("osm-server.url", "http://api.openstreetmap.org");314 assertTrue(im.isAnonymous()); 315 316 Main.pref.put("osm-server.url", null);313 Config.getPref().put("osm-server.url", "http://api.openstreetmap.org"); 314 assertTrue(im.isAnonymous()); 315 316 Config.getPref().put("osm-server.url", null); 317 317 assertTrue(im.isAnonymous()); 318 318 … … 320 320 im.setPartiallyIdentified("test"); 321 321 322 Main.pref.put("osm-server.url", "http://api.openstreetmap.org");323 assertTrue(im.isPartiallyIdentified()); 324 assertEquals("test", im.getUserName()); 325 326 Main.pref.put("osm-server.url", null);322 Config.getPref().put("osm-server.url", "http://api.openstreetmap.org"); 323 assertTrue(im.isPartiallyIdentified()); 324 assertEquals("test", im.getUserName()); 325 326 Config.getPref().put("osm-server.url", null); 327 327 assertTrue(im.isAnonymous()); 328 328 … … 330 330 im.setFullyIdentified("test", newUserInfo()); 331 331 332 Main.pref.put("osm-server.url", "http://api.openstreetmap.org");332 Config.getPref().put("osm-server.url", "http://api.openstreetmap.org"); 333 333 assertTrue(im.isPartiallyIdentified()); 334 334 assertEquals("test", im.getUserName()); … … 337 337 im.setFullyIdentified("test", newUserInfo()); 338 338 339 Main.pref.put("osm-server.url", null);339 Config.getPref().put("osm-server.url", null); 340 340 assertTrue(im.isAnonymous()); 341 341 } … … 348 348 im.setAnonymous(); 349 349 350 Main.pref.put("osm-server.username", "test");351 assertTrue(im.isPartiallyIdentified()); 352 assertEquals("test", im.getUserName()); 353 354 Main.pref.put("osm-server.username", null);350 Config.getPref().put("osm-server.username", "test"); 351 assertTrue(im.isPartiallyIdentified()); 352 assertEquals("test", im.getUserName()); 353 354 Config.getPref().put("osm-server.username", null); 355 355 assertTrue(im.isAnonymous()); 356 356 assertEquals(User.getAnonymous(), im.asUser()); … … 359 359 im.setPartiallyIdentified("test1"); 360 360 361 Main.pref.put("osm-server.username", "test2");361 Config.getPref().put("osm-server.username", "test2"); 362 362 assertTrue(im.isPartiallyIdentified()); 363 363 assertEquals("test2", im.getUserName()); … … 366 366 assertEquals("test2", usr.getName()); 367 367 368 Main.pref.put("osm-server.username", null);368 Config.getPref().put("osm-server.username", null); 369 369 assertTrue(im.isAnonymous()); 370 370 … … 372 372 im.setFullyIdentified("test1", newUserInfo()); 373 373 374 Main.pref.put("osm-server.username", "test2");374 Config.getPref().put("osm-server.username", "test2"); 375 375 assertTrue(im.isPartiallyIdentified()); 376 376 assertEquals("test2", im.getUserName()); … … 382 382 im.setFullyIdentified("test1", newUserInfo()); 383 383 384 Main.pref.put("osm-server.username", null);384 Config.getPref().put("osm-server.username", null); 385 385 assertTrue(im.isAnonymous()); 386 386 }
Note:
See TracChangeset
for help on using the changeset viewer.