mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-16 07:10:48 +00:00
added synchronization to avoid possible threading issues in JUnit execution order
Change-Id: I5e0b3fdcab8bf0349e25149a79557e5b8cc60a4f
This commit is contained in:
1 parent
a4818d2b3c
commit
fd0cc2e388
1 file changed
+26
-22
+26
-22
@@ -79,7 +79,7 @@ public class TaggingServiceTest {
|
||||
private static SubjectThreadState threadState;
|
||||
|
||||
@BeforeClass
|
||||
public static void setUpClass()
|
||||
public synchronized static void setUpClass()
|
||||
throws MalformedURLException, IOException, InterruptedException, UserManagementException, MailException {
|
||||
MongoDBService.INSTANCE.getDB().drop();
|
||||
// setup racing service and racelog
|
||||
@@ -116,7 +116,7 @@ public class TaggingServiceTest {
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
public static void tearDownClass() {
|
||||
public synchronized static void tearDownClass() {
|
||||
try {
|
||||
subject.logout();
|
||||
securityService.deleteUser(username);
|
||||
@@ -128,33 +128,37 @@ public class TaggingServiceTest {
|
||||
|
||||
@Before
|
||||
public void resetEnvironment() {
|
||||
// setup the Shiro SubjectThreadState to ensure that the tagging service can check whether a subject is logged in
|
||||
threadState.bind();
|
||||
securityService.addPermissionForUser(username, editLeaderboardPermission);
|
||||
securityService.unsetPreference(username,
|
||||
serializer.generateUniqueKey(leaderboardName, raceColumnName, fleetName));
|
||||
final RaceLog raceLog = racingService.getRaceLog(leaderboardName, raceColumnName, fleetName);
|
||||
if (raceLog != null) {
|
||||
for (RaceLogEvent event : raceLog.getUnrevokedEvents()) {
|
||||
try {
|
||||
raceLog.revokeEvent(event.getAuthor(), event);
|
||||
} catch (NotRevokableException e) {
|
||||
logger.warning(
|
||||
"Could not clean up test setup for TaggingServiceTest as public tag could not be removed!");
|
||||
synchronized (TaggingServiceTest.class) {
|
||||
// setup the Shiro SubjectThreadState to ensure that the tagging service can check whether a subject is logged in
|
||||
threadState.bind();
|
||||
securityService.addPermissionForUser(username, editLeaderboardPermission);
|
||||
securityService.unsetPreference(username,
|
||||
serializer.generateUniqueKey(leaderboardName, raceColumnName, fleetName));
|
||||
final RaceLog raceLog = racingService.getRaceLog(leaderboardName, raceColumnName, fleetName);
|
||||
if (raceLog != null) {
|
||||
for (RaceLogEvent event : raceLog.getUnrevokedEvents()) {
|
||||
try {
|
||||
raceLog.revokeEvent(event.getAuthor(), event);
|
||||
} catch (NotRevokableException e) {
|
||||
logger.warning(
|
||||
"Could not clean up test setup for TaggingServiceTest as public tag could not be removed!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
try {
|
||||
List<TagDTO> tags = taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false);
|
||||
logger.info("Tags after environment reset: " + tags.toString());
|
||||
} catch (Exception e) {
|
||||
logger.severe("Could not reset test environment");
|
||||
try {
|
||||
List<TagDTO> tags = taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false);
|
||||
logger.info("Tags after environment reset: " + tags.toString());
|
||||
} catch (Exception e) {
|
||||
logger.severe("Could not reset test environment");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@After
|
||||
public void restoreEnvironment() {
|
||||
threadState.restore();
|
||||
synchronized (TaggingServiceTest.class) {
|
||||
threadState.restore();
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in new issue
Block a user