diff --git a/java/com.google.gwt.user/META-INF/MANIFEST.MF b/java/com.google.gwt.user/META-INF/MANIFEST.MF index 1ba93613e69..db566c04fe9 100755 --- a/java/com.google.gwt.user/META-INF/MANIFEST.MF +++ b/java/com.google.gwt.user/META-INF/MANIFEST.MF @@ -185,6 +185,5 @@ Export-Package: com.google.gwt.activity.shared, javaemul.internal, javaemul.internal.annotations, jsinterop.annotations -Require-Bundle: org.eclipse.jetty.osgi-servlet-api;bundle-version="3.1.0", - org.junit;bundle-version="4.8.2";resolution:=optional +Require-Bundle: org.eclipse.jetty.osgi-servlet-api;bundle-version="3.1.0" Automatic-Module-Name: com.google.gwt.user diff --git a/java/com.googlecode.java-diff-utils.test/src/diffutils/DiffTest.java b/java/com.googlecode.java-diff-utils.test/src/diffutils/DiffTest.java index 9042745801e..aa54fc71064 100755 --- a/java/com.googlecode.java-diff-utils.test/src/diffutils/DiffTest.java +++ b/java/com.googlecode.java-diff-utils.test/src/diffutils/DiffTest.java @@ -1,14 +1,22 @@ package diffutils; -import difflib.*; -import junit.framework.TestCase; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -public class DiffTest extends TestCase { +import difflib.ChangeDelta; +import difflib.Chunk; +import difflib.DeleteDelta; +import difflib.Delta; +import difflib.DiffUtils; +import difflib.InsertDelta; +import difflib.Patch; + +public class DiffTest { public void testDiff_Insert() { final Patch patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.asList("hhh", "jjj", "kkk")); diff --git a/java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java b/java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java index c651bef4b65..680eae77345 100755 --- a/java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java +++ b/java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java @@ -1,9 +1,7 @@ package diffutils; -import difflib.DiffUtils; -import difflib.Patch; -import difflib.PatchFailedException; -import junit.framework.TestCase; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.BufferedReader; import java.io.File; @@ -14,7 +12,11 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -public class GenerateUnifiedDiffTest extends TestCase { +import difflib.DiffUtils; +import difflib.Patch; +import difflib.PatchFailedException; + +public class GenerateUnifiedDiffTest { private static final String FS = File.separator; private static final String MOCK_FOLDER = "test" + FS + "mocks" + FS; diff --git a/java/com.googlecode.java-diff-utils.test/src/diffutils/PatchTest.java b/java/com.googlecode.java-diff-utils.test/src/diffutils/PatchTest.java index 46fe5f417e5..60f8c3abf1c 100755 --- a/java/com.googlecode.java-diff-utils.test/src/diffutils/PatchTest.java +++ b/java/com.googlecode.java-diff-utils.test/src/diffutils/PatchTest.java @@ -1,15 +1,17 @@ package diffutils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; import difflib.DiffUtils; import difflib.Patch; import difflib.PatchFailedException; -public class PatchTest extends TestCase { +public class PatchTest { public void testPatch_Insert() { final List insertTest_from = Arrays.asList("hhh"); diff --git a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java index c893c2185ef..187e0d392e8 100755 --- a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java +++ b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java @@ -28,14 +28,14 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TimeZone; import java.util.UUID; +import java.util.concurrent.TimeUnit; import java.util.function.BooleanSupplier; import java.util.function.Consumer; -import org.junit.Rule; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.Timeout; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.DeclinationService; @@ -73,9 +73,8 @@ import com.sap.sse.common.Util; import com.sap.sse.common.Util.Triple; import com.sap.sse.common.impl.MillisecondsTimePoint; +@Timeout(value=60, unit=TimeUnit.SECONDS) public class UDPExpeditionReceiverTest { - @Rule public Timeout TestTimeout = Timeout.millis(60 * 1000); - private String[] validLines; private String[] someValidWithFourInvalidLines; private final List messages = new ArrayList(); diff --git a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPMirrorTest.java b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPMirrorTest.java index 065bc54e597..a52daa273f9 100755 --- a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPMirrorTest.java +++ b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPMirrorTest.java @@ -8,18 +8,17 @@ import java.net.DatagramSocket; import java.net.InetAddress; import java.util.Arrays; import java.util.Random; +import java.util.concurrent.TimeUnit; -import org.junit.Rule; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.Timeout; import com.sap.sailing.expeditionconnector.UDPMirror; +@Timeout(value = 60, unit=TimeUnit.SECONDS) public class UDPMirrorTest { - @Rule public Timeout TestTimeout = Timeout.millis(60 * 1000); - private static final int MIRROR_PORT = 33795; private static final int RECEIVING_PORT = 33796; private Thread mirrorThread; diff --git a/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/AbstractMongoDBTest.java b/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/AbstractMongoDBTest.java index 719530704ab..e249fbd6ffe 100644 --- a/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/AbstractMongoDBTest.java +++ b/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/AbstractMongoDBTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.UnknownHostException; import java.util.Arrays; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import com.mongodb.MongoClientSettings; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/MediaDBTest.java b/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/MediaDBTest.java index 52ef147aa7d..e90bcb89193 100644 --- a/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/MediaDBTest.java +++ b/java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/MediaDBTest.java @@ -1,5 +1,10 @@ package com.sap.sailing.media.persistence.test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.net.UnknownHostException; import java.util.HashSet; import java.util.List; @@ -21,10 +26,6 @@ import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.media.MimeType; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; -import static org.junit.jupiter.api.Assertions.*; - public class MediaDBTest extends AbstractMongoDBTest { public MediaDBTest() throws UnknownHostException, MongoException { @@ -69,34 +70,36 @@ public class MediaDBTest extends AbstractMongoDBTest { assertThat(videoTrack.title, Is.is(videoTitle)); } - @Test(expected=IllegalArgumentException.class) + @Test public void testCreateVideoTrackWithNullId() { - final String dbId = null; - final String videoTitle = "Test Video"; - final String url = "http://localhost:8888/media/HTML5/1809147112001_1842870496001_SAP-Regatta-Day02-Final_libtheora.ogv"; - MediaDB mongoDB = MediaDBFactory.INSTANCE.getMediaDB(getMongoService()); - TimePoint startTime = MillisecondsTimePoint.now(); - Duration duration = MillisecondsDurationImpl.ONE_HOUR; - MimeType mimeType = MimeType.ogv; - Set assignedRaces = new HashSet(); - assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); - mongoDB.insertMediaTrackWithId(dbId, videoTitle, url, startTime, duration, mimeType, assignedRaces); - + assertThrows(IllegalArgumentException.class, () -> { + final String dbId = null; + final String videoTitle = "Test Video"; + final String url = "http://localhost:8888/media/HTML5/1809147112001_1842870496001_SAP-Regatta-Day02-Final_libtheora.ogv"; + MediaDB mongoDB = MediaDBFactory.INSTANCE.getMediaDB(getMongoService()); + TimePoint startTime = MillisecondsTimePoint.now(); + Duration duration = MillisecondsDurationImpl.ONE_HOUR; + MimeType mimeType = MimeType.ogv; + Set assignedRaces = new HashSet(); + assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); + mongoDB.insertMediaTrackWithId(dbId, videoTitle, url, startTime, duration, mimeType, assignedRaces); + }); } - @Test(expected=IllegalArgumentException.class) + @Test public void testCreateVideoTrackWithExistingId() { - final String videoTitle = "Test Video"; - final String url = "http://localhost:8888/media/HTML5/1809147112001_1842870496001_SAP-Regatta-Day02-Final_libtheora.ogv"; - MediaDB mongoDB = MediaDBFactory.INSTANCE.getMediaDB(getMongoService()); - TimePoint startTime = MillisecondsTimePoint.now(); - Duration duration = MillisecondsDurationImpl.ONE_HOUR; - MimeType mimeType = MimeType.ogv; - Set assignedRaces = new HashSet(); - assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); - String dbId = mongoDB.insertMediaTrack(videoTitle, url, startTime, duration, mimeType, assignedRaces); - mongoDB.insertMediaTrackWithId(dbId, videoTitle, url, startTime, duration, mimeType, assignedRaces); - + assertThrows(IllegalArgumentException.class, () -> { + final String videoTitle = "Test Video"; + final String url = "http://localhost:8888/media/HTML5/1809147112001_1842870496001_SAP-Regatta-Day02-Final_libtheora.ogv"; + MediaDB mongoDB = MediaDBFactory.INSTANCE.getMediaDB(getMongoService()); + TimePoint startTime = MillisecondsTimePoint.now(); + Duration duration = MillisecondsDurationImpl.ONE_HOUR; + MimeType mimeType = MimeType.ogv; + Set assignedRaces = new HashSet(); + assignedRaces.add(new RegattaNameAndRaceName("49er", "R1")); + String dbId = mongoDB.insertMediaTrack(videoTitle, url, startTime, duration, mimeType, assignedRaces); + mongoDB.insertMediaTrackWithId(dbId, videoTitle, url, startTime, duration, mimeType, assignedRaces); + }); } // @Test diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractConnectivityParamsLoadAndStoreTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractConnectivityParamsLoadAndStoreTest.java index 112dfc56b95..1d08f8656a5 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractConnectivityParamsLoadAndStoreTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractConnectivityParamsLoadAndStoreTest.java @@ -2,7 +2,7 @@ package com.sap.sailing.mongodb.test; import java.net.UnknownHostException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import com.mongodb.MongoException; import com.sap.sailing.domain.persistence.DomainObjectFactory; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java index 8ce354ee156..e27059c6ffd 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java @@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.UnknownHostException; -import org.junit.BeforeEach; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import com.mongodb.MongoException; import com.mongodb.client.MongoClient; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java index 2b2ddeab372..9a828728f4b 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java @@ -6,7 +6,7 @@ import java.util.Collections; import java.util.List; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/CollectionNameServiceTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/CollectionNameServiceTest.java index a4d890ac5c9..cffb9939fdf 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/CollectionNameServiceTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/CollectionNameServiceTest.java @@ -1,5 +1,7 @@ package com.sap.sailing.mongodb.test; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import com.sap.sse.mongodb.AlreadyRegisteredException; @@ -16,10 +18,12 @@ public class CollectionNameServiceTest { service.registerExclusively(TestInterface.class, "B"); } - @Test(expected=AlreadyRegisteredException.class) + @Test public void shouldNotWork() throws AlreadyRegisteredException { - MongoDBService service = MongoDBService.INSTANCE; - service.registerExclusively(TestInterface.class, "b"); - service.registerExclusively(com.sap.sailing.mongodb.test.needadifferentpackage.TestInterface.class, "b"); + assertThrows(AlreadyRegisteredException.class, () -> { + MongoDBService service = MongoDBService.INSTANCE; + service.registerExclusively(TestInterface.class, "b"); + service.registerExclusively(com.sap.sailing.mongodb.test.needadifferentpackage.TestInterface.class, "b"); + }); } } diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MarkPassingRaceFingerprintConversionTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MarkPassingRaceFingerprintConversionTest.java index 84b34a6d6f9..46b7c97da22 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MarkPassingRaceFingerprintConversionTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MarkPassingRaceFingerprintConversionTest.java @@ -8,7 +8,7 @@ import java.net.URISyntaxException; import java.net.UnknownHostException; import java.util.Map; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MockConnectivityParamsServiceFinderFactory.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MockConnectivityParamsServiceFinderFactory.java index 62b86d8920a..21caeceeeb5 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MockConnectivityParamsServiceFinderFactory.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MockConnectivityParamsServiceFinderFactory.java @@ -1,7 +1,8 @@ package com.sap.sailing.mongodb.test; -import java.util.HashMap; import static org.mockito.Mockito.mock; + +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java index 54d5214b388..b1a91b3f1de 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java @@ -7,8 +7,8 @@ import java.net.UnknownHostException; import java.util.Iterator; import java.util.UUID; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.race.CompetitorResult; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadBoatsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadBoatsTest.java index 213ed4bc2f0..5e9bffbe6a6 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadBoatsTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadBoatsTest.java @@ -7,7 +7,7 @@ import java.net.UnknownHostException; import java.util.Collection; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadCompetitorsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadCompetitorsTest.java index 3cad47f88a7..a4c14fb6736 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadCompetitorsTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadCompetitorsTest.java @@ -12,7 +12,7 @@ import java.util.Collections; import java.util.Date; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java index aeb2cb8ce6a..a9a6b25b596 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java @@ -6,7 +6,7 @@ import static org.mockito.Mockito.mock; import java.net.UnknownHostException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java index 08612f4f1a1..058993bb739 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java @@ -15,7 +15,7 @@ import java.util.UUID; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRegattaLogEventsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRegattaLogEventsTest.java index 1609195d9f7..90183485a52 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRegattaLogEventsTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRegattaLogEventsTest.java @@ -15,7 +15,7 @@ import java.util.UUID; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingRaceORCLegDataEvent.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingRaceORCLegDataEvent.java index 51c42e6aa2a..2ead04fae08 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingRaceORCLegDataEvent.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingRaceORCLegDataEvent.java @@ -14,7 +14,7 @@ import java.util.UUID; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingRegattaORCCertificateAssignmentEvent.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingRegattaORCCertificateAssignmentEvent.java index bffe638334f..69fbcaff487 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingRegattaORCCertificateAssignmentEvent.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingRegattaORCCertificateAssignmentEvent.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboardGroups.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboardGroups.java index cf0a6bce2f5..6cf1183f10e 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboardGroups.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboardGroups.java @@ -13,8 +13,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.UUID; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java index f459a504c17..7b0c8dab397 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogEventData.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogEventData.java index 3cef19f264a..bc293b81798 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogEventData.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogEventData.java @@ -7,7 +7,7 @@ import java.net.UnknownHostException; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java index 3f826169898..5d6ef395273 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java @@ -12,7 +12,7 @@ import java.util.Collections; import java.util.UUID; import org.bson.Document; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java index acf2f8b151e..84b9f81f028 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.UnknownHostException; import org.bson.Document; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java index 3cfe5ba7139..0dc3d165429 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java @@ -11,7 +11,7 @@ import java.net.UnknownHostException; import java.util.Collections; import java.util.Optional; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/BATTest.java b/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/BATTest.java index 104f9e9e436..f9f9fe5f320 100755 --- a/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/BATTest.java +++ b/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/BATTest.java @@ -5,11 +5,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayInputStream; import java.io.UnsupportedEncodingException; +import java.util.concurrent.TimeUnit; -import org.junit.Rule; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.Timeout; import com.sap.sailing.nmeaconnector.BATSentence; import com.sap.sailing.nmeaconnector.BATSentence.WindVaneBatteryStatus; @@ -20,10 +20,8 @@ import net.sf.marineapi.nmea.event.AbstractSentenceListener; import net.sf.marineapi.nmea.io.SentenceReader; import net.sf.marineapi.nmea.sentence.TalkerId; +@Timeout(value = 10, unit=TimeUnit.SECONDS) // 10 seconds public class BATTest { - - @Rule public Timeout AbstractTracTracLiveTestTimeout = Timeout.millis(10 * 1000); - public static final String EXAMPLE = "$WIBAT,1,5"; BATSentence empty; BATSentence bat; diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/regression/test/IncrementalLinearRegressionOrderOneTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/regression/test/IncrementalLinearRegressionOrderOneTest.java index 43dbc8e2788..f92966ff63a 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/regression/test/IncrementalLinearRegressionOrderOneTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/regression/test/IncrementalLinearRegressionOrderOneTest.java @@ -1,6 +1,7 @@ package com.sap.sailing.polars.regression.test; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; @@ -136,10 +137,12 @@ public class IncrementalLinearRegressionOrderOneTest { assertThat(y, new IsCloseTo(0, EPSILON)); } - @Test(expected = NotEnoughDataHasBeenAddedException.class) + @Test public void testNoDataExceptionThrowing() throws NotEnoughDataHasBeenAddedException { - IncrementalLeastSquares leastSquares = new IncrementalAnyOrderLeastSquaresImpl(1); - leastSquares.getOrCreatePolynomialFunction().value(15); + assertThrows(NotEnoughDataHasBeenAddedException.class, () -> { + IncrementalLeastSquares leastSquares = new IncrementalAnyOrderLeastSquaresImpl(1); + leastSquares.getOrCreatePolynomialFunction().value(15); + }); } /** diff --git a/java/com.sap.sailing.sailwave.html.resultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.sailwave.html.resultimport.test/META-INF/MANIFEST.MF index 39d9e3a68f0..467a163e06f 100644 --- a/java/com.sap.sailing.sailwave.html.resultimport.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.sailwave.html.resultimport.test/META-INF/MANIFEST.MF @@ -5,6 +5,10 @@ Bundle-SymbolicName: com.sap.sailing.sailwave.html.resultimport.test Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Fragment-Host: com.sap.sailing.sailwave.html.resultimport -Require-Bundle: org.junit +Require-Bundle: junit-jupiter-api;bundle-version="5.12.2", + junit-jupiter-engine;bundle-version="5.12.2", + junit-platform-commons;bundle-version="1.12.2", + junit-platform-engine;bundle-version="1.12.2", + org.opentest4j;bundle-version="1.3.0" Automatic-Module-Name: com.sap.sailing.sailwave.html.resultimport.test Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/event/EventApi.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/event/EventApi.java index 9680f6a4c55..b7a1965718e 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/event/EventApi.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/event/EventApi.java @@ -1,5 +1,7 @@ package com.sap.sailing.selenium.api.event; +import static com.sap.sailing.selenium.api.core.ApiRequest.Context.SAILING; + import java.util.Map; import java.util.TreeMap; @@ -8,8 +10,6 @@ import org.json.simple.JSONObject; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.core.ApiRequest; - -import static com.sap.sailing.selenium.api.core.ApiRequest.Context.SAILING; import com.sap.sailing.selenium.api.core.JsonWrapper; import com.sun.jersey.api.representation.Form; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AbstractTestWithIgtimiConnection.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AbstractTestWithIgtimiConnection.java index b6317b01623..324026a2f4b 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AbstractTestWithIgtimiConnection.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AbstractTestWithIgtimiConnection.java @@ -10,10 +10,10 @@ import java.io.OutputStream; import java.net.Socket; import java.net.URL; import java.text.SimpleDateFormat; +import java.util.concurrent.TimeUnit; -import org.junit.BeforeEach; -import org.junit.Rule; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Timeout; import com.google.protobuf.CodedOutputStream; import com.sap.sailing.domain.igtimiadapter.IgtimiConnection; @@ -36,13 +36,10 @@ import com.sun.jersey.core.util.Base64; * @author Axel Uhl (d043530) * */ +@Timeout(value = 2, unit = TimeUnit.MINUTES) public abstract class AbstractTestWithIgtimiConnection extends AbstractSeleniumTest { protected IgtimiConnection connection; - @Rule public Timeout AbstractTestWithIgtimiConnectionTimeout = Timeout.millis(2 * 60 * 1000); - - @Rule public Timeout AbstractTracTracLiveTestTimeout = Timeout.millis(2 * 60 * 1000); - protected ApiContext ctx; @BeforeEach diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AclRevokeAnonymousTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AclRevokeAnonymousTest.java index f2f8a1ef025..ed285645ac8 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AclRevokeAnonymousTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AclRevokeAnonymousTest.java @@ -5,10 +5,10 @@ import static com.sap.sailing.selenium.api.core.ApiContext.SERVER_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; import static com.sap.sailing.selenium.api.core.ApiContext.createApiContext; import static com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage.goToPage; - import static org.hamcrest.MatcherAssert.assertThat; + import org.hamcrest.Matchers; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/ClosedRegattaTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/ClosedRegattaTest.java index 6ce144ce21c..a6d5a967813 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/ClosedRegattaTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/ClosedRegattaTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.fail; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CompetitorApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CompetitorApiTest.java index 52a149d773a..8913886dcc5 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CompetitorApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CompetitorApiTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashMap; import java.util.Map; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseConfigurationTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseConfigurationTest.java index a83e572b82f..c93b510b207 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseConfigurationTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseConfigurationTest.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import org.json.JSONException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseTemplateApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseTemplateApiTest.java index 22f0e33e767..bd39d9ade75 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseTemplateApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseTemplateApiTest.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.TreeSet; import java.util.stream.Collectors; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/DefaultTenantApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/DefaultTenantApiTest.java index 3d4a99eaa05..e6220129ab9 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/DefaultTenantApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/DefaultTenantApiTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/EventApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/EventApiTest.java index c64a73653be..e02cd67a787 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/EventApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/EventApiTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/GpsFixApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/GpsFixApiTest.java index 533088c1edc..8ccc56c4ccb 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/GpsFixApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/GpsFixApiTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/LeaderboardApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/LeaderboardApiTest.java index e8fb6ff9bcc..89260c55d36 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/LeaderboardApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/LeaderboardApiTest.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import org.json.simple.JSONArray; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.racelog.RacingProcedureType; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkApiTest.java index 1375ee59395..f48557b4d9a 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkApiTest.java @@ -9,13 +9,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Collections; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; @@ -72,38 +73,40 @@ public class MarkApiTest extends AbstractSeleniumTest { /** * Negative test scenarios. Checks all common 'not found' errors. */ - @Test(expected = HttpException.class) + @Test public void testRevokeMarkOnRegattaMarkNotFound() { - final ApiContext ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); - eventApi.createEvent(ctx, EVENT_NAME, BOAT_CLASS, CompetitorRegistrationType.CLOSED, "default"); - final Regatta regatta = regattaApi.getRegatta(ctx, EVENT_NAME); - final RaceColumn race = regattaApi.addRaceColumn(ctx, EVENT_NAME, null, 1)[0]; - try { - markApi.revokeMarkOnRegatta(ctx, "blah", race.getRaceName(), FLEET, UUID.randomUUID()); + assertThrows(HttpException.class, () -> { + final ApiContext ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); + eventApi.createEvent(ctx, EVENT_NAME, BOAT_CLASS, CompetitorRegistrationType.CLOSED, "default"); + final Regatta regatta = regattaApi.getRegatta(ctx, EVENT_NAME); + final RaceColumn race = regattaApi.addRaceColumn(ctx, EVENT_NAME, null, 1)[0]; + try { + markApi.revokeMarkOnRegatta(ctx, "blah", race.getRaceName(), FLEET, UUID.randomUUID()); + assertFalse(true); + } catch (HttpException e) { + assertTrue(e.getMessage().contains("Could not find a regatta with name")); + } + try { + markApi.revokeMarkOnRegatta(ctx, regatta.getName(), "Blub", FLEET, UUID.randomUUID()); + assertFalse(true); + } catch (HttpException e) { + assertTrue(e.getMessage().contains("Could not find a race with raceColumn")); + } + try { + markApi.revokeMarkOnRegatta(ctx, regatta.getName(), race.getRaceName(), "Blume", UUID.randomUUID()); + assertFalse(true); + } catch (HttpException e) { + assertTrue(e.getMessage().contains("Could not find a race with raceColumn")); + } + try { + markApi.revokeMarkOnRegatta(ctx, regatta.getName(), race.getRaceName(), FLEET, UUID.randomUUID()); + assertFalse(true); + } catch (HttpException e) { + assertTrue(e.getMessage().contains("Could not find a mark with id")); + throw e; + } assertFalse(true); - } catch (HttpException e) { - assertTrue(e.getMessage().contains("Could not find a regatta with name")); - } - try { - markApi.revokeMarkOnRegatta(ctx, regatta.getName(), "Blub", FLEET, UUID.randomUUID()); - assertFalse(true); - } catch (HttpException e) { - assertTrue(e.getMessage().contains("Could not find a race with raceColumn")); - } - try { - markApi.revokeMarkOnRegatta(ctx, regatta.getName(), race.getRaceName(), "Blume", UUID.randomUUID()); - assertFalse(true); - } catch (HttpException e) { - assertTrue(e.getMessage().contains("Could not find a race with raceColumn")); - } - try { - markApi.revokeMarkOnRegatta(ctx, regatta.getName(), race.getRaceName(), FLEET, UUID.randomUUID()); - assertFalse(true); - } catch (HttpException e) { - assertTrue(e.getMessage().contains("Could not find a mark with id")); - throw e; - } - assertFalse(true); + }); } /** @@ -243,20 +246,23 @@ public class MarkApiTest extends AbstractSeleniumTest { currentTimeMillis()); } - @Test(expected = HttpException.NotFound.class) + @Test public void testAddMarkToRegattaForNonExistingEvent() { - final ApiContext ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); - markApi.addMarkToRegatta(ctx, "NONEVENT", "Startboat"); + assertThrows(HttpException.NotFound.class, () -> { + final ApiContext ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); + markApi.addMarkToRegatta(ctx, "NONEVENT", "Startboat"); + }); } - @Test(expected = HttpException.Unauthorized.class) + @Test public void testAddMarkToRegattaWithoutPermission() { - final ApiContext adminSecurityCtx = createAdminApiContext(getContextRoot(), SECURITY_CONTEXT); - final ApiContext ownerCtx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); - securityApi.createUser(adminSecurityCtx, "donald", "Donald Duck", null, DONALDS_PASSWORD); - final ApiContext readerCtx = createApiContext(getContextRoot(), SERVER_CONTEXT, "donald", DONALDS_PASSWORD); - - eventApi.createEvent(ownerCtx, EVENT_NAME, BOAT_CLASS, CompetitorRegistrationType.CLOSED, "default"); - markApi.addMarkToRegatta(readerCtx, EVENT_NAME, "Startboat"); + assertThrows(HttpException.Unauthorized.class, () -> { + final ApiContext adminSecurityCtx = createAdminApiContext(getContextRoot(), SECURITY_CONTEXT); + final ApiContext ownerCtx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); + securityApi.createUser(adminSecurityCtx, "donald", "Donald Duck", null, DONALDS_PASSWORD); + final ApiContext readerCtx = createApiContext(getContextRoot(), SERVER_CONTEXT, "donald", DONALDS_PASSWORD); + eventApi.createEvent(ownerCtx, EVENT_NAME, BOAT_CLASS, CompetitorRegistrationType.CLOSED, "default"); + markApi.addMarkToRegatta(readerCtx, EVENT_NAME, "Startboat"); + }); } } diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkPropertiesTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkPropertiesTest.java index 7c74432dbf5..e233c3db198 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkPropertiesTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkPropertiesTest.java @@ -7,13 +7,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -118,17 +119,19 @@ public class MarkPropertiesTest extends AbstractSeleniumTest { "read: MarkProperties.type is different"); } - @Test(expected = HttpException.NotFound.class) + @Test public void createAndDeleteMarkPropertiesTest() { - final ApiContext ctx = createAdminApiContext(getContextRoot(), SHARED_SERVER_CONTEXT); - MarkProperties createdMarkProperties = markPropertiesApi.createMarkProperties(ctx, MARK_PROPERTIES_NAME, - MARK_PROPERTIES_SHORTNAME, null, MARK_PROPERTIES_COLOR, MARK_PROPERTIES_SHAPE, MARK_PROPERTIES_PATTERN, - MARK_PROPERTIES_TYPE, MARK_PROPERTIES_TAGS, MARK_PROPERTIES_LATDEG, MARK_PROPERTIES_LONDEG); - assertNotNull(createdMarkProperties, "create: no MarkProperties returnded"); - assertNotNull(createdMarkProperties.getId(), "create: MarkProperties.id is missing"); - - markPropertiesApi.deleteMarkProperties(ctx, createdMarkProperties.getId()); - markPropertiesApi.getMarkProperties(ctx, createdMarkProperties.getId()); + assertThrows(HttpException.NotFound.class, () -> { + final ApiContext ctx = createAdminApiContext(getContextRoot(), SHARED_SERVER_CONTEXT); + MarkProperties createdMarkProperties = markPropertiesApi.createMarkProperties(ctx, MARK_PROPERTIES_NAME, + MARK_PROPERTIES_SHORTNAME, null, MARK_PROPERTIES_COLOR, MARK_PROPERTIES_SHAPE, MARK_PROPERTIES_PATTERN, + MARK_PROPERTIES_TYPE, MARK_PROPERTIES_TAGS, MARK_PROPERTIES_LATDEG, MARK_PROPERTIES_LONDEG); + assertNotNull(createdMarkProperties, "create: no MarkProperties returnded"); + assertNotNull(createdMarkProperties.getId(), "create: MarkProperties.id is missing"); + + markPropertiesApi.deleteMarkProperties(ctx, createdMarkProperties.getId()); + markPropertiesApi.getMarkProperties(ctx, createdMarkProperties.getId()); + }); } @Test @@ -151,12 +154,14 @@ public class MarkPropertiesTest extends AbstractSeleniumTest { assertTrue(updatedMarkProperties.hasDevice()); } - @Test(expected = HttpException.class) + @Test public void testOverlapOfDeviceUuidAndFixedPositioning() { - final ApiContext ctx = createAdminApiContext(getContextRoot(), SHARED_SERVER_CONTEXT); - final UUID deviceUuid = UUID.randomUUID(); - markPropertiesApi.createMarkProperties(ctx, MARK_PROPERTIES_NAME, - MARK_PROPERTIES_SHORTNAME, deviceUuid.toString(), MARK_PROPERTIES_COLOR, MARK_PROPERTIES_SHAPE, MARK_PROPERTIES_PATTERN, - MARK_PROPERTIES_TYPE, MARK_PROPERTIES_TAGS, MARK_PROPERTIES_LATDEG, MARK_PROPERTIES_LONDEG); + assertThrows(HttpException.class, () -> { + final ApiContext ctx = createAdminApiContext(getContextRoot(), SHARED_SERVER_CONTEXT); + final UUID deviceUuid = UUID.randomUUID(); + markPropertiesApi.createMarkProperties(ctx, MARK_PROPERTIES_NAME, + MARK_PROPERTIES_SHORTNAME, deviceUuid.toString(), MARK_PROPERTIES_COLOR, MARK_PROPERTIES_SHAPE, MARK_PROPERTIES_PATTERN, + MARK_PROPERTIES_TYPE, MARK_PROPERTIES_TAGS, MARK_PROPERTIES_LATDEG, MARK_PROPERTIES_LONDEG); + }); } } diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkRoleTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkRoleTest.java index 3c7809801cd..84727fba013 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkRoleTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkRoleTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkTemplateTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkTemplateTest.java index 38e104d4b66..bba01f5dacc 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkTemplateTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/MarkTemplateTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/OpenRegattaTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/OpenRegattaTest.java index 22e164e83d9..1ab16ec2f68 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/OpenRegattaTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/OpenRegattaTest.java @@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/PreferencesApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/PreferencesApiTest.java index 12201c6e60e..cdbd0a294bf 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/PreferencesApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/PreferencesApiTest.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Map; import org.json.simple.JSONObject; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RegattaApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RegattaApiTest.java index 65ca9832c88..f1670dc8ae1 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RegattaApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RegattaApiTest.java @@ -22,8 +22,8 @@ import java.util.stream.Collectors; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; @@ -45,9 +45,9 @@ import com.sap.sailing.selenium.api.regatta.RegattaDeviceStatus.CompetitorDevice import com.sap.sailing.selenium.api.regatta.RegattaRaces; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.test.AbstractSeleniumTest; -import com.sap.sse.security.SecurityService; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.security.SecurityService; public class RegattaApiTest extends AbstractSeleniumTest { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RoleApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RoleApiTest.java index 8f01435a643..a95f929779b 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RoleApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/RoleApiTest.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.fail; import java.util.ArrayList; import java.util.Collection; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/SecurityApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/SecurityApiTest.java index 8a539bc7c59..aaf94a12ef3 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/SecurityApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/SecurityApiTest.java @@ -20,7 +20,7 @@ import java.util.UUID; import org.apache.http.client.ClientProtocolException; import org.json.simple.parser.ParseException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/TrackedEventsResourceApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/TrackedEventsResourceApiTest.java index 0cf39017e0b..db8dd89aa9b 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/TrackedEventsResourceApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/TrackedEventsResourceApiTest.java @@ -4,9 +4,9 @@ import static com.sap.sailing.selenium.api.core.ApiContext.SERVER_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; import static com.sap.sailing.selenium.api.core.ApiContext.createApiContext; import static java.util.concurrent.TimeUnit.SECONDS; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.iterableWithSize; -import static org.hamcrest.MatcherAssert.assertThat; import java.util.ArrayList; import java.util.Arrays; @@ -20,9 +20,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.stream.StreamSupport; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.opentest4j.AssertionFailedError; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.api.core.ApiContext; @@ -37,8 +38,6 @@ import com.sap.sailing.selenium.test.AbstractSeleniumTest; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Triple; -import junit.framework.AssertionFailedError; - public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { private static final String TEST_USER_PASSWORD = "tesOJDS8729438*&tuser"; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/TrackingDeviceStatusApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/TrackingDeviceStatusApiTest.java index 5f37f523c32..054d509ef17 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/TrackingDeviceStatusApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/TrackingDeviceStatusApiTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/UserGroupApiTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/UserGroupApiTest.java index 08318beeb11..ce74b2a477f 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/UserGroupApiTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/UserGroupApiTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.fail; import java.util.Arrays; import java.util.concurrent.atomic.LongAdder; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/WebSocketServerListTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/WebSocketServerListTest.java index 271c505408a..4525c2da8ac 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/WebSocketServerListTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/WebSocketServerListTest.java @@ -4,18 +4,17 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import java.net.URI; import java.net.URL; +import java.util.concurrent.TimeUnit; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.Timeout; import com.sap.sailing.domain.igtimiadapter.IgtimiConnectionFactory; import com.sap.sailing.selenium.test.AbstractSeleniumTest; import com.sap.sse.common.Util; +@Timeout(value = 2, unit = TimeUnit.MINUTES) // 2 minutes timeout for the test public class WebSocketServerListTest extends AbstractSeleniumTest { - @Rule public Timeout AbstractTracTracLiveTestTimeout = Timeout.millis(2 * 60 * 1000); - @Test public void testWebSocketServerList() throws Exception { final IgtimiConnectionFactory igtimiConnectionFactory = IgtimiConnectionFactory.create( diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/WebSocketTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/WebSocketTest.java index e4c54f6a9d1..c743455e7fa 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/WebSocketTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/WebSocketTest.java @@ -29,10 +29,9 @@ import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage; import org.eclipse.jetty.websocket.api.annotations.WebSocket; import org.eclipse.jetty.websocket.client.ClientUpgradeRequest; import org.eclipse.jetty.websocket.client.WebSocketClient; -import org.junit.Rule; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.Timeout; import com.sap.sailing.domain.igtimiadapter.BulkFixReceiver; import com.sap.sailing.domain.igtimiadapter.IgtimiConnection; @@ -43,11 +42,10 @@ import com.sap.sailing.domain.igtimiadapter.websocket.LiveDataConnectionWrapper; import com.sap.sailing.selenium.test.AbstractSeleniumTest; import com.sap.sse.common.Util; +@Timeout(value = 1, unit = TimeUnit.MINUTES) public class WebSocketTest extends AbstractSeleniumTest { private static final Logger logger = Logger.getLogger(WebSocketTest.class.getName()); - @Rule public Timeout AbstractTracTracLiveTestTimeout = Timeout.millis(1 * 60 * 1000); - @WebSocket public class SimpleEchoTestSocket { private final CountDownLatch closeLatch; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/AjaxCallsExecuted.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/AjaxCallsExecuted.java index 110797ad1ea..79172e68b47 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/AjaxCallsExecuted.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/AjaxCallsExecuted.java @@ -2,7 +2,6 @@ package com.sap.sailing.selenium.core; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; - import org.openqa.selenium.support.ui.ExpectedCondition; /** diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/Annotations.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/Annotations.java index af3efe16068..7b37be8479f 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/Annotations.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/Annotations.java @@ -4,9 +4,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import org.openqa.selenium.By; - import org.openqa.selenium.support.CacheLookup; - import org.openqa.selenium.support.pagefactory.ByChained; /** diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/BySeleniumId.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/BySeleniumId.java index a65414c820c..6524b586720 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/BySeleniumId.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/BySeleniumId.java @@ -1,7 +1,6 @@ package com.sap.sailing.selenium.core; import java.text.MessageFormat; - import java.util.List; import org.openqa.selenium.By; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/ScreenShotFilenameGenerator.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/ScreenShotFilenameGenerator.java index 58cf152691c..1c3d25efac9 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/ScreenShotFilenameGenerator.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/ScreenShotFilenameGenerator.java @@ -1,6 +1,6 @@ package com.sap.sailing.selenium.core; -import org.junit.runner.Description; +import org.hamcrest.Description; /** *

Describes the interface for objects that generate unique file names for screen shots.

diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumElementLocatorFactory.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumElementLocatorFactory.java index 9ffc45e50d9..2bc1d806bc5 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumElementLocatorFactory.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumElementLocatorFactory.java @@ -3,7 +3,6 @@ package com.sap.sailing.selenium.core; import java.lang.reflect.Field; import org.openqa.selenium.SearchContext; - import org.openqa.selenium.support.pagefactory.ElementLocator; import org.openqa.selenium.support.pagefactory.ElementLocatorFactory; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumFieldDecorator.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumFieldDecorator.java index a44340818d3..31468c6f25d 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumFieldDecorator.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumFieldDecorator.java @@ -5,17 +5,14 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Proxy; import java.lang.reflect.Type; - import java.util.List; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Locatable; import org.openqa.selenium.internal.WrapsElement; - import org.openqa.selenium.support.pagefactory.ElementLocator; import org.openqa.selenium.support.pagefactory.ElementLocatorFactory; import org.openqa.selenium.support.pagefactory.FieldDecorator; - import org.openqa.selenium.support.pagefactory.internal.LocatingElementHandler; import org.openqa.selenium.support.pagefactory.internal.LocatingElementListHandler; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumRunner.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumRunner.java index 6469e469848..dd2c4cf3c49 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumRunner.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumRunner.java @@ -11,7 +11,7 @@ import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.runner.Description; +import org.hamcrest.Description; import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunNotifier; import org.junit.runners.BlockJUnit4ClassRunner; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/TestEnvironmentConfiguration.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/TestEnvironmentConfiguration.java index d7e1b65025c..e6e98d6eba0 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/TestEnvironmentConfiguration.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/TestEnvironmentConfiguration.java @@ -2,7 +2,6 @@ package com.sap.sailing.selenium.core; import java.io.FileInputStream; import java.io.IOException; - import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; @@ -10,19 +9,15 @@ import java.util.List; import java.util.Map; import javax.xml.XMLConstants; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; - import javax.xml.transform.stream.StreamSource; - import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; - import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/DefaultFilenameGenerator.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/DefaultFilenameGenerator.java index 85ea811849f..efada2816da 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/DefaultFilenameGenerator.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/DefaultFilenameGenerator.java @@ -2,7 +2,7 @@ package com.sap.sailing.selenium.core.impl; import java.util.UUID; -import org.junit.runner.Description; +import org.hamcrest.Description; import com.sap.sailing.selenium.core.ScreenShotFilenameGenerator; @@ -11,5 +11,4 @@ public class DefaultFilenameGenerator implements ScreenShotFilenameGenerator { public String getTargetFilename(Description description) { return UUID.randomUUID().toString(); } - } diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/JUnitAttachmentsPluginFilenameGenerator.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/JUnitAttachmentsPluginFilenameGenerator.java index 89d39a7f7ba..f695c9b71b1 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/JUnitAttachmentsPluginFilenameGenerator.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/JUnitAttachmentsPluginFilenameGenerator.java @@ -1,6 +1,6 @@ package com.sap.sailing.selenium.core.impl; -import org.junit.runner.Description; +import org.hamcrest.Description; public class JUnitAttachmentsPluginFilenameGenerator extends DefaultFilenameGenerator { @Override diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java index f5329e82ccd..f5ecf7b95bd 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java @@ -15,8 +15,8 @@ import com.sap.sailing.selenium.pages.adminconsole.advanced.FileStoragePO; import com.sap.sailing.selenium.pages.adminconsole.advanced.LocalServerPO; import com.sap.sailing.selenium.pages.adminconsole.advanced.MasterDataImportPO; import com.sap.sailing.selenium.pages.adminconsole.common.WhatsNewDialogPO; -import com.sap.sailing.selenium.pages.adminconsole.connectors.ResultImportUrlsPanelPO; import com.sap.sailing.selenium.pages.adminconsole.connectors.ExpeditionDeviceConfigurationsPanelPO; +import com.sap.sailing.selenium.pages.adminconsole.connectors.ResultImportUrlsPanelPO; import com.sap.sailing.selenium.pages.adminconsole.connectors.SmartphoneTrackingEventManagementPanelPO; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; import com.sap.sailing.selenium.pages.adminconsole.igtimi.IgtimiDevicesManagementPanelPO; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/connectors/ExpeditionDeviceConfigurationCreateDialogPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/connectors/ExpeditionDeviceConfigurationCreateDialogPO.java index f6fedd646fb..40b04d7d165 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/connectors/ExpeditionDeviceConfigurationCreateDialogPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/connectors/ExpeditionDeviceConfigurationCreateDialogPO.java @@ -5,7 +5,6 @@ import org.openqa.selenium.WebElement; import com.sap.sailing.selenium.core.BySeleniumId; import com.sap.sailing.selenium.core.FindBy; - import com.sap.sailing.selenium.pages.common.DataEntryDialogPO; public class ExpeditionDeviceConfigurationCreateDialogPO extends DataEntryDialogPO { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/FlexibleLeaderboardCreateDialogPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/FlexibleLeaderboardCreateDialogPO.java index 1f2562cebd3..410978b806d 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/FlexibleLeaderboardCreateDialogPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/FlexibleLeaderboardCreateDialogPO.java @@ -5,7 +5,6 @@ import org.openqa.selenium.WebElement; import com.sap.sailing.selenium.core.BySeleniumId; import com.sap.sailing.selenium.core.FindBy; - import com.sap.sailing.selenium.pages.common.DataEntryDialogPO; public class FlexibleLeaderboardCreateDialogPO extends DataEntryDialogPO { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/LeaderboardGroupCreateDialogPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/LeaderboardGroupCreateDialogPO.java index bbc7a5d7837..a32a5797892 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/LeaderboardGroupCreateDialogPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/LeaderboardGroupCreateDialogPO.java @@ -5,7 +5,6 @@ import org.openqa.selenium.WebElement; import com.sap.sailing.selenium.core.BySeleniumId; import com.sap.sailing.selenium.core.FindBy; - import com.sap.sailing.selenium.pages.common.DataEntryDialogPO; import com.sap.sailing.selenium.pages.gwt.CheckBoxPO; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/RegattaLeaderboardCreateDialogPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/RegattaLeaderboardCreateDialogPO.java index 247adcb3d4b..64f3f5e8eab 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/RegattaLeaderboardCreateDialogPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/RegattaLeaderboardCreateDialogPO.java @@ -6,7 +6,6 @@ import org.openqa.selenium.support.ui.Select; import com.sap.sailing.selenium.core.BySeleniumId; import com.sap.sailing.selenium.core.FindBy; - import com.sap.sailing.selenium.pages.adminconsole.regatta.RegattaListCompositePO.RegattaDescriptor; import com.sap.sailing.selenium.pages.common.DataEntryDialogPO; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/SeriesCreateDialogPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/SeriesCreateDialogPO.java index 30fa1f1c8e5..e97691982e0 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/SeriesCreateDialogPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/SeriesCreateDialogPO.java @@ -5,7 +5,6 @@ import org.openqa.selenium.WebElement; import com.sap.sailing.selenium.core.BySeleniumId; import com.sap.sailing.selenium.core.FindBy; - import com.sap.sailing.selenium.pages.common.DataEntryDialogPO; public class SeriesCreateDialogPO extends DataEntryDialogPO { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesCompetitorTablePO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesCompetitorTablePO.java index fab3260b136..9849e3e2462 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesCompetitorTablePO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesCompetitorTablePO.java @@ -3,12 +3,12 @@ package com.sap.sailing.selenium.pages.adminconsole.tracking; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; -import com.sap.sailing.selenium.pages.gwt.CellTablePO; -import com.sap.sailing.selenium.pages.gwt.DataEntryPO; import com.sap.sailing.selenium.core.BySeleniumId; import com.sap.sailing.selenium.core.FindBy; import com.sap.sailing.selenium.pages.adminconsole.ActionsHelper; import com.sap.sailing.selenium.pages.adminconsole.tracking.TrackedRacesCompetitorTablePO.CompetitorEntry; +import com.sap.sailing.selenium.pages.gwt.CellTablePO; +import com.sap.sailing.selenium.pages.gwt.DataEntryPO; public class TrackedRacesCompetitorTablePO extends CellTablePO { public static class CompetitorEntry extends DataEntryPO { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/PathMetadata.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/PathMetadata.java index 4ca0c85dd78..0fe6fcba83b 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/PathMetadata.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/PathMetadata.java @@ -1,7 +1,6 @@ package com.sap.sailing.selenium.pages.gwt.query; import java.lang.reflect.Method; - import java.util.Arrays; import java.util.Objects; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/TableQuery.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/TableQuery.java index 14d72930e91..5f9b457e069 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/TableQuery.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/TableQuery.java @@ -6,7 +6,6 @@ import java.util.List; import com.sap.sailing.selenium.pages.gwt.CellTablePO; import com.sap.sailing.selenium.pages.gwt.DataEntryPO; - import com.sap.sailing.selenium.pages.gwt.query.operation.bool.And; public class TableQuery { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/BooleanExpression.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/BooleanExpression.java index 0d6fb827fb4..1c799aff010 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/BooleanExpression.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/BooleanExpression.java @@ -2,9 +2,7 @@ package com.sap.sailing.selenium.pages.gwt.query.expr; import com.sap.sailing.selenium.pages.gwt.query.Expression; import com.sap.sailing.selenium.pages.gwt.query.Predicate; - import com.sap.sailing.selenium.pages.gwt.query.operation.BooleanOperation; - import com.sap.sailing.selenium.pages.gwt.query.operation.bool.And; import com.sap.sailing.selenium.pages.gwt.query.operation.bool.Not; import com.sap.sailing.selenium.pages.gwt.query.operation.bool.Or; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/SimpleExpression.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/SimpleExpression.java index 1eea6cce111..9214c967e2c 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/SimpleExpression.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/SimpleExpression.java @@ -4,13 +4,9 @@ import java.util.Arrays; import java.util.Collection; import com.sap.sailing.selenium.pages.gwt.query.Expression; - import com.sap.sailing.selenium.pages.gwt.query.operation.BooleanOperation; - import com.sap.sailing.selenium.pages.gwt.query.operation.bool.Eq; - import com.sap.sailing.selenium.pages.gwt.query.operation.collection.In; - import com.sap.sailing.selenium.pages.gwt.query.operation.object.IsNotNull; import com.sap.sailing.selenium.pages.gwt.query.operation.object.IsNull; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/StringExpression.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/StringExpression.java index 50f66718a46..2dfa08f90b4 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/StringExpression.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/expr/StringExpression.java @@ -1,7 +1,6 @@ package com.sap.sailing.selenium.pages.gwt.query.expr; import com.sap.sailing.selenium.pages.gwt.query.Expression; - import com.sap.sailing.selenium.pages.gwt.query.operation.BooleanOperation; import com.sap.sailing.selenium.pages.gwt.query.operation.string.Matches; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/BooleanOperation.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/BooleanOperation.java index 6c36c412894..9e5c851e1f0 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/BooleanOperation.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/BooleanOperation.java @@ -4,9 +4,7 @@ import java.util.List; import com.sap.sailing.selenium.pages.gwt.query.Expression; import com.sap.sailing.selenium.pages.gwt.query.Operation; - import com.sap.sailing.selenium.pages.gwt.query.expr.BooleanExpression; - import com.sap.sailing.selenium.pages.gwt.query.operation.bool.Not; public class BooleanOperation extends BooleanExpression implements Operation { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/PredicateOperation.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/PredicateOperation.java index 55f0839a7b0..601c7473fce 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/PredicateOperation.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/PredicateOperation.java @@ -1,7 +1,6 @@ package com.sap.sailing.selenium.pages.gwt.query.operation; import com.google.common.collect.ImmutableList; - import com.sap.sailing.selenium.pages.gwt.query.Expression; import com.sap.sailing.selenium.pages.gwt.query.Predicate; import com.sap.sailing.selenium.pages.gwt.query.operation.bool.Not; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/SimpleOperation.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/SimpleOperation.java index b67848d763b..4f08248a436 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/SimpleOperation.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/SimpleOperation.java @@ -3,10 +3,8 @@ package com.sap.sailing.selenium.pages.gwt.query.operation; import java.util.List; import com.google.common.collect.ImmutableList; - import com.sap.sailing.selenium.pages.gwt.query.Expression; import com.sap.sailing.selenium.pages.gwt.query.Operation; - import com.sap.sailing.selenium.pages.gwt.query.expr.ImmutableExpression; public abstract class SimpleOperation extends ImmutableExpression implements Operation { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/And.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/And.java index a17e2dc4508..f2c16d47bc7 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/And.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/And.java @@ -1,7 +1,6 @@ package com.sap.sailing.selenium.pages.gwt.query.operation.bool; import com.sap.sailing.selenium.pages.gwt.query.Expression; - import com.sap.sailing.selenium.pages.gwt.query.operation.PredicateOperation; public class And extends PredicateOperation { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/Eq.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/Eq.java index 6d0bf7eacc5..a982086807e 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/Eq.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/Eq.java @@ -3,7 +3,6 @@ package com.sap.sailing.selenium.pages.gwt.query.operation.bool; import java.util.Objects; import com.sap.sailing.selenium.pages.gwt.query.Expression; - import com.sap.sailing.selenium.pages.gwt.query.operation.PredicateOperation; public class Eq extends PredicateOperation { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/Or.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/Or.java index 22284424b4c..766c2e65f43 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/Or.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/bool/Or.java @@ -1,7 +1,6 @@ package com.sap.sailing.selenium.pages.gwt.query.operation.bool; import com.sap.sailing.selenium.pages.gwt.query.Expression; - import com.sap.sailing.selenium.pages.gwt.query.operation.PredicateOperation; public class Or extends PredicateOperation { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/object/IsNotNull.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/object/IsNotNull.java index 0c549e0b68a..bb292eb078b 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/object/IsNotNull.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/object/IsNotNull.java @@ -1,7 +1,6 @@ package com.sap.sailing.selenium.pages.gwt.query.operation.object; import com.sap.sailing.selenium.pages.gwt.query.Expression; - import com.sap.sailing.selenium.pages.gwt.query.operation.PredicateOperation; public class IsNotNull extends PredicateOperation { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/object/IsNull.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/object/IsNull.java index 4c774ae1297..a54a580910a 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/object/IsNull.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/query/operation/object/IsNull.java @@ -1,7 +1,6 @@ package com.sap.sailing.selenium.pages.gwt.query.operation.object; import com.sap.sailing.selenium.pages.gwt.query.Expression; - import com.sap.sailing.selenium.pages.gwt.query.operation.PredicateOperation; public class IsNull extends PredicateOperation { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java index 9a99eb06b2d..093dfab84ef 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java @@ -15,13 +15,13 @@ import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; +import org.hamcrest.Description; import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; -import org.junit.BeforeEach; import org.junit.Rule; +import org.junit.jupiter.api.BeforeEach; import org.junit.rules.TestWatcher; -import org.junit.runner.Description; import org.junit.runner.RunWith; import org.openqa.selenium.By; import org.openqa.selenium.Cookie; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestBoatCreation.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestBoatCreation.java index 7620f21f2c4..4d6712a79e6 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestBoatCreation.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestBoatCreation.java @@ -2,7 +2,7 @@ package com.sap.sailing.selenium.test.adminconsole; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestCompetitorCreation.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestCompetitorCreation.java index 85add2b11b2..15a36b4b13d 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestCompetitorCreation.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestCompetitorCreation.java @@ -6,7 +6,7 @@ import static com.sap.sailing.selenium.pages.PageObject.createFluentWait; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openqa.selenium.support.ui.FluentWait; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestConnectorsResultImportUrls.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestConnectorsResultImportUrls.java index 84571ed7363..b358ac7a1d4 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestConnectorsResultImportUrls.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestConnectorsResultImportUrls.java @@ -1,6 +1,6 @@ package com.sap.sailing.selenium.test.adminconsole; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestEventCreationWithPredefinedLeaderboards.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestEventCreationWithPredefinedLeaderboards.java index baafa00cfa9..0737bb1c756 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestEventCreationWithPredefinedLeaderboards.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestEventCreationWithPredefinedLeaderboards.java @@ -5,7 +5,7 @@ import static com.sap.sailing.selenium.pages.common.DateHelper.getPastDate; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestExpeditionDeviceConfigurationsFilterAndSelectByUrlParameters.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestExpeditionDeviceConfigurationsFilterAndSelectByUrlParameters.java index 58d26f8a05c..c85c62e190a 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestExpeditionDeviceConfigurationsFilterAndSelectByUrlParameters.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestExpeditionDeviceConfigurationsFilterAndSelectByUrlParameters.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardConfigSelectionModel.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardConfigSelectionModel.java index c7db263e6b5..d97ba71bb11 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardConfigSelectionModel.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardConfigSelectionModel.java @@ -4,13 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO; -import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardDetailsPanelPO; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO.LeaderboardEntryPO; +import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardDetailsPanelPO; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardRacesTablePO.RaceEntryPO; import com.sap.sailing.selenium.test.AbstractSeleniumTest; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardCreation.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardCreation.java index 4cfe00016d8..1bd2058185c 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardCreation.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardCreation.java @@ -3,7 +3,7 @@ package com.sap.sailing.selenium.test.adminconsole; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardFilterAndSelectByUrlParameters.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardFilterAndSelectByUrlParameters.java index 47e0ec67e42..68ed0b91607 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardFilterAndSelectByUrlParameters.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardFilterAndSelectByUrlParameters.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardFilterInLeaderboardGroupConfig.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardFilterInLeaderboardGroupConfig.java index 6ebbfef0558..aa0204b262d 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardFilterInLeaderboardGroupConfig.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardFilterInLeaderboardGroupConfig.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLinkCreation.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLinkCreation.java index ae4f85be9ef..16cbfa999f6 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLinkCreation.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLinkCreation.java @@ -10,8 +10,8 @@ import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Assume; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; @@ -21,6 +21,7 @@ import org.openqa.selenium.support.ui.Wait; import org.openqa.selenium.support.ui.WebDriverWait; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import com.sap.sailing.landscape.common.SharedLandscapeConstants; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.connectors.SmartphoneTrackingEventManagementPanelPO; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestOpenRegattaCreation.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestOpenRegattaCreation.java index cb4745dc685..244ba7aa7bf 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestOpenRegattaCreation.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestOpenRegattaCreation.java @@ -1,6 +1,6 @@ package com.sap.sailing.selenium.test.adminconsole; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRaceFilterForTracTracEvents.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRaceFilterForTracTracEvents.java index 8f4e1a3b2ca..cfd939e4f28 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRaceFilterForTracTracEvents.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRaceFilterForTracTracEvents.java @@ -1,9 +1,9 @@ package com.sap.sailing.selenium.test.adminconsole; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.*; +import static org.hamcrest.core.Is.is; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java index 943a7692684..a815ebf2450 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestSmartphoneTrackingEventManagementPanel.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestSmartphoneTrackingEventManagementPanel.java index 5adddbca446..d71ce22660d 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestSmartphoneTrackingEventManagementPanel.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestSmartphoneTrackingEventManagementPanel.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.ArrayList; import java.util.List; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java index 5aebd32f958..74c2eade17e 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java @@ -1,9 +1,9 @@ package com.sap.sailing.selenium.test.adminconsole; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/roles/TestRoleDefinitionCreation.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/roles/TestRoleDefinitionCreation.java index 052aaf86532..11e93a83942 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/roles/TestRoleDefinitionCreation.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/roles/TestRoleDefinitionCreation.java @@ -3,7 +3,7 @@ package com.sap.sailing.selenium.test.adminconsole.roles; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usergroupmanagement/TestUserGroupCreation.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usergroupmanagement/TestUserGroupCreation.java index 37a566fdd03..d0c8c4e8309 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usergroupmanagement/TestUserGroupCreation.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usergroupmanagement/TestUserGroupCreation.java @@ -3,7 +3,7 @@ package com.sap.sailing.selenium.test.adminconsole.usergroupmanagement; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usermanagement/TestNegativeAcls.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usermanagement/TestNegativeAcls.java index 1ae17d1afee..3e30e32ce8c 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usermanagement/TestNegativeAcls.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usermanagement/TestNegativeAcls.java @@ -8,7 +8,7 @@ import java.time.Duration; import java.time.ZonedDateTime; import java.util.Date; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usermanagement/TestUserManagement.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usermanagement/TestUserManagement.java index 54557ad2c44..9963dba52b9 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usermanagement/TestUserManagement.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/usermanagement/TestUserManagement.java @@ -3,7 +3,7 @@ package com.sap.sailing.selenium.test.adminconsole.usermanagement; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/authentication/TestAuthenticationSignIn.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/authentication/TestAuthenticationSignIn.java index b03327c0a51..71039a9a81f 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/authentication/TestAuthenticationSignIn.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/authentication/TestAuthenticationSignIn.java @@ -3,7 +3,7 @@ package com.sap.sailing.selenium.test.authentication; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/autoplay/TestAutoPlay.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/autoplay/TestAutoPlay.java index 5476e909a90..38bb1df2560 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/autoplay/TestAutoPlay.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/autoplay/TestAutoPlay.java @@ -10,8 +10,8 @@ import java.util.function.Function; import javax.xml.bind.DatatypeConverter; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.WebDriverWait; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/datamining/DataminingEntrypointSmokeTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/datamining/DataminingEntrypointSmokeTest.java index 8fa68071df7..186aeef80f9 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/datamining/DataminingEntrypointSmokeTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/datamining/DataminingEntrypointSmokeTest.java @@ -2,7 +2,7 @@ package com.sap.sailing.selenium.test.datamining; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.datamining.DataMiningPage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/home/MediaUploadTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/home/MediaUploadTest.java index c601c691719..91ffb211388 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/home/MediaUploadTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/home/MediaUploadTest.java @@ -5,7 +5,7 @@ import java.util.Date; import javax.xml.bind.DatatypeConverter; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/home/WhitelabelTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/home/WhitelabelTest.java index 3555d2823d7..1f0c3c891e7 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/home/WhitelabelTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/home/WhitelabelTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.selenium.test.home; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; import java.io.UnsupportedEncodingException; import java.util.ArrayList; @@ -12,7 +12,7 @@ import java.util.List; import javax.xml.bind.DatatypeConverter; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebElement; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/integration/state/TestStateVisualizationRegatta.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/integration/state/TestStateVisualizationRegatta.java index 2f355b3c52f..67e2dce2425 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/integration/state/TestStateVisualizationRegatta.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/integration/state/TestStateVisualizationRegatta.java @@ -7,8 +7,8 @@ import static com.sap.sailing.selenium.pages.common.DateHelper.getPastTime; import java.util.Date; import java.util.function.Predicate; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestColumnsInLeaderboard.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestColumnsInLeaderboard.java index 2cc16288c32..0befbf57e7e 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestColumnsInLeaderboard.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestColumnsInLeaderboard.java @@ -1,14 +1,14 @@ package com.sap.sailing.selenium.test.leaderboard; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.hamcrest.MatcherAssert.assertThat; import java.util.List; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java index 6ddf7078a9e..eae608367ae 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java @@ -1,13 +1,13 @@ package com.sap.sailing.selenium.test.leaderboard; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java index 582b717d97b..77dc68ac9a8 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java @@ -1,14 +1,14 @@ package com.sap.sailing.selenium.test.leaderboard; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.hamcrest.MatcherAssert.assertThat; import java.util.Arrays; import java.util.List; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboardedit/TestLeaderboardEditing.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboardedit/TestLeaderboardEditing.java index 84e61937b55..f9f48d08dad 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboardedit/TestLeaderboardEditing.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboardedit/TestLeaderboardEditing.java @@ -3,7 +3,7 @@ package com.sap.sailing.selenium.test.leaderboardedit; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/pairinglist/PairinglistTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/pairinglist/PairinglistTest.java index 533302667d5..ad6c725eb58 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/pairinglist/PairinglistTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/pairinglist/PairinglistTest.java @@ -4,8 +4,8 @@ import java.util.Date; import javax.xml.bind.DatatypeConverter; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java index fc3bdfe4527..bd885213f22 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java @@ -10,8 +10,8 @@ import java.util.stream.Collectors; import javax.xml.bind.DatatypeConverter; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SimulatorOverlayTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SimulatorOverlayTest.java index b493729323c..72e8a05f93b 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SimulatorOverlayTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SimulatorOverlayTest.java @@ -11,8 +11,8 @@ import java.util.List; import javax.xml.bind.DatatypeConverter; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/expeditionimport/TestWindLogParser.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/expeditionimport/TestWindLogParser.java index 7a0824a4e89..fa571959dc8 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/expeditionimport/TestWindLogParser.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/expeditionimport/TestWindLogParser.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.gateway.expeditionimport; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.number.IsCloseTo.closeTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.number.IsCloseTo.closeTo; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/jaxrs/api/CompareServersTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/jaxrs/api/CompareServersTest.java index eb37306d372..51bf135dec6 100755 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/jaxrs/api/CompareServersTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/jaxrs/api/CompareServersTest.java @@ -15,7 +15,7 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/DeviceIdentifierSerializationTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/DeviceIdentifierSerializationTest.java index 711f5569c9c..acfa1683368 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/DeviceIdentifierSerializationTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/DeviceIdentifierSerializationTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import org.json.simple.JSONObject; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.DeviceIdentifier; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/SailingServerTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/SailingServerTest.java index 26c0f03e167..8e10c12476d 100755 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/SailingServerTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/SailingServerTest.java @@ -8,7 +8,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.server.gateway.impl.SailingServerImpl; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/BoatResourceTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/BoatResourceTest.java index 08858be0cd6..ff2e2be4cf6 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/BoatResourceTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/BoatResourceTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.json.simple.JSONObject; import org.json.simple.JSONValue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/CompetitorsResourceTeamImageTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/CompetitorsResourceTeamImageTest.java index b4e8ced3490..b39a72c3933 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/CompetitorsResourceTeamImageTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/CompetitorsResourceTeamImageTest.java @@ -14,7 +14,7 @@ import org.apache.commons.io.IOUtils; import org.json.simple.JSONObject; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.impl.DynamicTeam; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/CompetitorsResourceTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/CompetitorsResourceTest.java index 28fa35acc23..b7d9099c91d 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/CompetitorsResourceTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/CompetitorsResourceTest.java @@ -6,7 +6,7 @@ import java.util.Collections; import org.json.simple.JSONObject; import org.json.simple.JSONValue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.impl.DynamicTeam; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/EventResourceTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/EventResourceTest.java index b8c4fc0516a..b351edf55ac 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/EventResourceTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/EventResourceTest.java @@ -20,7 +20,7 @@ import org.apache.commons.lang.RandomStringUtils; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/GPSFixesResourceTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/GPSFixesResourceTest.java index 3081662f42b..7e0d91dc40e 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/GPSFixesResourceTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/GPSFixesResourceTest.java @@ -8,7 +8,7 @@ import java.util.UUID; import javax.ws.rs.core.Response; import org.json.simple.parser.ParseException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.DeviceIdentifier; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardGroupResourceTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardGroupResourceTest.java index ecc1a291f12..821e0f72ce6 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardGroupResourceTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardGroupResourceTest.java @@ -11,7 +11,7 @@ import javax.ws.rs.core.Response; import org.json.simple.JSONArray; import org.json.simple.JSONValue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourceCheckinAndOutTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourceCheckinAndOutTest.java index 1ee85a7342c..c77a3456bb6 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourceCheckinAndOutTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourceCheckinAndOutTest.java @@ -14,7 +14,7 @@ import java.util.UUID; import javax.ws.rs.core.Response; import org.json.simple.JSONObject; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourcePingMarkTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourcePingMarkTest.java index 89aef7683dd..c85f47f017c 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourcePingMarkTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourcePingMarkTest.java @@ -11,7 +11,7 @@ import java.util.UUID; import javax.ws.rs.core.Response; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourceTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourceTest.java index 12d5651935c..ea9535026ec 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourceTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/LeaderboardsResourceTest.java @@ -18,7 +18,7 @@ import javax.ws.rs.core.Response.Status; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java index 0a2fc705f0b..4c157e5a501 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response.Status; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java index 8d565dec92e..f8e3faa9703 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java @@ -9,7 +9,7 @@ import java.io.FileNotFoundException; import java.net.UnknownHostException; import java.util.logging.Logger; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/IdempotencyForWaypointOperationsTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/IdempotencyForWaypointOperationsTest.java index b02765a4f15..19534d86a42 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/IdempotencyForWaypointOperationsTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/IdempotencyForWaypointOperationsTest.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Course; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java index ec2f3850a2e..11c41e138c6 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.server.replication.test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.hamcrest.MatcherAssert.assertThat; import java.io.Serializable; import java.util.ArrayList; @@ -20,7 +20,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.Callable; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PostingOperationFromReplicaToMasterTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PostingOperationFromReplicaToMasterTest.java index 6550b7f02b1..326bb24e632 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PostingOperationFromReplicaToMasterTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PostingOperationFromReplicaToMasterTest.java @@ -7,9 +7,8 @@ import java.util.Collections; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.Timeout; import com.sap.sailing.domain.base.CompetitorAndBoatStore; import com.sap.sailing.domain.base.CourseArea; @@ -28,9 +27,8 @@ import com.sap.sailing.server.operationaltransformation.UpdateBoat; * @author Frank Mittag * */ +@Timeout(value = 30, unit = TimeUnit.SECONDS) public class PostingOperationFromReplicaToMasterTest extends AbstractServerReplicationTest { - @Rule public Timeout timeout = new Timeout(30, TimeUnit.SECONDS); - /** * Add a tracked race to the master that includes a competitor; check that the boat was properly replicated to * the replica's {@link CompetitorAndBoatStore}. Afterwards, use the {@link UpdateBoat} operation on the master to diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java index 90032ba20d2..eb95afe8ba0 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java @@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.UUID; -import org.junit.BeforeEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java index 96c647825d3..b1926079a04 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.replication.test; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RemoteMessageStreamTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RemoteMessageStreamTest.java index a42f486eded..0d6fdc1ecc9 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RemoteMessageStreamTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RemoteMessageStreamTest.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.TimeoutException; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.rabbitmq.client.Channel; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ReplicationInstancesManagerLoggingPerformanceTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ReplicationInstancesManagerLoggingPerformanceTest.java index 32ed735d3d5..1867e53793c 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ReplicationInstancesManagerLoggingPerformanceTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ReplicationInstancesManagerLoggingPerformanceTest.java @@ -8,7 +8,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.server.operationaltransformation.CreateLeaderboardGroup; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/SimpleRabbitMQTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/SimpleRabbitMQTest.java index b7504351f72..0a80eac754c 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/SimpleRabbitMQTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/SimpleRabbitMQTest.java @@ -7,8 +7,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeoutException; -import org.junit.BeforeEach; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.rabbitmq.client.Channel; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java index 69c28ee6fe9..ff8be5ff361 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java @@ -12,8 +12,8 @@ import java.util.GregorianCalendar; import java.util.TimeZone; import java.util.UUID; -import org.junit.BeforeEach; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; @@ -32,8 +32,8 @@ import com.sap.sailing.domain.test.AbstractTracTracLiveTest; import com.sap.sailing.domain.tracking.RaceHandle; import com.sap.sailing.domain.tracking.RaceTracker; import com.sap.sailing.domain.tracking.RaceTrackingConnectivityParameters; -import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.RaceTrackingHandler.DefaultRaceTrackingHandler; +import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tractracadapter.impl.DomainFactoryImpl; import com.sap.sailing.server.interfaces.RacingEventService; import com.sap.sailing.server.operationaltransformation.CreateTrackedRace; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java index dfbf7e7aba4..4e810a2fac9 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java @@ -17,8 +17,8 @@ import java.util.TimeZone; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.BeforeEach; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java index 68b5c197c8a..5e7ca1f3344 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.MongoException; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithSensorFixStoreContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithSensorFixStoreContentsReplicationTest.java index 8fbbd0ad5e6..411f2163645 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithSensorFixStoreContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithSensorFixStoreContentsReplicationTest.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.BeforeEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/UnsentOperationSenderJobTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/UnsentOperationSenderJobTest.java index 2f4092804a3..4a5503d47e2 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/UnsentOperationSenderJobTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/UnsentOperationSenderJobTest.java @@ -9,10 +9,9 @@ import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.BeforeEach; -import org.junit.Rule; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.Timeout; import com.sap.sailing.server.interfaces.RacingEventService; import com.sap.sse.replication.OperationWithResult; @@ -21,14 +20,13 @@ import com.sap.sse.replication.OperationsToMasterSender; import com.sap.sse.replication.ReplicationMasterDescriptor; import com.sap.sse.replication.impl.UnsentOperationsSenderJob; +@Timeout(value = 10, unit = TimeUnit.SECONDS) public class UnsentOperationSenderJobTest implements OperationsToMasterSender> { private static final int MAX_RESEND_COUNT = 10; private UnsentOperationsSenderJob job; private int resendCount; private CountDownLatch latch; - @Rule public Timeout timeout = new Timeout(10, TimeUnit.SECONDS); - @BeforeEach public void setUp() { job = new UnsentOperationsSenderJob(); diff --git a/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF index f0c1578c595..e9f992e2842 100644 --- a/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF @@ -16,7 +16,11 @@ Require-Bundle: com.sap.sailing.domain, com.sap.sse.mongodb, com.tractrac.clientmodule;bundle-version="2.0.0", org.hamcrest;bundle-version="2.2.0", - org.junit;bundle-version="4.8.2", + junit-jupiter-api;bundle-version="5.12.2", + junit-jupiter-engine;bundle-version="5.12.2", + junit-platform-commons;bundle-version="1.12.2", + junit-platform-engine;bundle-version="1.12.2", + org.opentest4j;bundle-version="1.3.0", com.sap.sailing.domain.test, org.mockito.mockito-core;bundle-version="1.10.14", com.sap.sse.common, diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/anniversary/AnniversaryQuarterCheckerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/anniversary/AnniversaryQuarterCheckerTest.java index 8a29793c7d6..ce4792dc1cd 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/anniversary/AnniversaryQuarterCheckerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/anniversary/AnniversaryQuarterCheckerTest.java @@ -1,5 +1,7 @@ package com.sap.sailing.server.anniversary; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.Arrays; import org.junit.jupiter.api.Assertions; @@ -90,15 +92,19 @@ public class AnniversaryQuarterCheckerTest { * Tests that no runaway loop can happen, if the anniversary to check overflows internally. The used 1000000000 is * the first number, that will lead to a overflow, after *10 multiplier is applied, testing for the next anniversary */ - @Test(expected = IllegalStateException.class) + @Test public void ensureInCaseOfBugNoFreeze() { - AnniversaryChecker checker = new QuarterChecker(); - checker.update(1000000000); + assertThrows(IllegalStateException.class, () -> { + AnniversaryChecker checker = new QuarterChecker(); + checker.update(1000000000); + }); } - @Test(expected = IllegalStateException.class) + @Test public void illegalRaceCountTest() { - AnniversaryChecker checker = new QuarterChecker(); - checker.update(-1); + assertThrows(IllegalStateException.class, () -> { + AnniversaryChecker checker = new QuarterChecker(); + checker.update(-1); + }); } } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/anniversary/AnniversarySameDigitCheckerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/anniversary/AnniversarySameDigitCheckerTest.java index 5df3e20b079..58dd371986b 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/anniversary/AnniversarySameDigitCheckerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/anniversary/AnniversarySameDigitCheckerTest.java @@ -1,5 +1,7 @@ package com.sap.sailing.server.anniversary; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.Arrays; import org.junit.jupiter.api.Assertions; @@ -93,15 +95,19 @@ public class AnniversarySameDigitCheckerTest { * Tests that no runaway loop can happen, if the anniversary to check overflows internally. It is expected that the * resulting String cannot be converted to a number anymore if it exceeds IntegerRange. */ - @Test(expected = NumberFormatException.class) + @Test public void ensureInCaseOfBugNoFreeze() { - AnniversaryChecker checker = new SameDigitChecker(); - checker.update(Integer.MAX_VALUE); + assertThrows(NumberFormatException.class, () -> { + AnniversaryChecker checker = new SameDigitChecker(); + checker.update(Integer.MAX_VALUE); + }); } - @Test(expected = IllegalStateException.class) + @Test public void illegalRaceCountTest() { - AnniversaryChecker checker = new SameDigitChecker(); - checker.update(-1); + assertThrows(IllegalStateException.class, () -> { + AnniversaryChecker checker = new SameDigitChecker(); + checker.update(-1); + }); } } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardStorageTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardStorageTest.java index 79caa67f8ae..c2e76375e70 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardStorageTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardStorageTest.java @@ -1,5 +1,7 @@ package com.sap.sailing.server.test; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; @@ -7,6 +9,8 @@ import java.util.List; import java.util.UUID; import org.bson.Document; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.mongodb.BasicDBObject; @@ -24,18 +28,16 @@ import com.sap.sailing.server.impl.RacingEventServiceImpl; import com.sap.sailing.server.interfaces.RacingEventService; import com.sap.sse.mongodb.MongoDBService; -import junit.framework.TestCase; - -public class LeaderboardStorageTest extends TestCase { +public class LeaderboardStorageTest { private static final String LEADERBOARD_NAME = "test"; - @Override + @BeforeEach protected void setUp() throws Exception { removeTestLeaderboard(); } - @Override + @AfterEach protected void tearDown() throws Exception { removeTestLeaderboard(); } diff --git a/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF index 2ebacb4cf75..124a819bca1 100644 --- a/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF @@ -14,9 +14,13 @@ Import-Package: com.sap.sailing.domain.common, org.mockito.stubbing;version="4.8.1", org.osgi.framework;version="1.5.0" Fragment-Host: com.sap.sailing.yachtscoring.resultimport -Require-Bundle: org.junit;bundle-version="4.8.2", +Require-Bundle: org.hamcrest;bundle-version="2.2.0", + junit-jupiter-api;bundle-version="5.12.2", + junit-jupiter-engine;bundle-version="5.12.2", + junit-platform-commons;bundle-version="1.12.2", + junit-platform-engine;bundle-version="1.12.2", + org.opentest4j;bundle-version="1.3.0", com.sap.sse.common, - org.hamcrest;bundle-version="2.2.0", com.sap.sse, com.sap.sailing.server, com.sap.sailing.server.interface, diff --git a/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java b/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java index 8e3d2638da2..71a69aa3db3 100644 --- a/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java +++ b/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; import java.util.UUID; +import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; @@ -32,8 +33,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.shiro.SecurityUtils; import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.subject.Subject; -import org.junit.Rule; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.Timeout; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -60,6 +60,7 @@ import com.sap.sse.replication.interfaces.impl.ReplicaDescriptorImpl; import net.jpountz.lz4.LZ4BlockOutputStream; +@Timeout(value=5, unit=TimeUnit.MINUTES) // timeout after 5 minutes public abstract class AbstractServerReplicationTestSetUp, ReplicableImpl extends ReplicableInterface> { private static final Logger logger = Logger.getLogger(AbstractServerReplicationTestSetUp.class.getName()); @@ -80,7 +81,6 @@ public abstract class AbstractServerReplicationTestSetUpcallable.apply(securityService)); } - @Test(expected = IllegalArgumentException.class) + @Test public void testHasCurrentUserAnyPermissionExpectException() { - createSecurityServiceWithoutHasPermissionsProvider().hasCurrentUserAnyPermission(new WildcardPermission("LEADERBOARD:READ:Humba")); + assertThrows(IllegalArgumentException.class, () -> { + createSecurityServiceWithoutHasPermissionsProvider().hasCurrentUserAnyPermission(new WildcardPermission("LEADERBOARD:READ:Humba")); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void testHasCurrentUserMetaPermissionExpectException() { - createSecurityServiceWithoutHasPermissionsProvider().hasCurrentUserMetaPermission(new WildcardPermission("LEADERBOARD:READ:Humba"), /* ownership */ null); + assertThrows(IllegalArgumentException.class, () -> { + createSecurityServiceWithoutHasPermissionsProvider().hasCurrentUserMetaPermission(new WildcardPermission("LEADERBOARD:READ:Humba"), /* ownership */ null); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void testHasCurrentUserMetaPermissionWithOwnershipLookupExpectException() { - createSecurityServiceWithoutHasPermissionsProvider().hasCurrentUserMetaPermissionWithOwnershipLookup(new WildcardPermission("LEADERBOARD:READ:Humba")); + assertThrows(IllegalArgumentException.class, () -> { + createSecurityServiceWithoutHasPermissionsProvider().hasCurrentUserMetaPermissionWithOwnershipLookup(new WildcardPermission("LEADERBOARD:READ:Humba")); + }); } @Test diff --git a/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/AbstractSettingsSerializationTest.java b/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/AbstractSettingsSerializationTest.java index 45e741efcf3..f1575777c03 100644 --- a/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/AbstractSettingsSerializationTest.java +++ b/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/AbstractSettingsSerializationTest.java @@ -1,6 +1,7 @@ package com.sap.sse.shared.android.test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.math.BigDecimal; import java.util.Arrays; @@ -271,17 +272,21 @@ public abstract class AbstractSettingsSerializationTest { * Verifies that it is not possible to have two equally named child settings that would cause conflicts on * serialization. */ - @Test(expected = RuntimeException.class) + @Test public void testDuplicateSetting() { - new DuplicateFieldSettings(); + assertThrows(RuntimeException.class, () -> { + new DuplicateFieldSettings(); + }); } /** * Verifies that it is not possible to have setting names with ".". */ - @Test(expected = RuntimeException.class) + @Test public void testDisallowedSettingNameSetting() { - new DisallowedKeySettings(); + assertThrows(RuntimeException.class, () -> { + new DisallowedKeySettings(); + }); } /** diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/ThreadPoolWithExceptionsTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/ThreadPoolWithExceptionsTest.java index 8dc4738b247..c7c031df99b 100755 --- a/java/com.sap.sse.test/src/com/sap/sse/test/ThreadPoolWithExceptionsTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/ThreadPoolWithExceptionsTest.java @@ -8,10 +8,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; -import org.junit.Rule; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.Timeout; import com.sap.sse.util.impl.ThreadFactoryWithPriority; @@ -22,9 +21,8 @@ import com.sap.sse.util.impl.ThreadFactoryWithPriority; * @author Axel Uhl (D043530) * */ +@Timeout(value=10, unit=TimeUnit.SECONDS) public class ThreadPoolWithExceptionsTest { - @Rule public Timeout threadPoolWithExceptionsTestTimeout = Timeout.millis(10 * 1000); // 10s timeout - private static final Logger logger = Logger.getLogger(ThreadPoolWithExceptionsTest.class.getName()); final int THREAD_POOL_SIZE = 100; diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/BODTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/BODTest.java index e61a6bd3d35..9205d273011 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/BODTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/BODTest.java @@ -1,19 +1,22 @@ package net.sf.marineapi.nmea.parser; -import junit.framework.TestCase; -import net.sf.marineapi.nmea.sentence.BODSentence; -import net.sf.marineapi.nmea.sentence.TalkerId; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import net.sf.marineapi.nmea.sentence.BODSentence; +import net.sf.marineapi.nmea.sentence.TalkerId; + /** * Tests the BOD sentence parser. * * @author Kimmo Tuukkanen */ -public class BODTest extends TestCase { +public class BODTest { public static final String EXAMPLE = "$GPBOD,234.9,T,228.8,M,RUSKI,*1D"; @@ -23,7 +26,6 @@ public class BODTest extends TestCase { /** * setUp */ - @Override @BeforeEach public void setUp() throws Exception { try { @@ -37,7 +39,6 @@ public class BODTest extends TestCase { /** * tearDown */ - @Override @AfterEach public void tearDown() throws Exception { } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/SentenceParserTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/SentenceParserTest.java index 5a41ae1d5ce..b1fe53a2385 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/SentenceParserTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/SentenceParserTest.java @@ -10,6 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -411,7 +412,7 @@ public class SentenceParserTest { // https://bugs.openjdk.java.net/browse/JDK-8039915 String version = System.getProperty("java.version"); - org.junit.Assume.assumeTrue(!version.startsWith("1.7.")); + assumeTrue(!version.startsWith("1.7.")); // would fail in jdk7 claiming "12.35" not equal to "12.34" instance.setDoubleValue(0, 12.345, 1, 2);