Revision 7c37f7fa
Added by Andreas Müller almost 4 years ago
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java | ||
---|---|---|
61 | 61 |
@DataSet |
62 | 62 |
public class CdmEntitySessionAwareTest extends RemotingSessionAwareTest { |
63 | 63 |
|
64 |
@SuppressWarnings("unused") |
|
64 | 65 |
private static final Logger logger = Logger.getLogger(CdmEntitySessionAwareTest.class); |
65 | 66 |
|
66 | 67 |
UUID polytomousKeyUuid = UUID.fromString("0d53ba20-7de4-4baa-bd8a-401048447d66"); |
... | ... | |
349 | 350 |
Assert.fail(); |
350 | 351 |
} |
351 | 352 |
|
352 |
|
|
353 |
|
|
354 |
|
|
355 | 353 |
// retrieving subkey shows its null |
356 | 354 |
subKey = CdmBase.deproxy(polytomousKeyService.find(subKeyUuid),PolytomousKey.class); |
357 | 355 |
Assert.assertNull(subKey); |
358 | 356 |
|
359 | 357 |
pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class); |
360 |
|
|
361 |
|
|
362 | 358 |
} |
363 | 359 |
|
364 | 360 |
|
... | ... | |
434 | 430 |
|
435 | 431 |
try { |
436 | 432 |
List<Feature> features = termService.list(Feature.class, 100, 0, null, null); |
437 |
List<UUID> updateTerms = new ArrayList<UUID>();
|
|
433 |
List<UUID> updateTerms = new ArrayList<>(); |
|
438 | 434 |
for (Feature feature:features){ |
439 | 435 |
if (feature.getLabel().equals("UpdateTest")){ |
440 | 436 |
updateTerms.add(feature.getUuid()); |
... | ... | |
518 | 514 |
} |
519 | 515 |
|
520 | 516 |
@Test |
521 |
public void testThreadLocalActiveSession() throws InterruptedException {
|
|
522 |
MockSessionOwner<CdmBase> so1 = new MockSessionOwner<CdmBase>();
|
|
517 |
public void testThreadLocalActiveSession() { |
|
518 |
MockSessionOwner<CdmBase> so1 = new MockSessionOwner<>(); |
|
523 | 519 |
final ICdmEntitySession activeSession = getCdmEntitySessionManager().newSession(so1, true); |
524 | 520 |
TestThread thread = new TestThread(true) { |
525 | 521 |
@Override |
... | ... | |
529 | 525 |
} |
530 | 526 |
}; |
531 | 527 |
invokeThread(thread); |
532 |
MockSessionOwner<CdmBase> so2 = new MockSessionOwner<CdmBase>();
|
|
528 |
MockSessionOwner<CdmBase> so2 = new MockSessionOwner<>(); |
|
533 | 529 |
ICdmEntitySession newActiveSession = getCdmEntitySessionManager().newSession(so2, true); |
534 | 530 |
Assert.assertFalse(activeSession.equals(newActiveSession)); |
535 | 531 |
thread.unblock(); |
Also available in: Unified diff
cleanup