diff --git a/java/com.sap.sailing.barbados.resultimport.test/src/com/sap/sailing/barbados/resultimport/test/BarbadosResultImportTest.java b/java/com.sap.sailing.barbados.resultimport.test/src/com/sap/sailing/barbados/resultimport/test/BarbadosResultImportTest.java index e7f8766f356..11ba06636ba 100755 --- a/java/com.sap.sailing.barbados.resultimport.test/src/com/sap/sailing/barbados/resultimport/test/BarbadosResultImportTest.java +++ b/java/com.sap.sailing.barbados.resultimport.test/src/com/sap/sailing/barbados/resultimport/test/BarbadosResultImportTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.barbados.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +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 java.io.File; import java.io.FileInputStream; @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.barbados.resultimport.impl.BarbadosResultSpreadsheet; import com.sap.sailing.barbados.resultimport.impl.ScoreCorrectionProviderImpl; @@ -50,7 +50,7 @@ public class BarbadosResultImportTest { return new File(RESOURCES + filename); } - @Before + @BeforeEach public void setUp() throws FileNotFoundException, IOException, Exception { spreadsheet = new BarbadosResultSpreadsheet(getInputStream(SAMPLE_INPUT_NAME_EMPTY_RESULTS)); scp = new ScoreCorrectionProviderImpl(new ResultDocumentProvider() { diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/components/TestLeaderboardGroupRetrievalProcessor.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/components/TestLeaderboardGroupRetrievalProcessor.java index 0b4e7316f14..a645f31ae0d 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/components/TestLeaderboardGroupRetrievalProcessor.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/components/TestLeaderboardGroupRetrievalProcessor.java @@ -31,8 +31,8 @@ import org.apache.shiro.subject.SimplePrincipalCollection; import org.apache.shiro.subject.Subject; import org.apache.shiro.util.ThreadContext; import org.apache.shiro.web.subject.support.WebDelegatingSubject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.datamining.data.HasLeaderboardGroupContext; import com.sap.sailing.datamining.test.util.ConcurrencyTestsUtil; @@ -104,7 +104,7 @@ public class TestLeaderboardGroupRetrievalProcessor { } } - @Before + @BeforeEach public void initializeComponents() { final DummyRealm realm = new DummyRealm(); SecurityUtils.setSecurityManager(new DefaultSecurityManager(realm)); diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/components/TestSegmentsTackType.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/components/TestSegmentsTackType.java index a3d9ec17488..721b83b3f65 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/components/TestSegmentsTackType.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/components/TestSegmentsTackType.java @@ -1,16 +1,16 @@ package com.sap.sailing.datamining.impl.components; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.datamining.data.HasLeaderboardContext; import com.sap.sailing.datamining.data.HasRaceOfCompetitorContext; @@ -54,7 +54,7 @@ public class TestSegmentsTackType extends StoredTrackBasedTest { private HasRaceOfCompetitorContext raceOfCompContext; private TackTypeSegmentRetrievalProcessor resultTTSegmentsRetrieval; - @Before + @BeforeEach public void setup() { competitorA = createCompetitorWithBoat("A"); trackedRace = createTestTrackedRace("TestRegatta", "TestRace", "F18", createCompetitorAndBoatsMap(competitorA), diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/functions/TestSailingFunctionsRegistration.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/functions/TestSailingFunctionsRegistration.java index d40a80c5dd2..2c326cdba29 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/functions/TestSailingFunctionsRegistration.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/functions/TestSailingFunctionsRegistration.java @@ -8,8 +8,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashSet; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.datamining.Activator; import com.sap.sailing.datamining.data.HasGPSFixContext; @@ -30,7 +30,7 @@ public class TestSailingFunctionsRegistration { private OpenFunctionManager functionRegistry; - @Before + @BeforeEach public void setUpFunctionRegistryAndProvider() { functionRegistry = new OpenFunctionManager(); functionRegistry.registerAllClasses(Activator.getDefault().getClassesWithMarkedMethods()); diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/ConcurrencyTestsUtil.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/ConcurrencyTestsUtil.java index 51d4f7562cd..1c00c09d6cb 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/ConcurrencyTestsUtil.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/ConcurrencyTestsUtil.java @@ -1,6 +1,6 @@ package com.sap.sailing.datamining.test.util; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.util.concurrent.ExecutorService; diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/TestAttachToVM.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/TestAttachToVM.java index 9febb510a87..00afc676ceb 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/TestAttachToVM.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/TestAttachToVM.java @@ -1,11 +1,11 @@ package com.sap.sailing.datamining.test.util; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import net.bytebuddy.agent.VirtualMachine; @@ -15,7 +15,7 @@ import net.bytebuddy.agent.VirtualMachine; * @author Axel Uhl (d043530) * */ -@Ignore("This class is used only to demonstrate how injecting the JMX Prometheus Java agent works for a running VM") +@Disabled("This class is used only to demonstrate how injecting the JMX Prometheus Java agent works for a running VM") public class TestAttachToVM { @Test public void testInjectAgentToRunningVM() throws IOException { diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationImportTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationImportTest.java index 8595fd83f42..8ba8273a81c 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationImportTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationImportTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.declination.test; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.declination.impl.BGSImporter; public class BGSDeclinationImportTest extends DeclinationImportTest { - @Before + @BeforeEach public void setUp() { importer = new BGSImporter(); } diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationServiceTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationServiceTest.java index fff08f897aa..fed59a50324 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationServiceTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationServiceTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.declination.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.text.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.impl.BGSImporter; @@ -16,7 +16,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class BGSDeclinationServiceTest extends DeclinationServiceTest { @Override - @Before + @BeforeEach public void setUp() { importer = new BGSImporter(); super.setUp(); diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationStoreTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationStoreTest.java index 8cf519e1109..8706be7656d 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationStoreTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSDeclinationStoreTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.declination.test; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.declination.impl.BGSImporter; public class BGSDeclinationStoreTest extends DeclinationStoreTest { @Override - @Before + @BeforeEach public void setUp() { importer = new BGSImporter(); super.setUp(); diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSSimpleDeclinationTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSSimpleDeclinationTest.java index 15410bc96dd..4fd0607f4c5 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSSimpleDeclinationTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/BGSSimpleDeclinationTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.declination.test; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.declination.impl.BGSImporter; public class BGSSimpleDeclinationTest extends SimpleDeclinationTest { - @Before + @BeforeEach public void setUp() { importer = new BGSImporter(); } diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationImportTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationImportTest.java index f665ea8e592..eedde3c4ab1 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationImportTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationImportTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.declination.test; -import org.junit.Before; -import org.junit.Ignore; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import com.sap.sailing.declination.impl.ColoradoImporter; -@Ignore("currently, http://magcalc.geomag.info/ seems down") +@Disabled("currently, http://magcalc.geomag.info/ seems down") public class ColoradoDeclinationImportTest extends DeclinationImportTest { - @Before + @BeforeEach public void setUp() { importer = new ColoradoImporter(); } diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationServiceTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationServiceTest.java index 2e01269e1c3..4a373dcdba9 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationServiceTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationServiceTest.java @@ -1,24 +1,24 @@ package com.sap.sailing.declination.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.text.ParseException; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.impl.ColoradoImporter; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sse.common.impl.MillisecondsTimePoint; -@Ignore("currently, http://magcalc.geomag.info/ seems down") +@Disabled("currently, http://magcalc.geomag.info/ seems down") public class ColoradoDeclinationServiceTest extends DeclinationServiceTest { @Override - @Before + @BeforeEach public void setUp() { importer = new ColoradoImporter(); super.setUp(); diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationStoreTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationStoreTest.java index cafe5ed848a..3258aaa162a 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationStoreTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoDeclinationStoreTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.declination.test; -import org.junit.Before; -import org.junit.Ignore; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import com.sap.sailing.declination.impl.ColoradoImporter; -@Ignore("currently, http://magcalc.geomag.info/ seems down") +@Disabled("currently, http://magcalc.geomag.info/ seems down") public class ColoradoDeclinationStoreTest extends DeclinationStoreTest { @Override - @Before + @BeforeEach public void setUp() { importer = new ColoradoImporter(); super.setUp(); diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoSimpleDeclinationTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoSimpleDeclinationTest.java index fad84507456..6783e511b7e 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoSimpleDeclinationTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoSimpleDeclinationTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.declination.test; -import org.junit.Before; -import org.junit.Ignore; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import com.sap.sailing.declination.impl.ColoradoImporter; -@Ignore("currently, http://magcalc.geomag.info/ seems down") +@Disabled("currently, http://magcalc.geomag.info/ seems down") public class ColoradoSimpleDeclinationTest extends SimpleDeclinationTest { - @Before + @BeforeEach public void setUp() { importer = new ColoradoImporter(); } diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoTest.java index c3c05b059ca..81ef092b85a 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/ColoradoTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.declination.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.text.ParseException; @@ -9,8 +9,8 @@ import java.util.TimeZone; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.declination.Declination; @@ -18,7 +18,7 @@ import com.sap.sailing.declination.impl.ColoradoImporter; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sse.common.impl.MillisecondsTimePoint; -@Ignore("currently, http://magcalc.geomag.info/ seems down") +@Disabled("currently, http://magcalc.geomag.info/ seems down") public class ColoradoTest { @Test public void simpleDocumentParsingTest() throws SAXException, IOException, ParserConfigurationException { diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java index e83b3838062..94e57fb8d49 100755 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationImportTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.declination.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.text.ParseException; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.declination.Declination; diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationServiceTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationServiceTest.java index 5657d467bc4..acb0387f046 100755 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationServiceTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationServiceTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.declination.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.text.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.DeclinationService; @@ -21,7 +21,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public abstract class DeclinationServiceTest extends AbstractDeclinationTest { protected DeclinationService service; - @Before + @BeforeEach public void setUp() { service = new DeclinationServiceImpl(new CentralAngleDistance(1./180.*Math.PI), importer); } diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java index ec231cd153d..ca7b54a3105 100755 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.declination.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -23,9 +23,9 @@ import java.io.Writer; import java.text.ParseException; import java.text.SimpleDateFormat; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.impl.DeclinationImporter; @@ -43,7 +43,7 @@ public abstract class DeclinationStoreTest extend private DeclinationStore store; private static final SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd"); - @Before + @BeforeEach public void setUp() { store = new DeclinationStore(importer); } @@ -322,7 +322,7 @@ public abstract class DeclinationStoreTest extend } } - @Ignore("This was a one-time-only conversion") + @Disabled("This was a one-time-only conversion") @Test public void copyExistingDeclinationsToNewFormat() throws IOException, ClassNotFoundException, ParseException { File resourcesDir = new File("../com.sap.sailing.declination/resources/"); diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationImportTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationImportTest.java index 4f790216326..f236e8a1851 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationImportTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationImportTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.declination.test; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.declination.impl.NOAAImporterForTesting; public class NOAADeclinationImportTest extends DeclinationImportTest { - @Before + @BeforeEach public void setUp() { importer = new NOAAImporterForTesting(); } diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationServiceTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationServiceTest.java index f305b8c2259..25131bd1bbf 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationServiceTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationServiceTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.declination.test; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.declination.impl.NOAAImporter; public class NOAADeclinationServiceTest extends DeclinationServiceTest { @Override - @Before + @BeforeEach public void setUp() { importer = new NOAAImporter(); super.setUp(); diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationStoreTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationStoreTest.java index 68c2f4fe63d..f4f05fd243b 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationStoreTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationStoreTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.declination.test; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.declination.impl.NOAAImporter; public class NOAADeclinationStoreTest extends DeclinationStoreTest { @Override - @Before + @BeforeEach public void setUp() { importer = new NOAAImporter(); super.setUp(); diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAARegexpTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAARegexpTest.java index eb3cfe85c18..ccec1d33851 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAARegexpTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAARegexpTest.java @@ -1,17 +1,17 @@ package com.sap.sailing.declination.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.regex.Matcher; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.declination.impl.NOAAImporterForTesting; public class NOAARegexpTest extends AbstractDeclinationTest { - @Before + @BeforeEach public void setUp() { importer = new NOAAImporterForTesting(); } diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAASimpleDeclinationTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAASimpleDeclinationTest.java index d712850ffbd..1055831f2a7 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAASimpleDeclinationTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAASimpleDeclinationTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.declination.test; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.declination.impl.NOAAImporter; public class NOAASimpleDeclinationTest extends SimpleDeclinationTest { - @Before + @BeforeEach public void setUp() { importer = new NOAAImporter(); } diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java index 6f5a5f9c174..2ac504eb1a0 100755 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.declination.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.text.ParseException; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.declination.Declination; diff --git a/java/com.sap.sailing.domain.deckmanadapter.test/src/com/sap/sailing/domain/deckmanadapter/test/TestDeckmanLogfileParsing.java b/java/com.sap.sailing.domain.deckmanadapter.test/src/com/sap/sailing/domain/deckmanadapter/test/TestDeckmanLogfileParsing.java index f64a3377ea5..394f124ba9a 100755 --- a/java/com.sap.sailing.domain.deckmanadapter.test/src/com/sap/sailing/domain/deckmanadapter/test/TestDeckmanLogfileParsing.java +++ b/java/com.sap.sailing.domain.deckmanadapter.test/src/com/sap/sailing/domain/deckmanadapter/test/TestDeckmanLogfileParsing.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.deckmanadapter.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.IOException; import java.io.InputStreamReader; @@ -11,7 +11,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Iterator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; diff --git a/java/com.sap.sailing.domain.igtimiadapter.persistence.test/src/com/sap/sailing/domain/igtimiadapter/persistence/IgtimiPersistenceTest.java b/java/com.sap.sailing.domain.igtimiadapter.persistence.test/src/com/sap/sailing/domain/igtimiadapter/persistence/IgtimiPersistenceTest.java index 0513b6ede6c..5d45e162143 100755 --- a/java/com.sap.sailing.domain.igtimiadapter.persistence.test/src/com/sap/sailing/domain/igtimiadapter/persistence/IgtimiPersistenceTest.java +++ b/java/com.sap.sailing.domain.igtimiadapter.persistence.test/src/com/sap/sailing/domain/igtimiadapter/persistence/IgtimiPersistenceTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.igtimiadapter.persistence; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.InetSocketAddress; import java.util.Arrays; @@ -12,9 +12,9 @@ import java.util.Iterator; import java.util.Set; import java.util.logging.Logger; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.igtimi.IgtimiData.ApparentWindSpeed; import com.igtimi.IgtimiData.Data; @@ -45,14 +45,14 @@ public class IgtimiPersistenceTest { private MongoObjectFactory mongoObjectFactory; private DomainObjectFactory domainObjectFactory; - @BeforeClass + @BeforeAll public static void setUpClientSession() { testDBConfig = MongoDBConfiguration.getDefaultTestConfiguration(); mongoDBService = testDBConfig.getService(); clientSession = mongoDBService.startCausallyConsistentSession(); } - @Before + @BeforeEach public void setUp() { mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(mongoDBService); mongoObjectFactory.clear(clientSession); diff --git a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/impl/WindReceiverTest.java b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/impl/WindReceiverTest.java index 5c57144c122..0daf0491b4d 100755 --- a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/impl/WindReceiverTest.java +++ b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/impl/WindReceiverTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.igtimiadapter.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.util.ArrayList; import java.util.Arrays; @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.declination.DeclinationService; diff --git a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/FixFactoryTest.java b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/FixFactoryTest.java index 13847b4c390..71fbb94e002 100755 --- a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/FixFactoryTest.java +++ b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/FixFactoryTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.igtimiadapter.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; @@ -9,8 +9,8 @@ import java.util.List; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.google.protobuf.InvalidProtocolBufferException; import com.sap.sailing.domain.igtimiadapter.FixFactory; @@ -24,7 +24,7 @@ import com.sap.sse.common.Util; public class FixFactoryTest { private FixFactory fixFactory; - @Before + @BeforeEach public void setUp() { fixFactory = new FixFactory(); } diff --git a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/IgtimiFixTrackTest.java b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/IgtimiFixTrackTest.java index 6e6d13986e1..0a739b53f47 100755 --- a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/IgtimiFixTrackTest.java +++ b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/IgtimiFixTrackTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.igtimiadapter.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.URL; import java.util.ArrayList; @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; diff --git a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/LatestDatumTest.java b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/LatestDatumTest.java index 01e231f3695..7e0ab0254ed 100755 --- a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/LatestDatumTest.java +++ b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/LatestDatumTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.igtimiadapter.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Iterator; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.google.protobuf.InvalidProtocolBufferException; import com.sap.sailing.domain.igtimiadapter.FixFactory; diff --git a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/TestRiotServer.java b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/TestRiotServer.java index 897fefd1c16..01f70f7a248 100644 --- a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/TestRiotServer.java +++ b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/TestRiotServer.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.igtimiadapter.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.InputStream; @@ -15,8 +15,8 @@ import java.util.logging.Logger; import org.apache.http.client.ClientProtocolException; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.igtimi.IgtimiStream.Msg; import com.sap.sailing.domain.igtimiadapter.FixFactory; @@ -50,7 +50,7 @@ public class TestRiotServer { } } - @Before + @BeforeEach public void setUp() throws ClientProtocolException, IllegalStateException, IOException, ParseException { final SecurityService mockSecurityService = SecurityServiceMockFactory.mockSecurityService(); Activator.getInstance().setSecurityService(mockSecurityService); diff --git a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/TestSimpleProtobufReading.java b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/TestSimpleProtobufReading.java index 6e8cdf31a51..6a27ed9f5f1 100644 --- a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/TestSimpleProtobufReading.java +++ b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/test/TestSimpleProtobufReading.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.igtimiadapter.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.BufferedReader; import java.io.IOException; @@ -10,7 +10,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.google.protobuf.CodedInputStream; import com.google.protobuf.ExtensionRegistry; diff --git a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/websocket/test/TestWebsocketServer.java b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/websocket/test/TestWebsocketServer.java index 2e4fe5db1db..958f8114b4f 100644 --- a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/websocket/test/TestWebsocketServer.java +++ b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/websocket/test/TestWebsocketServer.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.igtimiadapter.websocket.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.URI; @@ -21,7 +21,7 @@ import org.eclipse.jetty.websocket.client.ClientUpgradeRequest; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.servlet.WebSocketServlet; import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.igtimi.IgtimiStream.ChannelManagement; import com.igtimi.IgtimiStream.Msg; diff --git a/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/AbstractQueclinkTrackerTest.java b/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/AbstractQueclinkTrackerTest.java index 1d5d67772bd..d4c9459d8a6 100644 --- a/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/AbstractQueclinkTrackerTest.java +++ b/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/AbstractQueclinkTrackerTest.java @@ -2,9 +2,9 @@ package com.sap.sailing.domain.queclinkadapter.impl; import java.io.IOException; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import com.mongodb.MongoException; import com.mongodb.ReadConcern; @@ -26,12 +26,12 @@ public class AbstractQueclinkTrackerTest { protected SensorFixStore store; private static ClientSession clientSession; - @BeforeClass + @BeforeAll public static void setUpClass() { clientSession = MongoDBService.INSTANCE.startCausallyConsistentSession(); } - @Before + @BeforeEach public void setUp() throws MongoException, IOException { dropPersistedData(); newStore(); @@ -43,7 +43,7 @@ public class AbstractQueclinkTrackerTest { WriteConcern.MAJORITY, clientSession, clientSession); } - @After + @AfterEach public void after() throws IOException { dropPersistedData(); } diff --git a/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkMessageParser.java b/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkMessageParser.java index e8c6d57fff2..80c7a11424d 100644 --- a/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkMessageParser.java +++ b/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkMessageParser.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.queclinkadapter.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.InputStreamReader; @@ -11,8 +11,8 @@ import java.io.Reader; import java.text.ParseException; import java.util.regex.Matcher; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.DegreePosition; @@ -30,7 +30,7 @@ public class TestQueclinkMessageParser { private static final double EPSILON = 0.00000001; private MessageParser messageParser; - @Before + @BeforeEach public void setUp() { this.messageParser = MessageParser.create(); } @@ -71,7 +71,7 @@ public class TestQueclinkMessageParser { final TimePoint now = TimePoint.now(); final Message ackHBD = new HBDAcknowledgementImpl(MessageParserImpl.parseProtocolVersionHex("301303"), MessageParserImpl.parseCountNumberHex("033E"), "860599004785994", null, now); final Matcher matcher = MessageParserImpl.messagePattern.matcher(ackHBD.getMessageString()); - assertTrue("Pattern "+MessageParserImpl.messagePattern.toString()+" doesn't match "+ackHBD.getMessageString(), matcher.matches()); + assertTrue(matcher.matches(), "Pattern "+MessageParserImpl.messagePattern.toString()+" doesn't match "+ackHBD.getMessageString()); assertEquals("+ACK:", matcher.group(1)); assertEquals("HBD", matcher.group(8)); assertEquals("301303,860599004785994,,"+MessageParserImpl.formatAsYYYYMMDDHHMMSS(now)+",033E", matcher.group(9)); @@ -81,7 +81,7 @@ public class TestQueclinkMessageParser { public void simplePatternTestForSACKHeartbeatMessage() { final Message sackHBD = new HBDServerAcknowledgementImpl(MessageParserImpl.parseProtocolVersionHex("301303"), MessageParserImpl.parseCountNumberHex("033E")); final Matcher matcher = MessageParserImpl.messagePattern.matcher(sackHBD.getMessageString()); - assertTrue("Pattern "+MessageParserImpl.messagePattern.toString()+" doesn't match "+sackHBD.getMessageString(), matcher.matches()); + assertTrue(matcher.matches(), "Pattern "+MessageParserImpl.messagePattern.toString()+" doesn't match "+sackHBD.getMessageString()); assertEquals("+SACK:", matcher.group(1)); assertEquals("HBD", matcher.group(8)); assertEquals("301303,033E", matcher.group(9)); @@ -91,7 +91,7 @@ public class TestQueclinkMessageParser { public void simplePatternTestForBasicSACKMessage() { final String sackMessage = "+SACK:11F0$"; final Matcher matcher = MessageParserImpl.messagePattern.matcher(sackMessage); - assertTrue("Pattern "+MessageParserImpl.messagePattern.toString()+" doesn't match "+sackMessage, matcher.matches()); + assertTrue(matcher.matches(), "Pattern "+MessageParserImpl.messagePattern.toString()+" doesn't match "+sackMessage); assertEquals("+SACK:", matcher.group(1)); assertEquals(null, matcher.group(8)); assertEquals("11F0", matcher.group(9)); diff --git a/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkTCPTracker.java b/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkTCPTracker.java index acdbd8ddc8a..9b53c4e6116 100644 --- a/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkTCPTracker.java +++ b/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkTCPTracker.java @@ -1,16 +1,16 @@ package com.sap.sailing.domain.queclinkadapter.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.queclinkadapter.tracker.QueclinkTCPTracker; @@ -19,14 +19,14 @@ public class TestQueclinkTCPTracker extends AbstractQueclinkTrackerTest { private QueclinkTCPTracker tracker; @Override - @Before + @BeforeEach public void setUp() throws MongoException, IOException { super.setUp(); tracker = new QueclinkTCPTracker(/* pick a port */ 0, store); } @Override - @After + @AfterEach public void after() throws IOException { super.after(); tracker.stop(); diff --git a/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkUDPTracker.java b/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkUDPTracker.java index 1f8ffde4dec..d89cf339a04 100644 --- a/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkUDPTracker.java +++ b/java/com.sap.sailing.domain.queclinkadapter.test/src/com/sap/sailing/domain/queclinkadapter/impl/TestQueclinkUDPTracker.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.queclinkadapter.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.InputStream; @@ -9,9 +9,9 @@ import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetSocketAddress; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.queclinkadapter.tracker.QueclinkUDPTracker; @@ -20,14 +20,14 @@ public class TestQueclinkUDPTracker extends AbstractQueclinkTrackerTest { private QueclinkUDPTracker tracker; @Override - @Before + @BeforeEach public void setUp() throws MongoException, IOException { super.setUp(); tracker = new QueclinkUDPTracker(/* pick a port */ 0, store); } @Override - @After + @AfterEach public void after() throws IOException { super.after(); tracker.stop(); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java index 5ce26ba9343..90f160ce3df 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.racelogtracking.test; import static com.sap.sse.common.Util.size; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import java.util.Collections; import java.util.UUID; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import com.mongodb.ReadConcern; import com.mongodb.WriteConcern; @@ -81,7 +81,7 @@ public class AbstractGPSFixStoreTest extends RaceLogTrackingTestHelper { new MillisecondsTimePoint(millis)); } - @Before + @BeforeEach public void setServiceAndRaceLog() { service = new RacingEventServiceImpl(null, null, serviceFinderFactory); raceLog = new RaceLogImpl("racelog"); @@ -93,7 +93,7 @@ public class AbstractGPSFixStoreTest extends RaceLogTrackingTestHelper { serviceFinderFactory, ReadConcern.MAJORITY, WriteConcern.MAJORITY, clientSession, metadataCollectionClientSession); } - @After + @AfterEach public void after() { dropPersistedData(); clientSession.close(); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/MetadataUpdaterTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/MetadataUpdaterTest.java index 5c3a9d88097..0114cff8b76 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/MetadataUpdaterTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/MetadataUpdaterTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.racelogtracking.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.UUID; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.ReadConcern; import com.mongodb.WriteConcern; @@ -44,12 +44,12 @@ public class MetadataUpdaterTest { return (TypeBasedServiceFinder) serviceFinderFactory.createServiceFinder(FixMongoHandler.class); } - @BeforeClass + @BeforeAll public static void createClientSession() { clientSession = MongoDBService.INSTANCE.startCausallyConsistentSession(); } - @Before + @BeforeEach public void dropData() { MongoDatabase db = PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory().getDatabase(); db.getCollection(CollectionNames.GPS_FIXES.name()).withWriteConcern(WriteConcern.MAJORITY).drop(clientSession); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/RevokeDeviceMappingsWithMarkDefinitionTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/RevokeDeviceMappingsWithMarkDefinitionTest.java index 539cd657c8e..03b07d85aed 100755 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/RevokeDeviceMappingsWithMarkDefinitionTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/RevokeDeviceMappingsWithMarkDefinitionTest.java @@ -2,8 +2,9 @@ package com.sap.sailing.domain.racelogtracking.test; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +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; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -18,14 +19,12 @@ import com.sap.sailing.domain.base.impl.MarkImpl; import com.sap.sailing.domain.racelogtracking.impl.PingDeviceIdentifierImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; -import org.junit.Assert; - public class RevokeDeviceMappingsWithMarkDefinitionTest { private RegattaLog regattaLog; private AbstractLogEventAuthor author; private Mark mark; - @Before + @BeforeEach public void prepare() { regattaLog = new RegattaLogImpl("RevokeTest"); author = new LogEventAuthorImpl("RevokeTest", 1); @@ -47,10 +46,10 @@ public class RevokeDeviceMappingsWithMarkDefinitionTest { for (RegattaLogEvent event : regattaLog.getUnrevokedEvents()) { if (event instanceof RegattaLogDefineMarkEventImpl) { - Assert.fail("Define mark not revoked."); + Assertions.fail("Define mark not revoked."); } if (event instanceof RegattaLogDeviceMarkMappingEventImpl) { - Assert.fail("Device mapping not revoked."); + Assertions.fail("Device mapping not revoked."); } } } @@ -66,7 +65,7 @@ public class RevokeDeviceMappingsWithMarkDefinitionTest { for (RegattaLogEvent event : regattaLog.getUnrevokedEvents()) { if (event instanceof RegattaLogDefineMarkEventImpl) { - Assert.fail("Define mark not revoked."); + Assertions.fail("Define mark not revoked."); } } } diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java index f4691d90a04..b4a5f84d7fa 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.racelogtracking.test.impl; import static com.sap.sse.common.Util.size; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.io.FileNotFoundException; import java.io.IOException; @@ -16,11 +16,11 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.mongodb.MongoException; @@ -100,7 +100,7 @@ public class CreateAndTrackWithRaceLogTest extends RaceLogTrackingTestHelper { @Rule public Timeout CreateAndTrackWithRaceLogTestTimeout = Timeout.millis(3 * 60 * 1000); - @Before + @BeforeEach public void setup() throws UnknownHostException, MongoException { final ClientSession clientSession = MongoDBService.INSTANCE.startCausallyConsistentSession(); final ClientSession metadataCollectionClientSession = MongoDBService.INSTANCE.startCausallyConsistentSession(); @@ -132,7 +132,7 @@ public class CreateAndTrackWithRaceLogTest extends RaceLogTrackingTestHelper { DomainFactory.INSTANCE.getCompetitorAndBoatStore().clear(); } - @After + @AfterEach public void tearDown() throws MalformedURLException, IOException, InterruptedException { service.removeRegatta(regatta); } @@ -154,7 +154,7 @@ public class CreateAndTrackWithRaceLogTest extends RaceLogTrackingTestHelper { public void cantAddBeforeDenoting() throws MalformedURLException, FileNotFoundException, URISyntaxException, Exception { RaceColumn column = leaderboard.getRaceColumnByName(columnName); - Assert.assertThrows(NotDenotedForRaceLogTrackingException.class, ()->trackAndGetRace(column)); + Assertions.assertThrows(NotDenotedForRaceLogTrackingException.class, ()->trackAndGetRace(column)); } private void testSize(Track track, int expected) { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/DeviceMappingsAndSensorFixStoreLockingTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/DeviceMappingsAndSensorFixStoreLockingTest.java index 426689f763d..6bdb47dd089 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/DeviceMappingsAndSensorFixStoreLockingTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/DeviceMappingsAndSensorFixStoreLockingTest.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.concurrent.CyclicBarrier; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/GPSFixStoreListenerTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/GPSFixStoreListenerTest.java index 422d9fbfa1d..e10052bfc0a 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/GPSFixStoreListenerTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/GPSFixStoreListenerTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.domain.common.DeviceIdentifier; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RaceLogFixTrackerManagerTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RaceLogFixTrackerManagerTest.java index 9e959e091b9..07667bef7c4 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RaceLogFixTrackerManagerTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RaceLogFixTrackerManagerTest.java @@ -10,8 +10,8 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.ReadConcern; @@ -77,7 +77,7 @@ public class RaceLogFixTrackerManagerTest { protected final AbstractLogEventAuthor author = new LogEventAuthorImpl("author", 0); private DynamicTrackedRace trackedRace; - @Before + @BeforeEach public void setUp() throws UnknownHostException, MongoException { raceLog = new RaceLogImpl("racelog"); raceLog2 = new RaceLogImpl("racelog2"); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java index 412058c99a8..93630754060 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.racelogtracking.test.impl; import static com.sap.sse.common.Util.size; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.io.Serializable; @@ -19,9 +19,9 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.CyclicBarrier; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.ReadConcern; @@ -141,7 +141,7 @@ public class SensorFixStoreAndLoadTest { protected final AbstractLogEventAuthor author = new LogEventAuthorImpl("author", 0); private DynamicTrackedRace trackedRace; - @Before + @BeforeEach public void setUp() throws UnknownHostException, MongoException { dropPersistedData(); raceLog = new RaceLogImpl("racelog"); @@ -180,7 +180,7 @@ public class SensorFixStoreAndLoadTest { db.getCollection(CollectionNames.RACE_LOGS.name()).drop(); } - @After + @AfterEach public void after() { dropPersistedData(); } diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreTest.java index f579531bd26..17b6c021489 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.racelogtracking.test.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; @@ -8,11 +8,11 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.logging.Level; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.mongodb.ReadConcern; @@ -51,12 +51,12 @@ public class SensorFixStoreTest { protected SensorFixStore store; private static ClientSession clientSession; - @BeforeClass + @BeforeAll public static void setUpClass() { clientSession = MongoDBService.INSTANCE.startCausallyConsistentSession(); } - @Before + @BeforeEach public void setUp() throws Exception { dropPersistedData(); newStore(); @@ -68,7 +68,7 @@ public class SensorFixStoreTest { WriteConcern.MAJORITY, clientSession, clientSession); } - @After + @AfterEach public void after() throws Exception { store.getNumberOfFixes(device); // wait until all metadata updates have completed; // this shall avoid that pending updates are written to the metadata collection after @@ -155,14 +155,14 @@ public class SensorFixStoreTest { // validate between 0 and 1 (inclusive) Double last = 0.0; for (Double progress : progressData) { - Assert.assertTrue(progress <= 1); - Assert.assertTrue(progress >= 0); - Assert.assertTrue(progress >= last); + Assertions.assertTrue(progress <= 1); + Assertions.assertTrue(progress >= 0); + Assertions.assertTrue(progress >= last); last = progress; } //validate that 0-100 updates do exist - Assert.assertFalse(progressData.isEmpty()); - Assert.assertTrue(progressData.size() <= 100); + Assertions.assertFalse(progressData.isEmpty()); + Assertions.assertTrue(progressData.size() <= 100); } @Test diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java index 7d8b29a1c58..80e3592d9e1 100755 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.racelogtracking.test.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.UnknownHostException; import java.util.ArrayList; @@ -13,9 +13,9 @@ import java.util.function.Consumer; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.mongodb.MongoException; @@ -61,7 +61,7 @@ public class TrackedRaceLoadsFixesTest extends AbstractGPSFixStoreTest { private RaceDefinition raceDefinition; - @Before + @BeforeEach public void setUp() throws UnknownHostException, MongoException { Map competitorsAndBoats = new HashMap<>(); competitorsAndBoats.put(comp, boat); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceStartTimeInferenceTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceStartTimeInferenceTest.java index acdafbca4a7..b943bce130c 100755 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceStartTimeInferenceTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceStartTimeInferenceTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.racelogtracking.test.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.util.Arrays; @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEndOfTrackingEventImpl; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogRaceStatusEventImpl; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/base/racegroup/impl/CurrentRaceFilterImplTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/base/racegroup/impl/CurrentRaceFilterImplTest.java index dd201107430..4608e81a55a 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/base/racegroup/impl/CurrentRaceFilterImplTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/base/racegroup/impl/CurrentRaceFilterImplTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.base.racegroup.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.util.ArrayList; import java.util.Arrays; @@ -12,8 +12,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.impl.BoatClassImpl; @@ -38,7 +38,7 @@ public class CurrentRaceFilterImplTest { private RaceGroup iQFOil; private Map races; - @Before + @BeforeEach public void setUp() { races = new HashMap<>(); // five regattas ("RaceGroup"s): diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/coursetemplate/test/TestLapConfiguration.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/coursetemplate/test/TestLapConfiguration.java index 10640b7737f..94618652d2f 100755 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/coursetemplate/test/TestLapConfiguration.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/coursetemplate/test/TestLapConfiguration.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.coursetemplate.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import static org.junit.Assume.assumeNoException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.util.ArrayList; import java.util.Arrays; @@ -12,8 +12,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.MarkType; import com.sap.sailing.domain.common.PassingInstruction; @@ -46,7 +46,7 @@ public class TestLapConfiguration { private ControlPointTemplate gate; private Map defaultMarkTemplatesForMarkRoles; - @Before + @BeforeEach public void setUp() { startBoat = new MarkTemplateImpl("Start Boat", "SB", /* color */ null, /* shape */ null, /* pattern */ null, MarkType.STARTBOAT); startBoatRole = new MarkRoleImpl(UUID.randomUUID(), "Start Boat", "SB"); diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/AbortingFlagFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/AbortingFlagFinderTest.java index 9436cc0ee38..39c47c1fa89 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/AbortingFlagFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/AbortingFlagFinderTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.when; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/ConfirmedFinishPositioningListFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/ConfirmedFinishPositioningListFinderTest.java index 33da9836bad..a6e7896007b 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/ConfirmedFinishPositioningListFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/ConfirmedFinishPositioningListFinderTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.when; import java.util.Arrays; @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.CompetitorResult; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/DependentStartTimeFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/DependentStartTimeFinderTest.java index 39720e7ef11..ef34389cba8 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/DependentStartTimeFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/DependentStartTimeFinderTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -38,7 +38,7 @@ public class DependentStartTimeFinderTest { private RaceLogResolver raceLogResolver; - @Before + @BeforeEach public void setUp() { author = new LogEventAuthorImpl("Test", 1); raceLogA = new RaceLogImpl("raceLogA"); diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/FinishedTimeFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/FinishedTimeFinderTest.java index b9f3abc2125..23282b009a3 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/FinishedTimeFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/FinishedTimeFinderTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.when; import java.io.Serializable; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLog; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/FinishingTimeFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/FinishingTimeFinderTest.java index f8f476078b7..1e12e128f3b 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/FinishingTimeFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/FinishingTimeFinderTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.when; import java.io.Serializable; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLog; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/GateLineOpeningTimeFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/GateLineOpeningTimeFinderTest.java index e9b1863c383..72e99f99b2e 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/GateLineOpeningTimeFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/GateLineOpeningTimeFinderTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.when; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLog; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/IndividualRecallFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/IndividualRecallFinderTest.java index 52282fd3c1c..a44fb9b2e5c 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/IndividualRecallFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/IndividualRecallFinderTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.when; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLog; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/LastFlagsFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/LastFlagsFinderTest.java index 155c75c78be..65dc57c4d3e 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/LastFlagsFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/LastFlagsFinderTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/LastWindFixFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/LastWindFixFinderTest.java index 8e3a9163fd5..f21be032311 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/LastWindFixFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/LastWindFixFinderTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/PassAwareRaceLogAnalyzerTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/PassAwareRaceLogAnalyzerTest.java index 74818b821de..c8499c66470 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/PassAwareRaceLogAnalyzerTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/PassAwareRaceLogAnalyzerTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Collection; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLog; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/ProtestStartTimeFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/ProtestStartTimeFinderTest.java index a4e8eca1b2e..84445abbb2d 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/ProtestStartTimeFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/ProtestStartTimeFinderTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.racelog.analyzing.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLog; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/RaceLogAnalyzerTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/RaceLogAnalyzerTest.java index a390a8fcd96..eafd95bde5c 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/RaceLogAnalyzerTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/RaceLogAnalyzerTest.java @@ -6,7 +6,7 @@ import static org.mockito.Mockito.when; import java.io.Serializable; import java.util.UUID; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -21,7 +21,7 @@ public abstract class RaceLogAnalyzerTest bag; - @Before + @BeforeEach public void setUp() { bag = new ConcurrentHashBag<>(); } diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailinig/domain/based/impl/BoatClassCacheTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailinig/domain/based/impl/BoatClassCacheTest.java index a65db01ae0e..e371de58d2d 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailinig/domain/based/impl/BoatClassCacheTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailinig/domain/based/impl/BoatClassCacheTest.java @@ -1,10 +1,10 @@ package com.sap.sailinig.domain.based.impl; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.base.BoatClass; @@ -22,7 +22,7 @@ import com.sap.sailing.domain.common.BoatClassMasterdata; public class BoatClassCacheTest { private SharedDomainFactory sharedDomainFactory; - @Before + @BeforeEach public void setUp() { sharedDomainFactory = new SharedDomainFactoryImpl<>(/* raceLogResolver */ null); } @@ -70,7 +70,7 @@ public class BoatClassCacheTest { public void testEssMayHaveNonUpwindStart() { for (final String boatClassName : new String[] { "extreme40", "ess", "ess40" }) { final BoatClass ess40 = sharedDomainFactory.getOrCreateBoatClass(boatClassName); - assertFalse("Boat class "+boatClassName+" expected to allow for non-upwind starts", ess40.typicallyStartsUpwind()); + assertFalse(ess40.typicallyStartsUpwind(), "Boat class "+boatClassName+" expected to allow for non-upwind starts"); } } } diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryTest.java index 819c0d86432..2102f83b30f 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryTest.java @@ -4,8 +4,8 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.swisstimingadapter.RaceType; @@ -15,7 +15,7 @@ public class DomainFactoryTest { private com.sap.sailing.domain.swisstimingadapter.impl.DomainFactoryImpl swissTimingDomainFactory; - @Before + @BeforeEach public void before() { com.sap.sailing.domain.base.DomainFactory baseDomainFactory = new com.sap.sailing.domain.base.impl.DomainFactoryImpl(DomainFactory.TEST_RACE_LOG_RESOLVER); swissTimingDomainFactory = new com.sap.sailing.domain.swisstimingadapter.impl.DomainFactoryImpl( diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/RPDMessageParsingTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/RPDMessageParsingTest.java index 5435493ccbd..7b1cb071dd7 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/RPDMessageParsingTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/RPDMessageParsingTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.swisstimingadapter.impl; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.UnknownHostException; import java.text.ParseException; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.swisstimingadapter.Fix; import com.sap.sailing.domain.swisstimingadapter.RaceStatus; diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/SequenceNumberParsingTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/SequenceNumberParsingTest.java index a16ce91c47f..1cf877bb1aa 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/SequenceNumberParsingTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/SequenceNumberParsingTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.swisstimingadapter.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SequenceNumberParsingTest { @Test diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/ParseSingleSwissTimingPacketFromFileTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/ParseSingleSwissTimingPacketFromFileTest.java index cbc8ff2c89f..fd6e84e91b8 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/ParseSingleSwissTimingPacketFromFileTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/ParseSingleSwissTimingPacketFromFileTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.swisstimingadapter.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.swisstimingadapter.SwissTimingFactory; import com.sap.sailing.domain.swisstimingadapter.SwissTimingFormatException; diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java index b405473b5a8..5a1224239de 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.swisstimingadapter.test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.net.ConnectException; @@ -18,10 +18,10 @@ import java.util.List; import java.util.TimeZone; import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; @@ -59,7 +59,7 @@ public class SailMasterConnectivityTest { private SailMasterConnector connector4712; - @Before + @BeforeEach public void setUp() throws InterruptedException, ParseException { startSailMasterDummy(); Race race4702 = new RaceImpl("W4702", "R2", "470 Women Race 2"); @@ -79,7 +79,7 @@ public class SailMasterConnectivityTest { Thread.sleep(100); // give dummy sail master server a change to start listening on its socket } - @After + @AfterEach public void tearDown() throws IOException, InterruptedException { connector4702.sendRequestAndGetResponse(MessageType._STOPSERVER); connector4711.stop(); diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SimpleDomainFactoryTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SimpleDomainFactoryTest.java index 0b72afb5dfb..9351853e987 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SimpleDomainFactoryTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SimpleDomainFactoryTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.swisstimingadapter.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.ArrayList; import java.util.Arrays; @@ -9,7 +9,7 @@ import java.util.Collections; import java.util.List; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.RaceDefinition; diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java index 9f59030a1d6..a274ad7110d 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.swisstimingadapter.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.io.IOException; import java.net.UnknownHostException; @@ -13,10 +13,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; import com.sap.sailing.domain.swisstimingadapter.Competitor; @@ -35,17 +35,17 @@ import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; -@Ignore("This test doesn't work as long as the server doesn't play an actual race") +@Disabled("This test doesn't work as long as the server doesn't play an actual race") public class SwissTimingSailMasterLiveTest implements SailMasterListener { private int rpdCounter; private SailMasterConnector connector; - @Before + @BeforeEach public void connect() throws InterruptedException, ParseException { connector = SwissTimingFactory.INSTANCE.getOrCreateSailMasterConnector("gps.sportresult.com", 40300, "W4702", /* raceDataUrl */ null, "R2", "Women 470 Race 2", null /* boat class*/, /* SwissTimingRaceTracker */ null); } - @After + @AfterEach public void stopConnector() throws IOException { connector.stop(); } diff --git a/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/MarkTypeTest.java b/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/MarkTypeTest.java index 4c8c768e605..40b239597aa 100644 --- a/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/MarkTypeTest.java +++ b/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/MarkTypeTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.swisstimingreplayadapter.test; -import org.junit.Test; +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 org.junit.jupiter.api.Test; import com.sap.sailing.domain.swisstimingreplayadapter.impl.MarkType; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class MarkTypeTest { @Test diff --git a/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingRaceConfigurationTest.java b/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingRaceConfigurationTest.java index 96c44e1b722..487b63ee143 100644 --- a/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingRaceConfigurationTest.java +++ b/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingRaceConfigurationTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.swisstimingreplayadapter.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +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 java.io.IOException; import java.io.InputStream; @@ -14,8 +14,8 @@ import java.text.MessageFormat; import java.text.ParseException; import java.util.List; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.swisstimingadapter.DomainFactory; import com.sap.sailing.domain.swisstimingreplayadapter.SwissTimingReplayRace; @@ -34,7 +34,7 @@ public class SwissTimingRaceConfigurationTest { assertFalse(races.isEmpty()); } - @Ignore("SwissTiming shut down their configuration server for good (2020-11-13), so we cannot get at the configs anymore") + @Disabled("SwissTiming shut down their configuration server for good (2020-11-13), so we cannot get at the configs anymore") @Test public void testRaceConfig_446483_no_detail_config() throws Exception { URL configFileURL = new URL(MessageFormat.format(SwissTimingReplayServiceImpl.RACE_CONFIG_URL_TEMPLATE, "446483")); @@ -53,7 +53,7 @@ public class SwissTimingRaceConfigurationTest { } - @Ignore("SwissTiming shut down their configuration server for good (2020-11-13), so we cannot get at the configs anymore") + @Disabled("SwissTiming shut down their configuration server for good (2020-11-13), so we cannot get at the configs anymore") @Test public void testRaceConfig_6260_with_detail_config() throws Exception { URL configFileURL = new URL(MessageFormat.format(SwissTimingReplayServiceImpl.RACE_CONFIG_URL_TEMPLATE, "6260")); diff --git a/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingReplayAdapterServiceTest.java b/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingReplayAdapterServiceTest.java index ffac540f13a..cc87f101c96 100644 --- a/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingReplayAdapterServiceTest.java +++ b/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingReplayAdapterServiceTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.swisstimingreplayadapter.test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.io.ByteArrayInputStream; @@ -15,8 +15,8 @@ import java.net.URL; import java.util.List; import java.util.Map.Entry; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; @@ -78,7 +78,7 @@ public class SwissTimingReplayAdapterServiceTest { assertEquals(321920, replayCountListener.rankingMarkCount); } - @Ignore("SwissTiming has shut down the ota2.sportresult.com server around 2020-11-13") + @Disabled("SwissTiming has shut down the ota2.sportresult.com server around 2020-11-13") @Test public void testRaceData_SAW005905_20120805_EqualsOnlineVersion() throws Exception { byte[] localCopy = read(getClass().getResourceAsStream("/SAW005905.20120805.replay")); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/BoatClassWithNullNameTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/BoatClassWithNullNameTest.java index c67e4baf8a4..873ab5b060b 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/BoatClassWithNullNameTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/BoatClassWithNullNameTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.common; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +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 org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.DomainFactory; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/MediaTrackTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/MediaTrackTest.java index 6d92b840f17..98d0aa7073e 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/MediaTrackTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/MediaTrackTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.common; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sse.common.Duration; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/MediaUtilTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/MediaUtilTest.java index 2f502e07a31..ee33f9356b8 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/MediaUtilTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/MediaUtilTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.common; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.media.MediaUtil; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BearingChangeAnalyzerTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BearingChangeAnalyzerTest.java index bdb94f185e4..14c04438213 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BearingChangeAnalyzerTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BearingChangeAnalyzerTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.common.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.BearingChangeAnalyzer; import com.sap.sse.common.impl.DegreeBearingImpl; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BeaufortTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BeaufortTest.java index 840e24c06b2..3c472cd3360 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BeaufortTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BeaufortTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.common.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.impl.MeterPerSecondSpeedImpl; import com.sap.sse.common.Speed; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ColorMapTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ColorMapTest.java index 3df0bf5b75a..253143a285c 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ColorMapTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ColorMapTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.common.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.impl.ColorMapImpl; import com.sap.sse.common.Color; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DoubleCoercionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DoubleCoercionTest.java index 88160b75082..a1408c80082 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DoubleCoercionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DoubleCoercionTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.common.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DoubleCoercionTest { @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DurationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DurationTest.java index d58ca88123c..43fcbc2d38c 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DurationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DurationTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.common.test; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +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 org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.DurationFormatter; import com.sap.sse.common.Duration; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/FuzzyBoatClassNameMatcherTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/FuzzyBoatClassNameMatcherTest.java index 8e4998aaffb..f4ee8a00d61 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/FuzzyBoatClassNameMatcherTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/FuzzyBoatClassNameMatcherTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.common.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Date; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.FuzzyBoatClassNameMatcher; import com.sap.sailing.domain.common.dto.BoatClassDTO; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/Java8FunctionsPerformanceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/Java8FunctionsPerformanceTest.java index 9022bd16c77..650cd4c8c24 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/Java8FunctionsPerformanceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/Java8FunctionsPerformanceTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.common.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; import java.util.stream.IntStream; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Compare Java 8 stream and function performance to direct method call performance @@ -21,7 +21,7 @@ public class Java8FunctionsPerformanceTest { private List intList; private final static int SIZE = 10000000; - @Before + @BeforeEach public void setUp() { intList = new ArrayList(SIZE); for (int i=0; i l; - @Before + @BeforeEach public void setUp() { l = new ArrayList<>(); l.add(1); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/CurveEnteringAndExitingComputationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/CurveEnteringAndExitingComputationTest.java index 19834494be7..c26131c71aa 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/CurveEnteringAndExitingComputationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/CurveEnteringAndExitingComputationTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.maneuverdetection.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.sql.Date; import java.time.LocalDateTime; @@ -8,7 +8,7 @@ import java.time.ZoneOffset; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.common.SpeedWithBearing; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverComputationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverComputationTest.java index cf0cee79a91..c68a7c2762d 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverComputationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverComputationTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.maneuverdetection.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.net.MalformedURLException; @@ -12,9 +12,9 @@ import java.util.Collections; import java.util.GregorianCalendar; import java.util.List; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.NoWindException; @@ -48,7 +48,7 @@ public class IncrementalManeuverComputationTest extends AbstractManeuverDetectio public IncrementalManeuverComputationTest() throws MalformedURLException, URISyntaxException { } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///" @@ -70,7 +70,7 @@ public class IncrementalManeuverComputationTest extends AbstractManeuverDetectio // version @SuppressWarnings("deprecation") @Test - @Ignore + @Disabled public void testIncrementalDouglasPeucker() throws NoWindException { Competitor competitor = getCompetitorByName("Findel"); DynamicTrackedRaceImpl trackedRace = getTrackedRace(); @@ -94,8 +94,8 @@ public class IncrementalManeuverComputationTest extends AbstractManeuverDetectio competitor); Iterable normallyApproximatedFixes = normalDouglasPeucker .approximate(trackTimeInfo.getTrackStartTimePoint(), trackTimeInfo.getTrackEndTimePoint()); - assertEquals("Incrementally calculated douglas peucker fixes differ from normally calculated fixes", - normallyApproximatedFixes, incrementallyApproximatedFixes); + assertEquals(normallyApproximatedFixes, + incrementallyApproximatedFixes, "Incrementally calculated douglas peucker fixes differ from normally calculated fixes"); } @Test @@ -135,12 +135,12 @@ public class IncrementalManeuverComputationTest extends AbstractManeuverDetectio int performanceBenefitOfIncrementalManeuverDetectionInPercent = (int) ((1.0 * (millisForNormalManeuverDetection - millisForIncrementalManeuverDetection) / millisForNormalManeuverDetection) * 100); - assertEquals("Incrementally calculated maneuvers differ from normally calculated maneuvers", - normallyDetectedManeuvers, incrementallyDetectedManeuvers); + assertEquals(normallyDetectedManeuvers, + incrementallyDetectedManeuvers, "Incrementally calculated maneuvers differ from normally calculated maneuvers"); assertTrue( + performanceBenefitOfIncrementalManeuverDetectionInPercent >= 20, "Incremental maneuver detection was not 20% faster in detecting maneuvers incrementally, than the full maneuver detection. The actual performance benefit was: " - + performanceBenefitOfIncrementalManeuverDetectionInPercent + "%", - performanceBenefitOfIncrementalManeuverDetectionInPercent >= 20); + + performanceBenefitOfIncrementalManeuverDetectionInPercent + "%"); } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassing/impl/WaypointPositionAndDistanceCacheTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassing/impl/WaypointPositionAndDistanceCacheTest.java index 3597bc90fb9..afd19b16c96 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassing/impl/WaypointPositionAndDistanceCacheTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassing/impl/WaypointPositionAndDistanceCacheTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.markpassing.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -9,8 +9,8 @@ import java.util.Collections; import java.util.UUID; import java.util.function.Function; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.ControlPointWithTwoMarks; import com.sap.sailing.domain.base.Course; @@ -57,7 +57,7 @@ public class WaypointPositionAndDistanceCacheTest { private Mark windward; private ControlPointWithTwoMarks startFinish; - @Before + @BeforeEach public void setUp() { final RaceDefinition race = mock(RaceDefinition.class); when(race.getCompetitors()).thenReturn(Collections.emptyList()); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculatorTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculatorTest.java index 91665344f17..2811499f500 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculatorTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculatorTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.markpassingcalculation; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -9,7 +9,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/AbstractCandidateFilterTestSupport.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/AbstractCandidateFilterTestSupport.java index 37fc9ef9760..b8e3b3eb6dc 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/AbstractCandidateFilterTestSupport.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/AbstractCandidateFilterTestSupport.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.markpassingcalculation.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Comparator; import java.util.NavigableSet; import java.util.TreeSet; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.markpassingcalculation.Candidate; @@ -25,7 +25,7 @@ public class AbstractCandidateFilterTestSupport { protected Candidate start; protected Candidate end; - @Before + @BeforeEach public void setUp() { final TimePoint now = MillisecondsTimePoint.now(); start = new CandidateImpl(0, now.minus(Duration.ONE_HOUR), 1.0, null); @@ -58,15 +58,15 @@ public class AbstractCandidateFilterTestSupport { } protected void assertContainsExactly(Iterable candidates, Candidate... candidatesExpected) { - assertEquals(""+candidates+"'s size does not match that of "+Arrays.toString(candidatesExpected)+"; ", - candidatesExpected.length, Util.size(candidates)); + assertEquals(candidatesExpected.length, + Util.size(candidates), ""+candidates+"'s size does not match that of "+Arrays.toString(candidatesExpected)+"; "); assertContains(candidates, candidatesExpected); } protected void assertContains(Iterable candidates, Candidate...candidatesExpected) { for (final Candidate candidateExpected : candidatesExpected) { - assertTrue("Expected "+candidateExpected+" to be in "+candidates+" but it wasn't; ", - Util.contains(candidates, candidateExpected)); + assertTrue(Util.contains(candidates, candidateExpected), + "Expected "+candidateExpected+" to be in "+candidates+" but it wasn't; "); } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java index be89bc6d489..563e324613e 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.markpassingcalculation.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.lang.reflect.Field; import java.util.ArrayList; @@ -11,8 +11,8 @@ import java.util.List; import java.util.Map; import java.util.stream.StreamSupport; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; @@ -60,7 +60,7 @@ public class CandidateFinderImplWhiteBoxTest { private DynamicTrackedRace trackedRace; private TimePoint now; - @Before + @BeforeEach public void setUp() { now = MillisecondsTimePoint.now(); competitor = TrackBasedTest.createCompetitorWithBoat("Competitor"); @@ -218,7 +218,7 @@ public class CandidateFinderImplWhiteBoxTest { distancesToStartLineOfOtherCompetitors.add(createDistancePair(2739.0, null)); final double probability = finder.getProbabilityOfStartBasedOnOtherCompetitorsStartLineDistances(distancesToStartLineOfOtherCompetitors, /* startIsLine */ false); - assertTrue("Expected probability to exceed 55% but got "+probability, probability > 0.55); + assertTrue(probability > 0.55, "Expected probability to exceed 55% but got "+probability); } @Test @@ -234,7 +234,7 @@ public class CandidateFinderImplWhiteBoxTest { distancesToStartLineOfOtherCompetitors.add(createDistancePair(2739.0, null)); final double probability = finder.getProbabilityOfStartBasedOnOtherCompetitorsStartLineDistances(distancesToStartLineOfOtherCompetitors, /* startIsLine */ false); - assertTrue("Expected probability to be below 10% but got "+probability, probability <= 0.1); + assertTrue(probability <= 0.1, "Expected probability to be below 10% but got "+probability); } @Test @@ -250,7 +250,7 @@ public class CandidateFinderImplWhiteBoxTest { distancesToStartLineOfOtherCompetitors.add(createDistancePair(20.0, -10.)); // another late starter just across the line final double probability = finder.getProbabilityOfStartBasedOnOtherCompetitorsStartLineDistances(distancesToStartLineOfOtherCompetitors, /* startIsLine */ true); - assertTrue("Expected probability to be above 85% but got "+probability, probability >= 0.85); + assertTrue(probability >= 0.85, "Expected probability to be above 85% but got "+probability); } private AbsoluteGeometricDistanceAndSignedProjectedDistanceToStartLine createDistancePair(double absoluteDistanceToLine, diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/MostProbableCandidatesInSmallTimeRangeFilterTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/MostProbableCandidatesInSmallTimeRangeFilterTest.java index ea52e1ccb0a..2e2b5afd4b8 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/MostProbableCandidatesInSmallTimeRangeFilterTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/MostProbableCandidatesInSmallTimeRangeFilterTest.java @@ -2,15 +2,15 @@ package com.sap.sailing.domain.markpassingcalculation.impl; import java.util.NavigableSet; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.markpassingcalculation.Candidate; public class MostProbableCandidatesInSmallTimeRangeFilterTest extends AbstractCandidateFilterTestSupport { private MostProbableCandidatesInSmallTimeRangeFilter filter; - @Before + @BeforeEach public void setUp() { super.setUp(); filter = new MostProbableCandidatesInSmallTimeRangeFilter( diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/StationarySequenceBasedFilterTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/StationarySequenceBasedFilterTest.java index 834d97a593a..5aa9ad7bfb8 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/StationarySequenceBasedFilterTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/StationarySequenceBasedFilterTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.domain.markpassingcalculation.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.NavigableSet; import java.util.TreeSet; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.Position; @@ -34,7 +34,7 @@ public class StationarySequenceBasedFilterTest extends AbstractCandidateFilterTe private DynamicGPSFixTrack track; private final static int FIXES_BETWEEN_CANDIDATES = 3; - @Before + @BeforeEach public void setUp() { super.setUp(); track = new DynamicGPSFixMovingTrackImpl(TrackBasedTest.createCompetitorWithBoat("Someone"), /* millisecondsOverWhichToAverage */ 15000); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/StationarySequenceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/StationarySequenceTest.java index 084b6ae05a8..774c864b3c2 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/StationarySequenceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/StationarySequenceTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.markpassingcalculation.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashSet; import java.util.NavigableSet; @@ -10,8 +10,8 @@ import java.util.Set; import java.util.TreeSet; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Waypoint; @@ -39,7 +39,7 @@ public class StationarySequenceTest extends AbstractCandidateFilterTestSupport { private DynamicGPSFixTrack track; private final static int FIXES_BETWEEN_CANDIDATES = 3; - @Before + @BeforeEach public void setUp() { super.setUp(); final TimePoint now = MillisecondsTimePoint.now(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/AbstractORCCertificateImporterTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/AbstractORCCertificateImporterTest.java index 9660bea8d1b..d38322dde57 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/AbstractORCCertificateImporterTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/AbstractORCCertificateImporterTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.orc; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import java.io.FileInputStream; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/ORCPerformanceCurveRankingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/ORCPerformanceCurveRankingTest.java index 454511b92fe..a7f53a4f704 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/ORCPerformanceCurveRankingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/ORCPerformanceCurveRankingTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.orc; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; import java.io.File; import java.net.MalformedURLException; @@ -14,10 +14,10 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.UUID; -import org.junit.Assert; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ErrorCollector; import org.junit.rules.TestRule; import org.junit.rules.Timeout; @@ -82,7 +82,7 @@ public class ORCPerformanceCurveRankingTest extends OnlineTracTracBasedTest { public void assertEquals(double a, double b, double accuracy) { try { - Assert.assertEquals(a, b, accuracy); + Assertions.assertEquals(a, b, accuracy); } catch (AssertionError e) { collector.addError(e); } @@ -90,7 +90,7 @@ public class ORCPerformanceCurveRankingTest extends OnlineTracTracBasedTest { public void assertEquals(String message, double a, double b, double accuracy) { try { - Assert.assertEquals(message, a, b, accuracy); + Assertions.assertEquals(a, b, accuracy, message); } catch (AssertionError e) { collector.addError(e); } @@ -104,7 +104,7 @@ public class ORCPerformanceCurveRankingTest extends OnlineTracTracBasedTest { return "D-Marin ORC World Championship"; } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/orc/worlds2019/348f93c0-6798-0137-b07e-60a44ce903c3.mtb").getCanonicalPath().replace('\\', '/')); @@ -135,7 +135,7 @@ public class ORCPerformanceCurveRankingTest extends OnlineTracTracBasedTest { certificate = certificates.getCertificateByBoatName(boat.getName() == null ? boat.getSailID() : boat.getName()); } } - assertNotNull("Couldn't find a certificate for boat "+boat, certificate); + assertNotNull(certificate, "Couldn't find a certificate for boat "+boat); final RegattaLogEvent certificateAssignment = new RegattaLogORCCertificateAssignmentEventImpl(MillisecondsTimePoint.now(), MillisecondsTimePoint.now(), author, UUID.randomUUID(), certificate, boat); regattaLog.add(certificateAssignment); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCCertificateImporterJSON.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCCertificateImporterJSON.java index 7d195ab70cc..9b75d27a34e 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCCertificateImporterJSON.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCCertificateImporterJSON.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.orc; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.Collection; import org.json.simple.parser.ParseException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.orc.ORCCertificate; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCCertificateImporterRMS.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCCertificateImporterRMS.java index 57098b49463..d402fab3fd1 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCCertificateImporterRMS.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCCertificateImporterRMS.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.orc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import java.io.FileInputStream; @@ -10,7 +10,7 @@ import java.io.IOException; import java.util.Collection; import org.json.simple.parser.ParseException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.orc.ORCCertificate; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPerformanceCurve.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPerformanceCurve.java index af6a44b3411..bce89b73c2b 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPerformanceCurve.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPerformanceCurve.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.orc; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import java.io.FileInputStream; @@ -19,10 +19,10 @@ import org.apache.commons.math.ArgumentOutsideDomainException; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MaxIterationsExceededException; import org.json.simple.parser.ParseException; -import org.junit.Assert; -import org.junit.BeforeClass; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.junit.rules.ErrorCollector; import org.w3c.dom.DOMException; import org.xml.sax.SAXException; @@ -72,7 +72,7 @@ public class TestORCPerformanceCurve { public void assertEquals(double a, double b, double accuracy) { try { - Assert.assertEquals(a, b, accuracy); + Assertions.assertEquals(a, b, accuracy); } catch (AssertionError e) { if (collectErrors) { collector.addError(e); @@ -82,7 +82,7 @@ public class TestORCPerformanceCurve { public void assertEquals(String message, double a, double b, double accuracy) { try { - Assert.assertEquals(message, a, b, accuracy); + Assertions.assertEquals(a, b, accuracy, message); } catch (AssertionError e) { if (collectErrors) { collector.addError(e); @@ -90,7 +90,7 @@ public class TestORCPerformanceCurve { } } - @BeforeClass + @BeforeAll public static void initialize() throws IOException, ParseException, DOMException, SAXException, ParserConfigurationException, java.text.ParseException { List legs = new ArrayList<>(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPerformanceCurveCourse.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPerformanceCurveCourse.java index 841a8d27a38..68c795a979f 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPerformanceCurveCourse.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPerformanceCurveCourse.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.orc; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPublicCertificateDatabase.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPublicCertificateDatabase.java index 53003876d62..9be66c16a51 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPublicCertificateDatabase.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCPublicCertificateDatabase.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.orc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.time.Instant; import java.time.LocalDate; @@ -26,10 +26,10 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.logging.Logger; -import org.junit.Assert; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.impl.BoatClassImpl; import com.sap.sailing.domain.common.orc.ORCCertificate; @@ -48,7 +48,7 @@ public class TestORCPublicCertificateDatabase { @Rule public FailIfNoValidOrcCertificateRule customIgnoreRule = new FailIfNoValidOrcCertificateRule(); - @Before + @BeforeEach public void setUp() { db = new ORCPublicCertificateDatabaseImpl(); /** @@ -185,19 +185,19 @@ public class TestORCPublicCertificateDatabase { */ null, /* includeInvalid */ false); } Optional certificateHandle = Optional.ofNullable(certHandles.iterator().hasNext() ? certHandles.iterator().next() : null); - assertTrue("No certificate found for handle "+certificateHandle+ - " extracted from certificates "+certificates, certificateHandle.isPresent()); + assertTrue(certificateHandle.isPresent(), "No certificate found for handle "+certificateHandle+ + " extracted from certificates "+certificates); final String referenceNumber = certificateHandle.get().getReferenceNumber(); final CertificateHandle handle = db.getCertificateHandle(referenceNumber); final ORCCertificate result = db.getCertificate(referenceNumber, handle.getFamily()); - assertNotNull("Unable to load certificate for reference number "+referenceNumber+" from handle "+certificateHandle, result); + assertNotNull(result, "Unable to load certificate for reference number "+referenceNumber+" from handle "+certificateHandle); assertEquals(handle.getGPH(), result.getGPH().asSeconds(), 0.00001); // Use some tolerance as we found differences as much as 5s between the dxtDate in the handle coming from the XML search result // and the IssueDate field in the JSON. Both suggest to report millisecond accuracy, but dxtDate always seems to have the // milliseconds as "000" explaining many sub-second differences. But in some cases differences were significantly bigger. - assertEquals("Issue dates of certificate with reference number "+referenceNumber+ - " varies between current year result handle ("+handle.getIssueDate()+") and certificate ("+ - result.getIssueDate()+").", handle.getIssueDate().asMillis(), result.getIssueDate().asMillis(), 10000.0); + assertEquals(handle.getIssueDate().asMillis(), result.getIssueDate().asMillis(), 10000.0, "Issue dates of certificate with reference number "+referenceNumber+ + " varies between current year result handle ("+handle.getIssueDate()+") and certificate ("+ + result.getIssueDate()+")."); assertEquals(handle.getSailNumber(), result.getSailNumber()); } @@ -229,7 +229,7 @@ public class TestORCPublicCertificateDatabase { public void testShould() throws Exception { for (String dateString : dateFailureCases) { db.parseDate(dateString); - Assert.fail(dateString + " is parsable"); + Assertions.fail(dateString + " is parsable"); } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCRankingMetricCollaborationWithRaceLogAndRegattaLog.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCRankingMetricCollaborationWithRaceLogAndRegattaLog.java index fed352bdb50..049a3dc61dc 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCRankingMetricCollaborationWithRaceLogAndRegattaLog.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCRankingMetricCollaborationWithRaceLogAndRegattaLog.java @@ -1,17 +1,17 @@ package com.sap.sailing.domain.orc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +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.mockito.Mockito.mock; import java.util.Map; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -63,7 +63,7 @@ public class TestORCRankingMetricCollaborationWithRaceLogAndRegattaLog { private AbstractLogEventAuthor authorP1 = new LogEventAuthorImpl("Test Author P1", 1); private AbstractLogEventAuthor authorP2 = new LogEventAuthorImpl("Test Author P2", 2); - @Before + @BeforeEach public void setUp() { final RaceLogAndTrackedRaceResolver raceLogResolver = createRaceLogResolver(); competitor1 = TrackBasedTest.createCompetitorWithBoat("C1"); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCSplineCalculation.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCSplineCalculation.java index 711be90cee7..8e66bcc643d 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCSplineCalculation.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/orc/TestORCSplineCalculation.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.orc; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.commons.math3.analysis.FunctionUtils; import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; @@ -8,7 +8,7 @@ import org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiabl import org.apache.commons.math3.analysis.function.Constant; import org.apache.commons.math3.analysis.solvers.NewtonRaphsonSolver; import org.apache.commons.math3.exception.DimensionMismatchException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestCrossFleetScoring.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestCrossFleetScoring.java index d00cbfacae3..84d9facce6a 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestCrossFleetScoring.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestCrossFleetScoring.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.ranking; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import java.util.ArrayList; @@ -16,8 +16,8 @@ import java.util.UUID; import java.util.function.Function; import java.util.stream.Collectors; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; @@ -71,7 +71,7 @@ import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; -@Ignore("bug5147: first ensuring that we have no regressions; then using this as test-first driver") +@Disabled("bug5147: first ensuring that we have no regressions; then using this as test-first driver") public class TestCrossFleetScoring extends LeaderboardScoringAndRankingTestBase { private final BoatClass boatClass = new BoatClassImpl(BoatClassMasterdata.PIRATE); private final TimePoint referenceTimePoint = MillisecondsTimePoint.now(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java index 4d725523152..ece750fc254 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.ranking; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.mock; import java.util.ArrayList; @@ -13,7 +13,7 @@ import java.util.Map; import java.util.UUID; import java.util.function.Function; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java index 97829c9d0da..b7afe1ee929 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.ranking; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.mock; import java.util.ArrayList; @@ -13,7 +13,7 @@ import java.util.Map; import java.util.UUID; import java.util.function.Function; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractManeuverDetectionTestCase.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractManeuverDetectionTestCase.java index 171c5d649bc..66ffb87b60a 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractManeuverDetectionTestCase.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractManeuverDetectionTestCase.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; import java.net.MalformedURLException; import java.net.URISyntaxException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java index 31fccb1694c..208ead922ba 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.FileNotFoundException; import java.io.IOException; @@ -14,9 +14,9 @@ import java.util.HashSet; import java.util.List; import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.rules.TestRule; import org.junit.rules.Timeout; @@ -71,7 +71,7 @@ public abstract class AbstractTracTracLiveTest extends StoredTrackBasedTest { /** * Default set-up for an STG training session in Weymouth, 2011 */ - @Before + @BeforeEach public void setUp() throws Exception { final String eventID = "event_20110505_SailingTea"; final String raceID = "bd8c778e-7c65-11e0-8236-406186cbf87c"; @@ -142,7 +142,7 @@ public abstract class AbstractTracTracLiveTest extends StoredTrackBasedTest { getRaceSubscriber().start(); } - @After + @AfterEach public void tearDown() throws MalformedURLException, IOException, InterruptedException { logger.info("entering "+getClass().getName()+".tearDown()"); for (Receiver receiver : receivers) { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ArrayListNavigableSetTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ArrayListNavigableSetTest.java index 1712890dccc..cbb6c24f679 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ArrayListNavigableSetTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ArrayListNavigableSetTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Comparator; @@ -13,7 +13,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.shared.util.impl.ArrayListNavigableSet; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java index 5bb04381369..4692cfd5b45 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +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 java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.impl.PositionWithConfidenceImpl; import com.sap.sailing.domain.common.BearingCluster; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BitShiftTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BitShiftTest.java index a367cd6fa7a..22ac4517bb5 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BitShiftTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BitShiftTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * See the use of bit shift operations in IncrementalLeaderboardDTO diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BoundsTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BoundsTest.java index 90ec758979b..1f0521c79de 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BoundsTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BoundsTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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 org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Bounds; import com.sap.sailing.domain.common.impl.BoundsImpl; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackAverageRideHeightTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackAverageRideHeightTest.java index a32fbebe3f6..d9628ad6be5 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackAverageRideHeightTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackAverageRideHeightTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.Arrays; import java.util.Collections; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CourseArea; import com.sap.sailing.domain.base.impl.CourseAreaImpl; @@ -22,7 +22,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class BravoFixTrackAverageRideHeightTest { private DynamicBravoFixTrack track; - @Before + @BeforeEach public void setUp() { track = new BravoFixTrackImpl<>(new CourseAreaImpl("Test", UUID.randomUUID(), /* centerPosition */ null, /* radius */ null), "test", /* hasExtendedFixes */ true); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackFoiledDistanceCacheTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackFoiledDistanceCacheTest.java index 57007af3551..a97ec38e1a1 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackFoiledDistanceCacheTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackFoiledDistanceCacheTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Collections; @@ -12,8 +12,8 @@ import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CourseArea; import com.sap.sailing.domain.base.impl.CourseAreaImpl; @@ -141,7 +141,7 @@ public class BravoFixTrackFoiledDistanceCacheTest { } } - @Before + @BeforeEach public void setUp() { final CourseAreaImpl courseArea = new CourseAreaImpl("Test", UUID.randomUUID(), /* centerPosition */ null, /* radius */ null); gpsTrack = new DynamicGPSFixMovingTrackImpl<>(courseArea, /* millisecondsOverWhichToAverage */ 15000); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackInterpolationWithNullTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackInterpolationWithNullTest.java index 37e0e096b4b..32a89fa4a73 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackInterpolationWithNullTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BravoFixTrackInterpolationWithNullTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CourseArea; import com.sap.sailing.domain.base.impl.CourseAreaImpl; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CalculateImageSizeFromUrlTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CalculateImageSizeFromUrlTest.java index ad89479bb14..09f3aa47112 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CalculateImageSizeFromUrlTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CalculateImageSizeFromUrlTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.URL; @@ -11,7 +11,7 @@ import javax.imageio.ImageIO; import javax.imageio.ImageReader; import javax.imageio.stream.ImageInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.impl.ImageSizeImpl; import com.sap.sse.common.media.ImageSize; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java index f7cb52173e0..5ab82778b1d 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java @@ -1,17 +1,17 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +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 java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CompetitorChangeListener; import com.sap.sailing.domain.base.DomainFactory; @@ -64,7 +64,7 @@ public class CompetitorListenerTest extends AbstractSerializationTest { private Duration oldTimeOnDistanceAllowancePerNauticalMile; private Duration newTimeOnDistanceAllowancePerNauticalMile; - @Before + @BeforeEach public void setUp() { baseDomainFactory = new DomainFactoryImpl(DomainFactory.TEST_RACE_LOG_RESOLVER); competitor = (DynamicCompetitor) TrackBasedTest.createCompetitorWithBoat("Hasso"); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorProviderCacheInvalidationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorProviderCacheInvalidationTest.java index 97d20537e42..c5765e79f9b 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorProviderCacheInvalidationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorProviderCacheInvalidationTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -13,8 +13,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; @@ -70,7 +70,7 @@ public class CompetitorProviderCacheInvalidationTest extends AbstractLeaderboard private List[] compLists = (List[]) new List[NUMBER_OF_COMP_LISTS]; private Map boats = new HashMap<>(); - @Before + @BeforeEach public void setUp() { final CourseAreaImpl courseArea = new CourseAreaImpl( "Test Course Area", UUID.randomUUID(), /* centerPosition */ null, /* radius */ null); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java index b0a6ec482df..f7ce93e8281 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.io.File; import java.net.MalformedURLException; @@ -12,8 +12,8 @@ import java.net.URL; import java.util.List; import java.util.logging.Logger; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.impl.DouglasPeucker; @@ -37,7 +37,7 @@ public class ConcurrencyTest extends OnlineTracTracBasedTest { super(); } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); // load Race8 of RC44 Cup in Sweden diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrentCollectionsPerformanceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrentCollectionsPerformanceTest.java index 5794a18225e..8e35f01c6c6 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrentCollectionsPerformanceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrentCollectionsPerformanceTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.Collection; @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ConcurrentLinkedQueue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; import com.sap.sse.concurrent.ConcurrentHashBag; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrentWeakHashMapTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrentWeakHashMapTest.java index cf9971c432f..8dda31fcf9f 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrentWeakHashMapTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrentWeakHashMapTest.java @@ -1,14 +1,15 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Iterator; import java.util.Map.Entry; -import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import java.util.Set; import com.sap.sse.concurrent.ConcurrentWeakHashMap; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConfidenceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConfidenceTest.java index 882a7f84304..2d45c44a035 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConfidenceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConfidenceTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.PositionWithConfidence; import com.sap.sailing.domain.base.impl.PositionWithConfidenceImpl; @@ -352,8 +352,8 @@ public class ConfidenceTest { assertEquals(.5, weigher.getConfidence(p, p2), 0.001); // somewhat more tolerant; using quick distance in weigher Position p3 = p.translateGreatCircle(new DegreeBearingImpl(123), new NauticalMileDistance(1000)); final double threshold = 0.001; - assertTrue("Expected confidence in 1000nm distance to be less than "+threshold+" but was "+weigher.getConfidence(p, p3), - weigher.getConfidence(p, p3) < threshold); + assertTrue(weigher.getConfidence(p, p3) < threshold, + "Expected confidence in 1000nm distance to be less than "+threshold+" but was "+weigher.getConfidence(p, p3)); } @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CopyOnWriteHashMapSerializationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CopyOnWriteHashMapSerializationTest.java index 607432f6adc..8bd0bfa8eb6 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CopyOnWriteHashMapSerializationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CopyOnWriteHashMapSerializationTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -8,8 +8,8 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.concurrent.CopyOnWriteHashMap; @@ -17,7 +17,7 @@ public class CopyOnWriteHashMapSerializationTest { private CopyOnWriteHashMap expected; - @Before + @BeforeEach public void setUp() { expected = new CopyOnWriteHashMap<>(); expected.put("a", "1"); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java index 976fcd22a59..621124ba2a5 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CountryCodeTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.BufferedReader; import java.io.IOException; @@ -15,8 +15,8 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sse.common.CountryCode; import com.sap.sse.common.CountryCodeFactory; @@ -25,7 +25,7 @@ import com.sap.sse.common.Util; public class CountryCodeTest { private static final int NUMBER_OF_COUNTRY_CODES = 262; - @Ignore + @Disabled @Test public void convertHTML() throws IOException { InputStream is = Util.class.getResourceAsStream("countrycodes.csv"); @@ -103,7 +103,7 @@ public class CountryCodeTest { public void testGermanyCountryCode() { for (String iso2 : Locale.getISOCountries()) { final CountryCode cc = CountryCodeFactory.INSTANCE.getFromTwoLetterISOName(iso2); - assertNotNull("No country code found for two-letter ISO code "+iso2, cc); + assertNotNull(cc, "No country code found for two-letter ISO code "+iso2); assertEquals(iso2, cc.getTwoLetterISOCode()); } assertEquals("DEU", Locale.GERMANY.getISO3Country()); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeBasedTrackApproximationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeBasedTrackApproximationTest.java index fcef8b395e6..e9556a010b4 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeBasedTrackApproximationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeBasedTrackApproximationTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CompetitorWithBoat; @@ -25,7 +25,7 @@ public class CourseChangeBasedTrackApproximationTest { private DynamicGPSFixTrack track; private CourseChangeBasedTrackApproximation approximation; - @Before + @BeforeEach public void setUp() throws InterruptedException { final CompetitorWithBoat competitor = TrackBasedTest.createCompetitorWithBoat("Someone"); track = new DynamicGPSFixMovingTrackImpl(competitor, diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeCalculatorTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeCalculatorTest.java index 74bfe1b6226..00aaaf35068 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeCalculatorTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeCalculatorTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.tracking.impl.CourseChangeCalculator; @@ -12,7 +12,7 @@ import com.sap.sse.common.impl.DegreeBearingImpl; public class CourseChangeCalculatorTest { private CourseChangeCalculator ccc; - @Before + @BeforeEach public void setUp() { ccc = new CourseChangeCalculator(); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java index b4344b73084..295fd911a5c 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +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.mockito.Mockito.mock; import java.util.ArrayList; @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; @@ -332,8 +332,8 @@ public class CourseTest { private void assertWaypointIndexes(Course course) { int i=0; for (Waypoint waypoint : course.getWaypoints()) { - assertEquals("expected index for waypoint "+waypoint.getName()+" to be "+i+" but was "+course.getIndexOfWaypoint(waypoint), - i, course.getIndexOfWaypoint(waypoint)); + assertEquals(i, + course.getIndexOfWaypoint(waypoint), "expected index for waypoint "+waypoint.getName()+" to be "+i+" but was "+course.getIndexOfWaypoint(waypoint)); i++; } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateDuringNonAtomicSerializationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateDuringNonAtomicSerializationTest.java index 6dcc02b3e77..bd4b5dbe1f6 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateDuringNonAtomicSerializationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateDuringNonAtomicSerializationTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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.mockito.Mockito.mock; import java.io.ByteArrayInputStream; @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java index 1db9a18c1ae..78cb0c3abdb 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +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.mockito.Mockito.mock; import java.io.IOException; @@ -22,9 +22,9 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sailing.domain.base.Competitor; @@ -88,7 +88,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest { super(); } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); routeDataFuture = new CompletableFuture<>(); @@ -372,7 +372,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest { testLegStructure(3); } - @After + @AfterEach public void tearDown() throws MalformedURLException, IOException, InterruptedException { super.tearDown(); routeDataFuture = null; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DirectGapCalculationVersusOneDesignRankingMetricTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DirectGapCalculationVersusOneDesignRankingMetricTest.java index 1f846abc166..29832597bc7 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DirectGapCalculationVersusOneDesignRankingMetricTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DirectGapCalculationVersusOneDesignRankingMetricTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; import java.io.File; import java.net.MalformedURLException; @@ -10,8 +10,8 @@ import java.net.URISyntaxException; import java.net.URL; import java.text.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.NoWindException; @@ -46,7 +46,7 @@ public class DirectGapCalculationVersusOneDesignRankingMetricTest extends Abstra return "Kieler Woche 2014 - Olympic Week"; } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20140619_KieleWoche-R1_Blue_Laser.mtb").getCanonicalPath().replace('\\', '/')); @@ -74,7 +74,7 @@ public class DirectGapCalculationVersusOneDesignRankingMetricTest extends Abstra Duration classicGap = getTrackedRace().getTrackedLeg(buhli, timePoint).getGapToLeader(timePoint, getTrackedRace().getRankingMetric().getRankingInfo(timePoint), WindPositionMode.LEG_MIDDLE); Duration rankingMetricGap = getTrackedRace().getRankingMetric().getGapToLeaderInOwnTime(buhli, timePoint); - assertEquals("At "+i+" minutes into the race ("+timePoint+"): ", classicGap.asSeconds(), rankingMetricGap.asSeconds(), 0.000001); + assertEquals(classicGap.asSeconds(), rankingMetricGap.asSeconds(), 0.000001, "At "+i+" minutes into the race ("+timePoint+"): "); } } @@ -87,7 +87,7 @@ public class DirectGapCalculationVersusOneDesignRankingMetricTest extends Abstra Competitor oneDesignRankingMetricLeader = getTrackedRace().getRankingMetric() .getRankingInfo(timePoint, new LeaderboardDTOCalculationReuseCache(timePoint)) .getLeaderByCorrectedEstimatedTimeToCompetitorFarthestAhead(); - assertSame("At "+i+" minutes into the race ("+timePoint+"): ", classicOverallLeader, oneDesignRankingMetricLeader); + assertSame(classicOverallLeader, oneDesignRankingMetricLeader, "At "+i+" minutes into the race ("+timePoint+"): "); } } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java index 58b61e9711c..9f4788d220c 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; @@ -38,7 +38,7 @@ public class DistanceCacheInvalidationAfterLoadingFinishedTest extends TrackBase private CompetitorWithBoat competitor; private DynamicTrackedRace trackedRace; - @Before + @BeforeEach public void setUp() { competitor = createCompetitorWithBoat("Test Competitor"); Map competitorsAndBoats = TrackBasedTest.createCompetitorAndBoatsMap(competitor); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceTest.java index b856e769c14..f3e87862f6c 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.BoatClassMasterdata; import com.sap.sailing.domain.common.Position; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DomainFactoryImplTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DomainFactoryImplTest.java index 11d80655f72..67440510615 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DomainFactoryImplTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DomainFactoryImplTest.java @@ -3,9 +3,9 @@ package com.sap.sailing.domain.test; import java.util.ArrayList; import java.util.List; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.tractracadapter.impl.DomainFactoryImpl; @@ -13,7 +13,7 @@ import com.sap.sailing.domain.tractracadapter.impl.DomainFactoryImpl; public class DomainFactoryImplTest { private DomainFactoryImpl domainFactory; - @Before + @BeforeEach public void setUp() { domainFactory = new DomainFactoryImpl(DomainFactory.INSTANCE); } @@ -21,19 +21,19 @@ public class DomainFactoryImplTest { @Test public void testGetDominantBoatClass_TestNullCollection() { - Assert.assertEquals(null, domainFactory.getDominantBoatClass(null)); + Assertions.assertEquals(null, domainFactory.getDominantBoatClass(null)); } @Test public void testGetDominantBoatClass_TestEmptyCollection() { List emptyList = new ArrayList<>(); - Assert.assertEquals(null, domainFactory.getDominantBoatClass(emptyList)); + Assertions.assertEquals(null, domainFactory.getDominantBoatClass(emptyList)); } @Test public void testGetDominantBoatClass_TestWithOneObject() { List list = new ArrayList<>(); list.add("LSR"); - Assert.assertEquals("Laser Int.", domainFactory.getDominantBoatClass(list).getName()); + Assertions.assertEquals("Laser Int.", domainFactory.getDominantBoatClass(list).getName()); } @Test @@ -43,7 +43,7 @@ public class DomainFactoryImplTest { list.add("18.Footer"); String result = domainFactory.getDominantBoatClass(list).getName(); if(!(result == "Laser Int." || result == "18Footer")) { - Assert.assertEquals("Laser Int.", result); + Assertions.assertEquals("Laser Int.", result); } } @@ -54,7 +54,7 @@ public class DomainFactoryImplTest { list.add("18.Footer"); list.add("LSR"); String result = domainFactory.getDominantBoatClass(list).getName(); - Assert.assertEquals("Laser Int.", result); + Assertions.assertEquals("Laser Int.", result); } @Test @@ -66,6 +66,6 @@ public class DomainFactoryImplTest { list.add("Laser Int."); list.add("Laser"); String result = domainFactory.getDominantBoatClass(list).getName(); - Assert.assertEquals("Laser Int.", result); + Assertions.assertEquals("Laser Int.", result); } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DynamicTrackedRaceImplSerializationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DynamicTrackedRaceImplSerializationTest.java index f225ef1447a..9a30cab39ab 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DynamicTrackedRaceImplSerializationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DynamicTrackedRaceImplSerializationTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.lang.reflect.Field; @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/EventLeaderboardGroupLinkTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/EventLeaderboardGroupLinkTest.java index 27fa19b68b4..242dc9bdaa4 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/EventLeaderboardGroupLinkTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/EventLeaderboardGroupLinkTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; import java.util.Collections; import java.util.Iterator; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.impl.EventImpl; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/FetchTracksAndStoreLocallyTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/FetchTracksAndStoreLocallyTest.java index 7a51c62c331..9b66ffb37c4 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/FetchTracksAndStoreLocallyTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/FetchTracksAndStoreLocallyTest.java @@ -8,8 +8,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; @@ -37,7 +37,7 @@ import com.tractrac.subscription.lib.api.SubscriberInitializationException; * @author Axel Uhl (D043530) * */ -@Ignore("Un-ignore when you need to fetch new tracks") +@Disabled("Un-ignore when you need to fetch new tracks") public class FetchTracksAndStoreLocallyTest extends OnlineTracTracBasedTest { private final Map> tracks; private TrackedRace trackedRace; @@ -141,7 +141,7 @@ public class FetchTracksAndStoreLocallyTest extends OnlineTracTracBasedTest { } } - @Ignore + @Disabled public void store505Race2() throws InterruptedException, FileNotFoundException, IOException, URISyntaxException, SubscriberInitializationException, CreateModelException { storeRace("event_20110609_KielerWoch", "357c700a-9d9a-11e0-85be-406186cbf87c"); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/JSONEnumTypeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/JSONEnumTypeTest.java index a2861253410..5582bdc9e92 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/JSONEnumTypeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/JSONEnumTypeTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.Reader; @@ -12,7 +12,7 @@ import java.io.Writer; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JSONEnumTypeTest { private enum TestEnum{ VALUE1, VALUE2 }; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/KMeansTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/KMeansTest.java index 8f86037b4c7..060b62972d4 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/KMeansTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/KMeansTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -10,7 +10,7 @@ import java.util.List; import java.util.Random; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.ScalableInteger; import com.sap.sailing.domain.common.confidence.impl.ScalableDouble; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardCourseChangeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardCourseChangeTest.java index 4f04230f1ee..cc159508912 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardCourseChangeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardCourseChangeTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -15,7 +15,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutionException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardDTOCacheInvalidationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardDTOCacheInvalidationTest.java index 1ae86d4dbe5..da9f51a19a6 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardDTOCacheInvalidationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardDTOCacheInvalidationTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Collections; import java.util.UUID; import java.util.concurrent.ExecutionException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.impl.CourseAreaImpl; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardDTOCalculationReuseCacheTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardDTOCalculationReuseCacheTest.java index cdff4336d56..42beec79ad0 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardDTOCalculationReuseCacheTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardDTOCalculationReuseCacheTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.Position; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java index 3a7eeb81eaf..42501030747 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.io.IOException; @@ -11,7 +11,7 @@ import java.net.URL; import java.util.GregorianCalendar; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.RaceColumn; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardOfflineTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardOfflineTest.java index 5b399e80be5..c59f06691ee 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardOfflineTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardOfflineTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +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.assertNotSame; +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 java.io.IOException; import java.io.Serializable; @@ -20,8 +20,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CompetitorWithBoat; @@ -54,7 +54,7 @@ public class LeaderboardOfflineTest extends AbstractLeaderboardTest { private Map raceColumnsInLeaderboard; private CompetitorWithBoat competitorWithBoat; - @Before + @BeforeEach public void setUp() { competitorWithBoat = createCompetitorWithBoat("Wolfgang Hunger"); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardRankingAndScoringWithEliminationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardRankingAndScoringWithEliminationTest.java index 6bcff6ac391..e51fa2911ba 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardRankingAndScoringWithEliminationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardRankingAndScoringWithEliminationTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingForLowPointThreeMedalWinsTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingForLowPointThreeMedalWinsTest.java index 70721ceba5f..bc5788b7871 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingForLowPointThreeMedalWinsTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingForLowPointThreeMedalWinsTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -14,8 +14,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; @@ -129,7 +129,7 @@ public class LeaderboardScoringAndRankingForLowPointThreeMedalWinsTest extends L series.add(finalSeries); } - @Before + @BeforeEach public void setUp() { series = new ArrayList(); setupOpeningSeriesWithOneRaceColumnPerSeries(); @@ -351,7 +351,7 @@ public class LeaderboardScoringAndRankingForLowPointThreeMedalWinsTest extends L * of each of the qualification series races to gold and half to silver, each. */ private void createCompetitorsAndRunAndAssertOpeningSeries(TimePoint now, TimePoint later, int numberOfCompetitors) { - assertEquals("Number of competitors must be evenly divisible by four, but "+numberOfCompetitors+" isn't.", 0, numberOfCompetitors % 4); + assertEquals(0, numberOfCompetitors % 4, "Number of competitors must be evenly divisible by four, but "+numberOfCompetitors+" isn't."); final int NUMBER_OF_COMPETITORS_PER_RACE = numberOfCompetitors / 2; // Competitor set-up final List competitors = createCompetitors(2*NUMBER_OF_COMPETITORS_PER_RACE); @@ -580,29 +580,29 @@ public class LeaderboardScoringAndRankingForLowPointThreeMedalWinsTest extends L final RaceColumn r2Column = regatta.getRaceColumnByName("R2"); final int previousFleetOrdering = r2Column.getFleetOfCompetitor(previous).getOrdering(); final int nextFleetOrdering = r2Column.getFleetOfCompetitor(next).getOrdering(); - assertTrue("Competitor "+previous+" ranked better although their final series fleet ranks worse than that of "+next, - + previousFleetOrdering <= nextFleetOrdering); + assertTrue(+ previousFleetOrdering <= nextFleetOrdering, + "Competitor "+previous+" ranked better although their final series fleet ranks worse than that of "+next); if (previousFleetOrdering == nextFleetOrdering) { // for equal fleet ordering ranking must be decided by points, and ties are to be broken by A8.1 final Double previousNetPoints = leaderboard.getNetPoints(previous, timePoint); final Double nextNetPoints = leaderboard.getNetPoints(next, timePoint); - assertTrue("Competitor "+previous+" ranked better although more points than "+next, previousNetPoints <= nextNetPoints); + assertTrue(previousNetPoints <= nextNetPoints, "Competitor "+previous+" ranked better although more points than "+next); if (previousNetPoints.doubleValue() == nextNetPoints.doubleValue()) { final double previousR1Score = leaderboard.getTotalPoints(previous, r1Column, timePoint); final double previousR2Score = leaderboard.getTotalPoints(previous, r2Column, timePoint); final double nextR1Score = leaderboard.getTotalPoints(next, r1Column, timePoint); final double nextR2Score = leaderboard.getTotalPoints(next, r2Column, timePoint); assertTrue( + Math.min(previousR1Score, previousR2Score) <= Math.min(nextR1Score, nextR2Score), "A8.1 tie-break broken: " + previous + " scored [" + previousR1Score + ", " + previousR2Score + "], " + next + " scored [" + nextR1Score + ", " + nextR2Score + "], yet " + previous - + " was ranked better", - Math.min(previousR1Score, previousR2Score) <= Math.min(nextR1Score, nextR2Score)); + + " was ranked better"); if (Math.min(previousR1Score, previousR2Score) == Math.min(nextR1Score, nextR2Score)) { // it had to be broken by the last race assertTrue( + previousR2Score < nextR2Score, "Tie-break by last race broken: " + previous + " scored " + previousR2Score + ", " + next - + " scored " + nextR2Score + ", yet " + previous + " was ranked better", - previousR2Score < nextR2Score); + + " scored " + nextR2Score + ", yet " + previous + " was ranked better"); } } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingForLowPointsTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingForLowPointsTest.java index 5bf42da71cc..ded289e9593 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingForLowPointsTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingForLowPointsTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; import java.util.ArrayList; import java.util.Arrays; @@ -10,8 +10,8 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; @@ -138,7 +138,7 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco List> nonFinalistsPreScore = preSeriesScoreRankResult.subList(4, preSeriesScoreRankResult.size()); List> nonFinalistsAfterScore = afterFinalResults.subList(4, afterFinalResults.size()); - Assert.assertEquals(nonFinalistsPreScore, nonFinalistsAfterScore); + Assertions.assertEquals(nonFinalistsPreScore, nonFinalistsAfterScore); } @Test @@ -273,10 +273,10 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace mDefault = new MockedTrackedRaceWithStartTimeAndRanks(now, m1Results); m1.setTrackedRace(m1.getFleetByName("Default"), mDefault); - Assert.assertEquals(2.0, leaderboard.getNetPoints(preFirst, later), EPSILON); - Assert.assertEquals(4, leaderboard.getNetPoints(preSecond, later), EPSILON); - Assert.assertEquals(6, leaderboard.getNetPoints(preThird, later), EPSILON); - Assert.assertEquals(8, leaderboard.getNetPoints(preFourth, later), EPSILON); + Assertions.assertEquals(2.0, leaderboard.getNetPoints(preFirst, later), EPSILON); + Assertions.assertEquals(4, leaderboard.getNetPoints(preSecond, later), EPSILON); + Assertions.assertEquals(6, leaderboard.getNetPoints(preThird, later), EPSILON); + Assertions.assertEquals(8, leaderboard.getNetPoints(preFourth, later), EPSILON); List> afterFinalResults = createCompetitorResultForTimestamp(later, leaderboard); assertNonFinalistsAreBehindFinalistsAndNotChanged(preSeriesScoreRankResult, afterFinalResults); @@ -331,14 +331,14 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m1Default = new MockedTrackedRaceWithStartTimeAndRanks(now, m1Results); m1.setTrackedRace(m1.getFleetByName("Default"), m1Default); - Assert.assertEquals(3, leaderboard.getNetPoints(preSecond, later), EPSILON); - Assert.assertEquals(3, leaderboard.getNetPoints(preFirst, later), EPSILON); - Assert.assertEquals(6, leaderboard.getNetPoints(preThird, later), EPSILON); - Assert.assertEquals(8, leaderboard.getNetPoints(preFourth, later), EPSILON); + Assertions.assertEquals(3, leaderboard.getNetPoints(preSecond, later), EPSILON); + Assertions.assertEquals(3, leaderboard.getNetPoints(preFirst, later), EPSILON); + Assertions.assertEquals(6, leaderboard.getNetPoints(preThird, later), EPSILON); + Assertions.assertEquals(8, leaderboard.getNetPoints(preFourth, later), EPSILON); Iterable res = leaderboard.getCompetitorsFromBestToWorst(later); - Assert.assertEquals(Util.get(res, 0), preFirst); - Assert.assertEquals(Util.get(res, 1), preSecond); + Assertions.assertEquals(Util.get(res, 0), preFirst); + Assertions.assertEquals(Util.get(res, 1), preSecond); RaceColumn m2 = leaderboard.getRaceColumnByName("M2"); @@ -353,16 +353,16 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m2Default = new MockedTrackedRaceWithStartTimeAndRanks(m2now, m2Results); m2.setTrackedRace(m1.getFleetByName("Default"), m2Default); - Assert.assertEquals(4.0, leaderboard.getNetPoints(preSecond, m2later), EPSILON); - Assert.assertEquals(5.0, leaderboard.getNetPoints(preFirst, m2later), EPSILON); - Assert.assertEquals(9, leaderboard.getNetPoints(preThird, m2later), EPSILON); - Assert.assertEquals(12, leaderboard.getNetPoints(preFourth, m2later), EPSILON); + Assertions.assertEquals(4.0, leaderboard.getNetPoints(preSecond, m2later), EPSILON); + Assertions.assertEquals(5.0, leaderboard.getNetPoints(preFirst, m2later), EPSILON); + Assertions.assertEquals(9, leaderboard.getNetPoints(preThird, m2later), EPSILON); + Assertions.assertEquals(12, leaderboard.getNetPoints(preFourth, m2later), EPSILON); Iterable res2 = leaderboard.getCompetitorsFromBestToWorst(m2later); - Assert.assertEquals(Util.get(res2, 0), preSecond); - Assert.assertEquals(Util.get(res2, 1), preFirst); - Assert.assertEquals(Util.get(res2, 2), preThird); - Assert.assertEquals(Util.get(res2, 3), preFourth); + Assertions.assertEquals(Util.get(res2, 0), preSecond); + Assertions.assertEquals(Util.get(res2, 1), preFirst); + Assertions.assertEquals(Util.get(res2, 2), preThird); + Assertions.assertEquals(Util.get(res2, 3), preFourth); List> afterFinalResults = createCompetitorResultForTimestamp(m2later, leaderboard); assertNonFinalistsAreBehindFinalistsAndNotChanged(preSeriesScoreRankResult, afterFinalResults); @@ -418,14 +418,14 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m1Default = new MockedTrackedRaceWithStartTimeAndRanks(now, m1Results); m1.setTrackedRace(m1.getFleetByName("Default"), m1Default); - Assert.assertEquals(3, leaderboard.getNetPoints(preSecond, later), EPSILON); - Assert.assertEquals(3, leaderboard.getNetPoints(preFirst, later), EPSILON); - Assert.assertEquals(6, leaderboard.getNetPoints(preThird, later), EPSILON); - Assert.assertEquals(8, leaderboard.getNetPoints(preFourth, later), EPSILON); + Assertions.assertEquals(3, leaderboard.getNetPoints(preSecond, later), EPSILON); + Assertions.assertEquals(3, leaderboard.getNetPoints(preFirst, later), EPSILON); + Assertions.assertEquals(6, leaderboard.getNetPoints(preThird, later), EPSILON); + Assertions.assertEquals(8, leaderboard.getNetPoints(preFourth, later), EPSILON); // assert that during tie-breaking the pre-series carry score takes precedence Iterable res = leaderboard.getCompetitorsFromBestToWorst(later); - Assert.assertEquals(Util.get(res, 0), preFirst); - Assert.assertEquals(Util.get(res, 1), preSecond); + Assertions.assertEquals(Util.get(res, 0), preFirst); + Assertions.assertEquals(Util.get(res, 1), preSecond); RaceColumn m2 = leaderboard.getRaceColumnByName("M2"); @@ -440,16 +440,16 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m2Default = new MockedTrackedRaceWithStartTimeAndRanks(m2now, m2Results); m2.setTrackedRace(m1.getFleetByName("Default"), m2Default); - Assert.assertEquals(4, leaderboard.getNetPoints(preFirst, m2later), EPSILON); - Assert.assertEquals(5, leaderboard.getNetPoints(preSecond, m2later), EPSILON); - Assert.assertEquals(9, leaderboard.getNetPoints(preThird, m2later), EPSILON); - Assert.assertEquals(12, leaderboard.getNetPoints(preFourth, m2later), EPSILON); + Assertions.assertEquals(4, leaderboard.getNetPoints(preFirst, m2later), EPSILON); + Assertions.assertEquals(5, leaderboard.getNetPoints(preSecond, m2later), EPSILON); + Assertions.assertEquals(9, leaderboard.getNetPoints(preThird, m2later), EPSILON); + Assertions.assertEquals(12, leaderboard.getNetPoints(preFourth, m2later), EPSILON); Iterable res2 = leaderboard.getCompetitorsFromBestToWorst(m2later); - Assert.assertEquals(Util.get(res2, 0), preFirst); - Assert.assertEquals(Util.get(res2, 1), preSecond); - Assert.assertEquals(Util.get(res2, 2), preThird); - Assert.assertEquals(Util.get(res2, 3), preFourth); + Assertions.assertEquals(Util.get(res2, 0), preFirst); + Assertions.assertEquals(Util.get(res2, 1), preSecond); + Assertions.assertEquals(Util.get(res2, 2), preThird); + Assertions.assertEquals(Util.get(res2, 3), preFourth); List> afterFinalResults = createCompetitorResultForTimestamp(m2later, leaderboard); assertNonFinalistsAreBehindFinalistsAndNotChanged(preSeriesScoreRankResult, afterFinalResults); @@ -504,15 +504,15 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m1Default = new MockedTrackedRaceWithStartTimeAndRanks(now, m1Results); m1.setTrackedRace(m1.getFleetByName("Default"), m1Default); - Assert.assertEquals(5, leaderboard.getNetPoints(preFourth, later), EPSILON); - Assert.assertEquals(3.0, leaderboard.getNetPoints(preFirst, later), EPSILON); - Assert.assertEquals(5, leaderboard.getNetPoints(preSecond, later), EPSILON); - Assert.assertEquals(7, leaderboard.getNetPoints(preThird, later), EPSILON); + Assertions.assertEquals(5, leaderboard.getNetPoints(preFourth, later), EPSILON); + Assertions.assertEquals(3.0, leaderboard.getNetPoints(preFirst, later), EPSILON); + Assertions.assertEquals(5, leaderboard.getNetPoints(preSecond, later), EPSILON); + Assertions.assertEquals(7, leaderboard.getNetPoints(preThird, later), EPSILON); Iterable res = leaderboard.getCompetitorsFromBestToWorst(later); - Assert.assertEquals(Util.get(res, 0), preFirst); - Assert.assertEquals(Util.get(res, 1), preSecond); - Assert.assertEquals(Util.get(res, 2), preFourth); + Assertions.assertEquals(Util.get(res, 0), preFirst); + Assertions.assertEquals(Util.get(res, 1), preSecond); + Assertions.assertEquals(Util.get(res, 2), preFourth); RaceColumn m2 = leaderboard.getRaceColumnByName("M2"); @@ -527,16 +527,16 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m2Default = new MockedTrackedRaceWithStartTimeAndRanks(m2now, m2Results); m2.setTrackedRace(m1.getFleetByName("Default"), m2Default); - Assert.assertEquals(6.0, leaderboard.getNetPoints(preFourth, m2later), EPSILON); - Assert.assertEquals(5.0, leaderboard.getNetPoints(preFirst, m2later), EPSILON); - Assert.assertEquals(8, leaderboard.getNetPoints(preSecond, m2later), EPSILON); - Assert.assertEquals(11, leaderboard.getNetPoints(preThird, m2later), EPSILON); + Assertions.assertEquals(6.0, leaderboard.getNetPoints(preFourth, m2later), EPSILON); + Assertions.assertEquals(5.0, leaderboard.getNetPoints(preFirst, m2later), EPSILON); + Assertions.assertEquals(8, leaderboard.getNetPoints(preSecond, m2later), EPSILON); + Assertions.assertEquals(11, leaderboard.getNetPoints(preThird, m2later), EPSILON); Iterable res2 = leaderboard.getCompetitorsFromBestToWorst(m2later); - Assert.assertEquals(Util.get(res2, 0), preFourth); - Assert.assertEquals(Util.get(res2, 1), preFirst); - Assert.assertEquals(Util.get(res2, 2), preSecond); - Assert.assertEquals(Util.get(res2, 3), preThird); + Assertions.assertEquals(Util.get(res2, 0), preFourth); + Assertions.assertEquals(Util.get(res2, 1), preFirst); + Assertions.assertEquals(Util.get(res2, 2), preSecond); + Assertions.assertEquals(Util.get(res2, 3), preThird); List> afterFinalResults = createCompetitorResultForTimestamp(m2later, leaderboard); assertNonFinalistsAreBehindFinalistsAndNotChanged(preSeriesScoreRankResult, afterFinalResults); @@ -591,16 +591,16 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m1Default = new MockedTrackedRaceWithStartTimeAndRanks(now, m1Results); m1.setTrackedRace(m1.getFleetByName("Default"), m1Default); - Assert.assertEquals(5, leaderboard.getNetPoints(preFourth, later), EPSILON); - Assert.assertEquals(3.0, leaderboard.getNetPoints(preFirst, later), EPSILON); - Assert.assertEquals(5, leaderboard.getNetPoints(preSecond, later), EPSILON); - Assert.assertEquals(7, leaderboard.getNetPoints(preThird, later), EPSILON); + Assertions.assertEquals(5, leaderboard.getNetPoints(preFourth, later), EPSILON); + Assertions.assertEquals(3.0, leaderboard.getNetPoints(preFirst, later), EPSILON); + Assertions.assertEquals(5, leaderboard.getNetPoints(preSecond, later), EPSILON); + Assertions.assertEquals(7, leaderboard.getNetPoints(preThird, later), EPSILON); Iterable res = leaderboard.getCompetitorsFromBestToWorst(later); - Assert.assertEquals(Util.get(res, 0), preFirst); - Assert.assertEquals(Util.get(res, 1), preSecond); - Assert.assertEquals(Util.get(res, 2), preFourth); + Assertions.assertEquals(Util.get(res, 0), preFirst); + Assertions.assertEquals(Util.get(res, 1), preSecond); + Assertions.assertEquals(Util.get(res, 2), preFourth); RaceColumn m2 = leaderboard.getRaceColumnByName("M2"); @@ -615,10 +615,10 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m2Default = new MockedTrackedRaceWithStartTimeAndRanks(m2now, m2Results); m2.setTrackedRace(m1.getFleetByName("Default"), m2Default); - Assert.assertEquals(9, leaderboard.getNetPoints(preFourth, m2later), EPSILON); - Assert.assertEquals(5.0, leaderboard.getNetPoints(preFirst, m2later), EPSILON); - Assert.assertEquals(8, leaderboard.getNetPoints(preSecond, m2later), EPSILON); - Assert.assertEquals(8, leaderboard.getNetPoints(preThird, m2later), EPSILON); + Assertions.assertEquals(9, leaderboard.getNetPoints(preFourth, m2later), EPSILON); + Assertions.assertEquals(5.0, leaderboard.getNetPoints(preFirst, m2later), EPSILON); + Assertions.assertEquals(8, leaderboard.getNetPoints(preSecond, m2later), EPSILON); + Assertions.assertEquals(8, leaderboard.getNetPoints(preThird, m2later), EPSILON); List> afterFinalResults = createCompetitorResultForTimestamp(m2later, leaderboard); assertNonFinalistsAreBehindFinalistsAndNotChanged(preSeriesScoreRankResult, afterFinalResults); @@ -663,14 +663,14 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace mDefault = new MockedTrackedRaceWithStartTimeAndRanks(now, m1Results); m1.setTrackedRace(m1.getFleetByName("Default"), mDefault); - Assert.assertEquals(4, leaderboard.getNetPoints(preFirst, later), EPSILON); - Assert.assertEquals(8, leaderboard.getNetPoints(preSecond, later), EPSILON); - Assert.assertEquals(12, leaderboard.getNetPoints(preThird, later), EPSILON); - Assert.assertEquals(16, leaderboard.getNetPoints(preFourth, later), EPSILON); - Assert.assertEquals(1, leaderboard.getTotalRankOfCompetitor(preFirst, later)); - Assert.assertEquals(2, leaderboard.getTotalRankOfCompetitor(preSecond, later)); - Assert.assertEquals(3, leaderboard.getTotalRankOfCompetitor(preThird, later)); - Assert.assertEquals(4, leaderboard.getTotalRankOfCompetitor(preFourth, later)); + Assertions.assertEquals(4, leaderboard.getNetPoints(preFirst, later), EPSILON); + Assertions.assertEquals(8, leaderboard.getNetPoints(preSecond, later), EPSILON); + Assertions.assertEquals(12, leaderboard.getNetPoints(preThird, later), EPSILON); + Assertions.assertEquals(16, leaderboard.getNetPoints(preFourth, later), EPSILON); + Assertions.assertEquals(1, leaderboard.getTotalRankOfCompetitor(preFirst, later)); + Assertions.assertEquals(2, leaderboard.getTotalRankOfCompetitor(preSecond, later)); + Assertions.assertEquals(3, leaderboard.getTotalRankOfCompetitor(preThird, later)); + Assertions.assertEquals(4, leaderboard.getTotalRankOfCompetitor(preFourth, later)); List> afterFinalResults = createCompetitorResultForTimestamp(later, leaderboard); assertNonFinalistsAreBehindFinalistsAndNotChanged(preSeriesScoreRankResult, afterFinalResults); @@ -724,10 +724,10 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m1Default = new MockedTrackedRaceWithStartTimeAndRanks(now, m1Results); m1.setTrackedRace(m1.getFleetByName("Default"), m1Default); - Assert.assertEquals(6, leaderboard.getNetPoints(preSecond, later), EPSILON); - Assert.assertEquals(6.0, leaderboard.getNetPoints(preFirst, later), EPSILON); - Assert.assertEquals(12, leaderboard.getNetPoints(preThird, later), EPSILON); - Assert.assertEquals(16, leaderboard.getNetPoints(preFourth, later), EPSILON); + Assertions.assertEquals(6, leaderboard.getNetPoints(preSecond, later), EPSILON); + Assertions.assertEquals(6.0, leaderboard.getNetPoints(preFirst, later), EPSILON); + Assertions.assertEquals(12, leaderboard.getNetPoints(preThird, later), EPSILON); + Assertions.assertEquals(16, leaderboard.getNetPoints(preFourth, later), EPSILON); RaceColumn m2 = leaderboard.getRaceColumnByName("M2"); @@ -742,14 +742,14 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m2Default = new MockedTrackedRaceWithStartTimeAndRanks(m2now, m2Results); m2.setTrackedRace(m1.getFleetByName("Default"), m2Default); - Assert.assertEquals(8, leaderboard.getNetPoints(preSecond, m2later), EPSILON); - Assert.assertEquals(10.0, leaderboard.getNetPoints(preFirst, m2later), EPSILON); - Assert.assertEquals(18, leaderboard.getNetPoints(preThird, m2later), EPSILON); - Assert.assertEquals(24, leaderboard.getNetPoints(preFourth, m2later), EPSILON); - Assert.assertEquals(1, leaderboard.getTotalRankOfCompetitor(preSecond, m2later)); - Assert.assertEquals(2, leaderboard.getTotalRankOfCompetitor(preFirst, m2later)); - Assert.assertEquals(3, leaderboard.getTotalRankOfCompetitor(preThird, m2later)); - Assert.assertEquals(4, leaderboard.getTotalRankOfCompetitor(preFourth, m2later)); + Assertions.assertEquals(8, leaderboard.getNetPoints(preSecond, m2later), EPSILON); + Assertions.assertEquals(10.0, leaderboard.getNetPoints(preFirst, m2later), EPSILON); + Assertions.assertEquals(18, leaderboard.getNetPoints(preThird, m2later), EPSILON); + Assertions.assertEquals(24, leaderboard.getNetPoints(preFourth, m2later), EPSILON); + Assertions.assertEquals(1, leaderboard.getTotalRankOfCompetitor(preSecond, m2later)); + Assertions.assertEquals(2, leaderboard.getTotalRankOfCompetitor(preFirst, m2later)); + Assertions.assertEquals(3, leaderboard.getTotalRankOfCompetitor(preThird, m2later)); + Assertions.assertEquals(4, leaderboard.getTotalRankOfCompetitor(preFourth, m2later)); List> afterFinalResults = createCompetitorResultForTimestamp(m2later, leaderboard); assertNonFinalistsAreBehindFinalistsAndNotChanged(preSeriesScoreRankResult, afterFinalResults); } @@ -802,15 +802,15 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m1Default = new MockedTrackedRaceWithStartTimeAndRanks(now, m1Results); m1.setTrackedRace(m1.getFleetByName("Default"), m1Default); - Assert.assertEquals(6, leaderboard.getNetPoints(preSecond, later), EPSILON); - Assert.assertEquals(6, leaderboard.getNetPoints(preFirst, later), EPSILON); - Assert.assertEquals(12, leaderboard.getNetPoints(preThird, later), EPSILON); - Assert.assertEquals(16, leaderboard.getNetPoints(preFourth, later), EPSILON); + Assertions.assertEquals(6, leaderboard.getNetPoints(preSecond, later), EPSILON); + Assertions.assertEquals(6, leaderboard.getNetPoints(preFirst, later), EPSILON); + Assertions.assertEquals(12, leaderboard.getNetPoints(preThird, later), EPSILON); + Assertions.assertEquals(16, leaderboard.getNetPoints(preFourth, later), EPSILON); Iterable res = leaderboard.getCompetitorsFromBestToWorst(later); - Assert.assertEquals(Util.get(res, 0), preSecond); - Assert.assertEquals(Util.get(res, 1), preFirst); + Assertions.assertEquals(Util.get(res, 0), preSecond); + Assertions.assertEquals(Util.get(res, 1), preFirst); RaceColumn m2 = leaderboard.getRaceColumnByName("M2"); @@ -825,10 +825,10 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m2Default = new MockedTrackedRaceWithStartTimeAndRanks(m2now, m2Results); m2.setTrackedRace(m1.getFleetByName("Default"), m2Default); - Assert.assertEquals(8, leaderboard.getNetPoints(preFirst, m2later), EPSILON); - Assert.assertEquals(10, leaderboard.getNetPoints(preSecond, m2later), EPSILON); - Assert.assertEquals(18, leaderboard.getNetPoints(preThird, m2later), EPSILON); - Assert.assertEquals(24, leaderboard.getNetPoints(preFourth, m2later), EPSILON); + Assertions.assertEquals(8, leaderboard.getNetPoints(preFirst, m2later), EPSILON); + Assertions.assertEquals(10, leaderboard.getNetPoints(preSecond, m2later), EPSILON); + Assertions.assertEquals(18, leaderboard.getNetPoints(preThird, m2later), EPSILON); + Assertions.assertEquals(24, leaderboard.getNetPoints(preFourth, m2later), EPSILON); List> afterFinalResults = createCompetitorResultForTimestamp(m2later, leaderboard); assertNonFinalistsAreBehindFinalistsAndNotChanged(preSeriesScoreRankResult, afterFinalResults); @@ -882,15 +882,15 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m1Default = new MockedTrackedRaceWithStartTimeAndRanks(now, m1Results); m1.setTrackedRace(m1.getFleetByName("Default"), m1Default); - Assert.assertEquals(10, leaderboard.getNetPoints(preFourth, later), EPSILON); - Assert.assertEquals(6.0, leaderboard.getNetPoints(preFirst, later), EPSILON); - Assert.assertEquals(10, leaderboard.getNetPoints(preSecond, later), EPSILON); - Assert.assertEquals(14, leaderboard.getNetPoints(preThird, later), EPSILON); + Assertions.assertEquals(10, leaderboard.getNetPoints(preFourth, later), EPSILON); + Assertions.assertEquals(6.0, leaderboard.getNetPoints(preFirst, later), EPSILON); + Assertions.assertEquals(10, leaderboard.getNetPoints(preSecond, later), EPSILON); + Assertions.assertEquals(14, leaderboard.getNetPoints(preThird, later), EPSILON); Iterable res = leaderboard.getCompetitorsFromBestToWorst(later); - Assert.assertEquals(Util.get(res, 0), preFirst); - Assert.assertEquals(Util.get(res, 1), preFourth); - Assert.assertEquals(Util.get(res, 2), preSecond); + Assertions.assertEquals(Util.get(res, 0), preFirst); + Assertions.assertEquals(Util.get(res, 1), preFourth); + Assertions.assertEquals(Util.get(res, 2), preSecond); RaceColumn m2 = leaderboard.getRaceColumnByName("M2"); @@ -905,10 +905,10 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m2Default = new MockedTrackedRaceWithStartTimeAndRanks(m2now, m2Results); m2.setTrackedRace(m1.getFleetByName("Default"), m2Default); - Assert.assertEquals(12, leaderboard.getNetPoints(preFourth, m2later), EPSILON); - Assert.assertEquals(10, leaderboard.getNetPoints(preFirst, m2later), EPSILON); - Assert.assertEquals(16, leaderboard.getNetPoints(preSecond, m2later), EPSILON); - Assert.assertEquals(22, leaderboard.getNetPoints(preThird, m2later), EPSILON); + Assertions.assertEquals(12, leaderboard.getNetPoints(preFourth, m2later), EPSILON); + Assertions.assertEquals(10, leaderboard.getNetPoints(preFirst, m2later), EPSILON); + Assertions.assertEquals(16, leaderboard.getNetPoints(preSecond, m2later), EPSILON); + Assertions.assertEquals(22, leaderboard.getNetPoints(preThird, m2later), EPSILON); List> afterFinalResults = createCompetitorResultForTimestamp(m2later, leaderboard); assertNonFinalistsAreBehindFinalistsAndNotChanged(preSeriesScoreRankResult, afterFinalResults); @@ -961,15 +961,15 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m1Default = new MockedTrackedRaceWithStartTimeAndRanks(now, m1Results); m1.setTrackedRace(m1.getFleetByName("Default"), m1Default); - Assert.assertEquals(10, leaderboard.getNetPoints(preFourth, later), EPSILON); - Assert.assertEquals(6.0, leaderboard.getNetPoints(preFirst, later), EPSILON); - Assert.assertEquals(10, leaderboard.getNetPoints(preSecond, later), EPSILON); - Assert.assertEquals(14, leaderboard.getNetPoints(preThird, later), EPSILON); + Assertions.assertEquals(10, leaderboard.getNetPoints(preFourth, later), EPSILON); + Assertions.assertEquals(6.0, leaderboard.getNetPoints(preFirst, later), EPSILON); + Assertions.assertEquals(10, leaderboard.getNetPoints(preSecond, later), EPSILON); + Assertions.assertEquals(14, leaderboard.getNetPoints(preThird, later), EPSILON); Iterable res = leaderboard.getCompetitorsFromBestToWorst(later); - Assert.assertEquals(Util.get(res, 0), preFirst); - Assert.assertEquals(Util.get(res, 1), preFourth); - Assert.assertEquals(Util.get(res, 2), preSecond); + Assertions.assertEquals(Util.get(res, 0), preFirst); + Assertions.assertEquals(Util.get(res, 1), preFourth); + Assertions.assertEquals(Util.get(res, 2), preSecond); RaceColumn m2 = leaderboard.getRaceColumnByName("M2"); @@ -984,16 +984,16 @@ public class LeaderboardScoringAndRankingForLowPointsTest extends LeaderboardSco TrackedRace m2Default = new MockedTrackedRaceWithStartTimeAndRanks(m2now, m2Results); m2.setTrackedRace(m1.getFleetByName("Default"), m2Default); - Assert.assertEquals(18, leaderboard.getNetPoints(preFourth, m2later), EPSILON); - Assert.assertEquals(10, leaderboard.getNetPoints(preFirst, m2later), EPSILON); - Assert.assertEquals(16, leaderboard.getNetPoints(preSecond, m2later), EPSILON); - Assert.assertEquals(16, leaderboard.getNetPoints(preThird, m2later), EPSILON); + Assertions.assertEquals(18, leaderboard.getNetPoints(preFourth, m2later), EPSILON); + Assertions.assertEquals(10, leaderboard.getNetPoints(preFirst, m2later), EPSILON); + Assertions.assertEquals(16, leaderboard.getNetPoints(preSecond, m2later), EPSILON); + Assertions.assertEquals(16, leaderboard.getNetPoints(preThird, m2later), EPSILON); Iterable res2 = leaderboard.getCompetitorsFromBestToWorst(m2later); - Assert.assertEquals(Util.get(res2, 0), preFirst); - Assert.assertEquals(Util.get(res2, 1), preThird); - Assert.assertEquals(Util.get(res2, 2), preSecond); - Assert.assertEquals(Util.get(res2, 3), preFourth); + Assertions.assertEquals(Util.get(res2, 0), preFirst); + Assertions.assertEquals(Util.get(res2, 1), preThird); + Assertions.assertEquals(Util.get(res2, 2), preSecond); + Assertions.assertEquals(Util.get(res2, 3), preFourth); List> afterFinalResults = createCompetitorResultForTimestamp(m2later, leaderboard); assertNonFinalistsAreBehindFinalistsAndNotChanged(preSeriesScoreRankResult, afterFinalResults); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java index 69471515f2a..ed9c5590be9 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +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.mockito.Mockito.mock; import java.util.ArrayList; @@ -22,7 +22,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutionException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; @@ -711,13 +711,13 @@ public class LeaderboardScoringAndRankingTest extends LeaderboardScoringAndRanki RaceColumn q2Column = qualificationSeries.getRaceColumnByName("Q2"); q2Column.setTrackedRace(q2Column.getFleetByName("Yellow"), q2Yellow); for (Competitor competitor : competitors.subList(3, 8)) { - assertTrue("Competitor "+competitor+" has no discard but should have one", - leaderboard.isDiscarded(competitor, q1Column, later) || leaderboard.isDiscarded(competitor, q2Column, later)); + assertTrue(leaderboard.isDiscarded(competitor, q1Column, later) || leaderboard.isDiscarded(competitor, q2Column, later), + "Competitor "+competitor+" has no discard but should have one"); } for (Competitor competitor : Arrays.asList(new Competitor[] { competitors.get(0), competitors.get(1), competitors.get(2), competitors.get(8), competitors.get(9) })) { - assertFalse("Competitor "+competitor+" has a discard but should'nt have one", - leaderboard.isDiscarded(competitor, q1Column, later) || leaderboard.isDiscarded(competitor, q2Column, later)); + assertFalse(leaderboard.isDiscarded(competitor, q1Column, later) || leaderboard.isDiscarded(competitor, q2Column, later), + "Competitor "+competitor+" has a discard but should'nt have one"); } // now add a tracked race for the blue fleet for Q2 and assert that all competitors have one discard TrackedRace q2Blue = new MockedTrackedRaceWithStartTimeAndRanks(now, @@ -725,8 +725,8 @@ public class LeaderboardScoringAndRankingTest extends LeaderboardScoringAndRanki competitors.get(8), competitors.get(9) })); q2Column.setTrackedRace(q2Column.getFleetByName("Blue"), q2Blue); for (Competitor competitor : competitors) { - assertTrue("Competitor "+competitor+" has no discard but should", - leaderboard.isDiscarded(competitor, q1Column, later) || leaderboard.isDiscarded(competitor, q2Column, later)); + assertTrue(leaderboard.isDiscarded(competitor, q1Column, later) || leaderboard.isDiscarded(competitor, q2Column, later), + "Competitor "+competitor+" has no discard but should"); } } @@ -760,14 +760,14 @@ public class LeaderboardScoringAndRankingTest extends LeaderboardScoringAndRanki RaceColumn f2Column = finalSeries.getRaceColumnByName("F2"); f2Column.setTrackedRace(f2Column.getFleetByName("Gold"), f2Gold); for (int i=0; i<5; i++) { - assertTrue("Competitor "+competitors.get(i)+" has no discard in F1 or F2 but should", - leaderboard.isDiscarded(competitors.get(i), f1Column, later) || - leaderboard.isDiscarded(competitors.get(i), f2Column, later)); + assertTrue(leaderboard.isDiscarded(competitors.get(i), f1Column, later) || + leaderboard.isDiscarded(competitors.get(i), f2Column, later), + "Competitor "+competitors.get(i)+" has no discard in F1 or F2 but should"); } for (int i=5; i<10; i++) { - assertFalse("Competitor "+competitors.get(i)+" has a discard in F1 or F2 but shouldn't", - leaderboard.isDiscarded(competitors.get(i), f1Column, later) || - leaderboard.isDiscarded(competitors.get(i), f2Column, later)); + assertFalse(leaderboard.isDiscarded(competitors.get(i), f1Column, later) || + leaderboard.isDiscarded(competitors.get(i), f2Column, later), + "Competitor "+competitors.get(i)+" has a discard in F1 or F2 but shouldn't"); } } @@ -1936,8 +1936,8 @@ public class LeaderboardScoringAndRankingTest extends LeaderboardScoringAndRanki final double expectedPointsForFirstEightBoats = (1.0 + 2.0 + 3.0 + 4.0 + 5.0 + 6.0 + 7.0 + 8.0) / 8.0; for (int i=0; i<8; i++) { assertEquals(expectedPointsForFirstEightBoats, leaderboard.getNetPoints(c[8*i], later), 0.0000001); - assertEquals("Competitor "+Util.get(rankedCompetitors, i)+" not in list of best eight ", - 0, Arrays.asList(c).indexOf(Util.get(rankedCompetitors, i))%8); // each first competitor in a heat ranks in the top 8 + assertEquals(0, + Arrays.asList(c).indexOf(Util.get(rankedCompetitors, i))%8, "Competitor "+Util.get(rankedCompetitors, i)+" not in list of best eight "); // each first competitor in a heat ranks in the top 8 } for (int i=1; i<=3; i++) { for (Competitor comp : c) { @@ -2786,10 +2786,10 @@ public class LeaderboardScoringAndRankingTest extends LeaderboardScoringAndRanki for (Competitor rankedCompetitor : rankedCompetitors) { // with a high-point scoring scheme, assert that as competitors get worse, scores get less double rankedCompetitorScore = netPoints.get(rankedCompetitor); - assertTrue("Expected " + rankedCompetitor + " with rank " - + (Util.indexOf(rankedCompetitors, rankedCompetitor) + 1) - + " to have worse (lesser) score than its immediate better competitor who scored " + lastScore - + " but was " + rankedCompetitorScore, rankedCompetitorScore <= lastScore); + assertTrue(rankedCompetitorScore <= lastScore, "Expected " + rankedCompetitor + " with rank " + + (Util.indexOf(rankedCompetitors, rankedCompetitor) + 1) + + " to have worse (lesser) score than its immediate better competitor who scored " + lastScore + + " but was " + rankedCompetitorScore); lastScore = rankedCompetitorScore; // assert that the qualification race consistently has zero points for all competitors because it is discarded assertTrue(leaderboard.isDiscarded(rankedCompetitor, qColumn, later)); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTestBase.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTestBase.java index 72c23b64233..606dd929ab1 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTestBase.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTestBase.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.Arrays; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java index d559226fbe1..62e86028a5a 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.Mark; @@ -28,7 +28,7 @@ public class LineAnalysisTest extends TrackBasedTest { private DynamicTrackedRace trackedRace; private CompetitorWithBoat competitor; - @Before + @BeforeEach public void setUp() { competitor = createCompetitorWithBoat("Test"); now = MillisecondsTimePoint.now(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LockAsResourceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LockAsResourceTest.java index fc8ff230073..fe42f386449 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LockAsResourceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LockAsResourceTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.concurrent.NamedReentrantReadWriteLock; import com.sap.sse.util.AutoCloseableReadLock; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LockTraceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LockTraceTest.java index 11bb1099494..6281a9d634c 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LockTraceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LockTraceTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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 java.io.IOException; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.test.measurements.Measurement; import com.sap.sailing.domain.test.measurements.MeasurementCase; @@ -104,7 +104,7 @@ public class LockTraceTest { System.out.println("Took "+(System.currentTimeMillis()-start)+"ms"); } - @Ignore + @Disabled @Test public void testLockTraceForMultipleReaders() throws InterruptedException { NamedReentrantReadWriteLock lock1 = new NamedReentrantReadWriteLock("Lock1", /* fair */ true); @@ -119,7 +119,7 @@ public class LockTraceTest { } } - @Ignore + @Disabled @Test public void testDeadlockDetectionWithJMX() throws InterruptedException { NamedReentrantReadWriteLock lock1 = new NamedReentrantReadWriteLock("Lock1", /* fair */ true); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LowPointWithEliminatingMedalSeriesPromotingOneToFinalAndTwoToSemifinalTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LowPointWithEliminatingMedalSeriesPromotingOneToFinalAndTwoToSemifinalTest.java index 10fecdbdde7..5231d98dc19 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LowPointWithEliminatingMedalSeriesPromotingOneToFinalAndTwoToSemifinalTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LowPointWithEliminatingMedalSeriesPromotingOneToFinalAndTwoToSemifinalTest.java @@ -1,16 +1,16 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.HashMap; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -32,7 +32,7 @@ public class LowPointWithEliminatingMedalSeriesPromotingOneToFinalAndTwoToSemifi private HashMap competitorsRankedByOpeningSeries; private Competitor c1, c2, c3, c4, c5; - @Before + @BeforeEach public void setUp() { regatta = mock(Regatta.class); scoringScheme = new LowPointWithEliminatingMedalSeriesPromotingOneToFinalAndTwoToSemifinal(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java index aabad630ef1..ab9e8aba4bc 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import java.net.MalformedURLException; @@ -13,8 +13,8 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.ManeuverType; @@ -34,7 +34,7 @@ public class ManeuverAnalysis505Test extends AbstractManeuverDetectionTestCase { super(); } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20110609_KielerWoch-505_Race_2.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java index 13caeb20373..818bb822c2c 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import java.net.MalformedURLException; @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; @@ -45,7 +45,7 @@ public class ManeuverAnalysisIDMChampionsFinalTest extends AbstractManeuverDetec super(); } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20110929_Internatio-Champions_Cup_Final.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisQingdao2014Test.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisQingdao2014Test.java index f30568aabd8..af1644ab0d1 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisQingdao2014Test.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisQingdao2014Test.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; import java.io.File; import java.net.MalformedURLException; @@ -12,8 +12,8 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.Date; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.ManeuverType; @@ -39,7 +39,7 @@ public class ManeuverAnalysisQingdao2014Test extends AbstractManeuverDetectionTe } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20140429_ESSQingdao-Race_4.mtb").getCanonicalPath().replace('\\', '/')); @@ -73,7 +73,7 @@ public class ManeuverAnalysisQingdao2014Test extends AbstractManeuverDetectionTe assertManeuver(maneuvers, ManeuverType.TACK, new MillisecondsTimePoint(dateFormat.parse("05/01/2014-09:08:56")), 5000); for (Maneuver maneuver : maneuvers) { // make sure there is no penalty detected in the time frame considered - assertNotSame("Found an unexpected penalty "+maneuver, ManeuverType.PENALTY_CIRCLE, maneuver.getType()); + assertNotSame(ManeuverType.PENALTY_CIRCLE, maneuver.getType(), "Found an unexpected penalty "+maneuver); } } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java index 9a624a53b60..da67f06a108 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.File; import java.net.MalformedURLException; @@ -17,8 +17,8 @@ import java.util.NavigableSet; import java.util.TimeZone; import java.util.logging.Logger; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.impl.DouglasPeucker; @@ -47,7 +47,7 @@ public class ManeuverDetectionOnKielerWoche505Race2DataTest extends AbstractMane public ManeuverDetectionOnKielerWoche505Race2DataTest() throws MalformedURLException, URISyntaxException { } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:////"+new File("resources/event_20110609_KielerWoch-505_Race_2.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java index f5ea0dabf0d..a0baedf1075 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.net.MalformedURLException; import java.net.URISyntaxException; @@ -11,8 +11,8 @@ import java.util.Map; import java.util.NavigableSet; import java.util.TimeZone; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; @@ -44,7 +44,7 @@ public class ManeuverDetectionOnMdM2011SemifinalTest extends OnlineTracTracBased return "Academy Tracking 2011"; } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); super.setUp("event_20110505_SailingTea", // Semifinale diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverLossOnPenaltyCircleTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverLossOnPenaltyCircleTest.java index 4a6f18f8a47..6f1f7d1eef4 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverLossOnPenaltyCircleTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverLossOnPenaltyCircleTest.java @@ -12,8 +12,8 @@ import java.util.Optional; import java.util.logging.Logger; import java.util.stream.StreamSupport; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.ManeuverType; @@ -38,7 +38,7 @@ public class ManeuverLossOnPenaltyCircleTest extends OnlineTracTracBasedTest { return "Sailing Champions League 2015"; } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:////"+new File("resources/SailingChampionsLeague2015-Race28.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPassingUpdateFromRaceLogFinishPositioningListTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPassingUpdateFromRaceLogFinishPositioningListTest.java index ea306c7b61c..cad50859c51 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPassingUpdateFromRaceLogFinishPositioningListTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPassingUpdateFromRaceLogFinishPositioningListTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +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 java.io.File; import java.net.MalformedURLException; @@ -17,8 +17,8 @@ import java.util.List; import java.util.NavigableSet; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -80,7 +80,7 @@ public class MarkPassingUpdateFromRaceLogFinishPositioningListTest extends Abstr } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20140429_ESSQingdao-Race_4.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPositionTimeFilterTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPositionTimeFilterTest.java index 272fd938411..6d8744b8816 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPositionTimeFilterTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPositionTimeFilterTest.java @@ -1,17 +1,17 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.impl.MarkImpl; @@ -31,7 +31,7 @@ public class MarkPositionTimeFilterTest { private MarkImpl m; private DynamicGPSFixTrackImpl track; - @Before + @BeforeEach public void setUp() { trackedRace = mock(DynamicTrackedRaceImpl.class); final TimePoint startOfTracking = MillisecondsTimePoint.now(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarshallingObjectOutputStreamsTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarshallingObjectOutputStreamsTest.java index e50493addd3..ace58828c20 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarshallingObjectOutputStreamsTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarshallingObjectOutputStreamsTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -11,7 +11,7 @@ import java.io.ObjectOutputStream; import java.io.OutputStream; import java.util.Random; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * See bug 3015. How sure can we be that multiple {@link ObjectOutputStream}s can be concatenated in one diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java index a67204e309c..eec79fa3f72 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.mockito.Mockito.mock; import java.io.IOException; @@ -10,9 +10,9 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.leaderboard.LeaderboardGroupResolver; import com.sap.sailing.domain.racelog.RaceLogAndTrackedRaceResolver; @@ -36,7 +36,7 @@ public class MultipleClassesInRegattaTest { private TracTracRaceTracker kiwotest3; private TracTracRaceTracker weym470may112014_2; - @Before + @BeforeEach public void setUp() { domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl(com.sap.sailing.domain.base.DomainFactory.TEST_RACE_LOG_RESOLVER)); } @@ -106,7 +106,7 @@ public class MultipleClassesInRegattaTest { /* useOfficialEventsToUpdateRaceLog */ false, /* liveURIFromConfiguration */ null, /* storedURIFromConfiguration */ null); } - @After + @AfterEach public void tearDown() throws MalformedURLException, IOException, InterruptedException { kiwotest1.stop(/* preemptive */ false); kiwotest2.stop(/* preemptive */ false); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/NonCardinalBoundsTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/NonCardinalBoundsTest.java index 33f4b3ca670..d7c92934cea 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/NonCardinalBoundsTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/NonCardinalBoundsTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.NonCardinalBounds; import com.sap.sailing.domain.common.Position; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/NonCompetingCompetitorTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/NonCompetingCompetitorTest.java index 71dad317dcd..65b2e1cedc6 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/NonCompetingCompetitorTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/NonCompetingCompetitorTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; import java.net.MalformedURLException; import java.net.URISyntaxException; @@ -9,8 +9,8 @@ import java.net.URL; import java.text.ParseException; import java.util.Map.Entry; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; @@ -28,7 +28,7 @@ public class NonCompetingCompetitorTest extends AbstractManeuverDetectionTestCas } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); super.setUp( diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java index c33c26b59d5..ab90f819cf1 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -21,7 +21,7 @@ import java.util.Set; import java.util.UUID; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java index 75de1a570c5..f8049d4114b 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.mock; import java.io.FileNotFoundException; @@ -17,7 +17,7 @@ import java.util.concurrent.CountDownLatch; import java.util.logging.Logger; import java.util.regex.Pattern; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; @@ -91,7 +91,7 @@ public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest i super(); } - @Before + @BeforeEach public void setUp() throws Exception { domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl(DomainFactory.TEST_RACE_LOG_RESOLVER)); // keep superclass implementation from automatically setting up for a Weymouth event and force subclasses diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OutlierDetectionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OutlierDetectionTest.java index 83496268b24..fc579ae35a8 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OutlierDetectionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OutlierDetectionTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.net.MalformedURLException; @@ -11,8 +11,8 @@ import java.net.URL; import java.text.ParseException; import java.util.Date; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.NoWindException; @@ -34,7 +34,7 @@ public class OutlierDetectionTest extends AbstractManeuverDetectionTestCase { super(); } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20150323_Worlds-505_Worlds_7.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ParseTracTracJSONServiceOutputTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ParseTracTracJSONServiceOutputTest.java index a5c0a19f670..ec78adf3820 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ParseTracTracJSONServiceOutputTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ParseTracTracJSONServiceOutputTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.io.IOException; import java.io.InputStream; @@ -18,7 +18,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.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.JSONService; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PartialNavigableSetViewTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PartialNavigableSetViewTest.java index ab1b42e74d3..c5377aac12e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PartialNavigableSetViewTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PartialNavigableSetViewTest.java @@ -1,16 +1,16 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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 java.util.Iterator; import java.util.NoSuchElementException; import java.util.TreeSet; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.tracking.impl.PartialNavigableSetView; @@ -21,7 +21,7 @@ public class PartialNavigableSetViewTest { private PartialNavigableSetView oddSet; private TreeSet set; - @Before + @BeforeEach public void setUp() { set = new TreeSet(); fullSet = new PartialNavigableSetView(set) { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PassingInstructionParserTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PassingInstructionParserTest.java index a4bc908d9c9..d8a54b3f9a6 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PassingInstructionParserTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PassingInstructionParserTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.net.MalformedURLException; @@ -8,8 +8,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.PassingInstruction; @@ -27,7 +27,7 @@ public class PassingInstructionParserTest extends OnlineTracTracBasedTest { super(); } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20131112_ESSFlorian-Race_1.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PhilippBuhlsDoublePenaltyCircleAtKielerWoche2014Test.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PhilippBuhlsDoublePenaltyCircleAtKielerWoche2014Test.java index beff4400291..1e7cdc4488f 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PhilippBuhlsDoublePenaltyCircleAtKielerWoche2014Test.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PhilippBuhlsDoublePenaltyCircleAtKielerWoche2014Test.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.net.MalformedURLException; @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.ManeuverType; @@ -45,7 +45,7 @@ public class PhilippBuhlsDoublePenaltyCircleAtKielerWoche2014Test extends Abstra return "Kieler Woche 2014 - Olympic Week"; } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20140619_KieleWoche-R1_Blue_Laser.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java index c056d51f9d4..a591dc62d4e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.util.Set; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionConversionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionConversionTest.java index 9f19aa5adc9..272813089d7 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionConversionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionConversionTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.tractracadapter.DomainFactory; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java index 3d1c15c5962..6e6e150d923 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Mile; import com.sap.sailing.domain.common.Position; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/QuadTreeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/QuadTreeTest.java index 1a2d5465ef5..02304a2228c 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/QuadTreeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/QuadTreeTest.java @@ -1,19 +1,19 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +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 java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Bounds; import com.sap.sailing.domain.common.Position; @@ -46,13 +46,13 @@ public class QuadTreeTest { private static MeasurementXMLFile performanceReport; private static MeasurementCase performanceReportCase; - @BeforeClass + @BeforeAll public static void setUpMeasurement() { performanceReport = new MeasurementXMLFile(QuadTreeTest.class); performanceReportCase = performanceReport.addCase(QuadTreeTest.class.getSimpleName()); } - @Before + @BeforeEach public void setUp() { quadtree = new GLatLngQuadTree(new DegreePosition(49, 7), new DegreePosition(51, 9), /* maxItems */30); @@ -1215,7 +1215,7 @@ public class QuadTreeTest { synchronized(qt) { qt.notifyAll(); } - assertNull("NullPointerException "+(npe[0]==null?"":npe[0].getMessage())+" during iteration "+i, npe[0]); + assertNull(npe[0], "NullPointerException "+(npe[0]==null?"":npe[0].getMessage())+" during iteration "+i); } stop[0] = true; } @@ -1364,7 +1364,7 @@ public class QuadTreeTest { assertEquals(expectedDistance, node.getDistance(p), 0.0001); } - @AfterClass + @AfterAll public static void writeMeasurements() throws IOException { performanceReport.write(); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceColumnCacheTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceColumnCacheTest.java index fbd3be0960a..305250e5622 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceColumnCacheTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceColumnCacheTest.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutionException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sailing.domain.base.Boat; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceExecutionOrderProvdiderAttachDetachTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceExecutionOrderProvdiderAttachDetachTest.java index 4f9f3588931..2ef0cd7aca3 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceExecutionOrderProvdiderAttachDetachTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceExecutionOrderProvdiderAttachDetachTest.java @@ -1,16 +1,16 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.base.Boat; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceLogAttachOnTrackedRaceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceLogAttachOnTrackedRaceTest.java index 3288d089366..d3874d7240f 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceLogAttachOnTrackedRaceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceLogAttachOnTrackedRaceTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.Serializable; import java.util.Collections; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.base.Fleet; @@ -56,7 +56,7 @@ public class RaceLogAttachOnTrackedRaceTest { private FlexibleLeaderboard leaderboard; - @Before + @BeforeEach public void setUp() { leaderboard = new FlexibleLeaderboardImpl("", null, new LowPoint(), null); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java index 7d6a912c5ae..ed71791dc6e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.util.ArrayList; @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; @@ -74,7 +74,7 @@ public class ReachingLegTest extends TrackBasedTest { * Creates the race and two competitors ({@link #plattner} and {@link #hunger}) and sets the start line passing for both of them * to {@link #start}. */ - @Before + @BeforeEach public void setUp() { competitorsAndBoats = new LinkedHashMap<>(); hunger = createCompetitorWithBoat("Wolfgang Hunger"); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReadReadDeadlockTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReadReadDeadlockTest.java index 9cc189ed605..9c13a9e1114 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReadReadDeadlockTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReadReadDeadlockTest.java @@ -2,7 +2,7 @@ package com.sap.sailing.domain.test; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.concurrent.LockUtil; import com.sap.sse.concurrent.NamedReentrantReadWriteLock; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java index 9aa3f93e841..720b28c8d6c 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.net.MalformedURLException; @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Waypoint; @@ -53,7 +53,7 @@ public class ReceiveMarkPassingDataTest extends AbstractTracTracLiveTest { * into {@link #firstTracked} and {@link #firstData}. All events are converted into {@link GPSFixMovingImpl} * objects and appended to the {@link DynamicTrackedRace}s. */ - @Before + @BeforeEach public void setupListener() { final IRace race = getTracTracRace(); logger.info("Setting up listener for race "+race.getName()+" with ID "+race.getId()); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java index be193c9a662..223d56043b2 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.mock; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.util.Optional; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.RaceDefinition; @@ -51,7 +51,7 @@ public class ReceiveTrackingDataTest extends AbstractTracTracLiveTest { * into {@link #firstTracked} and {@link #firstData}. All events are converted into {@link GPSFixMovingImpl} * objects and appended to the {@link DynamicTrackedRace}s. */ - @Before + @BeforeEach public void setupListener() { final DomainFactory domainFactory = DomainFactory.INSTANCE; final RaceChangeListener positionListener = new AbstractRaceChangeListener() { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RegattaLogAttachOnTrackedRaceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RegattaLogAttachOnTrackedRaceTest.java index 9e6b95fbb18..e71d86027d7 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RegattaLogAttachOnTrackedRaceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RegattaLogAttachOnTrackedRaceTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -9,8 +9,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; import com.sap.sailing.domain.abstractlog.regatta.impl.RegattaLogImpl; @@ -77,7 +77,7 @@ public class RegattaLogAttachOnTrackedRaceTest { private FlexibleLeaderboard leaderboard; - @Before + @BeforeEach public void setUp() { leaderboard = new FlexibleLeaderboardImpl(EmptyRaceLogStore.INSTANCE, new MyMockedRegattaLogStore(), "", null, new LowPoint(), /* no course area */ (CourseArea) null); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RegattaLogEventNotificationForwardingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RegattaLogEventNotificationForwardingTest.java index 28d5f01340d..22b128a8062 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RegattaLogEventNotificationForwardingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RegattaLogEventNotificationForwardingTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.Collections; @@ -11,7 +11,7 @@ import java.util.HashSet; import java.util.UUID; import java.util.concurrent.ExecutionException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEvent; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java index 5983e1f4f22..817e2c4d6f0 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.tractracadapter.DomainFactory; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java index ffe6c6468a2..55ff64899e0 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; import java.io.File; @@ -14,8 +14,8 @@ import java.net.URISyntaxException; import java.net.URL; import java.util.GregorianCalendar; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; @@ -35,7 +35,7 @@ public class SerializationWithOnlineRaceTest extends OnlineTracTracBasedTest { super(); } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20110609_KielerWoch-505_Race_2.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializeRankingMetricTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializeRankingMetricTest.java index 9e5c242e8cb..c0fa2efc420 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializeRankingMetricTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializeRankingMetricTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.Collections; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ShortTimeWindCacheTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ShortTimeWindCacheTest.java index ccccf585158..e68011afe09 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ShortTimeWindCacheTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ShortTimeWindCacheTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.ArgumentMatchers.same; @@ -10,8 +10,8 @@ import static org.mockito.Mockito.when; import java.util.Set; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -56,7 +56,7 @@ public class ShortTimeWindCacheTest { private WindWithConfidence> result; @SuppressWarnings("unchecked") - @Before + @BeforeEach public void setUp() { now = MillisecondsTimePoint.now(); trackedRace = mock(TrackedRaceImpl.class); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SmartFutureCacheDeadlockTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SmartFutureCacheDeadlockTest.java index 7a96fbf41f9..3eca7eef5aa 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SmartFutureCacheDeadlockTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SmartFutureCacheDeadlockTest.java @@ -1,19 +1,19 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; import com.sap.sse.concurrent.LockUtil; @@ -55,7 +55,7 @@ public class SmartFutureCacheDeadlockTest { private Thread writerThread; private SmartFutureCache sfc; - @Before + @BeforeEach public void setUp() throws InterruptedException { cacheUpdateBegunMonitor = new Object(); lock = new NamedReentrantReadWriteLock("testReadReadDeadlockBetweenGetterAndTrigger", /* fair */ true); @@ -188,7 +188,7 @@ public class SmartFutureCacheDeadlockTest { // see also LockUtil.NUMBER_OF_SECONDS_TO_WAIT_FOR_LOCK } - @After + @AfterEach public void tearDown() throws InterruptedException { reader.perform(Command.EXIT); writer.perform(Command.EXIT); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SmartFutureCacheTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SmartFutureCacheTest.java index 2e72e789fde..a70004edcfa 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SmartFutureCacheTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SmartFutureCacheTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +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.junit.jupiter.api.Assertions.fail; import java.util.HashSet; import java.util.Random; @@ -18,9 +18,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Ignore; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sse.util.SmartFutureCache; @@ -235,7 +235,7 @@ public class SmartFutureCacheTest { assertEquals(Integer.valueOf(91), sfc.get("Trala", /* waitForLatest */ true)); } - @Ignore // used only to solve bug 1314; it's hard to test re-cycling of tasks reliably without depending on timing issues + @Disabled // used only to solve bug 1314; it's hard to test re-cycling of tasks reliably without depending on timing issues @Test public void testOverloadingCacheWithUpdateRequests() throws InterruptedException { final Set updateWasCalled = new ConcurrentSkipListSet(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SpeedUnitTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SpeedUnitTest.java index 88bd4db96c8..2814c28bf7d 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SpeedUnitTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SpeedUnitTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StarbordSideOfStartLineRecognitionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StarbordSideOfStartLineRecognitionTest.java index d5dfea651ea..130cf238194 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StarbordSideOfStartLineRecognitionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StarbordSideOfStartLineRecognitionTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -9,8 +9,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import com.sap.sailing.domain.base.Competitor; @@ -38,7 +38,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class StarbordSideOfStartLineRecognitionTest { private TimePoint now; - @Before + @BeforeEach public void setUp() { now = MillisecondsTimePoint.now(); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SteadyRankingForBiasedFinishLineTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SteadyRankingForBiasedFinishLineTest.java index 05188ab23e9..ae42e4c0425 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SteadyRankingForBiasedFinishLineTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SteadyRankingForBiasedFinishLineTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.net.MalformedURLException; @@ -8,8 +8,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.WindSourceType; @@ -39,7 +39,7 @@ public class SteadyRankingForBiasedFinishLineTest extends OnlineTracTracBasedTes return "Sailing World Cup Genoa 2019"; } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/0fb18f50-45d7-0137-24dd-021d89ada30e.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTestWithTrackedRace.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTestWithTrackedRace.java index 0d9e084ca88..2c9a014c187 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTestWithTrackedRace.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTestWithTrackedRace.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; @@ -22,7 +22,7 @@ import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class StoredTrackBasedTestWithTrackedRace extends StoredTrackBasedTest { - @Before + @BeforeEach public void setUp() throws FileNotFoundException, IOException { Map> tracks = loadTracks(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TWATest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TWATest.java index 508a5036d96..616400a273d 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TWATest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TWATest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import com.sap.sailing.domain.base.Competitor; @@ -41,7 +41,7 @@ public class TWATest { private TrackedLegOfCompetitor trackedLegOfCompetitor; @SuppressWarnings("unchecked") - @Before + @BeforeEach public void setUp() { competitor = mock(CompetitorImpl.class); trackedRace = mock(DynamicTrackedRaceImpl.class); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTest.java index 57fb6e4bceb..f0f367cf12f 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import java.util.GregorianCalendar; import java.util.HashMap; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; @@ -37,7 +37,7 @@ public class TackTest extends StoredTrackBasedTestWithTrackedRace { private Competitor competitor; @Override - @Before + @BeforeEach public void setUp() { BoatClass boatClass = new BoatClassImpl("505", /* typicallyStartsUpwind */ true); competitor = new CompetitorImpl(123, "Wolfgang Hunger", "KYC", Color.RED, null, null, new TeamImpl("STG", Collections.singleton( diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackThatLookedABitLikePenaltyCircleAtTravemuenderWoche2014Test.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackThatLookedABitLikePenaltyCircleAtTravemuenderWoche2014Test.java index 51c8fb24994..9538241d427 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackThatLookedABitLikePenaltyCircleAtTravemuenderWoche2014Test.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackThatLookedABitLikePenaltyCircleAtTravemuenderWoche2014Test.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.net.MalformedURLException; @@ -13,9 +13,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.logging.Logger; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.ManeuverType; @@ -51,7 +51,7 @@ public class TackThatLookedABitLikePenaltyCircleAtTravemuenderWoche2014Test exte return "Travemunder Woche 2014"; } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20140714_Travemuende-Int14-R5.mtb").getCanonicalPath().replace('\\', '/')); @@ -74,7 +74,7 @@ public class TackThatLookedABitLikePenaltyCircleAtTravemuenderWoche2014Test exte * this track at this point is that the COG doesn't really match up with the actual lat/lon changes. That's * why maneuver recognition during what really was a penalty circle is a challenge. */ - @Ignore("Together with bug5239 this test has become too brittle. Outlier elimination is not deterministic and the track used in this test has outliers. Depending on which one is classified as outlier first, either two tacks or one penalty circle result") + @Disabled("Together with bug5239 this test has become too brittle. Outlier elimination is not deterministic and the track used in this test has outliers. Depending on which one is classified as outlier first, either two tacks or one penalty circle result") @Test public void testTackForTruswellAndPascoe() throws ParseException, NoWindException { assertTack("Truswell/Pascoe", "07/25/2014-13:08:00", "07/25/2014-13:09:00", "07/25/2014-13:08:10"); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTypeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTypeTest.java index be586c5edcb..55fb4d6eae7 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTypeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTypeTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.net.MalformedURLException; @@ -11,8 +11,8 @@ import java.util.ArrayList; import java.util.GregorianCalendar; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; @@ -35,7 +35,7 @@ public class TackTypeTest extends OnlineTracTracBasedTest { public TackTypeTest() throws MalformedURLException, URISyntaxException { } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///" diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TargetTimeEstimationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TargetTimeEstimationTest.java index 3db779826e8..072f05c29bc 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TargetTimeEstimationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TargetTimeEstimationTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -10,7 +10,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TestDeadlockInRegattaListener.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TestDeadlockInRegattaListener.java index 00f2e9c9729..699ff1bfbbd 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TestDeadlockInRegattaListener.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TestDeadlockInRegattaListener.java @@ -12,7 +12,7 @@ import java.util.concurrent.CyclicBarrier; import java.util.function.Consumer; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.domain.base.Course; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimeInLegProgressesTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimeInLegProgressesTest.java index 3cf9111c05d..8d1875b5c63 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimeInLegProgressesTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimeInLegProgressesTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.io.IOException; @@ -10,8 +10,8 @@ import java.net.URISyntaxException; import java.net.URL; import java.util.GregorianCalendar; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.WindSourceType; @@ -29,7 +29,7 @@ public class TimeInLegProgressesTest extends OnlineTracTracBasedTest { super(); } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20110609_KielerWoch-505_Race_2.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimerTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimerTest.java index 18648ae8ec6..773d3ac0a78 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimerTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimerTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.util.Timer; import java.util.TimerTask; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; /** diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TracTracIgnoreRandomInParamsURLTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TracTracIgnoreRandomInParamsURLTest.java index c95ecb8f4c0..3ef1cd4997c 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TracTracIgnoreRandomInParamsURLTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TracTracIgnoreRandomInParamsURLTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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 java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.tractracadapter.TracTracRaceTracker; import com.sap.sailing.domain.tractracadapter.impl.TracTracRaceTrackerImpl; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java index 3f7a1f16ca6..932043ee403 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.FileNotFoundException; import java.io.IOException; @@ -11,8 +11,8 @@ import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -45,7 +45,7 @@ public class TrackSmootheningTest extends StoredTrackBasedTest { * into {@link #firstTracked} and {@link #firstData}. All events are converted into {@link GPSFixMovingImpl} * objects and appended to the {@link DynamicTrackedRace}s. */ - @Before + @BeforeEach public void setupListener() throws InterruptedException, FileNotFoundException, IOException { tracks.putAll(loadTracks()); } @@ -78,7 +78,7 @@ public class TrackSmootheningTest extends StoredTrackBasedTest { try { Iterable fixes = track.getFixes(); GPSFixMoving outlier = getAnyOutlier(fixes); - assertNull("Found unexpected outlier " + outlier + " in smoothened track", outlier); // assert that we did not find an outlier + assertNull(outlier, "Found unexpected outlier " + outlier + " in smoothened track"); // assert that we did not find an outlier } finally { track.unlockAfterRead(); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java index fbdc68f978b..34a18145261 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.lang.reflect.Field; import java.text.ParseException; @@ -23,8 +23,8 @@ import java.util.concurrent.CyclicBarrier; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.impl.BoatClassImpl; @@ -74,7 +74,7 @@ public class TrackTest { private GPSFixMovingImpl gpsFix4; private GPSFixMovingImpl gpsFix5; - @Before + @BeforeEach public void setUp() throws InterruptedException { track = new DynamicGPSFixMovingTrackImpl(new BoatImpl("123", "MyFirstBoat", new BoatClassImpl("505", /* typicallyStartsUpwind */ true), null), /* millisecondsOverWhichToAverage */5000, /* no smoothening */null); @@ -204,8 +204,8 @@ public class TrackTest { assertTrue(p2Iter.hasNext()); Position p1 = p1Iter.next(); Position p2 = p2Iter.next(); - assertEquals("Diff between "+p1+" and "+p2, p1.getLatDeg(), p2.getLatDeg(), 0.000000001); - assertEquals("Diff between "+p1+" and "+p2, p1.getLngDeg(), p2.getLngDeg(), 0.000000001); + assertEquals(p1.getLatDeg(), p2.getLatDeg(), 0.000000001, "Diff between "+p1+" and "+p2); + assertEquals(p1.getLngDeg(), p2.getLngDeg(), 0.000000001, "Diff between "+p1+" and "+p2); } } @@ -741,9 +741,9 @@ public class TrackTest { new MillisecondsTimePoint((fixes.get(i).getTimePoint().asMillis() + fixes.get(i + 1) .getTimePoint().asMillis()) / 2), fixes.get(j).getTimePoint()) .getNauticalMiles(); - assertTrue("for i=" + i + ", j=" + j + ": " + nauticalMilesFromHalfAfterIToJ + "<" - + distanceSumInNauticalMiles, - nauticalMilesFromHalfAfterIToJ < distanceSumInNauticalMiles); + assertTrue(nauticalMilesFromHalfAfterIToJ < distanceSumInNauticalMiles, + "for i=" + i + ", j=" + j + ": " + nauticalMilesFromHalfAfterIToJ + "<" + + distanceSumInNauticalMiles); if (i > 0) { // now skip half a segment before the beginning: double nauticalMilesFromHalfBeforeIToJ = track.getRawDistanceTraveled( @@ -764,9 +764,9 @@ public class TrackTest { fixes.get(i).getTimePoint(), new MillisecondsTimePoint((fixes.get(j).getTimePoint().asMillis() + fixes .get(j + 1).getTimePoint().asMillis()) / 2)).getNauticalMiles(); - assertTrue("for i=" + i + ", j=" + j + ": " + nauticalMilesFromIToHalfAfterJ + ">" - + distanceSumInNauticalMiles, - nauticalMilesFromIToHalfAfterJ > distanceSumInNauticalMiles); + assertTrue(nauticalMilesFromIToHalfAfterJ > distanceSumInNauticalMiles, + "for i=" + i + ", j=" + j + ": " + nauticalMilesFromIToHalfAfterJ + ">" + + distanceSumInNauticalMiles); } } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceCenterTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceCenterTest.java index 220b343b5e5..03edc6a5393 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceCenterTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceCenterTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.Collections; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import com.sap.sailing.domain.base.Course; @@ -50,7 +50,7 @@ public class TrackedRaceCenterTest { private DynamicGPSFixTrack mark2Track; private DynamicTrackedRaceImpl trackedRace; - @Before + @BeforeEach public void setUp() { trackedRace = mock(DynamicTrackedRaceImpl.class); when(trackedRace.getCenterOfCourse(ArgumentMatchers.any(TimePoint.class))).thenCallRealMethod(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStartTimeUpdateForDependentStartTimeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStartTimeUpdateForDependentStartTimeTest.java index a1f8241b26f..f22ce80acd1 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStartTimeUpdateForDependentStartTimeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStartTimeUpdateForDependentStartTimeTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.net.MalformedURLException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStatusUpdateTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStatusUpdateTest.java index 64b4b411bb0..6f43974c5f1 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStatusUpdateTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStatusUpdateTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; @@ -22,7 +22,7 @@ public class TrackedRaceStatusUpdateTest extends TrackBasedTest { private CompetitorWithBoat competitor; private DynamicTrackedRace trackedRace; - @Before + @BeforeEach public void setUp() { competitor = createCompetitorWithBoat("Test Competitor"); trackedRace = createTestTrackedRace("Test Regatta", "Test Race", "505", createCompetitorAndBoatsMap(competitor), MillisecondsTimePoint.now(), /* useMarkPassingCalculator */ false); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java index 1d084fd3da4..e1114d93557 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java @@ -10,9 +10,9 @@ import java.net.URI; import java.net.URL; import java.nio.charset.Charset; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.domain.base.Competitor; @@ -36,7 +36,7 @@ public class UnicodeCharactersInCompetitorNamesTest { @Rule public Timeout AbstractTracTracLiveTestTimeout = Timeout.millis(2 * 60 * 1000); - @Before + @BeforeEach public void setUp() { domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl(com.sap.sailing.domain.base.DomainFactory.TEST_RACE_LOG_RESOLVER)); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnmodifiableCollectionsEqualsHashCodeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnmodifiableCollectionsEqualsHashCodeTest.java index af0ed7c1493..317983f1c44 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnmodifiableCollectionsEqualsHashCodeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnmodifiableCollectionsEqualsHashCodeTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.util.ArrayList; import java.util.Arrays; @@ -10,7 +10,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Demonstrates how unmodifiable collections' hashCode and equals is useless because it's based on identity and not on diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UpdateMarkPassingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UpdateMarkPassingTest.java index d440f478fb6..a46478a3360 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UpdateMarkPassingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UpdateMarkPassingTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -9,7 +9,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.Course; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/VirtualWindFixesTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/VirtualWindFixesTest.java index 019a6fee1fe..1b0a485022e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/VirtualWindFixesTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/VirtualWindFixesTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.common.Position; @@ -37,7 +37,7 @@ public class VirtualWindFixesTest { private TimePoint oddStart; private TimePoint evenStart; - @Before + @BeforeEach public void setUp() throws InvalidDateException { oddStart = new MillisecondsTimePoint(DateParser.parse("2017-02-15T09:59:59.9+01:00")); evenStart = new MillisecondsTimePoint(DateParser.parse("2017-02-15T10:00:00+01:00")); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationLockingUnderLoadTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationLockingUnderLoadTest.java index b94da63f494..6398b7df60f 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationLockingUnderLoadTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationLockingUnderLoadTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Collections; @@ -9,9 +9,9 @@ import java.util.List; import java.util.UUID; import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sailing.domain.base.BoatClass; @@ -78,14 +78,14 @@ public class WindEstimationLockingUnderLoadTest { private WindTrack measuredTrack; - @Before + @BeforeEach public void setUp() { realWindSource = new WindSourceWithAdditionalID(WindSourceType.EXPEDITION, "1"); mockedTrackedRace = mockTrackedRace(); estimationTrack = new TrackBasedEstimationWindTrackImpl(mockedTrackedRace, WindTrack.DEFAULT_MILLISECONDS_OVER_WHICH_TO_AVERAGE_WIND, 0.5); } - @After + @AfterEach public void tearDown() { // clean up all Mockito stubbing leaks, particularly the InvocationImpl objects attached to any ThreadLocal; // see also bug 1923, comment #9. diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java index a08df088f9f..b0d04562aab 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.util.ArrayList; import java.util.GregorianCalendar; @@ -15,8 +15,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; @@ -52,7 +52,7 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest private List competitors; private static final String[] competitorNames = new String[] { "Wolfgang Hunger", "Dr. Hasso Plattner", "Robert Stanjek", "Simon Grotelueschen" }; - @Before + @BeforeEach public void setUp() { competitors = new ArrayList<>(); for (String name : competitorNames) { @@ -137,9 +137,9 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest assertTrue(combinedDegreesNow > 170 && combinedDegreesNow < 180); // we expect the combined direction now to be closer to the estimation as compared to before because the estimation is more confident // since the minimum cluster size is 2 instead of 1 - assertTrue("expected combinedDegreesNow ("+combinedDegreesNow+ - ") < combinedDegreesMinClusterSizeOne ("+combinedDegreesMinClusterSizeOne+")", - combinedDegreesNow < combinedDegreesMinClusterSizeOne); + assertTrue(combinedDegreesNow < combinedDegreesMinClusterSizeOne, + "expected combinedDegreesNow ("+combinedDegreesNow+ + ") < combinedDegreesMinClusterSizeOne ("+combinedDegreesMinClusterSizeOne+")"); } @Test @@ -253,9 +253,9 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest Wind estimatedWindDirectionNew = track.getAveragedWind(/* position */ null, checkTime); assertFalse(cachedFixes.isEmpty()); assertNotNull(estimatedWindDirectionNew); - assertTrue("Expected estimated wind direction to now be greater than 185 degrees but was " - + estimatedWindDirectionCached.getBearing().getDegrees(), estimatedWindDirectionCached.getBearing() - .getDegrees() < 185.); // remember: bearing is opposite of from; boats start with upwind + assertTrue(estimatedWindDirectionCached.getBearing() + .getDegrees() < 185., "Expected estimated wind direction to now be greater than 185 degrees but was " + + estimatedWindDirectionCached.getBearing().getDegrees()); // remember: bearing is opposite of from; boats start with upwind } @Test @@ -299,8 +299,8 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest setBearingForCompetitor(competitors.get(1), now, 330); // on the same tack, should give no read-out Wind nullWind = getTrackedRace().getEstimatedWindDirection(now); assertNull( - "Shouldn't have been able to determine estimated wind direction because no two distinct direction clusters found upwind nor downwind", - nullWind); + nullWind, + "Shouldn't have been able to determine estimated wind direction because no two distinct direction clusters found upwind nor downwind"); } @Test @@ -313,8 +313,8 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest setBearingForCompetitor(competitors.get(3), now, 145); // on the same tack, should give no read-out Wind nullWind = getTrackedRace().getEstimatedWindDirection(now); assertNull( - "Shouldn't have been able to determine estimated wind direction because no two distinct direction clusters found upwind nor downwind", - nullWind); + nullWind, + "Shouldn't have been able to determine estimated wind direction because no two distinct direction clusters found upwind nor downwind"); } @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java index c10051093a4..f47cf4ee70b 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.io.File; import java.net.MalformedURLException; @@ -11,8 +11,8 @@ import java.net.URISyntaxException; import java.net.URL; import java.util.GregorianCalendar; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.NoWindException; @@ -37,7 +37,7 @@ public class WindEstimationOnKielerWoche505Race2DataTest extends OnlineTracTracB public WindEstimationOnKielerWoche505Race2DataTest() throws MalformedURLException, URISyntaxException { } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///"+new File("resources/event_20110609_KielerWoch-505_Race_2.mtb").getCanonicalPath().replace('\\', '/')); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java index 89576879b08..8a3441a261b 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.FileNotFoundException; import java.io.IOException; @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindSteppingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindSteppingTest.java index 00164c55f8f..1273c50c083 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindSteppingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindSteppingTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.WindSpeedStepping; import com.sap.sailing.domain.common.impl.WindSpeedSteppingImpl; @@ -13,26 +13,26 @@ public class WindSteppingTest { public void testStepping() { double[] levels = {2.,4.}; WindSpeedStepping stepping = new WindSpeedSteppingImpl(levels); - Assert.assertEquals(0, stepping.getLevelIndexForValue(1)); - Assert.assertEquals(1, stepping.getLevelIndexForValue(5)); - Assert.assertEquals(1, stepping.getLevelIndexForValue(3)); - Assert.assertEquals(2., stepping.getSteppedValueForValue(1.064), 0.005); - Assert.assertEquals(4., stepping.getSteppedValueForValue(7.8365), 0.005); + Assertions.assertEquals(0, stepping.getLevelIndexForValue(1)); + Assertions.assertEquals(1, stepping.getLevelIndexForValue(5)); + Assertions.assertEquals(1, stepping.getLevelIndexForValue(3)); + Assertions.assertEquals(2., stepping.getSteppedValueForValue(1.064), 0.005); + Assertions.assertEquals(4., stepping.getSteppedValueForValue(7.8365), 0.005); } @Test public void testSteppingWithMaxDistance() { double[] levels = {2.,4.}; WindSpeedSteppingWithMaxDistance stepping = new WindSpeedSteppingWithMaxDistance(levels, 1.0); - Assert.assertEquals(0, stepping.getLevelIndexForValue(1)); - Assert.assertEquals(1, stepping.getLevelIndexForValue(5)); - Assert.assertEquals(-1, stepping.getLevelIndexForValue(5.01)); - Assert.assertEquals(-1, stepping.getLevelIndexForValue(0.5)); - Assert.assertEquals(-1, stepping.getLevelIndexForValue(8)); - Assert.assertEquals(2.0, stepping.getSteppedValueForValue(1.064), 0.005); - Assert.assertEquals(-1.0, stepping.getSteppedValueForValue(7.8365), 0.005); - Assert.assertEquals(1.55, stepping.getHistogramXValue(20, 1.5), 0.0000001); - Assert.assertEquals(2.55, stepping.getHistogramXValue(20, 2.5), 0.0000001); + Assertions.assertEquals(0, stepping.getLevelIndexForValue(1)); + Assertions.assertEquals(1, stepping.getLevelIndexForValue(5)); + Assertions.assertEquals(-1, stepping.getLevelIndexForValue(5.01)); + Assertions.assertEquals(-1, stepping.getLevelIndexForValue(0.5)); + Assertions.assertEquals(-1, stepping.getLevelIndexForValue(8)); + Assertions.assertEquals(2.0, stepping.getSteppedValueForValue(1.064), 0.005); + Assertions.assertEquals(-1.0, stepping.getSteppedValueForValue(7.8365), 0.005); + Assertions.assertEquals(1.55, stepping.getHistogramXValue(20, 1.5), 0.0000001); + Assertions.assertEquals(2.55, stepping.getHistogramXValue(20, 2.5), 0.0000001); } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java index fff02e5b3ae..23e18c9ab02 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.text.ParseException; @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindwardToGoComparatorTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindwardToGoComparatorTest.java index 18e0e2591e0..b1aab628afa 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindwardToGoComparatorTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindwardToGoComparatorTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.domain.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Comparator; import java.util.TreeSet; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class WindwardToGoComparatorTest { - @Before + @BeforeEach public void setUp() { } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/compiler/EclipseNeonConstructorReferenceSerializationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/compiler/EclipseNeonConstructorReferenceSerializationTest.java index 59156fa50f3..6c549ea312f 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/compiler/EclipseNeonConstructorReferenceSerializationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/compiler/EclipseNeonConstructorReferenceSerializationTest.java @@ -5,7 +5,7 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EclipseNeonConstructorReferenceSerializationTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractExportedPositionsBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractExportedPositionsBasedTest.java index 2c90437dc18..24c11e15e90 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractExportedPositionsBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractExportedPositionsBasedTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test.markpassing; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.InputStreamReader; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java index 5babea029f2..e58dd8d1b01 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.test.markpassing; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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 java.io.File; import java.io.IOException; @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import org.junit.AfterClass; +import org.junit.jupiter.api.AfterAll; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Waypoint; @@ -222,7 +222,7 @@ public abstract class AbstractMarkPassingTest extends OnlineTracTracBasedTest { incorrect += incorrectPasses; skipped += wronglyNotComputed; extra += wronglyComputed; - assertTrue("Expected accuracy to be at least 0.8 but was " + accuracy, accuracy >= 0.8); + assertTrue(accuracy >= 0.8, "Expected accuracy to be at least 0.8 but was " + accuracy); logger.info(mpc.toString()); } @@ -290,7 +290,7 @@ public abstract class AbstractMarkPassingTest extends OnlineTracTracBasedTest { chooser.calculateMarkPassDeltas(c, f.getA(), f.getB()); } - @AfterClass + @AfterAll public static void createXML() throws IOException { double accuracy = correct / totalPasses; double different = incorrect / totalPasses; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java index 83858f0b855..59d1dfad77b 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java @@ -3,7 +3,7 @@ package com.sap.sailing.domain.test.markpassing; import java.net.MalformedURLException; import java.net.URISyntaxException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FlorianopolisMarkPassingTest extends AbstractMarkPassingTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/KW470MarkPassingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/KW470MarkPassingTest.java index 9784aee3736..f9dcb526595 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/KW470MarkPassingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/KW470MarkPassingTest.java @@ -3,7 +3,7 @@ package com.sap.sailing.domain.test.markpassing; import java.net.MalformedURLException; import java.net.URISyntaxException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KW470MarkPassingTest extends AbstractMarkPassingTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/Kiel2011505MarkPassingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/Kiel2011505MarkPassingTest.java index 2f0d2a49454..02b7c2e1853 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/Kiel2011505MarkPassingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/Kiel2011505MarkPassingTest.java @@ -3,7 +3,7 @@ package com.sap.sailing.domain.test.markpassing; import java.net.MalformedURLException; import java.net.URISyntaxException; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; public class Kiel2011505MarkPassingTest extends AbstractMarkPassingTest { @@ -13,15 +13,15 @@ public class Kiel2011505MarkPassingTest extends AbstractMarkPassingTest { // The Start-Times are set very wrong on these races - @Ignore + @Disabled public void testRace2() throws Exception { testRace("2"); } - @Ignore + @Disabled public void testRace3() throws Exception { testRace("3"); } - @Ignore + @Disabled public void testRace4() throws Exception { testRace("4"); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/Kiel2013505Test.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/Kiel2013505Test.java index 42e2245684c..dfc2e8c3e08 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/Kiel2013505Test.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/Kiel2013505Test.java @@ -3,7 +3,7 @@ package com.sap.sailing.domain.test.markpassing; import java.net.MalformedURLException; import java.net.URISyntaxException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java index 9660a70458d..dda383704b1 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.test.markpassing; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.ArrayList; @@ -8,9 +8,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Random; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.DegreePosition; @@ -41,7 +41,7 @@ public class MarkPassingCalculatorPerformanceTest extends AbstractMockedRaceMark protected Random rnd = new Random(); protected long time; - @AfterClass + @AfterAll public static void createXMLFile() throws IOException { final MeasurementXMLFile performanceReport = new MeasurementXMLFile(MarkPassingCalculatorPerformanceTest.class); for (String key : result.keySet()) { @@ -65,7 +65,7 @@ public class MarkPassingCalculatorPerformanceTest extends AbstractMockedRaceMark time = System.currentTimeMillis() - time; result.put("FinderPerformance", time); System.out.println(time); - Assert.assertTrue("Time expected to be less than 7000ms but was "+time+"ms", time < 7000); + Assertions.assertTrue(time < 7000, "Time expected to be less than 7000ms but was "+time+"ms"); } @Test @@ -73,7 +73,7 @@ public class MarkPassingCalculatorPerformanceTest extends AbstractMockedRaceMark final long time = timeToAddCandidatesToChooser(500, 1, 25); System.out.println(time); result.put("ChooserPerformance", time); - assertTrue("time needs to be less than 15s but was "+time+"ms", time < 15000); + assertTrue(time < 15000, "time needs to be less than 15s but was "+time+"ms"); } private long timeToAddCandidatesToChooser(int numberOfTimesAdding, int numberToAddEachTime, int numberOfRepititions) { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorWithTrackersOnStartBoatTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorWithTrackersOnStartBoatTest.java index 0d0b95b67eb..fc527dda3d4 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorWithTrackersOnStartBoatTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorWithTrackersOnStartBoatTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test.markpassing; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.lang.reflect.Field; @@ -10,8 +10,8 @@ import java.util.Map; import java.util.Map.Entry; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.ControlPoint; @@ -42,7 +42,7 @@ public class MarkPassingCalculatorWithTrackersOnStartBoatTest extends AbstractEx private CandidateChooserImpl candidateChooser; private TimePoint startOfSetup; - @Before + @BeforeEach public void setUp() throws IOException, ParseException, NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { startOfSetup = MillisecondsTimePoint.now(); trackedRace = readRace("/MoevensteinCompetitorPositions.json.gz", "/MoevensteinMarkPositions.json.gz", new BoatClassImpl(BoatClassMasterdata.J70)); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingWhiteBoxTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingWhiteBoxTest.java index 64fa7dd4501..a2eb99f41fe 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingWhiteBoxTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingWhiteBoxTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.domain.test.markpassing; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.NavigableSet; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Waypoint; @@ -34,7 +34,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; * Tests tricky situation that can fail easily. Created with help of http://itouchmap.com/latlong.html * */ -@Ignore +@Disabled public class MarkPassingWhiteBoxTest extends AbstractMockedRaceMarkPassingTest { @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMR2012VRMarkPassingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMR2012VRMarkPassingTest.java index 5cac814530b..26e224e1868 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMR2012VRMarkPassingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMR2012VRMarkPassingTest.java @@ -3,7 +3,7 @@ package com.sap.sailing.domain.test.markpassing; import java.net.MalformedURLException; import java.net.URISyntaxException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OBMR2012VRMarkPassingTest extends AbstractMarkPassingTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/StarIDM2013MarkPassingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/StarIDM2013MarkPassingTest.java index 0e7aeb4e785..3126b523c17 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/StarIDM2013MarkPassingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/StarIDM2013MarkPassingTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.test.markpassing; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.util.Collections; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Waypoint; @@ -120,8 +120,8 @@ public class StarIDM2013MarkPassingTest extends AbstractMarkPassingTest { fail("Expected mark passing for "+competitor+" and "+waypoint+" around "+when+" but no mark passing found"); } final Duration offset = new MillisecondsTimePoint(when).until(markPassing.getTimePoint()).abs(); - assertTrue("Expected mark passing for "+competitor+" and "+waypoint+" around "+when+ - " but found one at "+markPassing.getTimePoint()+" which is "+offset+" off.", offset.asSeconds() < 10); + assertTrue(offset.asSeconds() < 10, "Expected mark passing for "+competitor+" and "+waypoint+" around "+when+ + " but found one at "+markPassing.getTimePoint()+" which is "+offset+" off."); } @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassinghash/MarkPassingRaceFingerprintJsonSerializationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassinghash/MarkPassingRaceFingerprintJsonSerializationTest.java index d649cb001b9..413fd2b7517 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassinghash/MarkPassingRaceFingerprintJsonSerializationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassinghash/MarkPassingRaceFingerprintJsonSerializationTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.test.markpassinghash; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URISyntaxException; @@ -12,8 +12,8 @@ import java.util.Map; import java.util.UUID; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogFixedMarkPassingEvent; @@ -61,7 +61,7 @@ public class MarkPassingRaceFingerprintJsonSerializationTest extends OnlineTracT return "Academy Tracking 2011"; } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp("event_20110505_SailingTea", // Semifinale /* raceId */ "01ea3604-02ef-11e1-9efc-406186cbf87c", /* liveUri */ null, /* storedUri */ null, @@ -87,7 +87,7 @@ public class MarkPassingRaceFingerprintJsonSerializationTest extends OnlineTracT assertTrue(fingerprint1.matches(trackedRace1)); JSONObject json1 = fingerprint1.toJson(); MarkPassingRaceFingerprint output1 = factory.fromJson(json1); - assertTrue("Original and de-serialized copy are equal", output1.matches(trackedRace1)); + assertTrue(output1.matches(trackedRace1), "Original and de-serialized copy are equal"); assertEquals(fingerprint1, output1); assertEquals(fingerprint1.hashCode(), output1.hashCode()); } @@ -118,7 +118,7 @@ public class MarkPassingRaceFingerprintJsonSerializationTest extends OnlineTracT assertFalse(fingerprint2.matches(trackedRace1)); JSONObject json1 = fingerprint1.toJson(); JSONObject json2 = fingerprint2.toJson(); - assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2); + assertNotEquals(json1, json2, "Json1 and Json2 are equal: " + json1 + " json2: " + json2); } @Test @@ -136,7 +136,7 @@ public class MarkPassingRaceFingerprintJsonSerializationTest extends OnlineTracT assertFalse(fingerprint2.matches(trackedRace1)); JSONObject json1 = fingerprint1.toJson(); JSONObject json2 = fingerprint2.toJson(); - assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2); + assertNotEquals(json1, json2, "Json1 and Json2 are equal: " + json1 + " json2: " + json2); } @Test @@ -155,7 +155,7 @@ public class MarkPassingRaceFingerprintJsonSerializationTest extends OnlineTracT assertFalse(fingerprint2.matches(trackedRace1)); JSONObject json1 = fingerprint1.toJson(); JSONObject json2 = fingerprint2.toJson(); - assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2); + assertNotEquals(json1, json2, "Json1 and Json2 are equal: " + json1 + " json2: " + json2); } @Test @@ -170,7 +170,7 @@ public class MarkPassingRaceFingerprintJsonSerializationTest extends OnlineTracT assertFalse(fingerprint2.matches(trackedRace1)); JSONObject json1 = fingerprint1.toJson(); JSONObject json2 = fingerprint2.toJson(); - assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2); + assertNotEquals(json1, json2, "Json1 and Json2 are equal: " + json1 + " json2: " + json2); } @Test @@ -189,7 +189,7 @@ public class MarkPassingRaceFingerprintJsonSerializationTest extends OnlineTracT assertFalse(fingerprint2.matches(trackedRace1)); JSONObject json1 = fingerprint1.toJson(); JSONObject json2 = fingerprint2.toJson(); - assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2); + assertNotEquals(json1, json2, "Json1 and Json2 are equal: " + json1 + " json2: " + json2); } @Test @@ -204,7 +204,7 @@ public class MarkPassingRaceFingerprintJsonSerializationTest extends OnlineTracT assertFalse(fingerprint2.matches(trackedRace1)); JSONObject json1 = fingerprint1.toJson(); JSONObject json2 = fingerprint2.toJson(); - assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2); + assertNotEquals(json1, json2, "Json1 and Json2 are equal: " + json1 + " json2: " + json2); } @Test @@ -223,7 +223,7 @@ public class MarkPassingRaceFingerprintJsonSerializationTest extends OnlineTracT assertFalse(fingerprint2.matches(trackedRace1)); JSONObject json1 = fingerprint1.toJson(); JSONObject json2 = fingerprint2.toJson(); - assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2); + assertNotEquals(json1, json2, "Json1 and Json2 are equal: " + json1 + " json2: " + json2); } @Test @@ -252,6 +252,6 @@ public class MarkPassingRaceFingerprintJsonSerializationTest extends OnlineTracT assertFalse(fingerprint2.matches(trackedRace1)); JSONObject json1 = fingerprint1.toJson(); JSONObject json2 = fingerprint2.toJson(); - assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2); + assertNotEquals(json1, json2, "Json1 and Json2 are equal: " + json1 + " json2: " + json2); } } \ No newline at end of file diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/JorgesTracTracParallelLoadingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/JorgesTracTracParallelLoadingTest.java index 3329d3e251f..5d433cf8df9 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/JorgesTracTracParallelLoadingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/JorgesTracTracParallelLoadingTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.test.tractrac; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.BufferedReader; import java.io.IOException; @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Duration; import com.tractrac.model.lib.api.ModelLocator; @@ -249,7 +249,7 @@ public class JorgesTracTracParallelLoadingTest { fail("Key set differs: a-b="+diff1+", b-a="+diff2+"; in the meantime the following keys were updated: "+outputs.keySet()); } for (String key : firstRunsOutput.keySet()) { - assertEquals("values for key "+key+" differ", firstRunsOutput.get(key).toString(), secondRunsOutput.get(key).toString()); + assertEquals(firstRunsOutput.get(key).toString(), secondRunsOutput.get(key).toString(), "values for key "+key+" differ"); } } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/PasswordSuppressionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/PasswordSuppressionTest.java index b7053a7bdc4..8dd280a5d0f 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/PasswordSuppressionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/PasswordSuppressionTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.test.tractrac; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PasswordSuppressionTest { @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/RaceTrackerListenersTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/RaceTrackerListenersTest.java index d81ee5851b8..dab3ba168f6 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/RaceTrackerListenersTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/RaceTrackerListenersTest.java @@ -2,7 +2,7 @@ package com.sap.sailing.domain.tracking; import java.util.ConcurrentModificationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RaceTrackerListenersTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/TestTracTracRaceAndCompetitorStatusReconciler.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/TestTracTracRaceAndCompetitorStatusReconciler.java index 6f5bbc71cf2..85728f7c4b6 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/TestTracTracRaceAndCompetitorStatusReconciler.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/TestTracTracRaceAndCompetitorStatusReconciler.java @@ -1,18 +1,18 @@ package com.sap.sailing.domain.tracking; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +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.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Collections; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; @@ -95,7 +95,7 @@ public class TestTracTracRaceAndCompetitorStatusReconciler { } } - @Before + @BeforeEach public void setUp() { author = new LogEventAuthorImpl("me", 1); startOfPass = MillisecondsTimePoint.now(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java index 062d795244e..6128b862edb 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.tracking.impl; import static com.sap.sse.common.impl.MillisecondsTimePoint.now; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -11,8 +11,8 @@ import java.io.ObjectOutputStream; import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CompetitorWithBoat; @@ -29,7 +29,7 @@ public class BravoFixTrackSerializationTest { private DynamicBravoFixTrack track; - @Before + @BeforeEach public void setUp() { CompetitorWithBoat competitor = TrackBasedTest.createCompetitorWithBoat("SAP Extreme Sailing Team"); track = new BravoFixTrackImpl(competitor, BravoFixTrack.TRACK_NAME, false); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithSpeedInfoTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithSpeedInfoTest.java index c0392edb617..d31c90e6478 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithSpeedInfoTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithSpeedInfoTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.tracking.impl; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; @@ -17,7 +17,7 @@ import com.sap.sse.common.Duration; public class PositionInterpolationAndExtrapolationWithSpeedInfoTest extends PositionInterpolationAndExtrapolationTest { private SpeedWithBearing speed; - @Before + @BeforeEach public void setUp() { super.setUp(); setTrack(new DynamicGPSFixMovingTrackImpl(new Object(), /* millisecondsOverWhichToAverage */ 8000)); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithoutSpeedInfoTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithoutSpeedInfoTest.java index 8c429887667..ddf99ffca13 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithoutSpeedInfoTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithoutSpeedInfoTest.java @@ -1,16 +1,16 @@ package com.sap.sailing.domain.tracking.impl; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; import com.sap.sse.common.Duration; public class PositionInterpolationAndExtrapolationWithoutSpeedInfoTest extends PositionInterpolationAndExtrapolationTest { - @Before + @BeforeEach public void setUp() { super.setUp(); setTrack(new DynamicGPSFixTrackImpl<>(new Object(), /* millisecondsOverWhichToAverage */ 8000)); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TestVirtualWindFixTrackTimepointRounding.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TestVirtualWindFixTrackTimepointRounding.java index eec60656550..1864ddb468a 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TestVirtualWindFixTrackTimepointRounding.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TestVirtualWindFixTrackTimepointRounding.java @@ -1,19 +1,19 @@ package com.sap.sailing.domain.tracking.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; - import java.util.NavigableSet; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sse.common.TimePoint; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -65,7 +65,7 @@ public class TestVirtualWindFixTrackTimepointRounding { } } - @Before + @BeforeEach public void setUp() { final TrackedRace trackedRace = mock(TrackedRace.class); when(trackedRace.getTimePointOfNewestEvent()).thenReturn(TimePoint.now()); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TrackedLegTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TrackedLegTest.java index c90451e0cbc..44cd8b2cccd 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TrackedLegTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TrackedLegTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.tracking.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collections; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sailing.domain.base.Competitor; @@ -27,7 +27,7 @@ public class TrackedLegTest { private DynamicTrackedRaceImpl dynamicTrackedRace; private Leg leg; - @Before + @BeforeEach public void setUp() { leg = Mockito.mock(Leg.class); dynamicTrackedRace = Mockito.mock(DynamicTrackedRaceImpl.class); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaTest.java index aae5423818a..acc8c79bf21 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaTest.java @@ -11,9 +11,9 @@ import java.util.concurrent.Phaser; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Course; @@ -46,7 +46,7 @@ public class TrackedRegattaTest { Arrays.asList(new Waypoint[] { new WaypointImpl(mark), new WaypointImpl(mark2) })); private DynamicTrackedRegatta regatta; - @Before + @BeforeEach public void setUp() { regatta = new DynamicTrackedRegattaImpl(new RegattaImpl(EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, RegattaImpl.getDefaultName("regatta", boatClass.getName()), boatClass, @@ -103,7 +103,7 @@ public class TrackedRegattaTest { try { removeBarrier.await(10, TimeUnit.MILLISECONDS); // if this line is reached, the order of events is not correctly ensured - Assert.fail(); + Assertions.fail(); } finally { addPhaser.forceTermination(); try { diff --git a/java/com.sap.sailing.domain.vakarosadapter.test/src/com/sap/sailing/domain/vakarosadapter/test/TestReadingVakarosFiles.java b/java/com.sap.sailing.domain.vakarosadapter.test/src/com/sap/sailing/domain/vakarosadapter/test/TestReadingVakarosFiles.java index 7f0c9ce72b5..57ad8e93e39 100644 --- a/java/com.sap.sailing.domain.vakarosadapter.test/src/com/sap/sailing/domain/vakarosadapter/test/TestReadingVakarosFiles.java +++ b/java/com.sap.sailing.domain.vakarosadapter.test/src/com/sap/sailing/domain/vakarosadapter/test/TestReadingVakarosFiles.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.vakarosadapter.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.nio.charset.Charset; @@ -12,8 +12,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.sensordata.BravoExtendedSensorDataMetadata; import com.sap.sailing.domain.common.tracking.DoubleVectorFix; @@ -33,7 +33,7 @@ public class TestReadingVakarosFiles { private VakarosGPSFixImporter gpsFixImporter; private VakarosExtendedDataImporterImpl sensorFixImporter; - @Before + @BeforeEach public void setUp() { gpsFixImporter = new VakarosGPSFixImporter(); sensorFixImporter = new VakarosExtendedDataImporterImpl(); diff --git a/java/com.sap.sailing.domain.windfinderadapter.test/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderPollerTest.java b/java/com.sap.sailing.domain.windfinderadapter.test/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderPollerTest.java index 1c61031e9f1..b62e8f7aca1 100644 --- a/java/com.sap.sailing.domain.windfinderadapter.test/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderPollerTest.java +++ b/java/com.sap.sailing.domain.windfinderadapter.test/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderPollerTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.windfinderadapter.impl; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.mock; @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/java/com.sap.sailing.domain.windfinderadapter.test/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderReportParserTest.java b/java/com.sap.sailing.domain.windfinderadapter.test/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderReportParserTest.java index ce746bf0bd4..b44e3062e7b 100644 --- a/java/com.sap.sailing.domain.windfinderadapter.test/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderReportParserTest.java +++ b/java/com.sap.sailing.domain.windfinderadapter.test/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderReportParserTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.windfinderadapter.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.InputStreamReader; @@ -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.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; diff --git a/java/com.sap.sailing.domain.yellowbrickadapter.test/src/com/sap/sailing/domain/yellowbrickadapter/impl/GetPositionsParserTest.java b/java/com.sap.sailing.domain.yellowbrickadapter.test/src/com/sap/sailing/domain/yellowbrickadapter/impl/GetPositionsParserTest.java index de1e6c3de64..dac3549eff6 100755 --- a/java/com.sap.sailing.domain.yellowbrickadapter.test/src/com/sap/sailing/domain/yellowbrickadapter/impl/GetPositionsParserTest.java +++ b/java/com.sap.sailing.domain.yellowbrickadapter.test/src/com/sap/sailing/domain/yellowbrickadapter/impl/GetPositionsParserTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.yellowbrickadapter.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.io.InputStreamReader; @@ -10,8 +10,8 @@ import java.text.SimpleDateFormat; import java.util.stream.StreamSupport; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; @@ -19,7 +19,7 @@ import com.sap.sse.common.Util; public class GetPositionsParserTest { private GetPositionsParser parser; - @Before + @BeforeEach public void setUp() { parser = new GetPositionsParser(); } diff --git a/java/com.sap.sailing.domain.yellowbrickadapter.test/src/com/sap/sailing/domain/yellowbrickadapter/impl/YellowBrickAdapterTest.java b/java/com.sap.sailing.domain.yellowbrickadapter.test/src/com/sap/sailing/domain/yellowbrickadapter/impl/YellowBrickAdapterTest.java index d868c194c46..6b39ac97728 100755 --- a/java/com.sap.sailing.domain.yellowbrickadapter.test/src/com/sap/sailing/domain/yellowbrickadapter/impl/YellowBrickAdapterTest.java +++ b/java/com.sap.sailing.domain.yellowbrickadapter.test/src/com/sap/sailing/domain/yellowbrickadapter/impl/YellowBrickAdapterTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.yellowbrickadapter.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.MalformedURLException; @@ -9,8 +9,8 @@ import java.text.SimpleDateFormat; import java.util.Optional; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.yellowbrickadapter.YellowBrickRace; import com.sap.sse.common.TimePoint; @@ -20,7 +20,7 @@ public class YellowBrickAdapterTest { private static final String RMSR2019 = "rmsr2019"; private YellowBrickTrackingAdapterImpl adapter; - @Before + @BeforeEach public void setUp() { adapter = new YellowBrickTrackingAdapterImpl(/* base domain factory */ null); } diff --git a/java/com.sap.sailing.ess40.resultimport.test/src/com/sap/sailing/ess40/resultimport/test/SimpleESS40ResultImportTest.java b/java/com.sap.sailing.ess40.resultimport.test/src/com/sap/sailing/ess40/resultimport/test/SimpleESS40ResultImportTest.java index ff4a4e1e608..07a128a7d2c 100755 --- a/java/com.sap.sailing.ess40.resultimport.test/src/com/sap/sailing/ess40/resultimport/test/SimpleESS40ResultImportTest.java +++ b/java/com.sap.sailing.ess40.resultimport.test/src/com/sap/sailing/ess40/resultimport/test/SimpleESS40ResultImportTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.ess40.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.RegattaScoreCorrections; import com.sap.sailing.domain.common.RegattaScoreCorrections.ScoreCorrectionForCompetitorInRace; diff --git a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/impl/ExpeditionStartLineMessageTest.java b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/impl/ExpeditionStartLineMessageTest.java index 1ffe84527a4..35026e9860a 100755 --- a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/impl/ExpeditionStartLineMessageTest.java +++ b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/impl/ExpeditionStartLineMessageTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.expeditionconnector.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.SocketException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.expeditionconnector.UDPExpeditionReceiver; 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 189fe9f12f3..c893c2185ef 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 @@ -1,9 +1,9 @@ package com.sap.sailing.expeditionconnector.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.io.BufferedReader; import java.io.IOException; @@ -31,10 +31,10 @@ import java.util.UUID; import java.util.function.BooleanSupplier; import java.util.function.Consumer; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.declination.Declination; @@ -212,7 +212,7 @@ public class UDPExpeditionReceiverTest { } } - @Before + @BeforeEach public void setUp() throws UnknownHostException, SocketException, InterruptedException { validLines = new String[] { "#0,1,7.700,2,-39.0,3,23.00,9,319.0,12,1.17,146,40348.390035*37", @@ -280,7 +280,7 @@ public class UDPExpeditionReceiverTest { }; } - @After + @AfterEach public void tearDown() { socket.close(); receiver.removeListener(listener); 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 93b07fd2804..065bc54e597 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 @@ -1,6 +1,6 @@ package com.sap.sailing.expeditionconnector.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.DatagramPacket; @@ -9,10 +9,10 @@ import java.net.InetAddress; import java.util.Arrays; import java.util.Random; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.expeditionconnector.UDPMirror; @@ -24,7 +24,7 @@ public class UDPMirrorTest { private static final int RECEIVING_PORT = 33796; private Thread mirrorThread; - @Before + @BeforeEach public void startMirror() throws InterruptedException { mirrorThread = new Thread() { public void run() { @@ -79,7 +79,7 @@ public class UDPMirrorTest { } @SuppressWarnings("deprecation") - @After + @AfterEach public void stopMirror() { mirrorThread.stop(); } diff --git a/java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java b/java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java index d6da5a01d62..6a3072f7619 100755 --- a/java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java +++ b/java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.freg.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.io.BufferedReader; import java.io.IOException; @@ -14,7 +14,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.resultimport.CompetitorRow; import com.sap.sailing.resultimport.RegattaResults; @@ -103,7 +103,7 @@ public class SimpleHtmlParsingTest { resourceAsStream.close(); for (int i=2; i tdContent = parser.getTagContents(rowContents.get(i), "td"); - assertEquals("Expected "+tdContent+" index "+i+" to have size 14 but was "+tdContent.size(), 14, tdContent.size()); + assertEquals(14, tdContent.size(), "Expected "+tdContent+" index "+i+" to have size 14 but was "+tdContent.size()); } } diff --git a/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/PlacemarkTest.java b/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/PlacemarkTest.java index 06a67bca94a..41d51d8fa4f 100644 --- a/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/PlacemarkTest.java +++ b/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/PlacemarkTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.geocoding.test; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Placemark; import com.sap.sailing.domain.common.impl.DegreePosition; @@ -12,6 +12,6 @@ public class PlacemarkTest { public void placemarkEqualsTest() { Placemark p1 = new PlacemarkImpl("Kiel", "DE", "Germany", new DegreePosition(55, 10), "P"); Placemark p2 = new PlacemarkImpl("Kiel", "DE", "Germany", new DegreePosition(55, 10), "P"); - Assert.assertEquals(p1, p2); + Assertions.assertEquals(p1, p2); } } diff --git a/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/ReverseGeocoderTest.java b/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/ReverseGeocoderTest.java index c64f3ec4ee3..5fd37a30662 100644 --- a/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/ReverseGeocoderTest.java +++ b/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/ReverseGeocoderTest.java @@ -1,16 +1,16 @@ package com.sap.sailing.geocoding.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.io.IOException; import java.util.List; import org.json.simple.parser.ParseException; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Placemark; import com.sap.sailing.domain.common.Position; @@ -24,7 +24,7 @@ public class ReverseGeocoderTest { private static final Placemark KIEL = new PlacemarkImpl("Kiel", "DE", new DegreePosition(54.32132926107913, 10.1348876953125), 232758); private static final Position KIEL_POSITION = new DegreePosition(54.32217976191047, 10.133570443980922); - @Before + @BeforeEach public void setUp() { geocoder = new ReverseGeocoderImpl(); // ensure we don't see any caching effects across test case executions } @@ -42,14 +42,14 @@ public class ReverseGeocoderTest { //Simple Test in Kiel center to check the connection and the parsing from JSONObject to Placemark try { Placemark kielReversed = geocoder.getPlacemarkNearest(KIEL_POSITION); - Assert.assertEquals(KIEL.getName(), kielReversed.getName()); - Assert.assertEquals(KIEL.getCountryCode(), kielReversed.getCountryCode()); - Assert.assertEquals(KIEL.getPosition().getLatDeg(), kielReversed.getPosition().getLatDeg(), 0.0001); - Assert.assertEquals(KIEL.getPosition().getLngDeg(), kielReversed.getPosition().getLngDeg(), 0.0001); + Assertions.assertEquals(KIEL.getName(), kielReversed.getName()); + Assertions.assertEquals(KIEL.getCountryCode(), kielReversed.getCountryCode()); + Assertions.assertEquals(KIEL.getPosition().getLatDeg(), kielReversed.getPosition().getLatDeg(), 0.0001); + Assertions.assertEquals(KIEL.getPosition().getLngDeg(), kielReversed.getPosition().getLngDeg(), 0.0001); } catch (IOException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } catch (ParseException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } } @@ -58,11 +58,11 @@ public class ReverseGeocoderTest { try { List placemarks = geocoder.getPlacemarksNear(KIEL_POSITION, 20); assertNotNull(placemarks); - Assert.assertFalse(placemarks.isEmpty()); + Assertions.assertFalse(placemarks.isEmpty()); } catch (IOException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } catch (ParseException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } } @@ -73,27 +73,27 @@ public class ReverseGeocoderTest { final Placemark firstByDistanceVariation = new PlacemarkImpl("Wendtorfer Strand", "DE", new DegreePosition(54.41212, 10.28952), 1139); try { Placemark p = geocoder.getPlacemarkLast(abroad, 20, new Placemark.ByPopulation()); - Assert.assertEquals(KIEL.getName(), p.getName()); - Assert.assertEquals(KIEL.getCountryCode(), p.getCountryCode()); - Assert.assertEquals(KIEL.getPosition().getLatDeg(), p.getPosition().getLatDeg(), 0.0001); - Assert.assertEquals(KIEL.getPosition().getLngDeg(), p.getPosition().getLngDeg(), 0.0001); + Assertions.assertEquals(KIEL.getName(), p.getName()); + Assertions.assertEquals(KIEL.getCountryCode(), p.getCountryCode()); + Assertions.assertEquals(KIEL.getPosition().getLatDeg(), p.getPosition().getLatDeg(), 0.0001); + Assertions.assertEquals(KIEL.getPosition().getLngDeg(), p.getPosition().getLngDeg(), 0.0001); p = geocoder.getPlacemarkFirst(abroad, 20, new Placemark.ByDistance(abroad)); - Assert.assertTrue(""+p.getName()+" neither equals "+firstByDistance.getName()+" nor "+firstByDistanceVariation.getName(), - firstByDistance.getName().equals(p.getName()) || firstByDistanceVariation.getName().equals(p.getName())); - Assert.assertEquals(firstByDistance.getCountryCode(), p.getCountryCode()); - Assert.assertEquals(firstByDistance.getPosition().getLatDeg(), p.getPosition().getLatDeg(), 0.005); - Assert.assertEquals(firstByDistance.getPosition().getLngDeg(), p.getPosition().getLngDeg(), 0.012); + Assertions.assertTrue(firstByDistance.getName().equals(p.getName()) || firstByDistanceVariation.getName().equals(p.getName()), + ""+p.getName()+" neither equals "+firstByDistance.getName()+" nor "+firstByDistanceVariation.getName()); + Assertions.assertEquals(firstByDistance.getCountryCode(), p.getCountryCode()); + Assertions.assertEquals(firstByDistance.getPosition().getLatDeg(), p.getPosition().getLatDeg(), 0.005); + Assertions.assertEquals(firstByDistance.getPosition().getLngDeg(), p.getPosition().getLngDeg(), 0.012); p = geocoder.getPlacemarkLast(abroad, 20, new Placemark.ByPopulationDistanceRatio(abroad)); - Assert.assertEquals(KIEL.getName(), p.getName()); - Assert.assertEquals(KIEL.getCountryCode(), p.getCountryCode()); - Assert.assertEquals(KIEL.getPosition().getLatDeg(), p.getPosition().getLatDeg(), 0.005); - Assert.assertEquals(KIEL.getPosition().getLngDeg(), p.getPosition().getLngDeg(), 0.005); + Assertions.assertEquals(KIEL.getName(), p.getName()); + Assertions.assertEquals(KIEL.getCountryCode(), p.getCountryCode()); + Assertions.assertEquals(KIEL.getPosition().getLatDeg(), p.getPosition().getLatDeg(), 0.005); + Assertions.assertEquals(KIEL.getPosition().getLngDeg(), p.getPosition().getLngDeg(), 0.005); } catch (IOException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } catch (ParseException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } } @@ -103,11 +103,11 @@ public class ReverseGeocoderTest { long radius = 300; try { List placemarks = geocoder.getPlacemarksNear(offshore, radius); - Assert.assertNull(placemarks); + Assertions.assertNull(placemarks); } catch (IOException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } catch (ParseException e) { - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } } } diff --git a/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/TimeZoneByPositionTest.java b/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/TimeZoneByPositionTest.java index 3cfc9b238a9..ab4953a7628 100644 --- a/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/TimeZoneByPositionTest.java +++ b/java/com.sap.sailing.geocoding.test/src/com/sap/sailing/geocoding/test/TimeZoneByPositionTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.geocoding.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.net.MalformedURLException; @@ -10,7 +10,7 @@ import java.util.Date; import java.util.TimeZone; import org.json.simple.parser.ParseException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.geocoding.impl.ReverseGeocoderImpl; diff --git a/java/com.sap.sailing.grib.test/src/com/sap/sailing/grib/test/Bzip2GridFileReadingTest.java b/java/com.sap.sailing.grib.test/src/com/sap/sailing/grib/test/Bzip2GridFileReadingTest.java index 2da03370cb3..13bfc375807 100755 --- a/java/com.sap.sailing.grib.test/src/com/sap/sailing/grib/test/Bzip2GridFileReadingTest.java +++ b/java/com.sap.sailing.grib.test/src/com/sap/sailing/grib/test/Bzip2GridFileReadingTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.grib.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.List; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.DegreePosition; @@ -25,12 +25,12 @@ import ucar.unidata.geoloc.LatLonRect; public class Bzip2GridFileReadingTest { private GridDataset dataSet; - @Before + @BeforeEach public void setUp() throws IOException { dataSet = GridDataset.open("resources/EWAM_DD_10M_2017011912_050.grib2.bz2"); } - @After + @AfterEach public void tearDown() throws IOException { dataSet.close(); } diff --git a/java/com.sap.sailing.grib.test/src/com/sap/sailing/grib/test/SimpleGridFileReadingTest.java b/java/com.sap.sailing.grib.test/src/com/sap/sailing/grib/test/SimpleGridFileReadingTest.java index b464e919935..0357ed29837 100644 --- a/java/com.sap.sailing.grib.test/src/com/sap/sailing/grib/test/SimpleGridFileReadingTest.java +++ b/java/com.sap.sailing.grib.test/src/com/sap/sailing/grib/test/SimpleGridFileReadingTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.grib.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.io.File; import java.io.IOException; @@ -15,7 +15,7 @@ import java.util.GregorianCalendar; import java.util.List; import java.util.TimeZone; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Bounds; import com.sap.sailing.domain.common.Position; @@ -176,7 +176,7 @@ public class SimpleGridFileReadingTest { // ll: 10.0N 100.0W+ ur: 48.0N 40.00W // // Havana, Cuba (23.099242, -82.360187) - // 5:55 AM 19.0 °C - 18.0 °C 94% 1018 hPa 9.0 km NE 7.4 km/h / 2.1 m/s - N/A Unknown + // 5:55 AM 19.0 �C - 18.0 �C 94% 1018 hPa 9.0 km NE 7.4 km/h / 2.1 m/s - N/A Unknown // // NE is approx. from 45 // 2.1m/s is approx. 4.2kts @@ -188,7 +188,7 @@ public class SimpleGridFileReadingTest { cal.setTimeZone(TimeZone.getTimeZone("CET")); WindWithConfidence wind = windField.getWind(new MillisecondsTimePoint(cal.getTimeInMillis()), havanaPosition); assertEquals(4.2, wind.getObject().getKnots(), 3); - assertEquals(90, wind.getObject().getFrom().getDegrees(), 45); // historic data says NE but we get 130° which matches the SE + assertEquals(90, wind.getObject().getFrom().getDegrees(), 45); // historic data says NE but we get 130� which matches the SE // direction from https://www.wunderground.com/history/airport/MUHA/2016/12/12/DailyHistory.html?req_city=Havana&req_state=03&req_statename=Cuba&reqdb.zip=00000&reqdb.magic=1&reqdb.wmo=78224&MR=1 // for 10:55 CST. So we should probably accept that. dataSet.close(); @@ -199,7 +199,7 @@ public class SimpleGridFileReadingTest { // Mon Dec 12 13:00:00 CET 2016 // // Nassau, Bahamas (25.052497, -77.366815) - // 8:00 AM 25.0 °C - 23.0 °C 89% 1020.2 hPa 10.0 km ESE 9.3 km/h / 2.6 m/s - N/A Mostly Cloudy + // 8:00 AM 25.0 �C - 23.0 �C 89% 1020.2 hPa 10.0 km ESE 9.3 km/h / 2.6 m/s - N/A Mostly Cloudy // // NE is approx. from 45 // 2.1m/s is approx. 4.2kts diff --git a/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java b/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java index fdc863f9d2b..38a12629758 100755 --- a/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java +++ b/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.kiworesultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +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 java.io.File; import java.io.FileInputStream; @@ -17,7 +17,7 @@ import java.util.Iterator; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.SAXException; diff --git a/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ZipStreamTest.java b/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ZipStreamTest.java index cb5f52ca053..58da7403f6a 100755 --- a/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ZipStreamTest.java +++ b/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ZipStreamTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.kiworesultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.io.FileInputStream; import java.io.FileNotFoundException; @@ -12,7 +12,7 @@ import java.util.zip.ZipInputStream; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.domain.common.MaxPointsReason; diff --git a/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestProcedures.java b/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestProcedures.java index dd95eb2090a..17fe84cb646 100755 --- a/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestProcedures.java +++ b/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestProcedures.java @@ -1,10 +1,10 @@ package com.sap.sailing.landscape.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -18,8 +18,8 @@ import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.SftpException; @@ -92,7 +92,7 @@ public class TestProcedures { */ private byte[] privateKeyEncryptionPassphrase; - @Before + @BeforeEach public void setUp() { privateKeyEncryptionPassphrase = ("awptyf87l"+"097384sf;,57").getBytes(); landscape = AwsLandscape.obtain(RemoteServiceMappingConstants.pathPrefixForShardingKey); @@ -351,7 +351,7 @@ public class TestProcedures { assertTrue(process.waitUntilReady(optionalTimeout)); final String envSh = process.getEnvSh(optionalTimeout, /* optional SSH key pair name */ Optional.empty(), privateKeyEncryptionPassphrase); assertFalse(envSh.isEmpty()); - assertTrue("Couldn't find SERVER_NAME=\""+serverName+"\" in env.sh:\n"+envSh, envSh.contains("SERVER_NAME=\""+serverName+"\"")); + assertTrue(envSh.contains("SERVER_NAME=\""+serverName+"\""), "Couldn't find SERVER_NAME=\""+serverName+"\" in env.sh:\n"+envSh); assertEquals(14888, process.getTelnetPortToOSGiConsole(optionalTimeout, /* optional SSH key pair name */ Optional.empty(), privateKeyEncryptionPassphrase)); // Now create an ALB mapping, assuming to create the dynamic ALB: final String domain = "wiesen-weg.de"; diff --git a/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestReleaseRepository.java b/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestReleaseRepository.java index e31b27d4889..c65a71d9b45 100755 --- a/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestReleaseRepository.java +++ b/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestReleaseRepository.java @@ -1,9 +1,9 @@ package com.sap.sailing.landscape.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.landscape.SailingReleaseRepository; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestTrustedDomains.java b/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestTrustedDomains.java index 8a77b53078a..a37d4b4171f 100644 --- a/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestTrustedDomains.java +++ b/java/com.sap.sailing.landscape.test/src/com/sap/sailing/landscape/test/TestTrustedDomains.java @@ -1,9 +1,9 @@ package com.sap.sailing.landscape.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.landscape.common.SharedLandscapeConstants; diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/CompetitorImportTest.java b/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/CompetitorImportTest.java index 067842ecf52..d46a7868a5d 100644 --- a/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/CompetitorImportTest.java +++ b/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/CompetitorImportTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.manage2sail.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -15,7 +15,7 @@ import java.util.Arrays; import javax.xml.bind.JAXBException; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.competitorimport.CompetitorProvider; diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/EventResultJsonServiceTest.java b/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/EventResultJsonServiceTest.java index dc186d9d2dc..00f2560cb80 100644 --- a/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/EventResultJsonServiceTest.java +++ b/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/EventResultJsonServiceTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.manage2sail.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.io.InputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.manage2sail.EventResultDescriptor; import com.sap.sailing.manage2sail.Manage2SailEventResultsParser; diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/ParserTest.java b/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/ParserTest.java index 33aed9136e2..759c4695883 100755 --- a/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/ParserTest.java +++ b/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/ParserTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.manage2sail.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.mock; import java.io.File; @@ -23,7 +23,7 @@ import javax.xml.bind.DatatypeConverter; import javax.xml.bind.JAXBException; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.domain.common.MaxPointsReason; diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/PersistenceTest.java b/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/PersistenceTest.java index 98002e6a52e..439b43c94dd 100644 --- a/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/PersistenceTest.java +++ b/java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/PersistenceTest.java @@ -5,9 +5,8 @@ import java.net.URL; import java.util.Map; import java.util.Set; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.persistence.DomainObjectFactory; import com.sap.sailing.domain.persistence.MongoObjectFactory; @@ -29,13 +28,13 @@ public class PersistenceTest { "http://manage2sail.com/api/public/links/event/d30883d3-2876-4d7e-af49-891af6cbae1b?accesstoken=bDAv8CwsTM94ujZ&mediaType=json"); resultUrlRegistry.registerResultUrl(testProviderName, testUrl); Map> resultUrls = domainObjectFactory.loadResultUrls(); - Assert.assertTrue(resultUrls.containsKey(testProviderName)); + Assertions.assertTrue(resultUrls.containsKey(testProviderName)); Set urls = resultUrls.get(testProviderName); - Assert.assertEquals(1, urls.size()); + Assertions.assertEquals(1, urls.size()); URL url = urls.iterator().next(); - Assert.assertEquals(testUrl, url); + Assertions.assertEquals(testUrl, url); resultUrlRegistry.unregisterResultUrl(testProviderName, testUrl); resultUrls = domainObjectFactory.loadResultUrls(); - Assert.assertFalse(resultUrls.containsKey(testProviderName)); + Assertions.assertFalse(resultUrls.containsKey(testProviderName)); } } 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 d8d99b421fd..719530704ab 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 @@ -1,11 +1,11 @@ package com.sap.sailing.media.persistence.test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.UnknownHostException; import java.util.Arrays; -import org.junit.Before; +import org.junit.BeforeEach; import com.mongodb.MongoClientSettings; import com.mongodb.MongoException; @@ -39,7 +39,7 @@ public abstract class AbstractMongoDBTest { new ServerAddress(System.getProperty("mongo.host", "127.0.0.1"), dbConfiguration.getPort())))).build()); } - @Before + @BeforeEach public void dropTestDB() throws UnknownHostException, MongoException, InterruptedException { assertNotNull(mongo); dropAllCollections(db); 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 7ca3bd30e74..52ef147aa7d 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 @@ -7,7 +7,7 @@ import java.util.Set; import org.bson.types.ObjectId; import org.hamcrest.core.Is; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; @@ -22,8 +22,8 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.media.MimeType; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; import static org.hamcrest.Matchers.*; +import static org.junit.jupiter.api.Assertions.*; public class MediaDBTest extends AbstractMongoDBTest { 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 b2fbd282b2f..112dfc56b95 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.Before; +import org.junit.BeforeEach; import com.mongodb.MongoException; import com.sap.sailing.domain.persistence.DomainObjectFactory; @@ -20,7 +20,7 @@ public abstract class AbstractConnectivityParamsLoadAndStoreTest extends Abstrac super(); } - @Before + @BeforeEach public void setUp() { serviceFinderFactory = new MockConnectivityParamsServiceFinderFactory(); racingEventService = new RacingEventServiceImpl(/* clearPersistentCompetitorStore */ true, /* sensorFixStore */ null, 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 975e999f90f..8ce354ee156 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 @@ -1,11 +1,11 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.UnknownHostException; -import org.junit.After; -import org.junit.Before; +import org.junit.BeforeEach; +import org.junit.jupiter.api.AfterEach; import com.mongodb.MongoException; import com.mongodb.client.MongoClient; @@ -35,14 +35,14 @@ public abstract class AbstractMongoDBTest { return MongoClients.create(dbConfiguration.getMongoClientURI()); } - @Before + @BeforeEach public void dropTestDB() throws UnknownHostException, MongoException, InterruptedException { assertNotNull(mongo); dropAllCollections(db); assertNotNull(db); } - @After + @AfterEach public void tearDown() { } 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 1df6fb1e03c..2b2ddeab372 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.Before; +import org.junit.BeforeEach; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; @@ -43,7 +43,7 @@ public abstract class AbstractTestStoringAndRetrievingRaceLogInRegatta extends R super(); } - @Before + @BeforeEach public void setUp() { now = MillisecondsTimePoint.now(); mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(getMongoService()); 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 0788ca5ed23..a4d890ac5c9 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,6 +1,6 @@ package com.sap.sailing.mongodb.test; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.mongodb.AlreadyRegisteredException; import com.sap.sse.mongodb.MongoDBService; 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 e6a17e180a0..84b34a6d6f9 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 @@ -1,15 +1,15 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.UnknownHostException; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.client.MongoClient; @@ -48,7 +48,7 @@ public class MarkPassingRaceFingerprintConversionTest extends OnlineTracTracBase return "Academy Tracking 2011"; } - @Before + @BeforeEach public void setUp() throws Exception { newMongo().getDatabase(dbConfiguration.getDatabaseName()).drop(); super.setUp("event_20110505_SailingTea", // Semifinale @@ -71,7 +71,7 @@ public class MarkPassingRaceFingerprintConversionTest extends OnlineTracTracBase DomainObjectFactory dF = PersistenceFactory.INSTANCE.getDomainObjectFactory(dbConfiguration.getService(), getDomainFactory().getBaseDomainFactory()); Map fingerprintHashMap = dF.loadFingerprintsForMarkPassingHashes(); MarkPassingRaceFingerprint fingerprintAfterDB = fingerprintHashMap.get(trackedRace1.getRaceIdentifier()); - assertTrue("Original and de-serialized copy are equal", fingerprintAfterDB.matches(trackedRace1)); + assertTrue(fingerprintAfterDB.matches(trackedRace1), "Original and de-serialized copy are equal"); final Map> markPassingsLoaded = dF.loadMarkPassings(trackedRace1.getRaceIdentifier(), trackedRace1.getRace().getCourse()); assertEquals(markPassings, markPassingsLoaded); } diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MongoClientURITest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MongoClientURITest.java index ce1ff6c8c3a..24e3e01fe4f 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MongoClientURITest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MongoClientURITest.java @@ -1,9 +1,9 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.ReadPreference; import com.sap.sse.mongodb.MongoDBConfiguration; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogConnectivityParamsLoadAndStoreTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogConnectivityParamsLoadAndStoreTest.java index b44a724396b..0ec584febf6 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogConnectivityParamsLoadAndStoreTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogConnectivityParamsLoadAndStoreTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URISyntaxException; @@ -14,7 +14,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutionException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.base.Fleet; 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 d9b3970b844..54d5214b388 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 @@ -1,14 +1,14 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.UnknownHostException; import java.util.Iterator; import java.util.UUID; -import org.junit.Assert; -import org.junit.Before; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.race.CompetitorResult; @@ -54,7 +54,7 @@ public abstract class RaceLogMongoDBTest extends AbstractMongoDBTest { super(); } - @Before + @BeforeEach public void setup() { mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(getMongoService()); domainObjectFactory = PersistenceFactory.INSTANCE.getDomainObjectFactory(getMongoService(), @@ -64,8 +64,8 @@ public abstract class RaceLogMongoDBTest extends AbstractMongoDBTest { protected void compareCourseData(CourseBase storedCourse, CourseBase loadedCourse) { assertEquals(storedCourse.getFirstWaypoint().getPassingInstructions(), PassingInstruction.None); assertEquals(loadedCourse.getFirstWaypoint().getPassingInstructions(), PassingInstruction.None); - Assert.assertTrue(storedCourse.getFirstWaypoint().getControlPoint() instanceof ControlPointWithTwoMarks); - Assert.assertTrue(loadedCourse.getFirstWaypoint().getControlPoint() instanceof ControlPointWithTwoMarks); + Assertions.assertTrue(storedCourse.getFirstWaypoint().getControlPoint() instanceof ControlPointWithTwoMarks); + Assertions.assertTrue(loadedCourse.getFirstWaypoint().getControlPoint() instanceof ControlPointWithTwoMarks); ControlPointWithTwoMarks storedGate = (ControlPointWithTwoMarks) storedCourse.getFirstWaypoint() .getControlPoint(); @@ -80,8 +80,8 @@ public abstract class RaceLogMongoDBTest extends AbstractMongoDBTest { assertEquals(storedCourse.getLastWaypoint().getPassingInstructions(), PassingInstruction.Port); assertEquals(loadedCourse.getLastWaypoint().getPassingInstructions(), PassingInstruction.Port); - Assert.assertTrue(storedCourse.getLastWaypoint().getControlPoint() instanceof Mark); - Assert.assertTrue(loadedCourse.getLastWaypoint().getControlPoint() instanceof Mark); + Assertions.assertTrue(storedCourse.getLastWaypoint().getControlPoint() instanceof Mark); + Assertions.assertTrue(loadedCourse.getLastWaypoint().getControlPoint() instanceof Mark); Mark storedMark = (Mark) storedCourse.getLastWaypoint().getControlPoint(); Mark loadedMark = (Mark) loadedCourse.getLastWaypoint().getControlPoint(); 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 885220386cd..213ed4bc2f0 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 @@ -1,14 +1,14 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.URISyntaxException; import java.net.UnknownHostException; import java.util.Collection; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.WriteConcern; @@ -34,7 +34,7 @@ public class StoreAndLoadBoatsTest extends AbstractMongoDBTest { super(); } - @Before + @BeforeEach public void setUp() { // clear the domainFactory competitor store for a clean start: domainFactory = new DomainFactoryImpl(DomainFactory.TEST_RACE_LOG_RESOLVER); 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 425d39a54d5..3cad47f88a7 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 @@ -1,7 +1,7 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.Serializable; import java.net.URI; @@ -12,8 +12,8 @@ import java.util.Collections; import java.util.Date; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.WriteConcern; @@ -68,7 +68,7 @@ public class StoreAndLoadCompetitorsTest extends AbstractMongoDBTest { super(); } - @Before + @BeforeEach public void setUp() { // clear the domainFactory competitor store for a clean start: domainFactory = new DomainFactoryImpl(DomainFactory.TEST_RACE_LOG_RESOLVER); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceConfigurationsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceConfigurationsTest.java index 87392222309..1ab0a9d96dc 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceConfigurationsTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceConfigurationsTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.net.UnknownHostException; import java.util.Arrays; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.base.DomainFactory; 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 6216df79490..aeb2cb8ce6a 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 @@ -1,13 +1,13 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.net.UnknownHostException; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; @@ -54,7 +54,7 @@ public class StoreAndLoadDeviceIdentifierTest extends AbstractMongoDBTest { return MillisecondsTimePoint.now(); } - @Before + @BeforeEach public void setup() throws UnknownHostException, MongoException, InterruptedException { dropTestDB(); 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 f20288d1f39..08612f4f1a1 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 @@ -1,9 +1,9 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -15,8 +15,8 @@ import java.util.UUID; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; @@ -76,7 +76,7 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest { super(); } - @Before + @BeforeEach public void setUp() { logIdentifier = mock(RaceLogIdentifier.class); when(logIdentifier.getIdentifier()).thenReturn( diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java index 4d0434815bb..1e839cb494d 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -9,7 +9,7 @@ import java.net.UnknownHostException; import java.util.UUID; import org.bson.Document; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; 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 3eeb9ac1b94..1609195d9f7 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 @@ -1,9 +1,9 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -15,8 +15,8 @@ import java.util.UUID; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; @@ -66,7 +66,7 @@ public class StoreAndLoadRegattaLogEventsTest extends AbstractMongoDBTest { transcientCompetitorAndBoatStore = DomainFactory.INSTANCE.getCompetitorAndBoatStore(); } - @Before + @BeforeEach public void setUp() { regattaIdentifier = mock(RegattaLikeIdentifier.class); when(regattaIdentifier.getName()).thenReturn("testRegatta"); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/SwissTimingConnectivityParamsLoadAndStoreTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/SwissTimingConnectivityParamsLoadAndStoreTest.java index 9b216d414a6..bc28e7d3a59 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/SwissTimingConnectivityParamsLoadAndStoreTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/SwissTimingConnectivityParamsLoadAndStoreTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URISyntaxException; @@ -11,7 +11,7 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.ExecutionException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.base.BoatClass; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/SwissTimingReplayConnectivityParamsLoadAndStoreTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/SwissTimingReplayConnectivityParamsLoadAndStoreTest.java index 7e88b5105c4..bc963ad2d62 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/SwissTimingReplayConnectivityParamsLoadAndStoreTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/SwissTimingReplayConnectivityParamsLoadAndStoreTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URISyntaxException; @@ -10,7 +10,7 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.ExecutionException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.swisstimingadapter.SwissTimingAdapter; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestParseAndMigratePassingSideAndControlPointTwoMarks.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestParseAndMigratePassingSideAndControlPointTwoMarks.java index 3bace2741ab..0f26835b70e 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestParseAndMigratePassingSideAndControlPointTwoMarks.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestParseAndMigratePassingSideAndControlPointTwoMarks.java @@ -1,13 +1,13 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Serializable; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.BasicDBList; import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestRaceLogRemovalInRegatta.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestRaceLogRemovalInRegatta.java index ad4406320a6..fabf570a1a3 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestRaceLogRemovalInRegatta.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestRaceLogRemovalInRegatta.java @@ -1,12 +1,12 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.race.RaceLog; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java index 6304b2084f0..5d9b0e5a6d2 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java @@ -1,12 +1,12 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +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.assertNotSame; +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 java.io.Serializable; import java.net.MalformedURLException; @@ -26,7 +26,7 @@ import java.util.Set; import java.util.UUID; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; 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 db097b87d1a..51c42e6aa2a 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 @@ -1,8 +1,8 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -14,8 +14,8 @@ import java.util.UUID; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; @@ -62,7 +62,7 @@ public class TestStoringAndLoadingRaceORCLegDataEvent extends AbstractMongoDBTes super(); } - @Before + @BeforeEach public void setUp() { logIdentifier = mock(RaceLogIdentifier.class); when(logIdentifier.getIdentifier()).thenReturn( 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 9ce54feb7cc..bffe638334f 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 @@ -1,8 +1,8 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -20,8 +20,8 @@ import java.util.stream.Collectors; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; @@ -71,7 +71,7 @@ public class TestStoringAndLoadingRegattaORCCertificateAssignmentEvent extends A protected RaceLogIdentifier logIdentifier; private ORCCertificatesCollection importer; - @Before + @BeforeEach public void setUp() throws FileNotFoundException, IOException, ParseException { logIdentifier = mock(RaceLogIdentifier.class); when(logIdentifier.getIdentifier()).thenReturn( diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingServerConfiguration.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingServerConfiguration.java index 77f8921197b..1e82aa53dc9 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingServerConfiguration.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingServerConfiguration.java @@ -1,11 +1,11 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.UnknownHostException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.base.DomainFactory; 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 c9a98c449e4..cf0a6bce2f5 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 @@ -1,11 +1,11 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +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.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.UnknownHostException; import java.util.ArrayList; @@ -13,9 +13,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.UUID; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.base.Competitor; @@ -72,7 +72,7 @@ public class TestStoringAndRetrievingLeaderboardGroups extends AbstractMongoDBTe super(); } - @Before + @BeforeEach public void setUp() { DomainFactory.INSTANCE.getCompetitorAndBoatStore().clearCompetitors(); mongoObjectFactory = new MongoObjectFactoryImpl(db); @@ -385,13 +385,13 @@ public class TestStoringAndRetrievingLeaderboardGroups extends AbstractMongoDBTe final LeaderboardGroup loadedLeaderboardGroup = domainObjectFactory.loadLeaderboardGroup(groupName, /* regattaRegistry */ null, /* leaderboardRegistry */ null); - Assert.assertEquals(groupName, loadedLeaderboardGroup.getName()); - Assert.assertEquals(groupDescription, loadedLeaderboardGroup.getDescription()); - Assert.assertEquals(groupDisplayName, loadedLeaderboardGroup.getDisplayName()); + Assertions.assertEquals(groupName, loadedLeaderboardGroup.getName()); + Assertions.assertEquals(groupDescription, loadedLeaderboardGroup.getDescription()); + Assertions.assertEquals(groupDisplayName, loadedLeaderboardGroup.getDisplayName()); int c = 0; for (Leaderboard board : leaderboardGroup.getLeaderboards()) { - Assert.assertEquals(leaderboardNames[c], board.getName()); + Assertions.assertEquals(leaderboardNames[c], board.getName()); c++; } } @@ -424,7 +424,7 @@ public class TestStoringAndRetrievingLeaderboardGroups extends AbstractMongoDBTe mongoObjectFactory.storeLeaderboard(ungroupedLeaderboards[2]); Iterable loadedUngroupedLeaderboards = domainObjectFactory.getLeaderboardsNotInGroup(/* regattaRegistry */ null, /* leaderboardRegistry */ null); - Assert.assertTrue(loadedUngroupedLeaderboards.iterator().hasNext()); + Assertions.assertTrue(loadedUngroupedLeaderboards.iterator().hasNext()); int c = 0; for (int i = 0; i < ungroupedLeaderboardNames.length; i++) { boolean loadedBoardsContainsName = false; @@ -435,9 +435,9 @@ public class TestStoringAndRetrievingLeaderboardGroups extends AbstractMongoDBTe break; } } - Assert.assertTrue(loadedBoardsContainsName); + Assertions.assertTrue(loadedBoardsContainsName); } - Assert.assertTrue(c == ungroupedLeaderboards.length); + Assertions.assertTrue(c == ungroupedLeaderboards.length); } @Test @@ -465,12 +465,12 @@ public class TestStoringAndRetrievingLeaderboardGroups extends AbstractMongoDBTe final Leaderboard loadedLeaderboard = domainObjectFactory.loadLeaderboard(leaderboard.getName(), /* regattaRegistry */ null, /* leaderboardRegistry */ null); final RaceColumn loadedRaceColumnByName = loadedLeaderboard.getRaceColumnByName(columnName); Fleet loadedFleet = loadedRaceColumnByName.getFleetByName(fleet.getName()); - Assert.assertEquals(race.getRaceIdentifier(fleet), loadedRaceColumnByName.getRaceIdentifier(loadedFleet)); + Assertions.assertEquals(race.getRaceIdentifier(fleet), loadedRaceColumnByName.getRaceIdentifier(loadedFleet)); // Check if the group received the changes loadedGroup = domainObjectFactory.loadLeaderboardGroup(groupName, /* regattaRegistry */ null, /* leaderboardRegistry */ null); final RaceColumn loadedRaceColumnFromGroupByName = loadedGroup.getLeaderboards().iterator().next().getRaceColumnByName(columnName); Fleet loadedGroupFleet = loadedRaceColumnFromGroupByName.getFleetByName(fleet.getName()); RaceIdentifier loadedIdentifier = loadedRaceColumnFromGroupByName.getRaceIdentifier(loadedGroupFleet); - Assert.assertEquals(race.getRaceIdentifier(fleet), loadedIdentifier); + Assertions.assertEquals(race.getRaceIdentifier(fleet), loadedIdentifier); } } 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 1f47ffb3a6f..f459a504c17 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 @@ -1,17 +1,17 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.UnknownHostException; import java.util.Arrays; import java.util.Collections; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.base.Competitor; @@ -52,7 +52,7 @@ public class TestStoringAndRetrievingLeaderboards extends AbstractMongoDBTest { super(); } - @Before + @BeforeEach public void clearCompetitorStore() { DomainFactory.INSTANCE.getCompetitorAndBoatStore().clearCompetitors(); } 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 f2b96c313d5..3cef19f264a 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 @@ -1,14 +1,14 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.UnknownHostException; import org.bson.Document; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.client.MongoCollection; @@ -32,7 +32,7 @@ public class TestStoringAndRetrievingRaceLogEventData extends AbstractMongoDBTes super(); } - @Before + @BeforeEach @Override public void dropTestDB() throws UnknownHostException, MongoException, InterruptedException { super.dropTestDB(); 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 cc8af6c2754..3f826169898 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 @@ -1,8 +1,8 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -12,8 +12,8 @@ import java.util.Collections; import java.util.UUID; import org.bson.Document; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import com.mongodb.BasicDBList; @@ -98,7 +98,7 @@ public class TestStoringAndRetrievingRaceLogInLeaderboards extends RaceLogMongoD super(); } - @Before + @BeforeEach public void setUp() { now = MillisecondsTimePoint.now(); mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(getMongoService()); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java index 9dc16a5fe32..1691e464539 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java @@ -1,7 +1,7 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.net.UnknownHostException; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.List; import java.util.UUID; import org.bson.Document; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.BasicDBList; import com.mongodb.MongoException; 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 fffd2b6c173..acf2f8b151e 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 @@ -1,13 +1,13 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.UnknownHostException; import org.bson.Document; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.client.MongoCollection; @@ -29,7 +29,7 @@ public class TestStoringAndRetrievingWindData extends AbstractMongoDBTest { super(); } - @Before + @BeforeEach @Override public void dropTestDB() throws UnknownHostException, MongoException, InterruptedException { super.dropTestDB(); 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 56b5d0a84f4..3cfe5ba7139 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 @@ -1,8 +1,8 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 static org.mockito.Mockito.mock; import java.net.MalformedURLException; @@ -11,8 +11,8 @@ import java.net.UnknownHostException; import java.util.Collections; import java.util.Optional; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.client.MongoClient; @@ -70,7 +70,7 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive return MongoClients.create(dbConfiguration.getMongoClientURI()); } - @Before + @BeforeEach public void dropTestDB() throws UnknownHostException, MongoException { mongo = newMongo(); assertNotNull(mongo); @@ -137,6 +137,6 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive } finally { result.unlockAfterRead(); } - assertTrue("Expected myBeaaringDeg to be >= 139.999999999 but was "+myBearingDeg, myBearingDeg >= 139.999999999); + assertTrue(myBearingDeg >= 139.999999999, "Expected myBeaaringDeg to be >= 139.999999999 but was "+myBearingDeg); } } diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java index 9fdd43b20ea..9226b59dc79 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.URI; import java.net.URL; @@ -9,7 +9,7 @@ import java.net.UnknownHostException; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.tracking.RaceTracker; 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 b91938f3536..104f9e9e436 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 @@ -1,14 +1,14 @@ package com.sap.sailing.nmeaconnector.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.ByteArrayInputStream; import java.io.UnsupportedEncodingException; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.nmeaconnector.BATSentence; @@ -28,7 +28,7 @@ public class BATTest { BATSentence empty; BATSentence bat; - @Before + @BeforeEach public void setUp() throws Exception { empty = new BATParser(TalkerId.WI); bat = new BATParser(EXAMPLE); diff --git a/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/GeneralizedSentenceListenerTest.java b/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/GeneralizedSentenceListenerTest.java index 1aad7dddea5..66099c6697f 100755 --- a/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/GeneralizedSentenceListenerTest.java +++ b/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/GeneralizedSentenceListenerTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.nmeaconnector.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.nmeaconnector.NmeaFactory; @@ -29,7 +29,7 @@ public class GeneralizedSentenceListenerTest { private SentenceReader sentenceReader; private SentenceReaderSupport readerSupport; - @Before + @BeforeEach public void setUp() throws FileNotFoundException { sentenceReader = new SentenceReader(new FileInputStream("resources/LogSS.txt")); readerSupport = new SentenceReaderSupport(sentenceReader); diff --git a/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/GetInterfacesTest.java b/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/GetInterfacesTest.java index aad2b3a5a27..5ded3d01a25 100755 --- a/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/GetInterfacesTest.java +++ b/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/GetInterfacesTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.nmeaconnector.test; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sf.marineapi.nmea.event.AbstractSentenceListener; diff --git a/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/NMEAWindImportTest.java b/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/NMEAWindImportTest.java index 5d3e098519d..7969289c348 100755 --- a/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/NMEAWindImportTest.java +++ b/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/NMEAWindImportTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.nmeaconnector.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.FileInputStream; import java.io.FileNotFoundException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.nmeaconnector.NmeaFactory; @@ -17,7 +17,7 @@ import com.sap.sse.common.Util; public class NMEAWindImportTest { Iterable windFixes; - @Before + @BeforeEach public void setUp() throws FileNotFoundException, InterruptedException { NmeaFactory.INSTANCE.getUtil().registerAdditionalParsers(); windFixes = NmeaFactory.INSTANCE.readWind(new FileInputStream("resources/ExcerptFromLogJB010815.txt")); @@ -29,7 +29,7 @@ public class NMEAWindImportTest { assertTrue(!Util.isEmpty(windFixes)); } - @After + @AfterEach public void tearDown() { NmeaFactory.INSTANCE.getUtil().unregisterAdditionalParsers(); } diff --git a/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/NmeaFromZipImportTest.java b/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/NmeaFromZipImportTest.java index 34522d50e31..eda80db8ec9 100755 --- a/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/NmeaFromZipImportTest.java +++ b/java/com.sap.sailing.nmeaconnector.test/src/com/sap/sailing/nmeaconnector/test/NmeaFromZipImportTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.nmeaconnector.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -9,9 +9,9 @@ import java.io.IOException; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.nmeaconnector.NmeaFactory; @@ -20,7 +20,7 @@ import com.sap.sse.common.Util; public class NmeaFromZipImportTest { private ZipInputStream zipInputStream; - @Before + @BeforeEach public void setUp() throws FileNotFoundException { NmeaFactory.INSTANCE.getUtil().registerAdditionalParsers(); } @@ -37,7 +37,7 @@ public class NmeaFromZipImportTest { } } - @Ignore("This test only makes sense if the large file resources/Log210417.zip is present locally") + @Disabled("This test only makes sense if the large file resources/Log210417.zip is present locally") @Test public void testOtherZipFile() throws IOException, InterruptedException { zipInputStream = new ZipInputStream(new FileInputStream("resources/Log210417.zip")); diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/BearingClusterGroupTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/BearingClusterGroupTest.java index 9cd0d7187f4..5260090abd0 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/BearingClusterGroupTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/BearingClusterGroupTest.java @@ -2,9 +2,9 @@ package com.sap.sailing.polars.clusters.test; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.polars.mining.BearingClusterGroup; import com.sap.sse.common.Bearing; diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/SpeedClusterGroupTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/SpeedClusterGroupTest.java index 646ffb6511e..ace98626ca8 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/SpeedClusterGroupTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/SpeedClusterGroupTest.java @@ -3,9 +3,10 @@ package com.sap.sailing.polars.clusters.test; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.polars.datamining.data.impl.SpeedClusterGroup; diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/jaxrs/api/test/PolarDataResourceTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/jaxrs/api/test/PolarDataResourceTest.java index 0919075c0aa..6cfaab0b6eb 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/jaxrs/api/test/PolarDataResourceTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/jaxrs/api/test/PolarDataResourceTest.java @@ -10,8 +10,8 @@ import java.util.logging.Logger; import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.DomainFactory; @@ -31,7 +31,7 @@ public class PolarDataResourceTest { private PolarDataServiceImpl polarService; private DomainFactory domainFactory; - @Before + @BeforeEach public void setUp() throws IOException, ParseException, ClassNotFoundException, InterruptedException { polarService = new PolarDataServiceImpl(); domainFactory = new DomainFactoryImpl(/* raceLogResolver */ null); diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java index 5f17828641c..b4dbebf745c 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java @@ -20,8 +20,8 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.TimeoutException; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; @@ -84,7 +84,7 @@ public class PolarDataMinerTest { return new BearingClusterGroup(0, 180, 5); } - @Ignore("The test did work before DataMining was used for polars; maybe rework in the future...") + @Disabled("The test did work before DataMining was used for polars; maybe rework in the future...") @Test public void testGrouping() throws InterruptedException, TimeoutException, NoSuchMethodException, NotEnoughDataHasBeenAddedException { diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarFixFilterCriteriaTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarFixFilterCriteriaTest.java index b9357e5d06b..11cafba31ba 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarFixFilterCriteriaTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarFixFilterCriteriaTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.polars.mining.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import java.util.NavigableSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/regression/test/IncrementalLeastSquaresTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/regression/test/IncrementalLeastSquaresTest.java index f44f8c8804d..5d18a24367c 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/regression/test/IncrementalLeastSquaresTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/regression/test/IncrementalLeastSquaresTest.java @@ -10,7 +10,7 @@ import java.io.FileReader; import java.io.IOException; import java.util.Random; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.polars.regression.IncrementalLeastSquares; 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 354f19e8f36..43dbc8e2788 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,11 +1,11 @@ package com.sap.sailing.polars.regression.test; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import org.hamcrest.number.IsCloseTo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.polars.regression.IncrementalLeastSquares; diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/test/CubicEquationTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/test/CubicEquationTest.java index 518823428dc..486ecd690da 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/test/CubicEquationTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/test/CubicEquationTest.java @@ -3,9 +3,9 @@ package com.sap.sailing.polars.test; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.polars.impl.CubicEquation; diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/windestimation/TestWindEstimationFromManeuversOnAFew505Races.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/windestimation/TestWindEstimationFromManeuversOnAFew505Races.java index a8aba9f9c83..4f15867e83b 100755 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/windestimation/TestWindEstimationFromManeuversOnAFew505Races.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/windestimation/TestWindEstimationFromManeuversOnAFew505Races.java @@ -1,6 +1,6 @@ package com.sap.sailing.polars.windestimation; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.net.MalformedURLException; @@ -13,7 +13,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.Wind; diff --git a/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/TestXrrFileNamePattern.java b/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/TestXrrFileNamePattern.java index 7bcc61554f1..b3fd4dcd637 100644 --- a/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/TestXrrFileNamePattern.java +++ b/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/TestXrrFileNamePattern.java @@ -1,7 +1,7 @@ package com.sap.sailing.sailti.resultimport; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URL; @@ -9,7 +9,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.regex.Matcher; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/test/TestParsingEventHtml.java b/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/test/TestParsingEventHtml.java index d2939c8a343..216e030745c 100644 --- a/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/test/TestParsingEventHtml.java +++ b/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/test/TestParsingEventHtml.java @@ -1,7 +1,7 @@ package com.sap.sailing.sailti.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -11,7 +11,7 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.RegattaScoreCorrections; import com.sap.sailing.domain.common.ScoreCorrectionProvider; @@ -57,9 +57,9 @@ public class TestParsingEventHtml { for (final Pair boatClassAndResultTimePoint : resultsPerBoatClass) { final RegattaScoreCorrections result = scoreCorrectionProvider.getScoreCorrections(eventName, boatClassAndResultTimePoint.getA(), boatClassAndResultTimePoint.getB()); assertNotNull( + result, "Expected result for event " + eventName + " and boat class " + boatClassAndResultTimePoint.getA() - + " for time point " + boatClassAndResultTimePoint.getB() + " to not be null", - result); + + " for time point " + boatClassAndResultTimePoint.getB() + " to not be null"); } } } diff --git a/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/test/TrofeoSofia_ParserTest.java b/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/test/TrofeoSofia_ParserTest.java index 5d2366e6540..1bef57fec88 100644 --- a/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/test/TrofeoSofia_ParserTest.java +++ b/java/com.sap.sailing.sailti.resultimport.test/src/com/sap/sailing/sailti/resultimport/test/TrofeoSofia_ParserTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.sailti.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.mock; import java.io.IOException; @@ -12,7 +12,7 @@ import java.util.Set; import javax.xml.bind.JAXBException; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.domain.common.RegattaScoreCorrections; diff --git a/java/com.sap.sailing.sailwave.html.resultimport.test/src/com/sap/sailing/sailwave/html/resultimport/test/SimpleHtmlParsingTest.java b/java/com.sap.sailing.sailwave.html.resultimport.test/src/com/sap/sailing/sailwave/html/resultimport/test/SimpleHtmlParsingTest.java index 4cf303c0792..f60fb3d275d 100755 --- a/java/com.sap.sailing.sailwave.html.resultimport.test/src/com/sap/sailing/sailwave/html/resultimport/test/SimpleHtmlParsingTest.java +++ b/java/com.sap.sailing.sailwave.html.resultimport.test/src/com/sap/sailing/sailwave/html/resultimport/test/SimpleHtmlParsingTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.sailwave.html.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.io.BufferedReader; import java.io.IOException; @@ -12,7 +12,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.resultimport.CompetitorRow; import com.sap.sailing.resultimport.RegattaResults; diff --git a/java/com.sap.sailing.sailwave.resultimport.test/src/com/sap/sailing/sailwave/resultimport/test/ParserTest.java b/java/com.sap.sailing.sailwave.resultimport.test/src/com/sap/sailing/sailwave/resultimport/test/ParserTest.java index 16f3ca87a83..94cb4ee7ad0 100644 --- a/java/com.sap.sailing.sailwave.resultimport.test/src/com/sap/sailing/sailwave/resultimport/test/ParserTest.java +++ b/java/com.sap.sailing.sailwave.resultimport.test/src/com/sap/sailing/sailwave/resultimport/test/ParserTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.sailwave.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; import java.io.File; import java.io.FileInputStream; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.RegattaScoreCorrections; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/coursetemplate/MarkConfiguration.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/coursetemplate/MarkConfiguration.java index 3c96c687f6e..87d8a90caa5 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/coursetemplate/MarkConfiguration.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/coursetemplate/MarkConfiguration.java @@ -1,6 +1,6 @@ package com.sap.sailing.selenium.api.coursetemplate; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import java.util.List; 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 fd6c3b0c120..b6317b01623 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 @@ -11,7 +11,7 @@ import java.net.Socket; import java.net.URL; import java.text.SimpleDateFormat; -import org.junit.Before; +import org.junit.BeforeEach; import org.junit.Rule; import org.junit.rules.Timeout; @@ -45,7 +45,7 @@ public abstract class AbstractTestWithIgtimiConnection extends AbstractSeleniumT protected ApiContext ctx; - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); super.setUp(); 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 b61818e8f1c..f2f8a1ef025 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 @@ -8,8 +8,8 @@ import static com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage.goToP import static org.hamcrest.MatcherAssert.assertThat; import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.api.core.ApiContext; @@ -35,7 +35,7 @@ public class AclRevokeAnonymousTest extends AbstractSeleniumTest { private static final String BOAT_CLASS = "GC 32"; private AdminConsolePage adminConsole; - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/BasicIgtimiAdapterTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/BasicIgtimiAdapterTest.java index 0e1a7dd8ccb..2d35b0d377a 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/BasicIgtimiAdapterTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/BasicIgtimiAdapterTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.selenium.api.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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 java.io.IOException; import java.text.SimpleDateFormat; @@ -17,7 +17,7 @@ import java.util.Set; import org.apache.http.client.ClientProtocolException; import org.json.simple.parser.ParseException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.igtimiadapter.DataAccessWindow; import com.sap.sailing.domain.igtimiadapter.Permission; 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 c61ffcb42e8..6ce144ce21c 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 @@ -6,14 +6,14 @@ import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext import static com.sap.sailing.selenium.api.core.ApiContext.createAnonymousApiContext; import static com.sap.sailing.selenium.api.core.ApiContext.createApiContext; import static com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage.goToPage; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.api.core.ApiContext; @@ -38,7 +38,7 @@ public class ClosedRegattaTest extends AbstractSeleniumTest { private static final String EVENT_NAME = "Super exclusive regatta - invited competitors only"; private static final String BOAT_CLASS = "GC 32"; - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); @@ -57,13 +57,13 @@ public class ClosedRegattaTest extends AbstractSeleniumTest { final String registrationLinkSecret = event.getSecret(); final Competitor owner = regattaApi.createAndAddCompetitor(ownerCtx, EVENT_NAME, BOAT_CLASS, "", "Donald Duck", "USA"); - assertNotNull("Owner should be able to register for a closed regatta!", owner); + assertNotNull(owner, "Owner should be able to register for a closed regatta!"); try { regattaApi.createAndAddCompetitorWithSecret(unregisteredCtx, EVENT_NAME, BOAT_CLASS, "", "Mickey Mouse", "USA", registrationLinkSecret, UUID.randomUUID()); fail("Self-registration should not be possible for a closed regatta!"); } catch (RuntimeException exc) { - assertTrue("Response status \"Forbidden\" expected!", exc.getMessage().contains("rc=403")); + assertTrue(exc.getMessage().contains("rc=403"), "Response status \"Forbidden\" expected!"); } } } 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 76da2730c2c..52a149d773a 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 @@ -2,16 +2,16 @@ package com.sap.sailing.selenium.api.test; import static com.sap.sailing.selenium.api.core.ApiContext.SERVER_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashMap; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.api.core.ApiContext; @@ -33,7 +33,7 @@ public class CompetitorApiTest extends AbstractSeleniumTest { private ApiContext adminCtx; - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 1d93ae2cc88..a83e572b82f 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 @@ -7,11 +7,11 @@ 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 java.lang.System.currentTimeMillis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -27,9 +27,9 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import org.json.JSONException; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.domain.common.MarkType; @@ -84,7 +84,7 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { private ApiContext ctx; private ApiContext sharedServerCtx; - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); @@ -100,7 +100,7 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { found = true; } } - assertTrue("No markconfiguration with id " + mcId + " for waypoint", found); + assertTrue(found, "No markconfiguration with id " + mcId + " for waypoint"); } } } @@ -111,9 +111,9 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { final Iterable trgtMarkConfigurations = trgtCourseConfiguration.getMarkConfigurations(); final Iterable srcWaypoints = srcCourseConfiguration.getWaypoints(); final Iterable trgtWaypoints = trgtCourseConfiguration.getWaypoints(); - assertEquals("number of markconfiguration is different", Util.size(srcMarkConfigurations), - Util.size(trgtMarkConfigurations)); - assertEquals("number of waypoints is different", Util.size(srcWaypoints), Util.size(trgtWaypoints)); + assertEquals(Util.size(srcMarkConfigurations), Util.size(trgtMarkConfigurations), + "number of markconfiguration is different"); + assertEquals(Util.size(srcWaypoints), Util.size(trgtWaypoints), "number of waypoints is different"); final Map markConfigurationToNameMap = new HashMap<>(); for (final MarkConfiguration markConfiguration : srcMarkConfigurations) { final UUID markTemplateId = markConfiguration.getMarkTemplateId(); @@ -146,30 +146,30 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { : "unknown"; markConfigurationToNameMap.put(markConfiguration, identifier); if (markTemplateId != null && trgtMarkConfiguration.getMarkTemplateId() != null) { - assertEquals("markTemplateId is different for " + msgIdentifier, markTemplateId, - trgtMarkConfiguration.getMarkTemplateId()); + assertEquals(markTemplateId, trgtMarkConfiguration.getMarkTemplateId(), + "markTemplateId is different for " + msgIdentifier); } final String srcAssociatedRoleId = markConfiguration.getAssociatedRoleId(); if (srcAssociatedRoleId != null) { - assertEquals("associated role is different for " + msgIdentifier, srcAssociatedRoleId, - trgtMarkConfiguration.getAssociatedRoleId()); + assertEquals(srcAssociatedRoleId, trgtMarkConfiguration.getAssociatedRoleId(), + "associated role is different for " + msgIdentifier); } if (matchByName) { - assertEquals("shortName is different for " + msgIdentifier, srcAppearance.getShortName(), - trgtAppearance.getShortName()); + assertEquals(srcAppearance.getShortName(), trgtAppearance.getShortName(), + "shortName is different for " + msgIdentifier); } List trgtDeviceMappings = trgtMarkConfiguration.getDeviceMappings(); boolean hasNonPingDeviceIdentifier = !trgtDeviceMappings.isEmpty() && !trgtDeviceMappings.get(0).getType().equals("PING"); if (srcPositioning != null) { if (srcPositioning.getDeviceId() != null) { - assertEquals("tracking device was not properly mapped for " + msgIdentifier, - "smartphoneUUID", trgtDeviceMappings.get(0).getType()); + assertEquals("smartphoneUUID", + trgtDeviceMappings.get(0).getType(), "tracking device was not properly mapped for " + msgIdentifier); } else if (srcPositioning.getLatitudeDeg() != null && srcPositioning.getLongitudeDeg() != null) { - assertEquals("position.lat is different for " + msgIdentifier, srcPositioning.getLatitudeDeg(), - trgtMarkConfiguration.getLastKnownPosition().getLatDeg(), 0.0001); - assertEquals("position.lng is different for " + msgIdentifier, - srcPositioning.getLongitudeDeg(), trgtMarkConfiguration.getLastKnownPosition().getLngDeg(), 0.0001); + assertEquals(srcPositioning.getLatitudeDeg(), trgtMarkConfiguration.getLastKnownPosition().getLatDeg(), + 0.0001, "position.lat is different for " + msgIdentifier); + assertEquals(srcPositioning.getLongitudeDeg(), + trgtMarkConfiguration.getLastKnownPosition().getLngDeg(), 0.0001, "position.lng is different for " + msgIdentifier); } } if (markConfiguration.isStoreToInventory()) { @@ -182,11 +182,11 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { assertEquals(srcAppearance.getName(), markProperties.getName()); assertEquals(srcAppearance.getShortName(), markProperties.getShortName()); } - assertEquals("device association differs for "+msgIdentifier, markProperties.hasDevice(), hasNonPingDeviceIdentifier); + assertEquals(markProperties.hasDevice(), hasNonPingDeviceIdentifier, "device association differs for "+msgIdentifier); } } } - assertTrue("No matching markconfiguration found for markconfiguration " + markConfiguration.getId(), found); + assertTrue(found, "No matching markconfiguration found for markconfiguration " + markConfiguration.getId()); } for (final WaypointWithMarkConfiguration srcWaypoint : srcWaypoints) { final String controlPointName = srcWaypoint.getControlPointName(); @@ -195,11 +195,11 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { for (final WaypointWithMarkConfiguration trgtWaypoint : trgtWaypoints) { if (controlPointName.equals(trgtWaypoint.getControlPointName())) { found = true; - assertEquals("Waypoint controlpoint shortname is different", - srcWaypoint.getControlPointShortName(), trgtWaypoint.getControlPointShortName()); - assertEquals("Waypoint number of markconfigurations is different", - Util.size(srcWaypoint.getMarkConfigurationIds()), - Util.size(trgtWaypoint.getMarkConfigurationIds())); + assertEquals(srcWaypoint.getControlPointShortName(), + trgtWaypoint.getControlPointShortName(), "Waypoint controlpoint shortname is different"); + assertEquals(Util.size(srcWaypoint.getMarkConfigurationIds()), + Util.size(trgtWaypoint.getMarkConfigurationIds()), + "Waypoint number of markconfigurations is different"); final LongAdder srcIndex = new LongAdder(); for (final String srcMarkConfigurationId : srcWaypoint.getMarkConfigurationIds()) { srcIndex.increment(); @@ -213,8 +213,8 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { if (trgtMc.getId().equals(trgtMarkConfigurationId)) { if (markConfigurationToNameMap.get(srcMc) .equals(trgtMc.getEffectiveProperties().getName())) { - assertEquals("Waypoint position of markconfigurations is wrong", - srcIndex.intValue(), trgtIndex.intValue()); + assertEquals(srcIndex.intValue(), + trgtIndex.intValue(), "Waypoint position of markconfigurations is wrong"); } } }); @@ -224,17 +224,17 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { } } } - assertTrue("Waypoint with control point name " + controlPointName + " not found", found); + assertTrue(found, "Waypoint with control point name " + controlPointName + " not found"); } } final RepeatablePart srcRepeatablePart = srcCourseConfiguration.getRepeatablePart(); if (srcRepeatablePart != null) { final RepeatablePart tgrtRepeatablePart = trgtCourseConfiguration.getRepeatablePart(); - assertEquals("repeatablePart.start is different", - srcRepeatablePart.getZeroBasedIndexOfRepeatablePartStart(), - Integer.valueOf(tgrtRepeatablePart.getZeroBasedIndexOfRepeatablePartStart())); - assertEquals("repeatablePart.end is different", srcRepeatablePart.getZeroBasedIndexOfRepeatablePartEnd(), - tgrtRepeatablePart.getZeroBasedIndexOfRepeatablePartEnd()); + assertEquals(srcRepeatablePart.getZeroBasedIndexOfRepeatablePartStart(), + Integer.valueOf(tgrtRepeatablePart.getZeroBasedIndexOfRepeatablePartStart()), + "repeatablePart.start is different"); + assertEquals(srcRepeatablePart.getZeroBasedIndexOfRepeatablePartEnd(), tgrtRepeatablePart.getZeroBasedIndexOfRepeatablePartEnd(), + "repeatablePart.end is different"); } } @@ -298,7 +298,7 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { template.getId(), /* optionalRegattaName */ null, /* tags */ null, /* optionalNumberOfLaps */ null); assertEquals(templateWaypoints, Util.size(courseConfiguration.getWaypoints())); - assertNull("repeatable part of course configuration is not null", courseConfiguration.getRepeatablePart()); + assertNull(courseConfiguration.getRepeatablePart(), "repeatable part of course configuration is not null"); assertEquals(numberOfLaps, courseConfiguration.getNumberOfLaps()); // create a course and make sure it has no repeatable part final String regattaName = "test"; @@ -306,7 +306,7 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { final RaceColumn race = regattaApi.addRaceColumn(ctx, regattaName, null, 1)[0]; final CourseConfiguration course = courseConfigurationApi.createCourse(ctx, courseConfiguration, "test", race.getRaceName(), "Default"); assertEquals(templateWaypoints, Util.size(course.getWaypoints())); - assertNull("repeatable part of course is not null", course.getRepeatablePart()); + assertNull(course.getRepeatablePart(), "repeatable part of course is not null"); assertEquals(-1, course.getNumberOfLaps()); // the course template does not specify a repeatable part } @@ -526,7 +526,7 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { } } - @Ignore + @Disabled //TODO: Need to clarify this test. The two course template don't seem to get merged by // MarkRole. Perhaps the cause is, that the MarkTemplate/MarkRole-map of the first // MarkTemplate is passed to the creation of the second one, so the MarkTemplate-IDs are 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 a33a754c470..22f0e33e767 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 @@ -4,9 +4,9 @@ import static com.sap.sailing.selenium.api.core.ApiContext.SECURITY_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.SHARED_SERVER_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; import static com.sap.sailing.selenium.api.core.ApiContext.createApiContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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 java.util.Arrays; import java.util.HashMap; @@ -15,8 +15,8 @@ import java.util.Map; import java.util.TreeSet; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.core.HttpException; @@ -38,7 +38,7 @@ public class CourseTemplateApiTest extends AbstractSeleniumTest { private ApiContext ctx; private CourseTemplateDataFactory ctdf; - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); ctx = createAdminApiContext(getContextRoot(), SHARED_SERVER_CONTEXT); @@ -64,7 +64,7 @@ public class CourseTemplateApiTest extends AbstractSeleniumTest { fail(); } catch (Exception e) { final String expected = "Subject does not have permission [MARK_ROLE:READ:"; - assertTrue("Expected "+e.getMessage()+" to contain "+expected, e.getMessage().contains(expected)); + assertTrue(e.getMessage().contains(expected), "Expected "+e.getMessage()+" to contain "+expected); } } 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 596854d8ed7..3d4a99eaa05 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 @@ -1,12 +1,12 @@ package com.sap.sailing.selenium.api.test; import static com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage.goToPage; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.api.event.EventApi; @@ -25,7 +25,7 @@ public class DefaultTenantApiTest extends AbstractSeleniumTest { private UUID tenantGroupId; private String userToken; - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 e93750f07b4..c64a73653be 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 @@ -2,13 +2,13 @@ package com.sap.sailing.selenium.api.test; import static com.sap.sailing.domain.common.CompetitorRegistrationType.CLOSED; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.event.EventApi; @@ -19,7 +19,7 @@ public class EventApiTest extends AbstractSeleniumTest { private final EventApi eventApi = new EventApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } @@ -31,45 +31,45 @@ public class EventApiTest extends AbstractSeleniumTest { final String eventName = " loggingsession"; final Event createdEvent = eventApi.createEvent(ctx, eventName, "75QMNATIONALEKREUZER", CLOSED, "default"); - assertNotNull("create: event.eventid is missing", createdEvent.getId()); - assertNotNull("create: event.eventstartdate is missing", createdEvent.getStartDate()); - assertNotNull("create: event.eventenddate is missing", createdEvent.getEndDate()); - assertEquals("create: event.eventname is different", eventName, createdEvent.getName()); - assertEquals("create: event.reagattaname is different", eventName, createdEvent.get("regatta")); - assertEquals("create: event.leaderboard is different", eventName, createdEvent.get("leaderboard")); + assertNotNull(createdEvent.getId(), "create: event.eventid is missing"); + assertNotNull(createdEvent.getStartDate(), "create: event.eventstartdate is missing"); + assertNotNull(createdEvent.getEndDate(), "create: event.eventenddate is missing"); + assertEquals(eventName, createdEvent.getName(), "create: event.eventname is different"); + assertEquals(eventName, createdEvent.get("regatta"), "create: event.reagattaname is different"); + assertEquals(eventName, createdEvent.get("leaderboard"), "create: event.leaderboard is different"); final Event foundEvent = eventApi.getEvent(ctx, (String) createdEvent.getId()); - assertNotNull("read: event.id is missing", foundEvent.getId()); - assertEquals("read: event.name is different", eventName, foundEvent.getName()); - assertEquals("read: event.description is different", eventName, foundEvent.get("description")); - assertEquals("read: event.officialWebsiteURL is different", null, - (String) foundEvent.get("officialWebsiteURL")); - assertEquals("read: event.baseUrl is different", removeTrailingSlash(getContextRoot()), removeTrailingSlash(foundEvent.get("baseURL"))); - assertNotNull("read: event.startDate is missing", foundEvent.getStartDate()); - assertNotNull("read: event.endDate is missing", foundEvent.getEndDate()); - assertEquals("read: event.images should be empty", 0, ((JSONArray) foundEvent.get("images")).size()); - assertEquals("read: event.videos should be empty", 0, ((JSONArray) foundEvent.get("videos")).size()); - assertEquals("read: event.sailorsInfoWebsiteURLs", 0, - ((JSONArray) foundEvent.get("sailorsInfoWebsiteURLs")).size()); + assertNotNull(foundEvent.getId(), "read: event.id is missing"); + assertEquals(eventName, foundEvent.getName(), "read: event.name is different"); + assertEquals(eventName, foundEvent.get("description"), "read: event.description is different"); + assertEquals(null, (String) foundEvent.get("officialWebsiteURL"), + "read: event.officialWebsiteURL is different"); + assertEquals(removeTrailingSlash(getContextRoot()), removeTrailingSlash(foundEvent.get("baseURL")), "read: event.baseUrl is different"); + assertNotNull(foundEvent.getStartDate(), "read: event.startDate is missing"); + assertNotNull(foundEvent.getEndDate(), "read: event.endDate is missing"); + assertEquals(0, ((JSONArray) foundEvent.get("images")).size(), "read: event.images should be empty"); + assertEquals(0, ((JSONArray) foundEvent.get("videos")).size(), "read: event.videos should be empty"); + assertEquals(0, ((JSONArray) foundEvent.get("sailorsInfoWebsiteURLs")).size(), + "read: event.sailorsInfoWebsiteURLs"); JSONObject foundEventVenue = (JSONObject) foundEvent.get("venue"); - assertEquals("read: event.venue.name is different", "default", foundEventVenue.get("name")); + assertEquals("default", foundEventVenue.get("name"), "read: event.venue.name is different"); JSONArray foundEventVenueCourseAreas = (JSONArray) foundEventVenue.get("courseAreas"); JSONObject foundEventVenueCourseAreasFirst = (JSONObject) foundEventVenueCourseAreas.get(0); - assertEquals("read: event.venue.courseAreas[0].name is different", "Default", - foundEventVenueCourseAreasFirst.get("name")); - assertNotNull("read: event.venue.courseAreas[0].id is null", foundEventVenueCourseAreasFirst.get("id")); + assertEquals("Default", foundEventVenueCourseAreasFirst.get("name"), + "read: event.venue.courseAreas[0].name is different"); + assertNotNull(foundEventVenueCourseAreasFirst.get("id"), "read: event.venue.courseAreas[0].id is null"); JSONArray foundEventLeaderBoardGroups = (JSONArray) foundEvent.get("leaderboardGroups"); JSONObject foundEventLeaderBoardGroupsFirst = (JSONObject) foundEventLeaderBoardGroups.get(0); - assertNotNull("read: event.leaderboardGroups[0].id is null", foundEventLeaderBoardGroupsFirst.get("id")); - assertEquals("read: event.leaderboardGroups[0].name is different", eventName, - foundEventLeaderBoardGroupsFirst.get("name")); - assertEquals("read: event.leaderboardGroups[0].description is different", eventName, - foundEventLeaderBoardGroupsFirst.get("description")); - assertEquals("read: event.leaderboardGroups[0].hasOverallLeaderboard is different", false, - foundEventLeaderBoardGroupsFirst.get("hasOverallLeaderboard")); + assertNotNull(foundEventLeaderBoardGroupsFirst.get("id"), "read: event.leaderboardGroups[0].id is null"); + assertEquals(eventName, foundEventLeaderBoardGroupsFirst.get("name"), + "read: event.leaderboardGroups[0].name is different"); + assertEquals(eventName, foundEventLeaderBoardGroupsFirst.get("description"), + "read: event.leaderboardGroups[0].description is different"); + assertEquals(false, foundEventLeaderBoardGroupsFirst.get("hasOverallLeaderboard"), + "read: event.leaderboardGroups[0].hasOverallLeaderboard is different"); } private String removeTrailingSlash(String url) { 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 b4ca659ce36..533088c1edc 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 @@ -3,12 +3,12 @@ package com.sap.sailing.selenium.api.test; 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.GpsFixMoving.createFix; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.core.GpsFixMoving; @@ -20,7 +20,7 @@ public class GpsFixApiTest extends AbstractSeleniumTest { private final GpsFixApi gpsFixApi = new GpsFixApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } @@ -29,7 +29,7 @@ public class GpsFixApiTest extends AbstractSeleniumTest { public void testGpsFixHull() { final ApiContext ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); final GpsFixResponse gpsFixRepsone = gpsFixApi.postGpsFix(ctx, UUID.randomUUID()); - assertTrue("Result should be empty.", gpsFixRepsone.isEmpty()); + assertTrue(gpsFixRepsone.isEmpty(), "Result should be empty."); } @Test @@ -37,6 +37,6 @@ public class GpsFixApiTest extends AbstractSeleniumTest { final ApiContext ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); final GpsFixMoving gpsFix = createFix(49.12, 8.599, System.currentTimeMillis(), 10.0, 180.0); final GpsFixResponse gpsFixResponse = gpsFixApi.postGpsFix(ctx, UUID.randomUUID(), gpsFix); - assertTrue("Result should be empty.", gpsFixResponse.isEmpty()); + assertTrue(gpsFixResponse.isEmpty(), "Result should be empty."); } } 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 2a8a3a9eb4f..e8fb6ff9bcc 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 @@ -5,14 +5,14 @@ import static com.sap.sailing.selenium.api.core.ApiContext.SERVER_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; import static java.lang.System.currentTimeMillis; import static java.util.UUID.randomUUID; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import org.json.simple.JSONArray; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.racelog.RacingProcedureType; import com.sap.sailing.selenium.api.core.ApiContext; @@ -36,7 +36,7 @@ public class LeaderboardApiTest extends AbstractSeleniumTest { private final RegattaApi regattaApi = new RegattaApi(); private final LeaderboardApi leaderboardApi = new LeaderboardApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } @@ -46,22 +46,22 @@ public class LeaderboardApiTest extends AbstractSeleniumTest { final ApiContext ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); eventApi.createEvent(ctx, LEADERBOARD_NAME, BOATCLASSNAME, CLOSED, "default"); Leaderboard leaderBoard = leaderboardApi.getLeaderboard(ctx, LEADERBOARD_NAME); - assertEquals("read: leaderboard.name is different", LEADERBOARD_NAME, leaderBoard.getName()); - assertEquals("read: leaderboard.displayName is different", LEADERBOARD_NAME, leaderBoard.getDisplayName()); - assertNotNull("read: leaderboard.resultTimepoint is missing", leaderBoard.getResultTimePoint()); - assertEquals("read: leaderboard.resultState is different", "Live", leaderBoard.getResultState()); - assertEquals("read: leaderboard.type is different", "RegattaLeaderboard", leaderBoard.getType()); - assertEquals("read: leaderboard.canBoatsOfCompetitorsChangePerRace is different", false, - leaderBoard.canBoatsOfCompetitorsChangePerRace()); - assertNull("read: leaderboard.maxCompetitorsCount should be null", leaderBoard.getMaxCompetitorsCount()); - assertNull("read: leaderboard.scoringComment should be null", leaderBoard.getScoringComment()); - assertNull("read: leaderboard.lastScoringUpdate should be null", leaderBoard.getLastScoringUpdate()); - assertEquals("read: leaderboard.columnNames should be empty", 0, leaderBoard.getColumnNames().length); - assertEquals("read: leaderboard.competitors should be empty", 0, - ((JSONArray) leaderBoard.get("competitors")).size()); - assertEquals("read: leaderboard.shardingLeaderboardName is different", - "/leaderboard/" + LEADERBOARD_NAME.replaceAll(" ", "_").replaceAll("<", "_").replaceAll(">", "_"), - leaderBoard.get("shardingLeaderboardName")); + assertEquals(LEADERBOARD_NAME, leaderBoard.getName(), "read: leaderboard.name is different"); + assertEquals(LEADERBOARD_NAME, leaderBoard.getDisplayName(), "read: leaderboard.displayName is different"); + assertNotNull(leaderBoard.getResultTimePoint(), "read: leaderboard.resultTimepoint is missing"); + assertEquals("Live", leaderBoard.getResultState(), "read: leaderboard.resultState is different"); + assertEquals("RegattaLeaderboard", leaderBoard.getType(), "read: leaderboard.type is different"); + assertEquals(false, leaderBoard.canBoatsOfCompetitorsChangePerRace(), + "read: leaderboard.canBoatsOfCompetitorsChangePerRace is different"); + assertNull(leaderBoard.getMaxCompetitorsCount(), "read: leaderboard.maxCompetitorsCount should be null"); + assertNull(leaderBoard.getScoringComment(), "read: leaderboard.scoringComment should be null"); + assertNull(leaderBoard.getLastScoringUpdate(), "read: leaderboard.lastScoringUpdate should be null"); + assertEquals(0, leaderBoard.getColumnNames().length, "read: leaderboard.columnNames should be empty"); + assertEquals(0, ((JSONArray) leaderBoard.get("competitors")).size(), + "read: leaderboard.competitors should be empty"); + assertEquals("/leaderboard/" + LEADERBOARD_NAME.replaceAll(" ", "_").replaceAll("<", "_").replaceAll(">", "_"), + leaderBoard.get("shardingLeaderboardName"), + "read: leaderboard.shardingLeaderboardName is different"); } @Test @@ -170,8 +170,8 @@ public class LeaderboardApiTest extends AbstractSeleniumTest { leaderboardApi.startRaceLogTracking(ctx, LEADERBOARD_NAME, race.getRaceName(), "Default"); TrackingTimes trackingTimes = leaderboardApi.setTrackingTimes(ctx, LEADERBOARD_NAME, race.getRaceName(), "Default", startTime, endTime); - assertEquals("read: startTime is different", startTime, trackingTimes.getStartOfTracking()); - assertEquals("read: endTime is different", endTime, trackingTimes.getEndOfTracking()); + assertEquals(startTime, trackingTimes.getStartOfTracking(), "read: startTime is different"); + assertEquals(endTime, trackingTimes.getEndOfTracking(), "read: endTime is different"); } @Test 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 326c56eff02..1375ee59395 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 @@ -5,18 +5,18 @@ 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.lang.System.currentTimeMillis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.util.Arrays; import java.util.Collections; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.domain.common.MarkType; @@ -52,7 +52,7 @@ public class MarkApiTest extends AbstractSeleniumTest { private final CourseConfigurationApi courseConfigurationApi = new CourseConfigurationApi(); private final SecurityApi securityApi = new SecurityApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } @@ -65,8 +65,8 @@ public class MarkApiTest extends AbstractSeleniumTest { final Regatta regatta = regattaApi.getRegatta(ctx, EVENT_NAME); final Mark mark = markApi.addMarkToRegatta(ctx, regatta.getName(), "Startboat"); - assertNotNull("Mark result should not be null", mark); - assertNotNull("Id of created mark should not be null", mark.getMarkId()); + assertNotNull(mark, "Mark result should not be null"); + assertNotNull(mark.getMarkId(), "Id of created mark should not be null"); } /** 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 47416f43fe5..7c74432dbf5 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 @@ -3,19 +3,19 @@ package com.sap.sailing.selenium.api.test; import static com.sap.sailing.selenium.api.core.ApiContext.SHARED_SERVER_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; import static java.util.UUID.randomUUID; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.core.HttpException; @@ -43,7 +43,7 @@ public class MarkPropertiesTest extends AbstractSeleniumTest { private final MarkPropertiesApi markPropertiesApi = new MarkPropertiesApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } @@ -55,7 +55,7 @@ public class MarkPropertiesTest extends AbstractSeleniumTest { MarkProperties markProperties = markPropertiesApi.createMarkProperties(ctx, MARK_PROPERTIES_NAME, MARK_PROPERTIES_SHORTNAME, deviceUuid.toString(), MARK_PROPERTIES_COLOR, "shape", "pattern", MARK_PROPERTIES_TYPE, MARK_PROPERTIES_TAGS, null, null); - assertNotNull("read: no MarkProperties returnded", markProperties); + assertNotNull(markProperties, "read: no MarkProperties returnded"); assertDefaultValues(markProperties); assertTrue(markProperties.hasDevice()); } @@ -66,13 +66,13 @@ public class MarkPropertiesTest extends AbstractSeleniumTest { 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("create: no MarkProperties returnded", createdMarkProperties); - assertNotNull("create: MarkProperties.id is missing", createdMarkProperties.getId()); + assertNotNull(createdMarkProperties, "create: no MarkProperties returnded"); + assertNotNull(createdMarkProperties.getId(), "create: MarkProperties.id is missing"); MarkProperties foundMarkProperties = markPropertiesApi.getMarkProperties(ctx, createdMarkProperties.getId()); assertDefaultValues(foundMarkProperties); - assertEquals("read: MarkProperties.latDeg is different", MARK_PROPERTIES_LATDEG, foundMarkProperties.getLatDeg()); - assertEquals("read: MarkProperties.lonDeg is different", MARK_PROPERTIES_LONDEG, foundMarkProperties.getLonDeg()); + assertEquals(MARK_PROPERTIES_LATDEG, foundMarkProperties.getLatDeg(), "read: MarkProperties.latDeg is different"); + assertEquals(MARK_PROPERTIES_LONDEG, foundMarkProperties.getLonDeg(), "read: MarkProperties.lonDeg is different"); } @Test @@ -93,7 +93,7 @@ public class MarkPropertiesTest extends AbstractSeleniumTest { } } - @Ignore + @Disabled public void createAndUpdateMarkProperties() { final ApiContext ctx = createAdminApiContext(getContextRoot(), SHARED_SERVER_CONTEXT); MarkProperties createdMarkProperties = markPropertiesApi.createMarkProperties(ctx, MARK_PROPERTIES_NAME, @@ -102,20 +102,20 @@ public class MarkPropertiesTest extends AbstractSeleniumTest { final UUID deviceUuid = randomUUID(); MarkProperties updatedMarkProperties = markPropertiesApi.updateMarkPropertiesPositioning(ctx, createdMarkProperties.getId(), deviceUuid, 1.0, 2.0); - assertTrue("read: MarkProperties.latDeg is different", 1.0 == updatedMarkProperties.getLatDeg().doubleValue()); - assertTrue("read: MarkProperties.lonDeg is different", 2.0 == updatedMarkProperties.getLonDeg().doubleValue()); + assertTrue(1.0 == updatedMarkProperties.getLatDeg().doubleValue(), "read: MarkProperties.latDeg is different"); + assertTrue(2.0 == updatedMarkProperties.getLonDeg().doubleValue(), "read: MarkProperties.lonDeg is different"); } private void assertDefaultValues(MarkProperties markProperties) { - assertNotNull("read: MarkProperties.id is missing", markProperties.getId()); - assertEquals("read: MarkProperties.name is different", MARK_PROPERTIES_NAME, markProperties.getName()); - assertEquals("read: MarkProperties.shortName is different", MARK_PROPERTIES_SHORTNAME, - markProperties.getShortName()); - assertEquals("read: MarkProperties.color is different", MARK_PROPERTIES_COLOR, markProperties.getColor()); - assertEquals("read: MarkProperties.shape is different", MARK_PROPERTIES_SHAPE, markProperties.getShape()); - assertEquals("read: MarkProperties.pattern is different", MARK_PROPERTIES_PATTERN, markProperties.getPattern()); - assertEquals("read: MarkProperties.type is different", MARK_PROPERTIES_TYPE, - markProperties.getMarkType().name()); + assertNotNull(markProperties.getId(), "read: MarkProperties.id is missing"); + assertEquals(MARK_PROPERTIES_NAME, markProperties.getName(), "read: MarkProperties.name is different"); + assertEquals(MARK_PROPERTIES_SHORTNAME, markProperties.getShortName(), + "read: MarkProperties.shortName is different"); + assertEquals(MARK_PROPERTIES_COLOR, markProperties.getColor(), "read: MarkProperties.color is different"); + assertEquals(MARK_PROPERTIES_SHAPE, markProperties.getShape(), "read: MarkProperties.shape is different"); + assertEquals(MARK_PROPERTIES_PATTERN, markProperties.getPattern(), "read: MarkProperties.pattern is different"); + assertEquals(MARK_PROPERTIES_TYPE, markProperties.getMarkType().name(), + "read: MarkProperties.type is different"); } @Test(expected = HttpException.NotFound.class) @@ -124,8 +124,8 @@ public class MarkPropertiesTest extends AbstractSeleniumTest { 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("create: no MarkProperties returnded", createdMarkProperties); - assertNotNull("create: MarkProperties.id is missing", createdMarkProperties.getId()); + assertNotNull(createdMarkProperties, "create: no MarkProperties returnded"); + assertNotNull(createdMarkProperties.getId(), "create: MarkProperties.id is missing"); markPropertiesApi.deleteMarkProperties(ctx, createdMarkProperties.getId()); markPropertiesApi.getMarkProperties(ctx, createdMarkProperties.getId()); 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 f6d772b9257..3c7809801cd 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 @@ -2,12 +2,12 @@ package com.sap.sailing.selenium.api.test; import static com.sap.sailing.selenium.api.core.ApiContext.SHARED_SERVER_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.coursetemplate.MarkRole; @@ -18,7 +18,7 @@ public class MarkRoleTest extends AbstractSeleniumTest { private final MarkRoleApi markRoleApi = new MarkRoleApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } 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 2202f3a881a..38e104d4b66 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 @@ -2,13 +2,13 @@ package com.sap.sailing.selenium.api.test; import static com.sap.sailing.selenium.api.core.ApiContext.SHARED_SERVER_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.coursetemplate.MarkTemplate; @@ -26,7 +26,7 @@ public class MarkTemplateTest extends AbstractSeleniumTest { private final MarkTemplateApi markTemplateApi = new MarkTemplateApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } @@ -36,18 +36,18 @@ public class MarkTemplateTest extends AbstractSeleniumTest { final ApiContext ctx = createAdminApiContext(getContextRoot(), SHARED_SERVER_CONTEXT); MarkTemplate markTemplate = markTemplateApi.createMarkTemplate(ctx, MARK_TEMPLATE_NAME, MARK_TEMPLATE_SHORTNAME, MARK_TEMPLATE_COLOR, MARK_TEMPLATE_SHAPE, MARK_TEMPLATE_PATTERN, MARK_TEMPLATE_TYPE); - assertNotNull("read: no MarkTemplate returnded", markTemplate); + assertNotNull(markTemplate, "read: no MarkTemplate returnded"); assertDefaultValues(markTemplate); } private void assertDefaultValues(MarkTemplate markTemplate) { - assertNotNull("read: MarkTemplate.id is missing", markTemplate.getId()); - assertEquals("read: MarkTemplate.name is different", MARK_TEMPLATE_NAME, markTemplate.getName()); - assertEquals("read: MarkTemplate.shortName is different", MARK_TEMPLATE_SHORTNAME, markTemplate.getShortName()); - assertEquals("read: MarkTemplate.color is different", MARK_TEMPLATE_COLOR, markTemplate.getColor()); - assertEquals("read: MarkTemplate.shape is different", MARK_TEMPLATE_SHAPE, markTemplate.getShape()); - assertEquals("read: MarkTemplate.pattern is different", MARK_TEMPLATE_PATTERN, markTemplate.getPattern()); - assertEquals("read: MarkTemplate.type is different", MARK_TEMPLATE_TYPE, markTemplate.getMarkType().name()); + assertNotNull(markTemplate.getId(), "read: MarkTemplate.id is missing"); + assertEquals(MARK_TEMPLATE_NAME, markTemplate.getName(), "read: MarkTemplate.name is different"); + assertEquals(MARK_TEMPLATE_SHORTNAME, markTemplate.getShortName(), "read: MarkTemplate.shortName is different"); + assertEquals(MARK_TEMPLATE_COLOR, markTemplate.getColor(), "read: MarkTemplate.color is different"); + assertEquals(MARK_TEMPLATE_SHAPE, markTemplate.getShape(), "read: MarkTemplate.shape is different"); + assertEquals(MARK_TEMPLATE_PATTERN, markTemplate.getPattern(), "read: MarkTemplate.pattern is different"); + assertEquals(MARK_TEMPLATE_TYPE, markTemplate.getMarkType().name(), "read: MarkTemplate.type is different"); } @Test @@ -60,7 +60,7 @@ public class MarkTemplateTest extends AbstractSeleniumTest { assertDefaultValues(foundMarkTemplate); } - @Ignore + @Disabled public void createSeveralMarkTemplateAndGetAllTest() { final ApiContext ctx = createAdminApiContext(getContextRoot(), SHARED_SERVER_CONTEXT); MarkTemplate markTemplate1 = markTemplateApi.createMarkTemplate(ctx, MARK_TEMPLATE_NAME, 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 abc5fd32110..22e164e83d9 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 @@ -10,13 +10,13 @@ import static com.sap.sailing.selenium.api.core.GpsFixMoving.createFix; import static com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage.goToPage; import static java.lang.System.currentTimeMillis; import static java.util.UUID.randomUUID; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.event.EventApi; @@ -49,7 +49,7 @@ public class OpenRegattaTest extends AbstractSeleniumTest { private static final String EVENT_NAME = "Duckburg 2019 Everybody's Regatta"; private static final String BOAT_CLASS = "49er"; - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); @@ -72,18 +72,18 @@ public class OpenRegattaTest extends AbstractSeleniumTest { final RaceColumn race = regattaApi.addRaceColumn(ownerCtx, EVENT_NAME, null, 1)[0]; final Competitor competitorOwner = regattaApi.createAndAddCompetitorWithSecret(ownerCtx, EVENT_NAME, BOAT_CLASS, /* email */ null, "Competitor Owner", "USA", registrationLinkSecret, deviceUuidCompetitor1); - assertNotNull("Competitor for Owner should not be null!", competitorOwner); + assertNotNull(competitorOwner, "Competitor for Owner should not be null!"); final Competitor competitorSailor = regattaApi.createAndAddCompetitorWithSecret(sailorCtx, EVENT_NAME, BOAT_CLASS, /* email */ null, "Competitor Sailor", "USA", registrationLinkSecret, deviceUuidCompetitor2); - assertNotNull("Competitor for Sailor should not be null!", competitorSailor); - assertEquals("Regatta should contain 2 competitors (seen by regatta owner)", 2, - regattaApi.getCompetitors(ownerCtx, EVENT_NAME).length); + assertNotNull(competitorSailor, "Competitor for Sailor should not be null!"); + assertEquals(2, regattaApi.getCompetitors(ownerCtx, EVENT_NAME).length, + "Regatta should contain 2 competitors (seen by regatta owner)"); // see also bug 5442 / bug 5167: anonymous users registering a competitor with a secret will "donate" their competitor to the organizer: - assertEquals("Regatta should contain 2 competitor (seen by anonymous)", 2, - regattaApi.getCompetitors(sailorCtx, EVENT_NAME).length); - assertEquals("Regatta should contain 2 competitors (seen by admin)", 2, - regattaApi.getCompetitors(adminCtx, EVENT_NAME).length); + assertEquals(2, regattaApi.getCompetitors(sailorCtx, EVENT_NAME).length, + "Regatta should contain 2 competitor (seen by anonymous)"); + assertEquals(2, regattaApi.getCompetitors(adminCtx, EVENT_NAME).length, + "Regatta should contain 2 competitors (seen by admin)"); leaderboardApi.startRaceLogTracking(ownerCtx, EVENT_NAME, race.getRaceName(), "Default"); leaderboardApi.setTrackingTimes(ownerCtx, EVENT_NAME, race.getRaceName(), "Default", currentTimeMillis(), currentTimeMillis() + 600_000L); 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 37abdce22b9..12201c6e60e 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 @@ -1,15 +1,15 @@ package com.sap.sailing.selenium.api.test; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.HashMap; import java.util.Map; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.event.PreferencesApi; @@ -17,7 +17,7 @@ import com.sap.sailing.selenium.test.AbstractSeleniumTest; public class PreferencesApiTest extends AbstractSeleniumTest { - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } @@ -34,8 +34,8 @@ public class PreferencesApiTest extends AbstractSeleniumTest { preferencesApi.createPreference(ctx, "pref1", prefObjectAttr); JSONObject foundPreference = preferencesApi.getPreference(ctx, "pref1"); - assertEquals("restored preference is different", "value1", foundPreference.get("key1")); - assertEquals("restored preference is different", "value2", foundPreference.get("key2")); + assertEquals("value1", foundPreference.get("key1"), "restored preference is different"); + assertEquals("value2", foundPreference.get("key2"), "restored preference is different"); } @Test @@ -51,7 +51,7 @@ public class PreferencesApiTest extends AbstractSeleniumTest { preferencesApi.deletePreference(ctx, "pref2"); JSONObject foundPreference = preferencesApi.getPreference(ctx, "pref2"); - assertNull("should not find a deleted preference", foundPreference); + assertNull(foundPreference, "should not find a deleted preference"); } } 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 6383c5d41a4..65ca9832c88 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 @@ -7,12 +7,12 @@ 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.api.core.GpsFixMoving.createFix; import static com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage.goToPage; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import java.util.Map; @@ -22,9 +22,9 @@ import java.util.stream.Collectors; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.api.core.ApiContext; @@ -63,7 +63,7 @@ public class RegattaApiTest extends AbstractSeleniumTest { private final UserGroupApi usergroupApi = new UserGroupApi(); private final GpsFixApi gpsFixApi = new GpsFixApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); super.setUp(); @@ -78,21 +78,21 @@ public class RegattaApiTest extends AbstractSeleniumTest { JSONObject serie = (JSONObject) series.get(0); JSONArray fleets = (JSONArray) serie.get("fleets"); JSONObject trackedRaces = (JSONObject) serie.get("trackedRaces"); - assertEquals("read: regatta.name is different", EVENT_NAME, regatta.getName()); - assertNull("read: regatta.startDate should be null", regatta.getStartDate()); - assertNull("read: regatta.endDate should be null", regatta.getEndDate()); - assertEquals("read: regatta.scoringSystem is different", "LOW_POINT", regatta.getScoringSystem()); - assertEquals("read: regatta.boeatclass is different", BOAT_CLASS, regatta.getBoatClass()); - assertFalse("read: regatta.courseAreaId is missing", regatta.getCourseAreaId().isEmpty()); - assertEquals("read: regatta.canBoatsOfCompetitorsChangePerRace should be false", false, - regatta.canBoatsOfCompetitorsChangePerRace()); - assertEquals("read: regatta.competitorRegistrationType is different", CLOSED, - regatta.getCompetitorRegistrationType()); + assertEquals(EVENT_NAME, regatta.getName(), "read: regatta.name is different"); + assertNull(regatta.getStartDate(), "read: regatta.startDate should be null"); + assertNull(regatta.getEndDate(), "read: regatta.endDate should be null"); + assertEquals("LOW_POINT", regatta.getScoringSystem(), "read: regatta.scoringSystem is different"); + assertEquals(BOAT_CLASS, regatta.getBoatClass(), "read: regatta.boeatclass is different"); + assertFalse(regatta.getCourseAreaId().isEmpty(), "read: regatta.courseAreaId is missing"); + assertEquals(false, regatta.canBoatsOfCompetitorsChangePerRace(), + "read: regatta.canBoatsOfCompetitorsChangePerRace should be false"); + assertEquals(CLOSED, regatta.getCompetitorRegistrationType(), + "read: regatta.competitorRegistrationType is different"); assertTrue(regatta.isUseStartTimeInference()); assertFalse(regatta.isControlTrackingFromStartAndFinishTimes()); - assertEquals("read: reagtta.series should have 1 entry", 1, series.size()); - assertEquals("read: reagtta.fleets should have 1 entry", 1, fleets.size()); - assertNotNull("read: reagtta.trackedRaces is missing", trackedRaces); + assertEquals(1, series.size(), "read: reagtta.series should have 1 entry"); + assertEquals(1, fleets.size(), "read: reagtta.fleets should have 1 entry"); + assertNotNull(trackedRaces, "read: reagtta.trackedRaces is missing"); } @Test @@ -120,13 +120,13 @@ public class RegattaApiTest extends AbstractSeleniumTest { eventApi.createEvent(ctx, EVENT_NAME, BOAT_CLASS, CLOSED, "default"); RegattaRaces regattaRaces = regattaApi.getRegattaRaces(ctx, EVENT_NAME); - assertEquals("read: regatta is different", EVENT_NAME, regattaRaces.getRegattaName()); + assertEquals(EVENT_NAME, regattaRaces.getRegattaName(), "read: regatta is different"); //assertEquals("read: reagtta.series should have 0 entries", 0, regattaRaces.getRaces().length); RaceColumn[] raceColumns = regattaApi.addRaceColumn(ctx, EVENT_NAME, "R", 1); leaderboardApi.startRaceLogTracking(ctx, EVENT_NAME, raceColumns[0].getRaceName(), "Default"); regattaRaces = regattaApi.getRegattaRaces(ctx, EVENT_NAME, r -> r.getRaces().length > 0); - assertEquals("read: reagtta.series should have 1 entries", 1, regattaRaces.getRaces().length); + assertEquals(1, regattaRaces.getRaces().length, "read: reagtta.series should have 1 entries"); } @Test @@ -138,15 +138,15 @@ public class RegattaApiTest extends AbstractSeleniumTest { eventApi.createEvent(ctx, EVENT_NAME, BOAT_CLASS, CLOSED, "default"); Competitor competitor = regattaApi.createAndAddCompetitor(ctx, EVENT_NAME, BOAT_CLASS, "test@de", competitorName, competitorNationality); - assertNotNull("read: competitor.id is missing", competitor.getId()); - assertEquals("read: competitor.name is different", competitorName, competitor.getName()); - assertEquals("read: competitor.shortName is different", competitorName, competitor.getShortName()); - assertEquals("read: competitor.nationality is different", competitorNationality, competitor.getNationality()); - assertNotNull("read: competitor.team should not be emtpy", competitor.getTeam()); - assertNotNull("read: competitor.boat should not be empty", competitor.getBoat()); - assertNotNull("read: competitor.boat.boatClass should not be empty", competitor.getBoat().getBoatClass()); - assertEquals("read: competitor.boat.boatClass.name is differnet", BOAT_CLASS, - competitor.getBoat().getBoatClass().getName()); + assertNotNull(competitor.getId(), "read: competitor.id is missing"); + assertEquals(competitorName, competitor.getName(), "read: competitor.name is different"); + assertEquals(competitorName, competitor.getShortName(), "read: competitor.shortName is different"); + assertEquals(competitorNationality, competitor.getNationality(), "read: competitor.nationality is different"); + assertNotNull(competitor.getTeam(), "read: competitor.team should not be emtpy"); + assertNotNull(competitor.getBoat(), "read: competitor.boat should not be empty"); + assertNotNull(competitor.getBoat().getBoatClass(), "read: competitor.boat.boatClass should not be empty"); + assertEquals(BOAT_CLASS, competitor.getBoat().getBoatClass().getName(), + "read: competitor.boat.boatClass.name is differnet"); } @Test @@ -159,17 +159,17 @@ public class RegattaApiTest extends AbstractSeleniumTest { eventApi.createEvent(ctx, EVENT_NAME, BOAT_CLASS, CLOSED, "default"); final Competitor competitor1 = regattaApi.createAndAddCompetitor(ctx, EVENT_NAME, BOAT_CLASS, "test@de", competitor1Name, competitor1Nationality); - assertNotNull("Competitor1 should not be null", competitor1); + assertNotNull(competitor1, "Competitor1 should not be null"); final Competitor competitor2 = regattaApi.createAndAddCompetitor(ctx, EVENT_NAME, BOAT_CLASS, "test@de", competitor2Name, competitor2Nationality); - assertNotNull("Competitor2 should not be null", competitor2); + assertNotNull(competitor2, "Competitor2 should not be null"); final Competitor[] competitors = regattaApi.getCompetitors(ctx, EVENT_NAME); - assertNotNull("read: list of competitors should not be null", competitors); - assertNotEquals("read: list of competitors should not be empty", 0, competitors.length); - assertEquals("read: list of competitors should contains 2 comeptitors", 2, competitors.length); + assertNotNull(competitors, "read: list of competitors should not be null"); + assertNotEquals(0, competitors.length, "read: list of competitors should not be empty"); + assertEquals(2, competitors.length, "read: list of competitors should contains 2 comeptitors"); for (Competitor competitor : competitors) { - assertTrue("competitor name " + competitor.getName() + " is wrong", - competitor1Name.equals(competitor.getName()) || competitor2Name.equals(competitor.getName())); + assertTrue(competitor1Name.equals(competitor.getName()) || competitor2Name.equals(competitor.getName()), + "competitor name " + competitor.getName() + " is wrong"); } } @@ -179,10 +179,10 @@ public class RegattaApiTest extends AbstractSeleniumTest { eventApi.createEvent(ctx, EVENT_NAME, BOAT_CLASS, CLOSED, "default"); RaceColumn[] result = regattaApi.addRaceColumn(ctx, EVENT_NAME, "T", 5); - assertEquals("read: racecolumn.seriesname is different", "Default", result[0].getSeriesName()); - assertEquals("read: racecolumn.racename is different", "T1", result[0].getRaceName()); - assertEquals("read: racecolumn.seriesname is different", "Default", result[4].getSeriesName()); - assertEquals("read: racecolumn.racename is different", "T5", result[4].getRaceName()); + assertEquals("Default", result[0].getSeriesName(), "read: racecolumn.seriesname is different"); + assertEquals("T1", result[0].getRaceName(), "read: racecolumn.racename is different"); + assertEquals("Default", result[4].getSeriesName(), "read: racecolumn.seriesname is different"); + assertEquals("T5", result[4].getRaceName(), "read: racecolumn.racename is different"); } @Test @@ -246,9 +246,9 @@ public class RegattaApiTest extends AbstractSeleniumTest { try { regattaApi.addCompetitor(userWithCompetitorCtx, OTHER_EVENT_NAME, competitor.getId(), Optional.of(eventToRegisterExistingCompetitor.getSecret() + "bad")); - Assert.fail("Expected error because of bad secret."); + Assertions.fail("Expected error because of bad secret."); } catch (RuntimeException e) { - Assert.assertTrue("Exepcted HTTP 401 - Unauthorized", e.getMessage().contains("rc=401")); + Assertions.assertTrue(e.getMessage().contains("rc=401"), "Exepcted HTTP 401 - Unauthorized"); } Competitor[] competitors = regattaApi.getCompetitors(userOwningEventCtx, OTHER_EVENT_NAME); 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 7124f4906fe..8f01435a643 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 @@ -2,17 +2,17 @@ package com.sap.sailing.selenium.api.test; import static com.sap.sailing.selenium.api.core.ApiContext.SECURITY_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.ArrayList; import java.util.Collection; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.event.RoleApi; @@ -24,7 +24,7 @@ public class RoleApiTest extends AbstractSeleniumTest { private final RoleApi roleApi = new RoleApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } @@ -36,15 +36,15 @@ public class RoleApiTest extends AbstractSeleniumTest { final String testRoleName = "test role 123"; final RoleDefinition roleCreated = roleApi.createRole(adminCtx, testRoleName); - assertEquals("Responded role name of createRole is different!", testRoleName, roleCreated.getName()); - assertNotNull("UUID cannot be null!", roleCreated.getId()); - assertTrue("Permissions should be empty!", Util.isEmpty(roleCreated.getPermissions())); + assertEquals(testRoleName, roleCreated.getName(), "Responded role name of createRole is different!"); + assertNotNull(roleCreated.getId(), "UUID cannot be null!"); + assertTrue(Util.isEmpty(roleCreated.getPermissions()), "Permissions should be empty!"); final RoleDefinition roleGet = roleApi.getRole(adminCtx, roleCreated.getId()); - assertEquals("Responded role name of getRole is different!", roleCreated.getName(), roleGet.getName()); - assertEquals("UUID must be the same!", roleCreated.getId(), roleGet.getId()); - assertEquals("Permissions changed!", roleCreated.getPermissions(), roleGet.getPermissions()); + assertEquals(roleCreated.getName(), roleGet.getName(), "Responded role name of getRole is different!"); + assertEquals(roleCreated.getId(), roleGet.getId(), "UUID must be the same!"); + assertEquals(roleCreated.getPermissions(), roleGet.getPermissions(), "Permissions changed!"); roleApi.deleteRole(adminCtx, roleCreated.getId()); } @@ -56,11 +56,11 @@ public class RoleApiTest extends AbstractSeleniumTest { final String testRoleName = "test role 123"; final RoleDefinition roleCreated = roleApi.createRole(adminCtx, testRoleName); - assertNotNull("UUID cannot be null!", roleCreated.getId()); + assertNotNull(roleCreated.getId(), "UUID cannot be null!"); final RoleDefinition roleGet = roleApi.getRole(adminCtx, roleCreated.getId()); - assertEquals("UUID must be the same!", roleCreated.getId(), roleGet.getId()); + assertEquals(roleCreated.getId(), roleGet.getId(), "UUID must be the same!"); roleApi.deleteRole(adminCtx, roleCreated.getId()); @@ -68,7 +68,7 @@ public class RoleApiTest extends AbstractSeleniumTest { roleApi.getRole(adminCtx, roleCreated.getId()); fail("Expected exception since role should not be parsable!"); } catch (RuntimeException e) { - assertTrue("Unrelated error", e.getMessage().contains("No role with id")); + assertTrue(e.getMessage().contains("No role with id"), "Unrelated error"); } } @@ -79,11 +79,11 @@ public class RoleApiTest extends AbstractSeleniumTest { final String testRoleName = "test role 123"; final RoleDefinition roleCreated = roleApi.createRole(adminCtx, testRoleName); - assertNotNull("UUID cannot be null!", roleCreated.getId()); + assertNotNull(roleCreated.getId(), "UUID cannot be null!"); final RoleDefinition roleGet = roleApi.getRole(adminCtx, roleCreated.getId()); - assertEquals("UUID must be the same!", roleCreated.getId(), roleGet.getId()); + assertEquals(roleCreated.getId(), roleGet.getId(), "UUID must be the same!"); final Collection permissions = new ArrayList<>(); permissions.add("COMPETITOR,EVENT:READ"); @@ -92,17 +92,17 @@ public class RoleApiTest extends AbstractSeleniumTest { final String updatedRoleName = roleCreated.getName() + "_changed"; final String roleUpdate = roleApi.updateRole(adminCtx, roleCreated.getId(), permissions, updatedRoleName); - assertNull("Empty string expected.", roleUpdate); + assertNull(roleUpdate, "Empty string expected."); final RoleDefinition roleGetAfterUpdate = roleApi.getRole(adminCtx, roleCreated.getId()); - assertEquals("Responded role name of getRole is different!", updatedRoleName, roleGetAfterUpdate.getName()); - assertEquals("UUID must be the same!", roleCreated.getId(), roleGetAfterUpdate.getId()); + assertEquals(updatedRoleName, roleGetAfterUpdate.getName(), "Responded role name of getRole is different!"); + assertEquals(roleCreated.getId(), roleGetAfterUpdate.getId(), "UUID must be the same!"); // |A| = |B| ∧ ∀a∈ A: a∈ B --> A and B have the same elements, ignoring order - assertEquals("Permissions changed!", permissions.size(), Util.size(roleGetAfterUpdate.getPermissions())); + assertEquals(permissions.size(), Util.size(roleGetAfterUpdate.getPermissions()), "Permissions changed!"); for (String permission : roleGetAfterUpdate.getPermissions()) { - assertTrue("Permissions missing!", permissions.contains(permission)); + assertTrue(permissions.contains(permission), "Permissions missing!"); } roleApi.deleteRole(adminCtx, roleCreated.getId()); 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 7345ebc2183..8a539bc7c59 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 @@ -2,11 +2,11 @@ package com.sap.sailing.selenium.api.test; import static com.sap.sailing.selenium.api.core.ApiContext.SECURITY_CONTEXT; import static com.sap.sailing.selenium.api.core.ApiContext.createAdminApiContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.io.IOException; import java.net.MalformedURLException; @@ -20,8 +20,8 @@ import java.util.UUID; import org.apache.http.client.ClientProtocolException; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.event.SecurityApi; @@ -48,7 +48,7 @@ public class SecurityApiTest extends AbstractSeleniumTest { private final SecurityApi securityApi = new SecurityApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } @@ -57,18 +57,18 @@ public class SecurityApiTest extends AbstractSeleniumTest { public void testCreateAndGetUser() { final ApiContext adminCtx = createAdminApiContext(getContextRoot(), SECURITY_CONTEXT); final AccessToken createUserResponse = securityApi.createUser(adminCtx, USERNAME, USERNAME_FULL, null, DUMMY_PASSWORD); - assertEquals("Responded username of createUser is different!", USERNAME, createUserResponse.getUsername()); - assertNotNull("Token is missing in reponse!", createUserResponse.getAccessToken()); + assertEquals(USERNAME, createUserResponse.getUsername(), "Responded username of createUser is different!"); + assertNotNull(createUserResponse.getAccessToken(), "Token is missing in reponse!"); User getUserResponse = securityApi.getUser(adminCtx, USERNAME); - assertEquals("Responded username of getUser is different!", USERNAME, getUserResponse.getUsername()); + assertEquals(USERNAME, getUserResponse.getUsername(), "Responded username of getUser is different!"); } @Test public void testSayHello() { final ApiContext adminCtx = createAdminApiContext(getContextRoot(), SECURITY_CONTEXT); final Hello hello = securityApi.sayHello(adminCtx); - assertEquals("Responded principal of hello is different!", "admin", hello.getPrincipal()); - assertEquals("Responded authenticated of hello is different!", true, hello.isAuthenticated()); + assertEquals("admin", hello.getPrincipal(), "Responded principal of hello is different!"); + assertEquals(true, hello.isAuthenticated(), "Responded authenticated of hello is different!"); } @Test 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 bfd1d0df18e..0cf39017e0b 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 @@ -20,9 +20,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.stream.StreamSupport; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.api.core.ApiContext; @@ -48,7 +48,7 @@ public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { private final EventApi eventApi = new EventApi(); private final SecurityApi securityApi = new SecurityApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); } @@ -57,8 +57,8 @@ public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { public void testGetTrackedEventsEmpty() { final ApiContext adminCtx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT); final TrackedEvents trackedEvents = trackedEventsApi.getTrackedEvents(adminCtx, true); - Assert.assertNotNull("Tracked Events element should not be null", trackedEvents); - Assert.assertTrue("Expected empty list of tracked events", Util.isEmpty(trackedEvents.getEvents())); + Assertions.assertNotNull(trackedEvents, "Tracked Events element should not be null"); + Assertions.assertTrue(Util.isEmpty(trackedEvents.getEvents()), "Expected empty list of tracked events"); } @Test @@ -139,9 +139,9 @@ public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { try { future.get(); } catch (InterruptedException e) { - Assert.fail("interrupted exception occurred"); + Assertions.fail("interrupted exception occurred"); } catch (ExecutionException e) { - Assert.fail("execution exception:" + e.getCause()); + Assertions.fail("execution exception:" + e.getCause()); } }); } @@ -208,17 +208,17 @@ public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { int cntEvents = 0; for (final TrackedEvent event : trackedEvents.getEvents()) { cntEvents++; - Assert.assertEquals("Unexpected event base url", eventBaseUrl, event.getEventBaseUrl()); + Assertions.assertEquals(eventBaseUrl, event.getEventBaseUrl(), "Unexpected event base url"); if (eventId.equals(event.getEventId())) { - Assert.assertEquals("Unexpected event ID", eventId, event.getEventId()); - Assert.assertEquals("Unexpected leaderboard name", leaderboardName, event.getLeaderboardName()); - Assert.assertEquals("Unexpected regatta secret", regattaSecret, event.getRegattaSecret()); + Assertions.assertEquals(eventId, event.getEventId(), "Unexpected event ID"); + Assertions.assertEquals(leaderboardName, event.getLeaderboardName(), "Unexpected leaderboard name"); + Assertions.assertEquals(regattaSecret, event.getRegattaSecret(), "Unexpected regatta secret"); } else if (eventId2.equals(event.getEventId())) { - Assert.assertEquals("Unexpected event ID", eventId2, event.getEventId()); - Assert.assertEquals("Unexpected leaderboard name", leaderboardName2, event.getLeaderboardName()); - Assert.assertEquals("Unexpected regatta secret", regattaSecret2, event.getRegattaSecret()); + Assertions.assertEquals(eventId2, event.getEventId(), "Unexpected event ID"); + Assertions.assertEquals(leaderboardName2, event.getLeaderboardName(), "Unexpected leaderboard name"); + Assertions.assertEquals(regattaSecret2, event.getRegattaSecret(), "Unexpected regatta secret"); } else { - Assert.fail("Invalid event id."); + Assertions.fail("Invalid event id."); } int cntElements = 0; @@ -228,15 +228,15 @@ public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { final boolean correctCompetitorId = competitorId.equals(elem.getCompetitorId()); final boolean correctMarkId = markId.equals(elem.getMarkId()); - Assert.assertEquals("Unexpected device ID", deviceId, elem.getDeviceId()); - Assert.assertTrue("More than one or zero items tracked in this element", - correctBoatId ^ correctCompetitorId ^ correctMarkId); + Assertions.assertEquals(deviceId, elem.getDeviceId(), "Unexpected device ID"); + Assertions.assertTrue(correctBoatId ^ correctCompetitorId ^ correctMarkId, + "More than one or zero items tracked in this element"); } - Assert.assertEquals("Invalid numer of elements in this event", eventId.equals(event.getEventId()) ? 2 : 1, - cntElements); + Assertions.assertEquals(eventId.equals(event.getEventId()) ? 2 : 1, cntElements, + "Invalid numer of elements in this event"); } - Assert.assertEquals("Expected 2 events", 2, cntEvents); + Assertions.assertEquals(2, cntEvents, "Expected 2 events"); } @Test @@ -269,10 +269,10 @@ public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { int cntEvents = 0; for (final TrackedEvent event : trackedEvents.getEvents()) { cntEvents++; - Assert.assertEquals("Unexpected event base url", eventBaseUrl, event.getEventBaseUrl()); - Assert.assertEquals("Unexpected event ID", eventId, event.getEventId()); - Assert.assertEquals("Unexpected leaderboard name", leaderboardName, event.getLeaderboardName()); - Assert.assertEquals("Unexpected regatta secret", regattaSecret, event.getRegattaSecret()); + Assertions.assertEquals(eventBaseUrl, event.getEventBaseUrl(), "Unexpected event base url"); + Assertions.assertEquals(eventId, event.getEventId(), "Unexpected event ID"); + Assertions.assertEquals(leaderboardName, event.getLeaderboardName(), "Unexpected leaderboard name"); + Assertions.assertEquals(regattaSecret, event.getRegattaSecret(), "Unexpected regatta secret"); int cntElements = 0; for (final TrackedElement elem : event.getTrackedElements()) { @@ -281,14 +281,14 @@ public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { final boolean correctCompetitorId = competitorId.equals(elem.getCompetitorId()); final boolean correctMarkId = markId.equals(elem.getMarkId()); - Assert.assertEquals("Unexpected device ID", deviceId, elem.getDeviceId()); - Assert.assertTrue("More than one or zero items tracked in this element", - correctBoatId ^ correctCompetitorId ^ correctMarkId); + Assertions.assertEquals(deviceId, elem.getDeviceId(), "Unexpected device ID"); + Assertions.assertTrue(correctBoatId ^ correctCompetitorId ^ correctMarkId, + "More than one or zero items tracked in this element"); } - Assert.assertEquals("Expected 3 event elements", 3, cntElements); + Assertions.assertEquals(3, cntElements, "Expected 3 event elements"); } - Assert.assertEquals("Expected exactly 1 event", 1, cntEvents); + Assertions.assertEquals(1, cntEvents, "Expected exactly 1 event"); } @Test @@ -332,23 +332,23 @@ public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { boolean hasEvents = false; for (final TrackedEvent event : trackedEvents.getEvents()) { hasEvents = true; - Assert.assertEquals("Unexpected event base url", eventBaseUrl, event.getEventBaseUrl()); - Assert.assertEquals("Unexpected event ID", eventId, event.getEventId()); - Assert.assertEquals("Unexpected leaderboard name", leaderboardName, event.getLeaderboardName()); - Assert.assertEquals("Unexpected regatta secret", regattaSecret, event.getRegattaSecret()); + Assertions.assertEquals(eventBaseUrl, event.getEventBaseUrl(), "Unexpected event base url"); + Assertions.assertEquals(eventId, event.getEventId(), "Unexpected event ID"); + Assertions.assertEquals(leaderboardName, event.getLeaderboardName(), "Unexpected leaderboard name"); + Assertions.assertEquals(regattaSecret, event.getRegattaSecret(), "Unexpected regatta secret"); boolean hasElements = false; for (final TrackedElement elem : event.getTrackedElements()) { hasElements = true; - Assert.assertEquals("Unexpected boat ID", boatId, elem.getBoatId()); - Assert.assertEquals("Unexpected competitor ID", competitorId, elem.getCompetitorId()); - Assert.assertEquals("Unexpected device ID", deviceId, elem.getDeviceId()); - Assert.assertEquals("Unexpected mark ID", markId, elem.getMarkId()); + Assertions.assertEquals(boatId, elem.getBoatId(), "Unexpected boat ID"); + Assertions.assertEquals(competitorId, elem.getCompetitorId(), "Unexpected competitor ID"); + Assertions.assertEquals(deviceId, elem.getDeviceId(), "Unexpected device ID"); + Assertions.assertEquals(markId, elem.getMarkId(), "Unexpected mark ID"); } - Assert.assertTrue("Expected at least one element", hasElements); + Assertions.assertTrue(hasElements, "Expected at least one element"); } - Assert.assertTrue("Expected at least one event", hasEvents); + Assertions.assertTrue(hasEvents, "Expected at least one event"); return eventId; } @@ -362,8 +362,8 @@ public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { trackedEventsApi.deleteEventTrackings(adminCtx, eventId, leaderboardName); final TrackedEvents trackedEvents = trackedEventsApi.getTrackedEvents(adminCtx, true); - Assert.assertNotNull("Tracked Events element should not be null", trackedEvents); - Assert.assertTrue("Expected empty list of tracked events", Util.isEmpty(trackedEvents.getEvents())); + Assertions.assertNotNull(trackedEvents, "Tracked Events element should not be null"); + Assertions.assertTrue(Util.isEmpty(trackedEvents.getEvents()), "Expected empty list of tracked events"); } @Test @@ -382,8 +382,8 @@ public class TrackedEventsResourceApiTest extends AbstractSeleniumTest { // check if event is invisible to the other user final TrackedEvents trackedEvents = trackedEventsApi.getTrackedEvents(userCtx, true); - Assert.assertNotNull("Tracked Events element should not be null", trackedEvents); - Assert.assertTrue("Expected empty list of tracked events", Util.isEmpty(trackedEvents.getEvents())); + Assertions.assertNotNull(trackedEvents, "Tracked Events element should not be null"); + Assertions.assertTrue(Util.isEmpty(trackedEvents.getEvents()), "Expected empty list of tracked events"); } } 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 7ee6e914eb6..5f37f523c32 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 @@ -3,14 +3,14 @@ package com.sap.sailing.selenium.api.test; 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.GpsFixMoving.createFix; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.core.DeviceStatus; @@ -25,7 +25,7 @@ public class TrackingDeviceStatusApiTest extends AbstractSeleniumTest { private final GpsFixApi gpsFixApi = new GpsFixApi(); private final TrackingDeviceApi trackingDeviceApi = new TrackingDeviceApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); } 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 e3d8922318d..08318beeb11 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 @@ -5,16 +5,16 @@ 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.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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 static org.junit.jupiter.api.Assertions.fail; import java.util.Arrays; import java.util.concurrent.atomic.LongAdder; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.api.core.ApiContext; @@ -38,7 +38,7 @@ public class UserGroupApiTest extends AbstractSeleniumTest { private final RoleApi roleApi = new RoleApi(); private final SecurityApi securityApi = new SecurityApi(); - @Before + @BeforeEach public void setUp() { clearState(getContextRoot(), /* headless */ true); super.setUp(); @@ -52,25 +52,25 @@ public class UserGroupApiTest extends AbstractSeleniumTest { final String groupName = "test-group-01"; final UserGroup userGroupCreated = userGroupApi.createUserGroup(adminCtx, groupName); - assertEquals("Responded username of createUserGroup is different!", groupName, userGroupCreated.getGroupName()); - assertNotNull("GroupId is missing in reponse!", userGroupCreated.getGroupId()); - assertEquals("Wrong username count in response!", 1, Util.size(userGroupCreated.getUsers())); + assertEquals(groupName, userGroupCreated.getGroupName(), "Responded username of createUserGroup is different!"); + assertNotNull(userGroupCreated.getGroupId(), "GroupId is missing in reponse!"); + assertEquals(1, Util.size(userGroupCreated.getUsers()), "Wrong username count in response!"); // check, if user group was created final UserGroup userGroupGet = userGroupApi.getUserGroup(adminCtx, userGroupCreated.getGroupId()); - assertEquals("Responded user group ids are not the same!", userGroupCreated.getGroupId(), - userGroupGet.getGroupId()); - assertEquals("Responded user group names are not the same!", userGroupCreated.getGroupName(), - userGroupGet.getGroupName()); + assertEquals(userGroupCreated.getGroupId(), userGroupGet.getGroupId(), + "Responded user group ids are not the same!"); + assertEquals(userGroupCreated.getGroupName(), userGroupGet.getGroupName(), + "Responded user group names are not the same!"); assertSameElements(userGroupCreated.getUsers(), userGroupGet.getUsers()); assertSameElements(userGroupCreated.getRoles(), userGroupGet.getRoles()); // check getByName final UserGroup userGroupGetByName = userGroupApi.getUserGroupByName(adminCtx, groupName); - assertEquals("Responded user group ids are not the same!", userGroupCreated.getGroupId(), - userGroupGetByName.getGroupId()); + assertEquals(userGroupCreated.getGroupId(), userGroupGetByName.getGroupId(), + "Responded user group ids are not the same!"); // delete user group userGroupApi.deleteUserGroup(adminCtx, userGroupCreated.getGroupId()); @@ -80,7 +80,7 @@ public class UserGroupApiTest extends AbstractSeleniumTest { userGroupApi.getUserGroup(adminCtx, userGroupCreated.getGroupId()); fail("Expected parsing error since user group should be null"); } catch (RuntimeException e) { - assertTrue("Unrelated exception.", e.getMessage().contains("Usergroup with this id does not exist")); + assertTrue(e.getMessage().contains("Usergroup with this id does not exist"), "Unrelated exception."); } } @@ -101,7 +101,7 @@ public class UserGroupApiTest extends AbstractSeleniumTest { // create user group final UserGroup userGroupCreated = userGroupApi.createUserGroup(adminCtx, "test-group-01"); - assertNotNull("GroupId is missing in reponse!", userGroupCreated.getGroupId()); + assertNotNull(userGroupCreated.getGroupId(), "GroupId is missing in reponse!"); // add new role to group with admin user final RoleDefinition createdRole = roleApi.createRole(adminCtx, "My-Epic-Role"); @@ -115,7 +115,7 @@ public class UserGroupApiTest extends AbstractSeleniumTest { fail("Expected unauthorized exception."); } catch (RuntimeException e) { - assertTrue("Expected unauthorized exception", e.getMessage().contains("failed (rc=401)")); + assertTrue(e.getMessage().contains("failed (rc=401)"), "Expected unauthorized exception"); } } @@ -168,7 +168,7 @@ public class UserGroupApiTest extends AbstractSeleniumTest { // create user group final String groupName = "test-group-01"; final UserGroup userGroupCreated = userGroupApi.createUserGroup(adminCtx, groupName); - assertNotNull("GroupId is missing in reponse!", userGroupCreated.getGroupId()); + assertNotNull(userGroupCreated.getGroupId(), "GroupId is missing in reponse!"); // add test user final SecurityApi securityApi = new SecurityApi(); @@ -185,20 +185,20 @@ public class UserGroupApiTest extends AbstractSeleniumTest { // check, if user was properly added and group was not broken final UserGroup userGroupAfterUserAdd = userGroupApi.getUserGroup(adminCtx, userGroupCreated.getGroupId()); - assertNotNull("GroupId is missing in reponse!", userGroupAfterUserAdd.getGroupId()); - assertEquals("Responded username of createUserGroup is different!", groupName, - userGroupAfterUserAdd.getGroupName()); + assertNotNull(userGroupAfterUserAdd.getGroupId(), "GroupId is missing in reponse!"); + assertEquals(groupName, userGroupAfterUserAdd.getGroupName(), + "Responded username of createUserGroup is different!"); assertSameElements(userGroupCreated.getRoles(), userGroupAfterUserAdd.getRoles()); - assertTrue("Added user is missing!", Util.contains(userGroupAfterUserAdd.getUsers(), username)); + assertTrue(Util.contains(userGroupAfterUserAdd.getUsers(), username), "Added user is missing!"); // remove user from group userGroupApi.removeUserFromGroup(adminCtx, userGroupCreated.getGroupId(), username); // check, if user was properly removed and group is the same as before adding final UserGroup userGroupAfterUserRemove = userGroupApi.getUserGroup(adminCtx, userGroupCreated.getGroupId()); - assertNotNull("GroupId is missing in reponse!", userGroupAfterUserRemove.getGroupId()); - assertEquals("Responded username of createUserGroup is different!", groupName, - userGroupAfterUserRemove.getGroupName()); + assertNotNull(userGroupAfterUserRemove.getGroupId(), "GroupId is missing in reponse!"); + assertEquals(groupName, userGroupAfterUserRemove.getGroupName(), + "Responded username of createUserGroup is different!"); assertSameElements(userGroupCreated.getRoles(), userGroupAfterUserRemove.getRoles()); assertSameElements(userGroupCreated.getUsers(), userGroupAfterUserRemove.getUsers()); } @@ -255,7 +255,7 @@ public class UserGroupApiTest extends AbstractSeleniumTest { for (final String user : privateUserGroupToCheck.getUsers()) { userExistsInGroup = userExistsInGroup || user.equals(userToAdd); } - assertTrue("User does not exist in group", userExistsInGroup); + assertTrue(userExistsInGroup, "User does not exist in group"); // create group by admin and try to add user to it final UserGroup adminUserGroup = userGroupApi.createUserGroup(adminSecurityCtx, "admingroup"); @@ -284,23 +284,23 @@ public class UserGroupApiTest extends AbstractSeleniumTest { // create user group final String groupName = "test-group-01"; final UserGroup userGroupCreated = userGroupApi.createUserGroup(adminCtx, groupName); - assertNotNull("GroupId is missing in reponse!", userGroupCreated.getGroupId()); + assertNotNull(userGroupCreated.getGroupId(), "GroupId is missing in reponse!"); // create test role final RoleApi roleApi = new RoleApi(); final RoleDefinition role = roleApi.createRole(adminCtx, "test-role-01"); - assertNotNull("RoleId is missing in response!", role.getId()); + assertNotNull(role.getId(), "RoleId is missing in response!"); // add role to group userGroupApi.addRoleToGroup(adminCtx, userGroupCreated.getGroupId(), role.getId(), true); // check, if role was added properly and that the group was not broken in the process final UserGroup userGroupAfterRoleAdd = userGroupApi.getUserGroup(adminCtx, userGroupCreated.getGroupId()); - assertNotNull("GroupId is missing in reponse!", userGroupAfterRoleAdd.getGroupId()); - assertEquals("Responded username of createUserGroup is different!", groupName, - userGroupAfterRoleAdd.getGroupName()); + assertNotNull(userGroupAfterRoleAdd.getGroupId(), "GroupId is missing in reponse!"); + assertEquals(groupName, userGroupAfterRoleAdd.getGroupName(), + "Responded username of createUserGroup is different!"); assertSameElements(userGroupCreated.getUsers(), userGroupAfterRoleAdd.getUsers()); - assertTrue("Added user is missing!", Util.contains(userGroupAfterRoleAdd.getRoles(), role)); + assertTrue(Util.contains(userGroupAfterRoleAdd.getRoles(), role), "Added user is missing!"); // remove the role from the group userGroupApi.removeRoleFromGroup(adminCtx, userGroupCreated.getGroupId(), role.getId()); @@ -308,18 +308,18 @@ public class UserGroupApiTest extends AbstractSeleniumTest { // check, if role was properly removed and group is the same as before adding final UserGroup userGroupAfterRoleRemove = userGroupApi.getUserGroup(adminCtx, userGroupCreated.getGroupId()); - assertNotNull("GroupId is missing in reponse!", userGroupAfterRoleRemove.getGroupId()); - assertEquals("Responded username of createUserGroup is different!", groupName, - userGroupAfterRoleRemove.getGroupName()); + assertNotNull(userGroupAfterRoleRemove.getGroupId(), "GroupId is missing in reponse!"); + assertEquals(groupName, userGroupAfterRoleRemove.getGroupName(), + "Responded username of createUserGroup is different!"); assertSameElements(userGroupCreated.getRoles(), userGroupAfterRoleRemove.getRoles()); assertSameElements(userGroupCreated.getUsers(), userGroupAfterRoleRemove.getUsers()); } /** |A| = |B| ∧ ∀a∈ A: a∈ B --> A and B have the same elements, ignoring order. */ private void assertSameElements(Iterable a, Iterable b) { - assertEquals("Element count changed!", Util.size(a), Util.size(b)); + assertEquals(Util.size(a), Util.size(b), "Element count changed!"); for (T elem : b) { - assertTrue("Element is missing!", Util.contains(a, elem)); + assertTrue(Util.contains(a, elem), "Element is missing!"); } } } 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 6d8166d33e8..271c505408a 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 @@ -1,12 +1,12 @@ package com.sap.sailing.selenium.api.test; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.net.URI; import java.net.URL; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.domain.igtimiadapter.IgtimiConnectionFactory; 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 756c70338b9..e4c54f6a9d1 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 @@ -1,10 +1,10 @@ package com.sap.sailing.selenium.api.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.URI; @@ -29,9 +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.Ignore; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.domain.igtimiadapter.BulkFixReceiver; @@ -113,7 +113,7 @@ public class WebSocketTest extends AbstractSeleniumTest { } } - @Ignore("echo.websocket.org is (2021-08-19) down; http://www.websocket.org/index.html says ''Service no longer available''") + @Disabled("echo.websocket.org is (2021-08-19) down; http://www.websocket.org/index.html says ''Service no longer available''") @Test public void simpleWebSocketEchoTest() throws Exception { String destUri = "ws://echo.websocket.org"; // wss currently doesn't seem to work with Jetty 9.0.4 WebSocket implementation @@ -160,7 +160,7 @@ public class WebSocketTest extends AbstractSeleniumTest { } }); assertNotNull(liveDataConnection); - assertTrue("Connection handshake not successful within 5s", liveDataConnection.waitForConnection(5000l)); + assertTrue(liveDataConnection.waitForConnection(5000l), "Connection handshake not successful within 5s"); liveDataConnection.stop(); // this won't stop the actual connection because it's still shared with redundantSecondSharedConnection redundantSecondSharedConnection.stop(); // now this should stop the actual connection LiveDataConnection secondRedundantSecondSharedConnection = conn.getOrCreateLiveConnection(Collections.singleton("GA-EN-AAEJ")); diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java index e16a31a433f..5c48d02a533 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java @@ -1,6 +1,6 @@ package com.sap.sailing.selenium.pages; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.text.MessageFormat; import java.time.Duration; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/connectors/ResultImportUrlsPanelPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/connectors/ResultImportUrlsPanelPO.java index 6eb26c91fe8..2d0945bbc12 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/connectors/ResultImportUrlsPanelPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/connectors/ResultImportUrlsPanelPO.java @@ -1,6 +1,6 @@ package com.sap.sailing.selenium.pages.adminconsole.connectors; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import org.openqa.selenium.StaleElementReferenceException; import org.openqa.selenium.WebDriver; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesBoatsPanelPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesBoatsPanelPO.java index 53e8ee9a04f..c1008fd62aa 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesBoatsPanelPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesBoatsPanelPO.java @@ -1,6 +1,6 @@ package com.sap.sailing.selenium.pages.adminconsole.tracking; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardPage.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardPage.java index 3e900f624d5..8e9f72f2728 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardPage.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardPage.java @@ -1,5 +1,6 @@ package com.sap.sailing.selenium.pages.leaderboard; +import org.junit.jupiter.api.Assertions; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -10,8 +11,6 @@ import com.sap.sailing.selenium.core.FindBy; import com.sap.sailing.selenium.pages.HostPage; import com.sap.sailing.selenium.pages.gwt.CheckBoxPO; -import org.junit.Assert; - /** *

The page object representing the leaderboard.

* @@ -146,7 +145,7 @@ public class LeaderboardPage extends HostPage { } catch(Exception e) {} int leaderboardsCount = findElementsBySeleniumId("LeaderboardCellTable").size(); - Assert.assertEquals(selected ? 2 : 1, leaderboardsCount); + Assertions.assertEquals(selected ? 2 : 1, leaderboardsCount); return selected; } @@ -187,7 +186,7 @@ public class LeaderboardPage extends HostPage { try { element = findElementBySeleniumId("CompetitorChart"); } catch(Exception e) {} - Assert.assertEquals(selected, element != null); + Assertions.assertEquals(selected, element != null); return selected; } 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 d18a83408c9..9a99eb06b2d 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 @@ -18,7 +18,7 @@ import java.util.logging.Logger; import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; -import org.junit.Before; +import org.junit.BeforeEach; import org.junit.Rule; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -207,7 +207,7 @@ public abstract class AbstractSeleniumTest { * This is important because {@link #clearState(String)} will also clear all session state that has been constructed * by {@link #setUpAuthenticatedSession()}. */ - @Before + @BeforeEach public void setUp() { setUpAuthenticatedSession(getWebDriver()); } 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 9c77e99ba04..7620f21f2c4 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 @@ -1,9 +1,9 @@ package com.sap.sailing.selenium.test.adminconsole; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.tracking.TrackedRacesBoatEditDialogPO; @@ -12,7 +12,7 @@ import com.sap.sailing.selenium.test.AbstractSeleniumTest; public class TestBoatCreation extends AbstractSeleniumTest { @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 4af7e4259a1..85add2b11b2 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 @@ -3,11 +3,11 @@ package com.sap.sailing.selenium.test.adminconsole; import static com.sap.sailing.selenium.pages.PageObject.DEFAULT_POLLING_INTERVAL; import static com.sap.sailing.selenium.pages.PageObject.DEFAULT_WAIT_TIMEOUT_SECONDS; import static com.sap.sailing.selenium.pages.PageObject.createFluentWait; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import org.openqa.selenium.support.ui.FluentWait; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; @@ -21,7 +21,7 @@ import com.sap.sailing.selenium.test.AbstractSeleniumTest; public class TestCompetitorCreation extends AbstractSeleniumTest { @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 0ce70f25e5f..84571ed7363 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,7 +1,7 @@ package com.sap.sailing.selenium.test.adminconsole; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.connectors.ResultImportUrlsPanelPO; @@ -13,7 +13,7 @@ public class TestConnectorsResultImportUrls extends AbstractSeleniumTest { private final static String TEST_URL_PROVIDER_LABEL = "FREG HTML Score Importer"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 9baafacb83f..baafa00cfa9 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 @@ -2,11 +2,11 @@ package com.sap.sailing.selenium.test.adminconsole; import static com.sap.sailing.selenium.pages.common.DateHelper.getFutureDate; import static com.sap.sailing.selenium.pages.common.DateHelper.getPastDate; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; @@ -18,7 +18,7 @@ public class TestEventCreationWithPredefinedLeaderboards extends AbstractSeleniu private AdminConsolePage adminConsolePage; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 24b0c7a8f0d..58d26f8a05c 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 @@ -1,11 +1,12 @@ package com.sap.sailing.selenium.test.adminconsole; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.connectors.ExpeditionDeviceConfigurationsPanelPO; @@ -22,7 +23,7 @@ public class TestExpeditionDeviceConfigurationsFilterAndSelectByUrlParameters ex private static final String PARAM_FILTER_AND_SELECT = "filterAndSelect"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 4c7dc31e5d1..c7db263e6b5 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 @@ -1,11 +1,11 @@ package com.sap.sailing.selenium.test.adminconsole; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO; @@ -18,7 +18,7 @@ public class TestLeaderboardConfigSelectionModel extends AbstractSeleniumTest { private static final String LEADERBOARDNAME = "Test"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 fce400607af..4cfe00016d8 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 @@ -1,10 +1,10 @@ package com.sap.sailing.selenium.test.adminconsole; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.FlexibleLeaderboardCreateDialogPO; @@ -19,7 +19,7 @@ import com.sap.sailing.selenium.test.AbstractSeleniumTest; */ public class TestLeaderboardCreation extends AbstractSeleniumTest { @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 3bad5663337..47e0ec67e42 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 @@ -1,12 +1,12 @@ package com.sap.sailing.selenium.test.adminconsole; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO; @@ -24,7 +24,7 @@ public class TestLeaderboardFilterAndSelectByUrlParameters extends AbstractSelen private static final String PARAM_FILTER_AND_SELECT = "filterAndSelect"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 20b5c670353..6ebbfef0558 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 @@ -1,14 +1,14 @@ package com.sap.sailing.selenium.test.adminconsole; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO; @@ -19,7 +19,7 @@ import com.sap.sailing.selenium.test.AbstractSeleniumTest; public class TestLeaderboardFilterInLeaderboardGroupConfig extends AbstractSeleniumTest { @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 f1d7e7081ac..ae4f85be9ef 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 @@ -9,10 +9,10 @@ import javax.xml.bind.DatatypeConverter; import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Assert; import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -92,7 +92,7 @@ public class TestLinkCreation extends AbstractSeleniumTest { private static final String BRANCH_IO_COMPLIANT_LOCALHOST_ALIAS = "branch-io-localhost-alias"; @Override - @Before + @BeforeEach public void setUp() { boolean checkUrlIsWorking; String prodCheckUrl = "https://www.sapsailing.com/gwt/status"; @@ -141,10 +141,10 @@ public class TestLinkCreation extends AbstractSeleniumTest { RegistrationLinkWithQRCodeDialogPO registrationLinkWithQRCode = regattaDetails.configureRegistrationURL(); // check URL String createdInvitationUrl = registrationLinkWithQRCode.getRegistrationLinkUrl(); - Assert.assertTrue(createdInvitationUrl.startsWith(INVITATION_URL_BASE)); - Assert.assertTrue(createdInvitationUrl.contains("secret=" + secret)); - Assert.assertTrue(createdInvitationUrl.contains("event_id=" + selectedEventId)); - Assert.assertTrue(createdInvitationUrl.contains("server=http%3A%2F%2Flocalhost%3A")); + Assertions.assertTrue(createdInvitationUrl.startsWith(INVITATION_URL_BASE)); + Assertions.assertTrue(createdInvitationUrl.contains("secret=" + secret)); + Assertions.assertTrue(createdInvitationUrl.contains("event_id=" + selectedEventId)); + Assertions.assertTrue(createdInvitationUrl.contains("server=http%3A%2F%2Flocalhost%3A")); // "localhost" is not accepted by branch.io, so we need to replace by some artificial server; // that server will not have to be resolved during the test, so it can be a random string final String localNonLoopbackAddress = getNonLoopbackLocalhostAddress(); @@ -160,9 +160,9 @@ public class TestLinkCreation extends AbstractSeleniumTest { By.xpath("//div[contains(text(), '" + EXPECTED_PUPLIC_INVITE_QR_CODE_TITLE + "')]"))); WebElement qrCodeLink = wait.until(ExpectedConditions .presenceOfElementLocated(By.xpath("//a[contains(text(), '" + EXPECTED_QR_LINK_TEXT + "')]"))); - Assert.assertTrue(qrCodeLink.getAttribute("href").startsWith(INVITATION_QR_CODE_BASE)); - Assert.assertTrue(qrCodeLink.getAttribute("href").contains("secret=" + secret)); - Assert.assertTrue(qrCodeLink.getAttribute("href").contains("server=http%3A%2F%2F"+localNonLoopbackAddress+"%3A")); + Assertions.assertTrue(qrCodeLink.getAttribute("href").startsWith(INVITATION_QR_CODE_BASE)); + Assertions.assertTrue(qrCodeLink.getAttribute("href").contains("secret=" + secret)); + Assertions.assertTrue(qrCodeLink.getAttribute("href").contains("server=http%3A%2F%2F"+localNonLoopbackAddress+"%3A")); } /** 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 a4fd3cb34e8..cb4745dc685 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,7 +1,7 @@ package com.sap.sailing.selenium.test.adminconsole; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; @@ -18,7 +18,7 @@ public class TestOpenRegattaCreation extends AbstractSeleniumTest { private RegattaDescriptor regatta; @Override - @Before + @BeforeEach public void setUp() { this.regatta = new RegattaDescriptor(REGATTA, BOAT_CLASS, CompetitorRegistrationType.OPEN_UNMODERATED, REGISTRATION_LINK_SECRET); 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 84e5db072ab..8f4e1a3b2ca 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,11 +1,10 @@ package com.sap.sailing.selenium.test.adminconsole; -import org.junit.Test; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.*; -import org.junit.Before; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.tractrac.TracTracEventManagementPanelPO; @@ -22,7 +21,7 @@ public class TestRaceFilterForTracTracEvents extends AbstractSeleniumTest { "http://event2.tractrac.com/events/event_20120803_BMWCup/jsonservice.php"; //$NON-NLS-1$ @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 1e08a899b51..943a7692684 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 @@ -1,14 +1,14 @@ package com.sap.sailing.selenium.test.adminconsole; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.WebDriverWait; @@ -57,7 +57,7 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest { private List leaderboardRaces; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 2899e7ca3a4..5adddbca446 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 @@ -1,13 +1,13 @@ package com.sap.sailing.selenium.test.adminconsole; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.connectors.SmartphoneTrackingEventManagementPanelPO; @@ -47,7 +47,7 @@ public class TestSmartphoneTrackingEventManagementPanel extends AbstractSelenium private List leaderboardRaces; @Override - @Before + @BeforeEach public void setUp() { this.regatta = new RegattaDescriptor(REGATTA, BOAT_CLASS); this.trackableRaces = new ArrayList<>(); 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 dbb61139d5c..5aebd32f958 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 @@ -3,8 +3,8 @@ package com.sap.sailing.selenium.test.adminconsole; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.regatta.RegattaListCompositePO.RegattaDescriptor; @@ -45,7 +45,7 @@ public class TestStartAndStopTrackingForTracTracEvents extends AbstractSeleniumT // private static final String BMW_CUP_RACE_8 = "BMW Cup Race 8"; @Override - @Before + @BeforeEach public void setUp() { this.trackableRace = new TrackableRaceDescriptor(BMW_CUP_EVENT, String.format(RACE, 1), BMW_CUP_BOAT_CLASS); this.trackedRace = new TrackedRaceDescriptor(BMW_CUP_REGATTA, BMW_CUP_BOAT_CLASS, String.format(RACE, 1)); 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 e879312a604..052aaf86532 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 @@ -1,10 +1,10 @@ package com.sap.sailing.selenium.test.adminconsole.roles; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.roles.RoleDefinitionCreationAndUpdateDialogPO; @@ -16,7 +16,7 @@ public class TestRoleDefinitionCreation extends AbstractSeleniumTest { private static final String TEST_PERMISSION = "USER:READ"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 a07477097bb..37a566fdd03 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 @@ -1,10 +1,10 @@ package com.sap.sailing.selenium.test.adminconsole.usergroupmanagement; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.usergroups.UserGroupCreationDialogPO; @@ -19,7 +19,7 @@ public class TestUserGroupCreation extends AbstractSeleniumTest { private static final String TEST_USER_NAME = ""; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 d82117855c9..1ae17d1afee 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 @@ -1,15 +1,15 @@ package com.sap.sailing.selenium.test.adminconsole.usermanagement; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.Duration; import java.time.ZonedDateTime; import java.util.Date; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.advanced.LocalServerPO; @@ -50,7 +50,7 @@ public class TestNegativeAcls extends AbstractSeleniumTest { private static final String CUSTOM_ROLE = "custom-role"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 598f087e227..54557ad2c44 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 @@ -1,10 +1,10 @@ package com.sap.sailing.selenium.test.adminconsole.usermanagement; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.usermanagement.ChangePasswordDialogPO; @@ -24,7 +24,7 @@ public class TestUserManagement extends AbstractSeleniumTest { private static final String TEST_PERMISSION = "USER:READ"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 03ec20cf1aa..b03327c0a51 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 @@ -1,10 +1,10 @@ package com.sap.sailing.selenium.test.authentication; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.authentication.AuthenticationMenuPO; @@ -13,7 +13,7 @@ import com.sap.sailing.selenium.test.AbstractSeleniumTest; public class TestAuthenticationSignIn extends AbstractSeleniumTest { @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); getWebDriver().manage().deleteCookieNamed("JSESSIONID"); 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 86c9521defc..5476e909a90 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 @@ -1,8 +1,8 @@ package com.sap.sailing.selenium.test.autoplay; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.util.Date; import java.util.List; @@ -10,9 +10,9 @@ import java.util.function.Function; import javax.xml.bind.DatatypeConverter; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.WebDriverWait; @@ -49,7 +49,7 @@ public class TestAutoPlay extends AbstractSeleniumTest { private static final String BMW_CUP_RACE_NAME = "R1"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); @@ -74,7 +74,7 @@ public class TestAutoPlay extends AbstractSeleniumTest { LeaderboardConfigurationPanelPO leaderboard = adminConsole.goToLeaderboardConfiguration(); LeaderboardDetailsPanelPO details = leaderboard.getLeaderboardDetails(BMW_CUP_REGATTA); - Assert.assertTrue(details != null); + Assertions.assertTrue(details != null); details.linkRace(new RaceDescriptor(BMW_CUP_RACE_NAME, "Default", false, false, 0), trackedRace); } @@ -94,8 +94,8 @@ public class TestAutoPlay extends AbstractSeleniumTest { autoPlayConfiguration.select("Sixty Inch Autoplay", BMW_CUP_EVENT, BMW_CUP_REGATTA); String url = autoPlayConfiguration.getConfiguredUrl(); // eventid and server change, better only check arguments - assertTrue("Url does not contain proper type " + url, url.contains("autoplayType=SIXTYINCH")); - assertTrue("Url does not contain proper name " + url, url.contains("name=BMW+Cup+(J80)")); + assertTrue(url.contains("autoplayType=SIXTYINCH"), "Url does not contain proper type " + url); + assertTrue(url.contains("name=BMW+Cup+(J80)"), "Url does not contain proper name " + url); AutoPlayUpcomingView autoplayPage = page.goToAutoPlaySixtyInchUrl(getWebDriver(), url); String nextUpText = autoplayPage.getText(); assertEquals("There are no further races starting soon", nextUpText); @@ -117,8 +117,8 @@ public class TestAutoPlay extends AbstractSeleniumTest { autoPlayConfiguration.select("Classic Autoplay", BMW_CUP_EVENT, BMW_CUP_REGATTA); String url = autoPlayConfiguration.getConfiguredUrl(); // eventid and server change, better only check arguments - assertTrue("Url does not contain proper title " + url, url.contains("lbwh.saph.title=Leaderboard%3A+BMW+Cup+(J80)")); - assertTrue("Url does not contain proper name " + url, url.contains("name=BMW+Cup+(J80)")); + assertTrue(url.contains("lbwh.saph.title=Leaderboard%3A+BMW+Cup+(J80)"), "Url does not contain proper title " + url); + assertTrue(url.contains("name=BMW+Cup+(J80)"), "Url does not contain proper name " + url); AutoPlayLeaderboardView autoplayPage = page.goToAutoPlayClassicUrl(getWebDriver(), url); LeaderboardTablePO leaderBoard = autoplayPage.getLeaderBoardWithData(); final List races = new WebDriverWait(getWebDriver(), 20).until(new Function>() { @@ -141,9 +141,9 @@ public class TestAutoPlay extends AbstractSeleniumTest { } } }); - Assert.assertTrue(races.contains("R1")); - Assert.assertTrue(races.contains("R2")); - Assert.assertTrue(races.contains("R3")); + Assertions.assertTrue(races.contains("R1")); + Assertions.assertTrue(races.contains("R2")); + Assertions.assertTrue(races.contains("R3")); } } 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 dfe8afdfd8f..8fa68071df7 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 @@ -1,9 +1,9 @@ package com.sap.sailing.selenium.test.datamining; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.datamining.DataMiningPage; import com.sap.sailing.selenium.pages.datamining.DataMiningPanelPO; @@ -11,7 +11,7 @@ import com.sap.sailing.selenium.test.AbstractSeleniumTest; public class DataminingEntrypointSmokeTest extends AbstractSeleniumTest { @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 f84680f32fd..c601c691719 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,8 +5,8 @@ import java.util.Date; import javax.xml.bind.DatatypeConverter; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; @@ -37,7 +37,7 @@ public class MediaUploadTest extends AbstractSeleniumTest { private static final String MOV_URL = "https://exmaple.video.com/download/video.mov"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); 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 434615d366c..3555d2823d7 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 @@ -12,8 +12,8 @@ import java.util.List; import javax.xml.bind.DatatypeConverter; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import org.openqa.selenium.WebElement; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; @@ -55,7 +55,7 @@ public class WhitelabelTest extends AbstractSeleniumTest { private static final String SERIES_MEDALS = "Medals"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/integration/state/TestStateVisualizationEvent.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/integration/state/TestStateVisualizationEvent.java index 54b1fc192ff..8b165b8fb7c 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/integration/state/TestStateVisualizationEvent.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/integration/state/TestStateVisualizationEvent.java @@ -6,8 +6,8 @@ import static com.sap.sailing.selenium.pages.common.DateHelper.getPastDate; import java.util.Date; import java.util.function.Predicate; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; @@ -45,7 +45,7 @@ public class TestStateVisualizationEvent extends AbstractSeleniumTest { eventConfigurationPanel.createEmptyEvent(name, null, venue, startDate, endDate, true); String eventUrl = eventConfigurationPanel.getEventEntry(name).getEventURL(); EventPage eventPage = EventPage.goToEventUrl(getWebDriver(), eventUrl); - Assert.assertTrue(expectedLabelType.test(eventPage.getEventHeader().getEventStateLabel())); + Assertions.assertTrue(expectedLabelType.test(eventPage.getEventHeader().getEventStateLabel())); } } 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 80a33e9f096..2f355b3c52f 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,10 +7,9 @@ import static com.sap.sailing.selenium.pages.common.DateHelper.getPastTime; import java.util.Date; import java.util.function.Predicate; -import org.junit.Assert; - -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; @@ -26,7 +25,7 @@ import com.sap.sailing.selenium.test.AbstractSeleniumTest; public class TestStateVisualizationRegatta extends AbstractSeleniumTest { @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); @@ -86,7 +85,7 @@ public class TestStateVisualizationRegatta extends AbstractSeleniumTest { private void assertStateFlagOfRegatta(String regattaName, Predicate expectedLabelType) { RegattaEventPage regattaEventPage = RegattaEventPage.goToRegattaEventUrl(getWebDriver(), eventUrl); RegattaListItemPO regattaListItem = regattaEventPage.getRegattaListItem(regattaName); - Assert.assertTrue(expectedLabelType.test(regattaListItem.getRegattaHeader().getRegattaStateLabel())); + Assertions.assertTrue(expectedLabelType.test(regattaListItem.getRegattaHeader().getRegattaStateLabel())); } } } 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 7778db8817e..2cc16288c32 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,16 +1,16 @@ package com.sap.sailing.selenium.test.leaderboard; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +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 static org.junit.Assert.assertTrue; import java.util.List; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO; @@ -47,7 +47,7 @@ public class TestColumnsInLeaderboard extends AbstractSeleniumTest { private RaceDescriptor raceColumn; @Override - @Before + @BeforeEach public void setUp() { this.regatta = new RegattaDescriptor(REGATTA, BOAT_CLASS); this.trackableRace = new TrackableRaceDescriptor(EVENT, RACE, BOAT_CLASS); @@ -58,7 +58,7 @@ public class TestColumnsInLeaderboard extends AbstractSeleniumTest { configureLeaderboard(); } - @Ignore + @Disabled @Test public void testCorrectDisplayOfAllColumns() { LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, true); 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 9e0ac0f67b1..6ddf7078a9e 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 @@ -7,9 +7,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; @@ -49,7 +49,7 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest { private List leaderboardRaces; @Override - @Before + @BeforeEach public void setUp() { this.regatta = new RegattaDescriptor(REGATTA, BOAT_CLASS); this.trackableRaces = new ArrayList<>(); @@ -142,7 +142,7 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest { }); } - @Ignore("This test belongs to bug 1892 and currently fails. It is currently enabled on branch bug1892.") + @Disabled("This test belongs to bug 1892 and currently fails. It is currently enabled on branch bug1892.") @Test public void testDynamicRenamingOfRace() { this.environment.getWindowManager().withExtraWindow((adminConsoleWindow, leaderboardWindow) -> { 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 ce680c79337..582b717d97b 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,15 +1,15 @@ package com.sap.sailing.selenium.test.leaderboard; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; @@ -47,7 +47,7 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest { private RaceDescriptor raceColumn; @Override - @Before + @BeforeEach public void setUp() { this.regatta = new RegattaDescriptor(REGATTA, BOAT_CLASS); this.trackableRace = new TrackableRaceDescriptor(EVENT, RACE, BOAT_CLASS); 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 49ceaa5c64e..84e61937b55 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 @@ -1,10 +1,10 @@ package com.sap.sailing.selenium.test.leaderboardedit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO; @@ -36,7 +36,7 @@ public class TestLeaderboardEditing extends AbstractSeleniumTest { private static final RaceDescriptor RACE_COLUMN = new RaceDescriptor("R1", "Default", false, false, 0.0); @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); @@ -49,7 +49,7 @@ public class TestLeaderboardEditing extends AbstractSeleniumTest { LeaderboardTable table = page.getLeaderboardTable(); assertNotNull(table); Iterable rows = table.getRows(); - assertEquals("Expected 6 rows for the six competitors but found only "+Util.size(rows), 6, Util.size(rows)); + assertEquals(6, Util.size(rows), "Expected 6 rows for the six competitors but found only "+Util.size(rows)); } private void createNewLeaderboardLoadRaceAndLink(String leaderboardName) { 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 c53d90e7a00..533302667d5 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,9 @@ import java.util.Date; import javax.xml.bind.DatatypeConverter; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; @@ -20,8 +21,6 @@ import com.sap.sailing.selenium.pages.leaderboard.PairinfListCreationDialogPO; import com.sap.sailing.selenium.pages.leaderboard.PairingListCreationSetupDialogPO; import com.sap.sailing.selenium.test.AbstractSeleniumTest; -import org.junit.Assert; - public class PairinglistTest extends AbstractSeleniumTest { private static final String EVENT = "TestEvent"; private static final String EVENT_DESC = "TestEvent"; @@ -38,7 +37,7 @@ public class PairinglistTest extends AbstractSeleniumTest { private static final String SERIES_DEFAULT = "Default"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); @@ -75,19 +74,19 @@ public class PairinglistTest extends AbstractSeleniumTest { LeaderboardEntryPO leaderboardEntryPO = leaderboardConfigurationPanelPO.getLeaderboardTable() .getEntry(REGATTA_49ER_WITH_SUFFIX); PairingListCreationSetupDialogPO dialog = leaderboardEntryPO.getLeaderboardPairingListCreationSetupDialog(); - Assert.assertTrue(!dialog.isOkButtonEnabled()); + Assertions.assertTrue(!dialog.isOkButtonEnabled()); dialog.setCompetitorsCount("1"); - Assert.assertTrue(dialog.isOkButtonEnabled()); + Assertions.assertTrue(dialog.isOkButtonEnabled()); dialog.setCompetitorsCount("-1"); - Assert.assertTrue(!dialog.isOkButtonEnabled()); + Assertions.assertTrue(!dialog.isOkButtonEnabled()); dialog.setCompetitorsCount("17"); - Assert.assertTrue(dialog.isOkButtonEnabled()); + Assertions.assertTrue(dialog.isOkButtonEnabled()); dialog.setCompetitorsCount("18"); - Assert.assertTrue(dialog.isOkButtonEnabled()); + Assertions.assertTrue(dialog.isOkButtonEnabled()); PairinfListCreationDialogPO dialog2 = dialog.pressOk(); - Assert.assertEquals("12", dialog2.getValueOfFlightsLabel()); - Assert.assertEquals("1", dialog2.getValueOfGroupsLabel()); - Assert.assertEquals("18", dialog2.getValueOfCompetitorsLabel()); + Assertions.assertEquals("12", dialog2.getValueOfFlightsLabel()); + Assertions.assertEquals("1", dialog2.getValueOfGroupsLabel()); + Assertions.assertEquals("18", dialog2.getValueOfCompetitorsLabel()); dialog2.pressClose(); } { @@ -99,24 +98,24 @@ public class PairinglistTest extends AbstractSeleniumTest { .getEntry(REGATTA_49ER_WITH_SUFFIX); PairingListCreationSetupDialogPO dialog = leaderboardEntryPO.getLeaderboardPairingListCreationSetupDialog(); dialog.setCompetitorsCount("18"); - Assert.assertTrue(!dialog.isFlightMultiplierBoxEnabled()); + Assertions.assertTrue(!dialog.isFlightMultiplierBoxEnabled()); for (int i = 0; i < 1000; i++) { dialog.clickFlightMultiplierCheckBox(); if (dialog.getValueOfFlightMultiplierCheckBox()) { break; } } - Assert.assertTrue(dialog.isFlightMultiplierBoxEnabled()); + Assertions.assertTrue(dialog.isFlightMultiplierBoxEnabled()); Thread.sleep(5000); dialog.setFlightMultiplier("0"); - Assert.assertTrue(!dialog.isOkButtonEnabled()); + Assertions.assertTrue(!dialog.isOkButtonEnabled()); dialog.setFlightMultiplier("2"); - Assert.assertTrue(dialog.isOkButtonEnabled()); + Assertions.assertTrue(dialog.isOkButtonEnabled()); PairinfListCreationDialogPO dialog2 = dialog.pressOk(); - Assert.assertEquals("12", dialog2.getValueOfFlightsLabel()); - Assert.assertEquals("1", dialog2.getValueOfGroupsLabel()); - Assert.assertEquals("18", dialog2.getValueOfCompetitorsLabel()); - Assert.assertEquals("2", dialog2.getValueOfMultiplerLabel()); + Assertions.assertEquals("12", dialog2.getValueOfFlightsLabel()); + Assertions.assertEquals("1", dialog2.getValueOfGroupsLabel()); + Assertions.assertEquals("18", dialog2.getValueOfCompetitorsLabel()); + Assertions.assertEquals("2", dialog2.getValueOfMultiplerLabel()); dialog2.pressClose(); } } 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 67da6b09014..fc3bdfe4527 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,9 +10,9 @@ import java.util.stream.Collectors; import javax.xml.bind.DatatypeConverter; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; @@ -72,7 +72,7 @@ public class SettingsTest extends AbstractSeleniumTest { private static final String URL_PARAMETER_IGNORE_LOCAL_SETTINGS = "ignoreLocalSettings=true"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); @@ -105,14 +105,14 @@ public class SettingsTest extends AbstractSeleniumTest { LeaderboardSettingsPanelPO leaderboardSettingsPanelPO = leaderboardSettingsDialog .getLeaderboardSettingsPanelPO(); DetailCheckboxInfo[] selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails(); - Assert.assertArrayEquals(detailsToSelect, selectedDetails); + Assertions.assertArrayEquals(detailsToSelect, selectedDetails); leaderboardSettingsPanelPO.setRefreshInterval(2); leaderboardSettingsDialog.pressMakeDefault(); leaderboardSettingsDialog.pressCancel(); MapSettingsPO mapSettings = raceboard.openMapSettings(); // Verify initial mode settings mapSettings.waitForWindUpUntil(false); - Assert.assertFalse(mapSettings.isShowOnlySelectedCompetitors()); + Assertions.assertFalse(mapSettings.isShowOnlySelectedCompetitors()); mapSettings.setTransparentHoverlines(true); mapSettings.setWindUp(false); mapSettings.pressMakeDefault(); @@ -131,7 +131,7 @@ public class SettingsTest extends AbstractSeleniumTest { leaderboardSettingsDialog = raceboard.openLeaderboardSettingsDialog(); leaderboardSettingsPanelPO = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO(); selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails(); - Assert.assertArrayEquals(detailsToSelect, selectedDetails); + Assertions.assertArrayEquals(detailsToSelect, selectedDetails); detailsToSelect = new DetailCheckboxInfo[] { // Race details DetailCheckboxInfo.RACE_GAP_TO_LEADER, DetailCheckboxInfo.RACE_DISTANCE, DetailCheckboxInfo.RACE_TIME, @@ -150,9 +150,9 @@ public class SettingsTest extends AbstractSeleniumTest { // verify default mode settings override custom user settings mapSettings.waitForWindUpUntil(true); // verify default mode settings override system defaults - Assert.assertTrue(mapSettings.isShowOnlySelectedCompetitors()); + Assertions.assertTrue(mapSettings.isShowOnlySelectedCompetitors()); // Verify custom user settings are independent for modes - Assert.assertFalse(mapSettings.isTransparentHoverlines()); + Assertions.assertFalse(mapSettings.isTransparentHoverlines()); mapSettings.setWindUp(false); mapSettings.setTransparentHoverlines(false); mapSettings.pressOk(false, false); @@ -162,15 +162,15 @@ public class SettingsTest extends AbstractSeleniumTest { leaderboardSettingsPanelPO = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO(); selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails(); // verify highest precedence of document settings - Assert.assertArrayEquals(detailsToSelect, selectedDetails); + Assertions.assertArrayEquals(detailsToSelect, selectedDetails); // verify that document settings are able to override custom user settings by a system default value - Assert.assertEquals(1, leaderboardSettingsPanelPO.getRefreshInterval()); + Assertions.assertEquals(1, leaderboardSettingsPanelPO.getRefreshInterval()); leaderboardSettingsDialog.pressCancel(); mapSettings = raceboard.openMapSettings(); // Verify that mode settings are overridden by document settings mapSettings.waitForWindUpUntil(false); // Verify custom user settings are independent for modes - Assert.assertFalse(mapSettings.isTransparentHoverlines()); + Assertions.assertFalse(mapSettings.isTransparentHoverlines()); // verify that custom document settings override mode settings of other modes raceboard = RaceBoardPage.goToRaceboardUrl(getWebDriver(), getContextRoot(), BMW_CUP_REGATTA, BMW_CUP_REGATTA, String.format(BMW_RACE, 1), "START_ANALYSIS", false); @@ -188,7 +188,7 @@ public class SettingsTest extends AbstractSeleniumTest { DetailCheckboxInfo.START_TACK, // start analysis mode DetailCheckboxInfo.RANK_GAIN, DetailCheckboxInfo.TACK, DetailCheckboxInfo.JIBE, DetailCheckboxInfo.PENALTY_CIRCLE }; - Assert.assertArrayEquals(detailsToSelect, selectedDetails); + Assertions.assertArrayEquals(detailsToSelect, selectedDetails); leaderboardSettingsDialog.pressCancel(); mapSettings = raceboard.openMapSettings(); mapSettings.waitForWindUpUntil(true); @@ -206,7 +206,7 @@ public class SettingsTest extends AbstractSeleniumTest { MapSettingsPO mapSettings = raceboard.openMapSettings(); // Verify initial settings for mode PLAYER - Assert.assertFalse(mapSettings.isShowWindStreamletOverlay()); + Assertions.assertFalse(mapSettings.isShowWindStreamletOverlay()); mapSettings.setTransparentHoverlines(true); mapSettings.setWindUp(false); @@ -217,7 +217,7 @@ public class SettingsTest extends AbstractSeleniumTest { mapSettings = raceboard.openMapSettings(); // Verify initial settings for mode WINNING_LANES - Assert.assertFalse(mapSettings.isShowWindStreamletOverlay()); + Assertions.assertFalse(mapSettings.isShowWindStreamletOverlay()); raceboard = RaceBoardPage.goToRaceboardUrl(getWebDriver(), getContextRoot(), BMW_CUP_REGATTA, BMW_CUP_REGATTA, String.format(BMW_RACE, 1), "PLAYER", false); @@ -232,7 +232,7 @@ public class SettingsTest extends AbstractSeleniumTest { mapSettings = raceboard.openMapSettings(); // Verify settings for mode WINNING_LANES are unchanged - Assert.assertFalse(mapSettings.isShowWindStreamletOverlay()); + Assertions.assertFalse(mapSettings.isShowWindStreamletOverlay()); } /** @@ -248,7 +248,7 @@ public class SettingsTest extends AbstractSeleniumTest { MapSettingsPO mapSettings = raceboard.openMapSettings(); // Verify initial mode settings mapSettings.waitForWindUpUntil(false); - Assert.assertFalse(mapSettings.isShowOnlySelectedCompetitors()); + Assertions.assertFalse(mapSettings.isShowOnlySelectedCompetitors()); mapSettings.setWindUp(true); mapSettings.setShowOnlySelectedCompetitors(true); mapSettings.pressMakeDefault(); @@ -259,7 +259,7 @@ public class SettingsTest extends AbstractSeleniumTest { mapSettings = raceboard.openMapSettings(); // verify default settings work mapSettings.waitForWindUpUntil(true); - Assert.assertTrue(mapSettings.isShowOnlySelectedCompetitors()); + Assertions.assertTrue(mapSettings.isShowOnlySelectedCompetitors()); } /** @@ -276,7 +276,7 @@ public class SettingsTest extends AbstractSeleniumTest { final TimeSliderPO timeSlider = raceboard.getTimeSlider(); final String sliderKnobTime = timeSlider.getSliderKnobTime(); final String endMarkerTime = timeSlider.getEndMarkerTime(); - Assert.assertTrue(sliderKnobTime.equals(endMarkerTime)); + Assertions.assertTrue(sliderKnobTime.equals(endMarkerTime)); } @Test @@ -290,7 +290,7 @@ public class SettingsTest extends AbstractSeleniumTest { final TimeSliderPO timeSlider = raceboard.getTimeSlider(); final String sliderKnobTime = timeSlider.getSliderKnobTime(); final String finishMarkerTime = timeSlider.getFinishMarkerTime(); - Assert.assertTrue(sliderKnobTime.equals(finishMarkerTime)); + Assertions.assertTrue(sliderKnobTime.equals(finishMarkerTime)); } @Test @@ -308,7 +308,7 @@ public class SettingsTest extends AbstractSeleniumTest { final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("hh:mm"); final String formatedPlayerStartTime = formatter.format(playerStartTime); final String sliderKnobTime = timeSlider.getSliderKnobTime(); - Assert.assertTrue(sliderKnobTime.equals(formatedPlayerStartTime)); + Assertions.assertTrue(sliderKnobTime.equals(formatedPlayerStartTime)); } @Test @@ -326,7 +326,7 @@ public class SettingsTest extends AbstractSeleniumTest { final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("hh:mm"); final String formatedPlayerStartTime = formatter.format(playerStartTime); final String sliderKnobTime = timeSlider.getSliderKnobTime(); - Assert.assertTrue(sliderKnobTime.equals(formatedPlayerStartTime)); + Assertions.assertTrue(sliderKnobTime.equals(formatedPlayerStartTime)); } @@ -341,7 +341,7 @@ public class SettingsTest extends AbstractSeleniumTest { MapSettingsPO mapSettings = raceboard.openMapSettings(); // The following options are false in the system default but activated by the WINNING_LANES mode mapSettings.waitForWindUpUntil(true); - Assert.assertTrue(mapSettings.isShowOnlySelectedCompetitors()); + Assertions.assertTrue(mapSettings.isShowOnlySelectedCompetitors()); mapSettings.setWindUp(false); mapSettings.setShowOnlySelectedCompetitors(false); mapSettings.pressMakeDefault(); @@ -350,7 +350,7 @@ public class SettingsTest extends AbstractSeleniumTest { mapSettings = raceboard.openMapSettings(); // verify mode settings have been overwritten mapSettings.waitForWindUpUntil(false); - Assert.assertFalse(mapSettings.isShowOnlySelectedCompetitors()); + Assertions.assertFalse(mapSettings.isShowOnlySelectedCompetitors()); } private void createEventWithTrackedRace() { @@ -379,7 +379,7 @@ public class SettingsTest extends AbstractSeleniumTest { // status FINISHED when done loading LeaderboardConfigurationPanelPO leaderboard = adminConsole.goToLeaderboardConfiguration(); LeaderboardDetailsPanelPO details = leaderboard.getLeaderboardDetails(BMW_CUP_REGATTA); - Assert.assertTrue(details != null); + Assertions.assertTrue(details != null); details.linkRace(new RaceDescriptor(BMW_CUP_RACE_NAME, "Default", false, false, 0), trackedRace); } @@ -414,11 +414,11 @@ public class SettingsTest extends AbstractSeleniumTest { LeaderboardPage leaderboardPage = urlConfigurationDialog.openLeaderboard(); leaderboardSettingsPanel = leaderboardPage.getLeaderboardSettings().getLeaderboardSettingsPanelPO(); DetailCheckboxInfo[] selectedDetails = leaderboardSettingsPanel.getSelectedDetails(); - Assert.assertArrayEquals(detailsToSelect, selectedDetails); - Assert.assertTrue(leaderboardSettingsPanel.getCheckboxValue("R1CheckBox")); - Assert.assertTrue(!leaderboardSettingsPanel.getCheckboxValue("R2CheckBox")); - Assert.assertTrue(leaderboardSettingsPanel.getCheckboxValue("R3CheckBox")); - Assert.assertEquals(2, leaderboardSettingsPanel.getRefreshInterval()); + Assertions.assertArrayEquals(detailsToSelect, selectedDetails); + Assertions.assertTrue(leaderboardSettingsPanel.getCheckboxValue("R1CheckBox")); + Assertions.assertTrue(!leaderboardSettingsPanel.getCheckboxValue("R2CheckBox")); + Assertions.assertTrue(leaderboardSettingsPanel.getCheckboxValue("R3CheckBox")); + Assertions.assertEquals(2, leaderboardSettingsPanel.getRefreshInterval()); // set different custom leaderboard settings adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration(); @@ -464,11 +464,11 @@ public class SettingsTest extends AbstractSeleniumTest { // open settings dialog of configurated leaderboard and match the set values with forwarded values leaderboardPage = urlConfigurationDialog.openLeaderboard(); leaderboardSettingsPanel = leaderboardPage.getLeaderboardSettings().getLeaderboardSettingsPanelPO(); - Assert.assertTrue(leaderboardSettingsPanel.isNumberOfRacesToDisplaySelected()); - Assert.assertEquals(2, leaderboardSettingsPanel.getNumberOfRacesToDisplaySelected()); - Assert.assertEquals(3, leaderboardSettingsPanel.getRefreshInterval()); + Assertions.assertTrue(leaderboardSettingsPanel.isNumberOfRacesToDisplaySelected()); + Assertions.assertEquals(2, leaderboardSettingsPanel.getNumberOfRacesToDisplaySelected()); + Assertions.assertEquals(3, leaderboardSettingsPanel.getRefreshInterval()); selectedDetails = leaderboardSettingsPanel.getSelectedDetails(); - Assert.assertArrayEquals(detailsToSelect, selectedDetails); + Assertions.assertArrayEquals(detailsToSelect, selectedDetails); } /** @@ -515,14 +515,14 @@ public class SettingsTest extends AbstractSeleniumTest { leaderboardSettingsPanel.selectDetailsAndDeselectOther(detailsToSelect); // check the displaying leaderboard table columns of a tracked race LeaderboardPage leaderboardPage = urlConfigurationDialog.openLeaderboard(); - Assert.assertFalse(leaderboardPage.isCompetitorChartVisible()); + Assertions.assertFalse(leaderboardPage.isCompetitorChartVisible()); LeaderboardTablePO leaderboardTable = leaderboardPage.getLeaderboardTable(); leaderboardTable.expandRace("R1"); List columnHeadersToCheck = Arrays.stream(detailsToSelect).map(detail -> detail.getLabel()) .collect(Collectors.toList()); for (String headerToCheck : columnHeadersToCheck) { - Assert.assertTrue("Column header label \"" + headerToCheck + "\" not found", - leaderboardTable.containsColumnHeader(headerToCheck)); + Assertions.assertTrue(leaderboardTable.containsColumnHeader(headerToCheck), + "Column header label \"" + headerToCheck + "\" not found"); } // test showRaceDetails and showChart configuration options adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); @@ -534,7 +534,7 @@ public class SettingsTest extends AbstractSeleniumTest { leaderboardPageSettings.setShowCharts(true); // open settings dialog of configurated leaderboard and match the set values with forwarded values leaderboardPage = urlConfigurationDialog.openLeaderboard(); - Assert.assertTrue(leaderboardPage.isCompetitorChartVisible()); + Assertions.assertTrue(leaderboardPage.isCompetitorChartVisible()); } /** @@ -591,12 +591,12 @@ public class SettingsTest extends AbstractSeleniumTest { LeaderboardSettingsDialogPO leaderboardSettingsDialog = leaderboardPage.getLeaderboardSettings(); leaderboardSettingsPanel = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO(); DetailCheckboxInfo[] selectedDetails = leaderboardSettingsPanel.getSelectedDetails(); - Assert.assertArrayEquals(detailsToSelect, selectedDetails); + Assertions.assertArrayEquals(detailsToSelect, selectedDetails); leaderboardSettingsDialog.pressCancel(); // open settings dialog of configurated OVERALL leaderboard and match the set values with forwarded values leaderboardSettingsPanel = leaderboardPage.getOverallLeaderboardSettings().getLeaderboardSettingsPanelPO(); selectedDetails = leaderboardSettingsPanel.getSelectedDetails(); - Assert.assertArrayEquals(overallDetailsToSelect, selectedDetails); + Assertions.assertArrayEquals(overallDetailsToSelect, selectedDetails); } /** @@ -649,8 +649,8 @@ public class SettingsTest extends AbstractSeleniumTest { leaderboardPage = LeaderboardPage.goToPage(getWebDriver(), bmwCupDefaultLeaderboardLink); leaderboardSettingsDialog = leaderboardPage.getLeaderboardSettings(); leaderboardSettingsPanel = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO(); - Assert.assertArrayEquals(newDetails, leaderboardSettingsPanel.getSelectedDetails()); - Assert.assertEquals(newRefreshInterval, leaderboardSettingsPanel.getRefreshInterval()); + Assertions.assertArrayEquals(newDetails, leaderboardSettingsPanel.getSelectedDetails()); + Assertions.assertEquals(newRefreshInterval, leaderboardSettingsPanel.getRefreshInterval()); // ensure that url has priority adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration(); @@ -661,7 +661,7 @@ public class SettingsTest extends AbstractSeleniumTest { leaderboardPage = urlConfigurationDialog.openLeaderboard(); leaderboardSettingsDialog = leaderboardPage.getLeaderboardSettings(); leaderboardSettingsPanel = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO(); - Assert.assertEquals(4, leaderboardSettingsPanel.getRefreshInterval()); + Assertions.assertEquals(4, leaderboardSettingsPanel.getRefreshInterval()); // ensure that context specific settings are stored only for the context adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); events = adminConsole.goToEvents(); @@ -675,23 +675,23 @@ public class SettingsTest extends AbstractSeleniumTest { leaderboardPage = urlConfigurationDialog.openLeaderboard(); leaderboardSettingsDialog = leaderboardPage.getLeaderboardSettings(); leaderboardSettingsPanel = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO(); - Assert.assertArrayEquals(defaultDetails, leaderboardSettingsPanel.getSelectedDetails()); - Assert.assertEquals(defaultRefreshInterval, leaderboardSettingsPanel.getRefreshInterval()); + Assertions.assertArrayEquals(defaultDetails, leaderboardSettingsPanel.getSelectedDetails()); + Assertions.assertEquals(defaultRefreshInterval, leaderboardSettingsPanel.getRefreshInterval()); // set old default values to default again and check that the context values of other leaderboard have priority leaderboardSettingsDialog.pressMakeDefault(); leaderboardPage = LeaderboardPage.goToPage(getWebDriver(), bmwCupDefaultLeaderboardLink); leaderboardSettingsDialog = leaderboardPage.getLeaderboardSettings(); leaderboardSettingsPanel = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO(); - Assert.assertArrayEquals(newDetails, leaderboardSettingsPanel.getSelectedDetails()); - Assert.assertEquals(newRefreshInterval, leaderboardSettingsPanel.getRefreshInterval()); + Assertions.assertArrayEquals(newDetails, leaderboardSettingsPanel.getSelectedDetails()); + Assertions.assertEquals(newRefreshInterval, leaderboardSettingsPanel.getRefreshInterval()); // set new values to default and check that the other leaderboard which does not have context specific settings // stored, applies that values leaderboardSettingsDialog.pressMakeDefault(); leaderboardPage = LeaderboardPage.goToPage(getWebDriver(), audiCupDefaultLeaderboardLink); leaderboardSettingsDialog = leaderboardPage.getLeaderboardSettings(); leaderboardSettingsPanel = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO(); - Assert.assertArrayEquals(newDetails, leaderboardSettingsPanel.getSelectedDetails()); - Assert.assertEquals(newRefreshInterval, leaderboardSettingsPanel.getRefreshInterval()); + Assertions.assertArrayEquals(newDetails, leaderboardSettingsPanel.getSelectedDetails()); + Assertions.assertEquals(newRefreshInterval, leaderboardSettingsPanel.getRefreshInterval()); } /** @@ -718,13 +718,13 @@ public class SettingsTest extends AbstractSeleniumTest { .getRegattaOverviewSettingsDialog(); // assert state String regattaOverviewUrl = regattaOverviewPage.getCurrentUrl(); - Assert.assertTrue(regattaOverviewUrl.contains(URL_PARAMETER_IGNORE_LOCAL_SETTINGS)); - Assert.assertFalse(regattaOverviewSettingsDialog.isMakeDefaultButtonVisible()); + Assertions.assertTrue(regattaOverviewUrl.contains(URL_PARAMETER_IGNORE_LOCAL_SETTINGS)); + Assertions.assertFalse(regattaOverviewSettingsDialog.isMakeDefaultButtonVisible()); // per default all course areas and regatta names are selected => selectedValues equals availableValues List initiallySelectedCourseAreas = regattaOverviewSettingsDialog.getSelectedCourseAreas(); List initiallySelectedRegattaNames = regattaOverviewSettingsDialog.getSelectedRegattaNames(); - Assert.assertEquals(2, initiallySelectedCourseAreas.size()); - Assert.assertEquals(2, initiallySelectedRegattaNames.size()); + Assertions.assertEquals(2, initiallySelectedCourseAreas.size()); + Assertions.assertEquals(2, initiallySelectedRegattaNames.size()); // save initial state boolean initialShowOnlyCurrentlyRunningRaces = regattaOverviewSettingsDialog.isShowOnlyCurrentlyRunningRaces(); boolean initialShowOnlyRacesOfSameDay = regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay(); @@ -739,18 +739,18 @@ public class SettingsTest extends AbstractSeleniumTest { // ensure the regatta overview has still the initial state after reload due to ignoreLocalSettings flag regattaOverviewPage = RegattaOverviewPage.goToPage(getWebDriver(), regattaOverviewUrl); regattaOverviewSettingsDialog = regattaOverviewPage.getRegattaOverviewSettingsDialog(); - Assert.assertEquals(initiallySelectedCourseAreas, regattaOverviewSettingsDialog.getSelectedCourseAreas()); - Assert.assertEquals(initiallySelectedRegattaNames, regattaOverviewSettingsDialog.getSelectedRegattaNames()); - Assert.assertEquals(initialShowOnlyCurrentlyRunningRaces, + Assertions.assertEquals(initiallySelectedCourseAreas, regattaOverviewSettingsDialog.getSelectedCourseAreas()); + Assertions.assertEquals(initiallySelectedRegattaNames, regattaOverviewSettingsDialog.getSelectedRegattaNames()); + Assertions.assertEquals(initialShowOnlyCurrentlyRunningRaces, regattaOverviewSettingsDialog.isShowOnlyCurrentlyRunningRaces()); - Assert.assertEquals(initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); + Assertions.assertEquals(initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); // verify settings storage support without ignoreLocalSettingsParameter String regattaOverviewUrlWithoutIgnoreLocalSettings = regattaOverviewUrl .replace(URL_PARAMETER_IGNORE_LOCAL_SETTINGS, ""); regattaOverviewPage = RegattaOverviewPage.goToPage(getWebDriver(), regattaOverviewUrlWithoutIgnoreLocalSettings); regattaOverviewSettingsDialog = regattaOverviewPage.getRegattaOverviewSettingsDialog(); - Assert.assertTrue(regattaOverviewSettingsDialog.isMakeDefaultButtonVisible()); + Assertions.assertTrue(regattaOverviewSettingsDialog.isMakeDefaultButtonVisible()); regattaOverviewSettingsDialog.selectCourseAreasAndDeselectOther(newSelectedCourseAreas); regattaOverviewSettingsDialog.selectRegattaNamesAndDeselectOther(newSelectedRegattaNames); regattaOverviewSettingsDialog.setShowOnlyCurrentlyRunningRaces(!initialShowOnlyCurrentlyRunningRaces); @@ -760,11 +760,11 @@ public class SettingsTest extends AbstractSeleniumTest { regattaOverviewPage = RegattaOverviewPage.goToPage(getWebDriver(), regattaOverviewUrlWithoutIgnoreLocalSettings); regattaOverviewSettingsDialog = regattaOverviewPage.getRegattaOverviewSettingsDialog(); - Assert.assertEquals(newSelectedCourseAreas, regattaOverviewSettingsDialog.getSelectedCourseAreas()); - Assert.assertEquals(newSelectedRegattaNames, regattaOverviewSettingsDialog.getSelectedRegattaNames()); - Assert.assertEquals(!initialShowOnlyCurrentlyRunningRaces, + Assertions.assertEquals(newSelectedCourseAreas, regattaOverviewSettingsDialog.getSelectedCourseAreas()); + Assertions.assertEquals(newSelectedRegattaNames, regattaOverviewSettingsDialog.getSelectedRegattaNames()); + Assertions.assertEquals(!initialShowOnlyCurrentlyRunningRaces, regattaOverviewSettingsDialog.isShowOnlyCurrentlyRunningRaces()); - Assert.assertEquals(!initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); + Assertions.assertEquals(!initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); // create second event adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); events = adminConsole.goToEvents(); @@ -786,11 +786,11 @@ public class SettingsTest extends AbstractSeleniumTest { // verify the initial values are untouched List initiallySelectedCourseAreasForAudi = regattaOverviewSettingsDialog.getSelectedCourseAreas(); List initiallySelectedRegattaNamesForAudi = regattaOverviewSettingsDialog.getSelectedRegattaNames(); - Assert.assertEquals(2, initiallySelectedCourseAreasForAudi.size()); - Assert.assertEquals(2, initiallySelectedRegattaNamesForAudi.size()); - Assert.assertEquals(initialShowOnlyCurrentlyRunningRaces, + Assertions.assertEquals(2, initiallySelectedCourseAreasForAudi.size()); + Assertions.assertEquals(2, initiallySelectedRegattaNamesForAudi.size()); + Assertions.assertEquals(initialShowOnlyCurrentlyRunningRaces, regattaOverviewSettingsDialog.isShowOnlyCurrentlyRunningRaces()); - Assert.assertEquals(initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); + Assertions.assertEquals(initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); // apply new state List newSelectedCourseAreasForAudi = initiallySelectedCourseAreasForAudi.subList(0, 1); List newSelectedRegattaNamesForAudi = initiallySelectedRegattaNamesForAudi.subList(1, 2); @@ -803,11 +803,11 @@ public class SettingsTest extends AbstractSeleniumTest { regattaOverviewPage = RegattaOverviewPage.goToPage(getWebDriver(), regattaOverviewUrlWithoutIgnoreLocalSettings); regattaOverviewSettingsDialog = regattaOverviewPage.getRegattaOverviewSettingsDialog(); - Assert.assertEquals(newSelectedCourseAreas, regattaOverviewSettingsDialog.getSelectedCourseAreas()); - Assert.assertEquals(newSelectedRegattaNames, regattaOverviewSettingsDialog.getSelectedRegattaNames()); - Assert.assertEquals(!initialShowOnlyCurrentlyRunningRaces, + Assertions.assertEquals(newSelectedCourseAreas, regattaOverviewSettingsDialog.getSelectedCourseAreas()); + Assertions.assertEquals(newSelectedRegattaNames, regattaOverviewSettingsDialog.getSelectedRegattaNames()); + Assertions.assertEquals(!initialShowOnlyCurrentlyRunningRaces, regattaOverviewSettingsDialog.isShowOnlyCurrentlyRunningRaces()); - Assert.assertEquals(!initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); + Assertions.assertEquals(!initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); // verify global settings with make default button regattaOverviewSettingsDialog.pressMakeDefault(); // open second event again and verify that the global settings of the first event have applied @@ -815,21 +815,21 @@ public class SettingsTest extends AbstractSeleniumTest { audiCupRegattaOverviewUrlWithoutIgnoreLocalSettings); regattaOverviewSettingsDialog = regattaOverviewPage.getRegattaOverviewSettingsDialog(); // context specific settings must stay initial - Assert.assertEquals(2, regattaOverviewSettingsDialog.getSelectedCourseAreas().size()); - Assert.assertEquals(2, regattaOverviewSettingsDialog.getSelectedRegattaNames().size()); + Assertions.assertEquals(2, regattaOverviewSettingsDialog.getSelectedCourseAreas().size()); + Assertions.assertEquals(2, regattaOverviewSettingsDialog.getSelectedRegattaNames().size()); // global settings must match with the settings of the first event - Assert.assertEquals(!initialShowOnlyCurrentlyRunningRaces, + Assertions.assertEquals(!initialShowOnlyCurrentlyRunningRaces, regattaOverviewSettingsDialog.isShowOnlyCurrentlyRunningRaces()); - Assert.assertEquals(!initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); + Assertions.assertEquals(!initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); // verify that the stored values are ignored with ignoreLocalSettings flag set regattaOverviewPage = RegattaOverviewPage.goToPage(getWebDriver(), audiCupRegattaOverviewUrl); regattaOverviewSettingsDialog = regattaOverviewPage.getRegattaOverviewSettingsDialog(); - Assert.assertEquals(initiallySelectedCourseAreasForAudi, + Assertions.assertEquals(initiallySelectedCourseAreasForAudi, regattaOverviewSettingsDialog.getSelectedCourseAreas()); - Assert.assertEquals(initiallySelectedRegattaNamesForAudi, + Assertions.assertEquals(initiallySelectedRegattaNamesForAudi, regattaOverviewSettingsDialog.getSelectedRegattaNames()); - Assert.assertEquals(initialShowOnlyCurrentlyRunningRaces, + Assertions.assertEquals(initialShowOnlyCurrentlyRunningRaces, regattaOverviewSettingsDialog.isShowOnlyCurrentlyRunningRaces()); - Assert.assertEquals(initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); + Assertions.assertEquals(initialShowOnlyRacesOfSameDay, regattaOverviewSettingsDialog.isShowOnlyRacesOfSameDay()); } } 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 20461bf5d90..b493729323c 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,9 +11,9 @@ import java.util.List; import javax.xml.bind.DatatypeConverter; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; @@ -54,7 +54,7 @@ public class SimulatorOverlayTest extends AbstractSeleniumTest { private static final String SERIES_MEDALS = "Medals"; @Override - @Before + @BeforeEach public void setUp() { clearState(getContextRoot()); super.setUp(); @@ -102,7 +102,7 @@ public class SimulatorOverlayTest extends AbstractSeleniumTest { REGATTA_49ER_WITH_SUFFIX, String.format(RACE_N_49ER, 1), false); MapSettingsPO mapSettings = raceboard.openMapSettings(); // Simulator overlay option must not be available without wind data - Assert.assertFalse(mapSettings.isShowSimulationOverlayCheckBoxVisible()); + Assertions.assertFalse(mapSettings.isShowSimulationOverlayCheckBoxVisible()); } { final AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); @@ -129,7 +129,7 @@ public class SimulatorOverlayTest extends AbstractSeleniumTest { REGATTA_49ER_WITH_SUFFIX, String.format(RACE_N_49ER, 1), false); MapSettingsPO mapSettings = raceboard.openMapSettings(); // Simulator overlay option must be available with the wind data being available - Assert.assertTrue(mapSettings.isShowSimulationOverlayCheckBoxVisible()); + Assertions.assertTrue(mapSettings.isShowSimulationOverlayCheckBoxVisible()); } } diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/GPSFixMovingJsonDeserializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/GPSFixMovingJsonDeserializerTest.java index 1ce06328b1c..c5aa903d7fa 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/GPSFixMovingJsonDeserializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/GPSFixMovingJsonDeserializerTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.server.gateway.deserialization.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; @@ -17,7 +17,7 @@ public class GPSFixMovingJsonDeserializerTest { private GPSFixMovingJsonSerializer serializer; private GPSFixMovingJsonDeserializer deserializer; - @Before + @BeforeEach public void setup() { serializer = new GPSFixMovingJsonSerializer(); deserializer = new GPSFixMovingJsonDeserializer(); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/ORCCertificateJsonDeserializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/ORCCertificateJsonDeserializerTest.java index 8f641398028..f3005c4edc1 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/ORCCertificateJsonDeserializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/ORCCertificateJsonDeserializerTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.gateway.deserialization.test.racelog; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.io.File; import java.io.FileInputStream; @@ -13,8 +13,8 @@ import java.util.Iterator; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.orc.ORCCertificate; @@ -31,7 +31,7 @@ public class ORCCertificateJsonDeserializerTest { private ORCCertificateJsonDeserializer deserializer; private static final String RESOURCES = "resources/rms/"; - @Before + @BeforeEach public void setup() { deserializer = new ORCCertificateJsonDeserializer(); serializer = new ORCCertificateJsonSerializer(); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/RaceLogDeserializationTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/RaceLogDeserializationTest.java index ec2c2f18d17..ed6fb3277da 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/RaceLogDeserializationTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/RaceLogDeserializationTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.gateway.deserialization.test.racelog; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.io.InputStream; @@ -9,8 +9,8 @@ import java.io.InputStreamReader; import org.json.simple.JSONObject; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; @@ -24,7 +24,7 @@ import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogEventD public class RaceLogDeserializationTest { private RaceLog parsedRaceLog; - @Before + @BeforeEach public void setUp() throws IOException, ParseException { parsedRaceLog = deserializeFromFile(); } diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/RaceLogEventDeserializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/RaceLogEventDeserializerTest.java index 14264550884..51d51535345 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/RaceLogEventDeserializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/deserialization/test/racelog/RaceLogEventDeserializerTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.gateway.deserialization.test.racelog; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.StringReader; @@ -12,7 +12,7 @@ import java.util.UUID; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/BoatClassJsonSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/BoatClassJsonSerializerTest.java index 029b461eecd..52a358f8b77 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/BoatClassJsonSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/BoatClassJsonSerializerTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.server.gateway.serialization.impl.BoatClassJsonSerializer; @@ -16,7 +16,7 @@ public class BoatClassJsonSerializerTest { protected BoatClass boatClass; protected BoatClassJsonSerializer serializer; - @Before + @BeforeEach public void setUp() { boatClass = mock(BoatClass.class); serializer = new BoatClassJsonSerializer(); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/CompetitorJsonSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/CompetitorJsonSerializerTest.java index 70a220b69d2..bf40cdb40e6 100755 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/CompetitorJsonSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/CompetitorJsonSerializerTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -13,8 +13,8 @@ import java.util.UUID; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; @@ -38,7 +38,7 @@ public class CompetitorJsonSerializerTest { private CompetitorJsonSerializer serializer; private CompetitorJsonDeserializer deserializer; - @Before + @BeforeEach public void setUp() { competitor = mock(Competitor.class); mockTeam(competitor); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/CourseAreaJsonSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/CourseAreaJsonSerializerTest.java index 15eaee6c636..d3499e0686b 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/CourseAreaJsonSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/CourseAreaJsonSerializerTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.UUID; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CourseArea; import com.sap.sailing.server.gateway.serialization.impl.CourseAreaJsonSerializer; @@ -21,7 +21,7 @@ public class CourseAreaJsonSerializerTest { protected CourseArea courseArea; protected CourseAreaJsonSerializer serializer; - @Before + @BeforeEach public void setUp() { courseArea = mock(CourseArea.class); serializer = new CourseAreaJsonSerializer(); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java index 23dc6d8a2db..4cde5e8de73 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.text.ParseException; import java.text.SimpleDateFormat; import org.json.simple.JSONObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.DomainFactory; diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerTest.java index b95caf1f3df..dd11faae97c 100755 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -15,8 +15,8 @@ import java.util.Map; import java.util.UUID; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CourseArea; import com.sap.sailing.domain.base.DomainFactory; @@ -75,7 +75,7 @@ public class EventDataJsonSerializerTest { } // see https://groups.google.com/forum/?fromgroups=#!topic/mockito/iMumB0_bpdo - @Before + @BeforeEach public void setUp() { // Event and its basic attributes ... event = mock(EventBase.class); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerWithImagesAndVideosTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerWithImagesAndVideosTest.java index b22810e2c20..548c0b33e61 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerWithImagesAndVideosTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerWithImagesAndVideosTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -16,8 +16,8 @@ import java.util.UUID; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.EventBase; @@ -107,7 +107,7 @@ public class EventDataJsonSerializerWithImagesAndVideosTest { videos.add(video1); } - @Before + @BeforeEach public void setUp() { // Event and its basic attributes ... event = mock(EventBase.class); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerWithNullValuesTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerWithNullValuesTest.java index 3436939c70d..91e726468e2 100755 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerWithNullValuesTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerWithNullValuesTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -12,8 +12,8 @@ import java.util.Date; import java.util.UUID; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.EventBase; @@ -54,7 +54,7 @@ public class EventDataJsonSerializerWithNullValuesTest { protected EventBase event; // see https://groups.google.com/forum/?fromgroups=#!topic/mockito/iMumB0_bpdo - @Before + @BeforeEach public void setUp() { // Event and its basic attributes ... event = mock(EventBase.class); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventWithNullStartAndEndDataJsonSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventWithNullStartAndEndDataJsonSerializerTest.java index 4121666f014..05eb27ad68e 100755 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventWithNullStartAndEndDataJsonSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventWithNullStartAndEndDataJsonSerializerTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -12,8 +12,8 @@ import java.util.Collections; import java.util.UUID; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.EventBase; @@ -66,7 +66,7 @@ public class EventWithNullStartAndEndDataJsonSerializerTest { expectedLogoImageDescriptor = new ImageDescriptorImpl(expectedLogoImageURL, MillisecondsTimePoint.now()); } - @Before + @BeforeEach public void setUp() { // Event and its basic attributes ... when(expectedLeaderboardGroup.getId()).thenReturn(UUID.randomUUID()); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest.java index e5ff9a29135..86922f9f0bd 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest.java @@ -9,8 +9,8 @@ import java.util.UUID; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.server.gateway.deserialization.impl.FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer; @@ -80,7 +80,7 @@ public class FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest { new FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer(); try { deserializer.deserialize(Helpers.toJSONObjectSafe(JSONValue.parseWithException(json))); - Assert.fail(); + Assertions.fail(); } catch (JsonDeserializationException e) { assertThat(e.getMessage(),equalTo("two timestamp fields are filled. Please use only one of both.")); } @@ -104,7 +104,7 @@ public class FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest { new FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer(); try { deserializer.deserialize(Helpers.toJSONObjectSafe(JSONValue.parseWithException(json))); - Assert.fail(); + Assertions.fail(); } catch (NumberFormatException e) { assertThat(e.getMessage(),equalTo("For input string: \"2418-03-18T17:34:30Z\"")); } @@ -128,7 +128,7 @@ public class FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest { new FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer(); try { deserializer.deserialize(Helpers.toJSONObjectSafe(JSONValue.parseWithException(json))); - Assert.fail(); + Assertions.fail(); } catch (DateTimeParseException e) { assertThat(e.getMessage(),equalTo("Text '14144168490000' could not be parsed at index 0")); } diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/MarksJsonSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/MarksJsonSerializerTest.java index 7d63e7de370..cfff29218a5 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/MarksJsonSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/MarksJsonSerializerTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.common.MarkType; @@ -19,7 +19,7 @@ public class MarksJsonSerializerTest { private Mark mark; - @Before + @BeforeEach public void setUp() { serializer = new MarkJsonSerializer(); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/MultipleJSONObjectsInStreamTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/MultipleJSONObjectsInStreamTest.java index 8d44e51fa57..2f31aa1c5a5 100755 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/MultipleJSONObjectsInStreamTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/MultipleJSONObjectsInStreamTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -12,7 +12,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.Test; +import org.junit.jupiter.api.Test; /** * Demonstrates and validates how to write more than one JSON object into a single stream as a JSONArray diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/VenueJsonSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/VenueJsonSerializerTest.java index d953ba64ebb..f71be5d1868 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/VenueJsonSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/VenueJsonSerializerTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.server.gateway.serialization.test; -import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -12,8 +12,8 @@ import java.util.Map; import org.hamcrest.CoreMatchers; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CourseArea; import com.sap.sailing.domain.base.Venue; @@ -28,7 +28,7 @@ public class VenueJsonSerializerTest { private Venue venue; @SuppressWarnings("unchecked") - @Before + @BeforeEach public void setUp() { courseAreaSerializer = mock(JsonSerializer.class); serializer = new VenueJsonSerializer(courseAreaSerializer); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java index f7bab7d63b2..14af608a853 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.gateway.serialization.test.racelog; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -11,8 +11,8 @@ import java.util.UUID; import org.json.simple.JSONObject; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -41,7 +41,7 @@ public abstract class AbstractEventSerializerTest factory = DomainFactory.INSTANCE; serializer = new RaceLogCourseDesignChangedEventSerializer(CompetitorJsonSerializer.create(), new CourseBaseJsonSerializer( @@ -99,8 +99,8 @@ public class RaceLogCourseDesignChangedEventSerializerTest { protected void compareCourseData(CourseBase serializedCourse, CourseBase deserializedCourse) { assertEquals(serializedCourse.getFirstWaypoint().getPassingInstructions(), PassingInstruction.None); assertEquals(deserializedCourse.getFirstWaypoint().getPassingInstructions(), PassingInstruction.None); - Assert.assertTrue(serializedCourse.getFirstWaypoint().getControlPoint() instanceof ControlPointWithTwoMarks); - Assert.assertTrue(deserializedCourse.getFirstWaypoint().getControlPoint() instanceof ControlPointWithTwoMarks); + Assertions.assertTrue(serializedCourse.getFirstWaypoint().getControlPoint() instanceof ControlPointWithTwoMarks); + Assertions.assertTrue(deserializedCourse.getFirstWaypoint().getControlPoint() instanceof ControlPointWithTwoMarks); ControlPointWithTwoMarks serializedGate = (ControlPointWithTwoMarks) serializedCourse.getFirstWaypoint().getControlPoint(); ControlPointWithTwoMarks deserializedGate = (ControlPointWithTwoMarks) deserializedCourse.getFirstWaypoint().getControlPoint(); @@ -111,8 +111,8 @@ public class RaceLogCourseDesignChangedEventSerializerTest { assertEquals(serializedCourse.getLastWaypoint().getPassingInstructions(), PassingInstruction.Port); assertEquals(deserializedCourse.getLastWaypoint().getPassingInstructions(), PassingInstruction.Port); - Assert.assertTrue(serializedCourse.getLastWaypoint().getControlPoint() instanceof Mark); - Assert.assertTrue(deserializedCourse.getLastWaypoint().getControlPoint() instanceof Mark); + Assertions.assertTrue(serializedCourse.getLastWaypoint().getControlPoint() instanceof Mark); + Assertions.assertTrue(deserializedCourse.getLastWaypoint().getControlPoint() instanceof Mark); Mark serializedMark = (Mark) serializedCourse.getLastWaypoint().getControlPoint(); Mark deserializedMark = (Mark) deserializedCourse.getLastWaypoint().getControlPoint(); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java index 80901bc53b7..9ae9b03a461 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java @@ -6,8 +6,8 @@ import static org.mockito.Mockito.verify; import java.util.Collections; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -87,7 +87,7 @@ public class RaceLogEventSerializerTest { @SuppressWarnings("unchecked") - @Before + @BeforeEach public void setUp() { flagEventSerializer = mock(JsonSerializer.class); startTimeSerializer = mock(JsonSerializer.class); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogFinishPositioningConfirmedEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogFinishPositioningConfirmedEventSerializerTest.java index d2b23454f0c..16802ecf08a 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogFinishPositioningConfirmedEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogFinishPositioningConfirmedEventSerializerTest.java @@ -1,16 +1,16 @@ package com.sap.sailing.server.gateway.serialization.test.racelog; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Iterator; import java.util.UUID; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -50,7 +50,7 @@ public class RaceLogFinishPositioningConfirmedEventSerializerTest { private CompetitorResults positioningList; private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); - @Before + @BeforeEach public void setUp() { SharedDomainFactory factory = DomainFactory.INSTANCE; serializer = new RaceLogFinishPositioningConfirmedEventSerializer(new CompetitorJsonSerializer( diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java index 0fa78a60646..093f8d5e4b7 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.server.gateway.serialization.test.racelog; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -47,7 +47,7 @@ public class RaceLogWindFixEventSerializerTest { private TimePoint now; private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); - @Before + @BeforeEach public void setUp() { SharedDomainFactory factory = DomainFactory.INSTANCE; serializer = new RaceLogWindFixEventSerializer(new CompetitorJsonSerializer(new TeamJsonSerializer( diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/StartTimeEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/StartTimeEventSerializerTest.java index a06a813e70c..e9db67552b6 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/StartTimeEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/StartTimeEventSerializerTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.server.gateway.serialization.test.racelog; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.json.simple.JSONObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/TrackingTimesEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/TrackingTimesEventSerializerTest.java index e932d7f7383..bc8d268dfd2 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/TrackingTimesEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/TrackingTimesEventSerializerTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.server.gateway.serialization.test.racelog; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import org.json.simple.JSONObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogEndOfTrackingEvent; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/expeditionimport/ExpeditionStartDataTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/expeditionimport/ExpeditionStartDataTest.java index 206b7b2258c..8f583558878 100755 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/expeditionimport/ExpeditionStartDataTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/expeditionimport/ExpeditionStartDataTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.gateway.expeditionimport; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.io.IOException; import java.nio.charset.Charset; @@ -11,7 +11,7 @@ import java.text.SimpleDateFormat; import java.util.HashSet; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapterFactory; 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 0f0386182bc..7a0824a4e89 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 @@ -2,10 +2,10 @@ package com.sap.sailing.server.gateway.expeditionimport; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.number.IsCloseTo.closeTo; -import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.server.gateway.windimport.expedition.WindLogParser; 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 ad30421a7fa..eb37306d372 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 @@ -1,12 +1,12 @@ package com.sap.sailing.server.gateway.jaxrs.api; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +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 java.io.IOException; import java.io.InputStreamReader; @@ -15,15 +15,15 @@ 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.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util.Pair; public class CompareServersTest { private CompareServersResource resource; - @Before + @BeforeEach public void setUp() { resource = new CompareServersResource(); } 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 18b230006cd..711f5569c9c 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 @@ -1,11 +1,11 @@ package com.sap.sailing.server.gateway.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.DeviceIdentifier; import com.sap.sailing.domain.racelog.tracking.test.mock.MockEmptyServiceFinder; @@ -21,7 +21,7 @@ import com.sap.sse.common.TypeBasedServiceFinder; import com.sap.sse.shared.json.JsonDeserializationException; public class DeviceIdentifierSerializationTest { - @Before + @BeforeEach public void setup() { } diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/FunnyDegreeConverterTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/FunnyDegreeConverterTest.java index 0e590a2ff02..be5076169d8 100755 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/FunnyDegreeConverterTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/FunnyDegreeConverterTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.gateway.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.server.gateway.windimport.bravo.FunnyDegreeConverter; 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 bf21b8c6d34..26c0f03e167 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 @@ -1,15 +1,15 @@ package com.sap.sailing.server.gateway.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.MalformedURLException; import java.net.URL; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.server.gateway.impl.SailingServerImpl; import com.sap.sailing.server.gateway.interfaces.SailingServer; @@ -19,7 +19,7 @@ import com.sap.sse.security.util.RemoteServerUtil; public class SailingServerTest { private SailingServer sailingServer; - @Before + @BeforeEach public void setUp() throws MalformedURLException { final URL devBaseUrl = new URL("https://dev.sapsailing.com"); sailingServer = new SailingServerImpl(devBaseUrl, RemoteServerUtil.resolveBearerTokenForRemoteServer(devBaseUrl.toString(), "admin", "admin")); 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 3488ebac8fd..08858be0cd6 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 @@ -1,11 +1,11 @@ package com.sap.sailing.server.gateway.test.jaxrs; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.json.simple.JSONObject; import org.json.simple.JSONValue; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.impl.BoatClassImpl; @@ -21,7 +21,7 @@ public class BoatResourceTest extends AbstractJaxRsApiTest { private final String sailId = "GER 1"; private final BoatClass boatClass = new BoatClassImpl(boatClassName, true); - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); racingEventService.getBaseDomainFactory().getOrCreateBoat(id, boatName, boatClass, sailId, null, /* storePersistently */ true); 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 7faa2c5b329..b4e8ced3490 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,8 +14,8 @@ 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.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.impl.DynamicTeam; import com.sap.sailing.domain.base.impl.NationalityImpl; @@ -36,7 +36,7 @@ public class CompetitorsResourceTeamImageTest extends AbstractJaxRsApiTest { private FileStorageService storageService; - @Before + @BeforeEach public void setUpSubClass() throws Exception { super.setUp(); storageService = AmazonS3TestSupport.createService(securityService); 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 41b633b94e2..28fa35acc23 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 @@ -1,13 +1,13 @@ package com.sap.sailing.server.gateway.test.jaxrs; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import org.json.simple.JSONObject; import org.json.simple.JSONValue; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.impl.DynamicTeam; import com.sap.sailing.domain.base.impl.NationalityImpl; @@ -23,7 +23,7 @@ public class CompetitorsResourceTest extends AbstractJaxRsApiTest { private final String countryCode = "DE"; private final String shortName = "HK"; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); DynamicTeam team = new TeamImpl(null, Collections.singleton(new PersonImpl(null, new NationalityImpl(nationality), null, null)), null); 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 ef0381e8773..b8c4fc0516a 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 @@ -1,8 +1,8 @@ package com.sap.sailing.server.gateway.test.jaxrs; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -20,8 +20,8 @@ import org.apache.commons.lang.RandomStringUtils; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.domain.common.NotFoundException; @@ -37,7 +37,7 @@ public class EventResourceTest extends AbstractJaxRsApiTest { private String randomName; private UriInfo uriInfo; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); uriInfo = mock(UriInfo.class); 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 2dd98e902eb..3081662f42b 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,8 +8,8 @@ import java.util.UUID; import javax.ws.rs.core.Response; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.DeviceIdentifier; import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneUuidServiceFinderFactory; @@ -43,7 +43,7 @@ public class GPSFixesResourceTest { private RacingEventService service; - @Before + @BeforeEach public void setup() { service = new RacingEventServiceImpl(/* clearPersistentCompetitorStore */ true, /* sensorFixStore */ null, new MockSmartphoneUuidServiceFinderFactory(), /* restoreTrackedRaces */ false); 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 62d27ee6f28..ecc1a291f12 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 @@ -1,6 +1,6 @@ package com.sap.sailing.server.gateway.test.jaxrs; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Serializable; import java.util.ArrayList; @@ -11,8 +11,8 @@ import javax.ws.rs.core.Response; import org.json.simple.JSONArray; import org.json.simple.JSONValue; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; @@ -40,7 +40,7 @@ public class LeaderboardGroupResourceTest extends AbstractJaxRsApiTest { private String regattaName = "TestRegatta"; private String leaderboardGroupName = "TestLeaderboardGroup"; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); List series = new ArrayList(); 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 f1ade1160b2..1ee85a7342c 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 @@ -2,8 +2,8 @@ package com.sap.sailing.server.gateway.test.jaxrs; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Collections; @@ -14,8 +14,8 @@ import java.util.UUID; import javax.ws.rs.core.Response; import org.json.simple.JSONObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; @@ -50,7 +50,7 @@ public class LeaderboardsResourceCheckinAndOutTest extends AbstractJaxRsApiTest private BoatClass boatClass = new BoatClassImpl("49er", false); private Regatta regatta; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); Competitor c = createCompetitors(1).get(0); @@ -122,8 +122,8 @@ public class LeaderboardsResourceCheckinAndOutTest extends AbstractJaxRsApiTest assertThat("checkout returns OK", response.getStatus(), equalTo(Response.Status.OK.getStatusCode())); mappings = new RegattaLogDeviceCompetitorMappingFinder(log).analyze(); mappingForC = mappings.get(competitor).get(0); - assertTrue("mapping now ends at checkout timepoint", mappingForC.getTimeRange().includes(new MillisecondsTimePoint(toMillis))); - assertFalse("mapping now ends at checkout timepoint", mappingForC.getTimeRange().includes(new MillisecondsTimePoint(toMillis+1))); + assertTrue(mappingForC.getTimeRange().includes(new MillisecondsTimePoint(toMillis)), "mapping now ends at checkout timepoint"); + assertFalse(mappingForC.getTimeRange().includes(new MillisecondsTimePoint(toMillis+1)), "mapping now ends at checkout timepoint"); } } 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 f822f3bd20b..89aef7683dd 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,8 +11,8 @@ import java.util.UUID; import javax.ws.rs.core.Response; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; import com.sap.sailing.domain.abstractlog.regatta.tracking.analyzing.impl.RegattaLogDeviceMarkMappingFinder; @@ -55,7 +55,7 @@ public class LeaderboardsResourcePingMarkTest extends AbstractJaxRsApiTest { " \"course\" : 258.11,\n" + " }"; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); mark = racingEventService.getBaseDomainFactory().getOrCreateMark("id", "name", "n"); 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 080e67e44a4..12d5651935c 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 @@ -1,10 +1,10 @@ package com.sap.sailing.server.gateway.test.jaxrs; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.io.Serializable; import java.util.ArrayList; @@ -18,8 +18,8 @@ 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.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; @@ -47,7 +47,7 @@ public class LeaderboardsResourceTest extends AbstractJaxRsApiTest { private String boatClassName = "49er"; private String regattaBaseName = "TestRegatta"; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); dropAndCreateRegatta(); 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 8f092a2874b..0a2fc705f0b 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 @@ -1,8 +1,8 @@ package com.sap.sailing.server.gateway.test.jaxrs; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -24,8 +24,8 @@ 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.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogDeviceCompetitorMappingEvent; @@ -72,7 +72,7 @@ public class RegattasResourceTest extends AbstractJaxRsApiTest { private final String flagImageUri = "file://flag.jpg"; private final String teamImageUri = "file://team.jpg"; - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); List series = new ArrayList(); @@ -166,14 +166,14 @@ public class RegattasResourceTest extends AbstractJaxRsApiTest { Response response = regattasResource.createAndAddCompetitor(closedRegattaName, boatClassName, null, "GER", "#F00", flagImageUri, teamImageUri, null, null, null, competitorName1, competitorShortName1, null, deviceUuid, null); - assertTrue(response.getStatus() + ": " + StreamingOutputUtil.getEntityAsString(response.getEntity()), - response.getStatus() == Status.OK.getStatusCode()); + assertTrue(response.getStatus() == Status.OK.getStatusCode(), + response.getStatus() + ": " + StreamingOutputUtil.getEntityAsString(response.getEntity())); assertTrue(regattasResource.getService() == racingEventService); response = regattasResource.createAndAddCompetitor(closedRegattaName, boatClassName, null, "GER", "#0F0", flagImageUri, teamImageUri, null, null, null, competitorName2, competitorShortName2, null, deviceUuid2, null); - assertTrue(response.getStatus() + ": " + StreamingOutputUtil.getEntityAsString(response.getEntity()), - response.getStatus() == Status.OK.getStatusCode()); + assertTrue(response.getStatus() == Status.OK.getStatusCode(), + response.getStatus() + ": " + StreamingOutputUtil.getEntityAsString(response.getEntity())); Regatta regatta = racingEventService.getRegattaByName(closedRegattaName); Iterator cit = regatta.getAllCompetitors().iterator(); Competitor readCompetitor = cit.next(); @@ -186,7 +186,7 @@ public class RegattasResourceTest extends AbstractJaxRsApiTest { citForRemove.forEachRemaining(competitor -> regattasResource.removeCompetitor(closedRegattaName, competitor.getId().toString(), null)); Iterator citAfterRemove = regatta.getAllCompetitors().iterator(); - assertTrue("Competitors still exist after remove.", !citAfterRemove.hasNext()); + assertTrue(!citAfterRemove.hasNext(), "Competitors still exist after remove."); } @Test @@ -196,8 +196,8 @@ public class RegattasResourceTest extends AbstractJaxRsApiTest { Response response = regattasResource.createAndAddCompetitor(openRegattaName, boatClassName, null, "GER", "#F00", flagImageUri, teamImageUri, null, null, null, competitorName1, competitorShortName1, null, deviceUuid, secret); - assertTrue(response.getStatus() + ": " + StreamingOutputUtil.getEntityAsString(response.getEntity()), - response.getStatus() == Status.OK.getStatusCode()); + assertTrue(response.getStatus() == Status.OK.getStatusCode(), + response.getStatus() + ": " + StreamingOutputUtil.getEntityAsString(response.getEntity())); assertTrue(regattasResource.getService() == racingEventService); Regatta regatta = racingEventService.getRegattaByName(openRegattaName); @@ -211,8 +211,8 @@ public class RegattasResourceTest extends AbstractJaxRsApiTest { Response response = regattasResource.createAndAddCompetitor(openRegattaName, boatClassName, null, "GER", "#F00", flagImageUri, teamImageUri, null, null, null, competitorName1, competitorShortName1, null, deviceUuid, "WRONGSECRET"); - assertTrue(response.getStatus() + ": " + StreamingOutputUtil.getEntityAsString(response.getEntity()), - response.getStatus() == Status.FORBIDDEN.getStatusCode()); + assertTrue(response.getStatus() == Status.FORBIDDEN.getStatusCode(), + response.getStatus() + ": " + StreamingOutputUtil.getEntityAsString(response.getEntity())); } @Test @@ -224,8 +224,8 @@ public class RegattasResourceTest extends AbstractJaxRsApiTest { Response response = regattasResource.createAndAddCompetitor(openRegattaName, boatClassName, null, "GER", "#F00", flagImageUri, teamImageUri, null, null, null, competitorName1, competitorShortName1, null, deviceUuid, secret); - assertTrue(response.getStatus() + ": " + StreamingOutputUtil.getEntityAsString(response.getEntity()), - response.getStatus() == Status.OK.getStatusCode()); + assertTrue(response.getStatus() == Status.OK.getStatusCode(), + response.getStatus() + ": " + StreamingOutputUtil.getEntityAsString(response.getEntity())); assertTrue(regattasResource.getService() == racingEventService); regatta = racingEventService.getRegattaByName(openRegattaName); testResponseOfOpenRegattaCompetitorRegistration(regatta); @@ -253,12 +253,12 @@ public class RegattasResourceTest extends AbstractJaxRsApiTest { // Same deviceUuid for registration should fail Response response = regattasResource.createAndAddCompetitor(regatta.getName(), boatClassName, null, "GER", "#F00", flagImageUri, teamImageUri, null, null, null, "XXX", "XXX", null, deviceUuid, secret); - assertTrue("Reponse http status for duplicate competitor device should be forbidden (403) but is " - + response.getStatus(), response.getStatus() == Status.FORBIDDEN.getStatusCode()); + assertTrue(response.getStatus() == Status.FORBIDDEN.getStatusCode(), "Reponse http status for duplicate competitor device should be forbidden (403) but is " + + response.getStatus()); // Remove competitor registration Response removeResponse = regattasResource.removeCompetitor(regatta.getName(), readCompetitor.getId().toString(), secret); - assertEquals("Remove of competitor failed", 200, removeResponse.getStatus()); + assertEquals(200, removeResponse.getStatus(), "Remove of competitor failed"); } } diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionImportFilenameUtilsTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionImportFilenameUtilsTest.java index 077d464e9a5..407aa2129a3 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionImportFilenameUtilsTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionImportFilenameUtilsTest.java @@ -4,8 +4,8 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.trackimport.FormatNotSupportedException; import com.sap.sailing.server.trackfiles.impl.ExpeditionImportFileHandler; @@ -76,7 +76,7 @@ public class ExpeditionImportFilenameUtilsTest { } private void testCase(String actualFilename, String expectedResult) { - Assert.assertEquals(expectedResult, ExpeditionImportFilenameUtils.truncateFilenameExtentions(actualFilename, new ExpeditionImportFileHandler() { + Assertions.assertEquals(expectedResult, ExpeditionImportFilenameUtils.truncateFilenameExtentions(actualFilename, new ExpeditionImportFileHandler() { @Override protected void handleExpeditionFile(String fileName, InputStream inputStream, Charset charset) throws IOException, FormatNotSupportedException { diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java index 75fac1a2183..3afb41f4742 100755 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.gateway.trackfiles.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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 java.io.BufferedInputStream; import java.io.File; @@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Logger; import org.apache.commons.fileupload.FileItem; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.DeviceIdentifier; import com.sap.sailing.domain.common.tracking.GPSFix; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractLogReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractLogReplicationTest.java index 77bbf0d5040..f64589b3b41 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractLogReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractLogReplicationTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.Arrays; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/BoatReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/BoatReplicationTest.java index de10b8016c8..00cef74bb4f 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/BoatReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/BoatReplicationTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Serializable; import java.net.URISyntaxException; @@ -13,7 +13,7 @@ import java.util.Map; import java.util.UUID; import java.util.stream.StreamSupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java index 093fd71c37d..7324ec9ab86 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.Serializable; import java.net.URI; @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.StreamSupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ConnectionResetAndReconnectTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ConnectionResetAndReconnectTest.java index aabb5627ae1..dc2181246f8 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ConnectionResetAndReconnectTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ConnectionResetAndReconnectTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.util.ArrayList; @@ -13,7 +13,7 @@ import java.util.UUID; import java.util.concurrent.TimeoutException; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; 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 6264a574b1f..8d565dec92e 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 @@ -1,16 +1,16 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.FileNotFoundException; import java.net.UnknownHostException; import java.util.logging.Logger; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; @@ -55,7 +55,7 @@ public class DelayedLeaderboardCorrectionsReplicationTest extends AbstractServer private ReplicationService replicaReplicator; private ReplicationMasterDescriptor masterDescriptor; - @Before + @BeforeEach public void setUp() throws FileNotFoundException, UnknownHostException { final MongoDBService mongoDBService = MongoDBService.INSTANCE; mongoDBService.getDB().drop(); @@ -146,7 +146,7 @@ public class DelayedLeaderboardCorrectionsReplicationTest extends AbstractServer unexpectedCompetitors.append(System.identityHashCode(unexpectedCompetitor)); unexpectedCompetitors.append(", "); } - assertTrue(unexpectedCompetitors.toString(), Util.isEmpty(newMasterScoreCorrections.getCompetitorsThatHaveCorrectionsIn(newMasterQ2))); // no score corrections applied yet + assertTrue(Util.isEmpty(newMasterScoreCorrections.getCompetitorsThatHaveCorrectionsIn(newMasterQ2)), unexpectedCompetitors.toString()); // no score corrections applied yet // now connect the tracked race again to the leaderboard column in the re-loaded environment master.apply(new ConnectTrackedRaceToLeaderboardColumn(masterLeaderboard.getName(), Q2, /* default fleet */ masterLeaderboard.getFleet(null).getName(), q2YellowTrackedRace.getRaceIdentifier())); diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DeviceConfigurationReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DeviceConfigurationReplicationTest.java index 886ca8f93a8..d5230d2396b 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DeviceConfigurationReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DeviceConfigurationReplicationTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.configuration.DeviceConfiguration; import com.sap.sailing.domain.base.configuration.impl.DeviceConfigurationImpl; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/EventReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/EventReplicationTest.java index 39e329d6ddc..1f1e7dbb9d5 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/EventReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/EventReplicationTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Collections; @@ -11,7 +11,7 @@ import java.util.Date; import java.util.List; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CourseArea; import com.sap.sailing.domain.base.Event; 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 56fa6a7cd36..b02765a4f15 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 @@ -1,7 +1,7 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.RaceDefinition; @@ -40,7 +40,7 @@ public class IdempotencyForWaypointOperationsTest { private RaceDefinition race; private Course course; - @Before + @BeforeEach public void setUp() { service = mock(RacingEventService.class); race = mock(RaceDefinition.class); 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 525b42521d6..ec2f3850a2e 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.core.Is.is; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +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 static org.junit.Assert.assertTrue; import java.io.Serializable; import java.util.ArrayList; @@ -20,8 +20,8 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.Callable; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -114,7 +114,7 @@ public class InitialLoadReplicationObjectIdentityTest extends AbstractServerRepl * Drops the test DB. Sets up master and replica, starts the JMS message broker and registers the replica with the master. */ @SuppressWarnings("unchecked") - @Before + @BeforeEach @Override public void setUp() throws Exception { persistenceSetUp(/* dropDB */ true); diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/MediaReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/MediaReplicationTest.java index 7fcc66b596e..6fdfcaef7c5 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/MediaReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/MediaReplicationTest.java @@ -2,8 +2,8 @@ package com.sap.sailing.server.replication.test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -24,8 +24,8 @@ import java.util.UUID; import javax.ws.rs.core.Response; import javax.ws.rs.core.StreamingOutput; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -348,11 +348,11 @@ public class MediaReplicationTest extends AbstractServerReplicationTest { } private void compareTracks(MediaTrack trackOnSource, Iterable targetTracksMaster) { - Assert.assertEquals(1, Util.size(targetTracksMaster)); + Assertions.assertEquals(1, Util.size(targetTracksMaster)); MediaTrack trackOnTarget = targetTracksMaster.iterator().next(); - Assert.assertEquals(trackOnSource.dbId, trackOnTarget.dbId); - Assert.assertEquals(trackOnSource.url, trackOnTarget.url); - Assert.assertEquals(trackOnSource.assignedRaces, trackOnTarget.assignedRaces); + Assertions.assertEquals(trackOnSource.dbId, trackOnTarget.dbId); + Assertions.assertEquals(trackOnSource.url, trackOnTarget.url); + Assertions.assertEquals(trackOnSource.assignedRaces, trackOnTarget.assignedRaces); } private T spyResource(T resource, RacingEventService service) { 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 f343cef56c7..6550b7f02b1 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 @@ -1,6 +1,6 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.URISyntaxException; import java.util.Collections; @@ -8,7 +8,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.domain.base.CompetitorAndBoatStore; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java index 271e94304f1..3009780683c 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.impl.LowPoint; 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 69a79aa2618..90032ba20d2 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 @@ -1,13 +1,13 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.UUID; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -51,7 +51,7 @@ public class RaceLogReplicationTest extends AbstractLogReplicationTest(); factory = RabbitMQConnectionFactoryHelper.getConnectionFactory(); @@ -36,7 +36,7 @@ public class SimpleRabbitMQTest { channel = connection.createChannel(); } - @After + @AfterEach public void tearDown() throws IOException, TimeoutException { channel.close(); connection.close(); diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/StandaloneServerWithInitialLoadReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/StandaloneServerWithInitialLoadReplicationTest.java index 4bc1c9b27ff..434a61be7a8 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/StandaloneServerWithInitialLoadReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/StandaloneServerWithInitialLoadReplicationTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.impl.SailingServerConfigurationImpl; import com.sap.sailing.server.interfaces.RacingEventService; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TestMaxMemory.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TestMaxMemory.java index 20c2a71bc40..da434634681 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TestMaxMemory.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TestMaxMemory.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestMaxMemory { @Test 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 80c9729e7f5..69c28ee6fe9 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 @@ -1,8 +1,8 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; import java.net.URI; import java.net.URL; @@ -12,9 +12,9 @@ import java.util.GregorianCalendar; import java.util.TimeZone; import java.util.UUID; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; @@ -56,7 +56,7 @@ public class TrackRaceBoatCompetitorMetadataReplicationTest extends AbstractServ // no-op } - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -189,7 +189,7 @@ public class TrackRaceBoatCompetitorMetadataReplicationTest extends AbstractServ return null; } - @After + @AfterEach @Override public void tearDown() throws Exception { if (racesHandle != null) { 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 6b8ba185dcd..dfbf7e7aba4 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 @@ -1,12 +1,12 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.net.URI; import java.net.URL; @@ -17,9 +17,9 @@ import java.util.TimeZone; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; @@ -69,7 +69,7 @@ public class TrackRaceReplicationTest extends AbstractServerReplicationTest { // no-op } - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -236,7 +236,7 @@ public class TrackRaceReplicationTest extends AbstractServerReplicationTest { } } - @After + @AfterEach @Override public void tearDown() throws Exception { if (racesHandle != null) { 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 404dd9d63f4..68b5c197c8a 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 @@ -1,9 +1,9 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; import java.net.UnknownHostException; import java.util.ArrayList; @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.sap.sailing.domain.base.Boat; @@ -70,7 +70,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio private RegattaNameAndRaceName raceIdentifier; private DynamicTrackedRegatta trackedRegatta; - @Before + @BeforeEach public void setUp() throws Exception, UnknownHostException, InterruptedException { super.setUp(); final String boatClassName = "49er"; 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 47a8e4bd3aa..8fbbd0ad5e6 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 @@ -1,8 +1,8 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; import java.net.UnknownHostException; import java.util.ArrayList; @@ -12,8 +12,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; @@ -70,7 +70,7 @@ public class TrackedRaceWithSensorFixStoreContentsReplicationTest extends Abstra private RegattaNameAndRaceName raceIdentifier; private DynamicTrackedRegatta trackedRegatta; - @Before + @BeforeEach public void setUp() throws Exception, UnknownHostException, InterruptedException { Pair, ReplicationMasterDescriptor> replicationDescriptors = super.basicSetUp( /* dropDB */true, /* master=null means create a new one */null, 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 26f04a31da4..2f4092804a3 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 @@ -1,6 +1,6 @@ package com.sap.sailing.server.replication.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.OutputStream; @@ -9,9 +9,9 @@ import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.Before; +import org.junit.BeforeEach; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sailing.server.interfaces.RacingEventService; @@ -29,7 +29,7 @@ public class UnsentOperationSenderJobTest implements OperationsToMasterSender mediaTracksToImport; - @Before + @BeforeEach public void before() { mediaTracksToImport = new ArrayList(); } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaLibaryTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaLibaryTest.java index 8643b5845cf..2bd9d413139 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaLibaryTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaLibaryTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.server.impl; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +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 static org.junit.Assert.assertTrue; import java.util.Collection; import java.util.Collections; @@ -12,8 +12,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaNameAndRaceName; @@ -40,7 +40,7 @@ public class MediaLibaryTest { private MediaLibrary mediaLibary; - @Before + @BeforeEach public void before() { this.mediaLibary = new MediaLibrary(); } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java index 142bb3079c7..c439e080ce5 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import java.util.Arrays; @@ -12,7 +12,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.CourseArea; import com.sap.sailing.domain.base.Event; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/statistics/StatisticsTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/statistics/StatisticsTest.java index 809ab259679..6d0ad99c0fd 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/statistics/StatisticsTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/statistics/StatisticsTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.server.statistics; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.util.ArrayList; @@ -13,8 +13,8 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; @@ -69,7 +69,7 @@ public class StatisticsTest { private DynamicTrackedRegatta regatta; private DynamicTrackedRace trackedRace; - @Before + @BeforeEach public void setUp() { regatta = new DynamicTrackedRegattaImpl(new RegattaImpl(EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, RegattaImpl.getDefaultName("regatta", boatClass.getName()), boatClass, false, diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ApplyScoresFromRaceLogTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ApplyScoresFromRaceLogTest.java index bcfe8a9eae1..2e8e9e300c9 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ApplyScoresFromRaceLogTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ApplyScoresFromRaceLogTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 java.util.ArrayList; import java.util.Arrays; @@ -14,8 +14,8 @@ import java.util.Map; import java.util.UUID; import java.util.function.Function; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -78,7 +78,7 @@ public class ApplyScoresFromRaceLogTest extends LeaderboardScoringAndRankingTest private List competitors; private Leaderboard leaderboard; - @Before + @BeforeEach public void setUp() { service = new RacingEventServiceImpl(); } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/AutomaticRetrackUponCompetitorSetChangeTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/AutomaticRetrackUponCompetitorSetChangeTest.java index c269593a5ac..b6ccce407eb 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/AutomaticRetrackUponCompetitorSetChangeTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/AutomaticRetrackUponCompetitorSetChangeTest.java @@ -1,12 +1,12 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -22,9 +22,9 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.osgi.framework.BundleContext; @@ -98,7 +98,7 @@ public class AutomaticRetrackUponCompetitorSetChangeTest { private MongoObjectFactory mongoObjectFactory; private RegattaName regattaIdentifier; - @Before + @BeforeEach public void setUp() throws Exception { final BundleContext contextMock = mock(BundleContext.class); when(contextMock.createFilter(ArgumentMatchers.any())).thenReturn(null); @@ -239,7 +239,7 @@ public class AutomaticRetrackUponCompetitorSetChangeTest { return raceTracker; } - @After + @AfterEach public void tearDown() throws Exception { if (racesHandle != null) { racesHandle.getRaceTracker().stop(/* preemptive */ false); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/CompetitorStoreTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/CompetitorStoreTest.java index b43aeeed05a..bf57d162a7f 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/CompetitorStoreTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/CompetitorStoreTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ExpeditionThroughHttpPostServletTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ExpeditionThroughHttpPostServletTest.java index 3e4eab22d3a..ede72eff3cd 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ExpeditionThroughHttpPostServletTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ExpeditionThroughHttpPostServletTest.java @@ -3,13 +3,13 @@ package com.sap.sailing.server.test; import java.io.IOException; import java.net.URL; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sailing.expeditionconnector.impl.HttpServletMessageReceiver; public class ExpeditionThroughHttpPostServletTest { - @Ignore // To run, the OSGi-based Jetty needs to run and listen on port 8888" + @Disabled // To run, the OSGi-based Jetty needs to run and listen on port 8888" @Test public void testConnectDisconnect() throws IOException, InterruptedException { int jettyPort = 8888; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/IdentifierSerializationTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/IdentifierSerializationTest.java index fc5949cb124..865703009b1 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/IdentifierSerializationTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/IdentifierSerializationTest.java @@ -6,8 +6,8 @@ import java.io.ObjectOutputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.RegattaNameAndRaceName; @@ -31,7 +31,7 @@ public class IdentifierSerializationTest { ois.close(); oos.close(); - Assert.assertEquals(original, streamed); + Assertions.assertEquals(original, streamed); } } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardDiscardingRulesTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardDiscardingRulesTest.java index 79ab52435b4..dc99415beed 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardDiscardingRulesTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardDiscardingRulesTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.Collections; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.CompetitorWithBoat; @@ -36,7 +36,7 @@ public class LeaderboardDiscardingRulesTest { private RacingEventService racingEventService; - @Before + @BeforeEach public void setUp() { racingEventService = new RacingEventServiceImpl(); } 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 5a896df6dc3..79caa67f8ae 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 @@ -7,7 +7,7 @@ import java.util.List; import java.util.UUID; import org.bson.Document; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.mongodb.BasicDBObject; import com.mongodb.client.FindIterable; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardWithEliminationTransitiveRemovalTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardWithEliminationTransitiveRemovalTest.java index 07c7b0bd1f9..99198250466 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardWithEliminationTransitiveRemovalTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardWithEliminationTransitiveRemovalTest.java @@ -1,15 +1,15 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +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 java.util.Collections; import java.util.LinkedHashMap; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.common.CompetitorRegistrationType; @@ -36,7 +36,7 @@ public class LeaderboardWithEliminationTransitiveRemovalTest { private RegattaLeaderboard regattaLeaderboard; private DelegatingRegattaLeaderboardWithCompetitorElimination regattaLeaderboardWithEliminations; - @Before + @BeforeEach public void setUp() { PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory().getDatabase().drop(); final SecurityService securityService = SecurityServiceMockFactory.mockSecurityService(); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeagueEventHierarchyOwnershipChangeTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeagueEventHierarchyOwnershipChangeTest.java index add7db05815..fefb72146fc 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeagueEventHierarchyOwnershipChangeTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeagueEventHierarchyOwnershipChangeTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import java.util.Collections; import java.util.Locale; @@ -14,10 +14,10 @@ import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.support.SubjectThreadState; import org.apache.shiro.util.ThreadContext; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.mongodb.WriteConcern; @@ -56,7 +56,7 @@ public class LeagueEventHierarchyOwnershipChangeTest { private static SecurityService securityService; private CourseArea defaultCourseArea; - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { MongoDBConfiguration.getDefaultTestConfiguration().getService().getDB().withWriteConcern(WriteConcern.JOURNALED).drop(); service = Mockito.spy(new RacingEventServiceImpl()); @@ -66,7 +66,7 @@ public class LeagueEventHierarchyOwnershipChangeTest { /* validation URL */ Locale.ENGLISH, null, null, /* clientIP */ null, /* enforce strong password */ false); } - @Before + @BeforeEach public void setUp() throws Exception { event = service.addEvent("Test", "Test Event", TimePoint.now(), TimePoint.now().plus(Duration.ONE_WEEK), "Here", /* isPublic */ true, UUID.randomUUID()); @@ -143,7 +143,7 @@ public class LeagueEventHierarchyOwnershipChangeTest { assertSame(eventOwnership.getAnnotation().getTenantOwner(), lg2Ownership.getAnnotation().getTenantOwner()); } - @After + @AfterEach public void tearDown() { if (service != null && event != null) { service.removeEvent(event.getId()); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java index 31cf49bd25b..2ac1bd2aa94 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -35,10 +35,10 @@ import javax.ws.rs.core.StreamingOutput; import org.apache.shiro.SecurityUtils; import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.subject.Subject; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -192,13 +192,13 @@ public class MasterDataImportTest { private RacingEventService sourceService; private DummyMasterDataRessource masterDataResource; - @After + @AfterEach public void tearDown() { deleteAllDataFromDatabase(); } @SuppressWarnings("unchecked") - @Before + @BeforeEach public void setUp() { UserGroupImpl defaultTenant = new UserGroupImpl(new UUID(0, 1), "defaultTenant"); User currentUser = Mockito.mock(User.class); @@ -421,24 +421,24 @@ public class MasterDataImportTest { } MasterDataImportObjectCreationCount creationCount = destService.getDataImportLock().getProgress(randomUUID) .getResult(); - Assert.assertNotNull(creationCount); + Assertions.assertNotNull(creationCount); Event eventOnTarget = destService.getEvent(eventUUID); - Assert.assertNotNull(eventOnTarget); + Assertions.assertNotNull(eventOnTarget); LeaderboardGroup leaderboardGroupOnTarget = destService.getLeaderboardGroupByID(TEST_GROUP_UUID); - Assert.assertNotNull(leaderboardGroupOnTarget); + Assertions.assertNotNull(leaderboardGroupOnTarget); assertSame(leaderboardGroupOnTarget, eventOnTarget.getLeaderboardGroups().iterator().next()); Leaderboard leaderboardOnTarget = destService.getLeaderboardByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(leaderboardOnTarget); + Assertions.assertNotNull(leaderboardOnTarget); Regatta regattaOnTarget = destService.getRegattaByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(regattaOnTarget); - Assert.assertEquals(false, regattaOnTarget.getAllRaces().iterator().hasNext()); - Assert.assertEquals(courseAreaUUID, eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); + Assertions.assertNotNull(regattaOnTarget); + Assertions.assertEquals(false, regattaOnTarget.getAllRaces().iterator().hasNext()); + Assertions.assertEquals(courseAreaUUID, eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); RaceColumn raceColumnOnTarget = leaderboardOnTarget.getRaceColumnByName(raceColumnName); - Assert.assertNotNull(raceColumnOnTarget); - Assert.assertNull(raceColumnOnTarget.getTrackedRace(raceColumnOnTarget.getFleetByName(testFleet1Name))); + Assertions.assertNotNull(raceColumnOnTarget); + Assertions.assertNull(raceColumnOnTarget.getTrackedRace(raceColumnOnTarget.getFleetByName(testFleet1Name))); raceColumnOnTarget.setTrackedRace(raceColumnOnTarget.getFleets().iterator().next(), new DummyTrackedRace( raceId, createCompetitorsAndBoatsMap(boatClass, competitors), regattaOnTarget, null, sourceService.getWindStore())); - Assert.assertTrue(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); + Assertions.assertTrue(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); Competitor competitorOnTarget = domainFactory.getExistingCompetitorById(competitorUUID); Set competitorsCreatedOnTarget = new HashSet<>(); competitorsCreatedOnTarget.add(competitorOnTarget); @@ -446,34 +446,34 @@ public class MasterDataImportTest { TrackedRace trackedRaceForTarget = new DummyTrackedRace(raceId, createCompetitorsAndBoatsMap(boatClass, competitorsCreatedOnTarget), regattaOnTarget, null, sourceService.getWindStore()); raceColumnOnTarget.setTrackedRace(fleet1OnTarget, trackedRaceForTarget); - Assert.assertEquals(factor, leaderboard.getScoringScheme().getScoreFactor(raceColumnOnTarget), 0.000001); + Assertions.assertEquals(factor, leaderboard.getScoringScheme().getScoreFactor(raceColumnOnTarget), 0.000001); Iterable competitorsOnTarget = leaderboardOnTarget.getAllCompetitors(); Iterator competitorIterator = competitorsOnTarget.iterator(); - Assert.assertTrue(competitorIterator.hasNext()); - Assert.assertEquals(competitorOnTarget, competitorIterator.next()); + Assertions.assertTrue(competitorIterator.hasNext()); + Assertions.assertEquals(competitorOnTarget, competitorIterator.next()); // Check for score corrections - Assert.assertEquals( + Assertions.assertEquals( scoreCorrection, leaderboardOnTarget.getScoreCorrection().getExplicitScoreCorrection(competitorOnTarget, raceColumnOnTarget), 0.0000001); - Assert.assertEquals(maxPointsReason, leaderboardOnTarget.getScoreCorrection() + Assertions.assertEquals(maxPointsReason, leaderboardOnTarget.getScoreCorrection() .getMaxPointsReason(competitorOnTarget, raceColumnOnTarget, MillisecondsTimePoint.now())); // Check for carried points - Assert.assertEquals(carriedPoints, leaderboardOnTarget.getCarriedPoints(competitorOnTarget), 0.0000001); + Assertions.assertEquals(carriedPoints, leaderboardOnTarget.getCarriedPoints(competitorOnTarget), 0.0000001); // Check for suppressed competitor - Assert.assertTrue(leaderboardOnTarget.getSuppressedCompetitors().iterator().hasNext()); + Assertions.assertTrue(leaderboardOnTarget.getSuppressedCompetitors().iterator().hasNext()); Competitor suppressedCompetitorOnTarget = domainFactory.getCompetitorAndBoatStore().getExistingCompetitorById( competitorToSuppressUUID); - Assert.assertEquals(suppressedCompetitorOnTarget, leaderboardOnTarget.getSuppressedCompetitors().iterator() + Assertions.assertEquals(suppressedCompetitorOnTarget, leaderboardOnTarget.getSuppressedCompetitors().iterator() .next()); // Check for competitor display name - Assert.assertEquals(nickName, leaderboardOnTarget.getDisplayName(suppressedCompetitorOnTarget)); + Assertions.assertEquals(nickName, leaderboardOnTarget.getDisplayName(suppressedCompetitorOnTarget)); // Check for race log event - Assert.assertNotNull(raceColumnOnTarget.getRaceLog(fleet1OnTarget).getFirstRawFixAtOrAfter(logTimePoint)); - Assert.assertEquals(logEvent.getId(), + Assertions.assertNotNull(raceColumnOnTarget.getRaceLog(fleet1OnTarget).getFirstRawFixAtOrAfter(logTimePoint)); + Assertions.assertEquals(logEvent.getId(), raceColumnOnTarget.getRaceLog(fleet1OnTarget).getFirstRawFixAtOrAfter(logTimePoint).getId()); - Assert.assertNotNull(raceColumnOnTarget.getRaceLog(fleet1OnTarget).getFirstFixAtOrAfter(logTimePoint2)); - Assert.assertEquals(wind, ((RaceLogWindFixEvent) raceColumnOnTarget.getRaceLog(fleet1OnTarget) + Assertions.assertNotNull(raceColumnOnTarget.getRaceLog(fleet1OnTarget).getFirstFixAtOrAfter(logTimePoint2)); + Assertions.assertEquals(wind, ((RaceLogWindFixEvent) raceColumnOnTarget.getRaceLog(fleet1OnTarget) .getFirstFixAtOrAfter(logTimePoint2)).getWindFix()); // Add new event to check persistence of post-import events (see bug 3230) TimePoint logTimePoint5 = new MillisecondsTimePoint(1372489310000L); @@ -484,34 +484,34 @@ public class MasterDataImportTest { // Check for regatta log event RegattaLogRegisterCompetitorEvent registerEventOnTarget = (RegattaLogRegisterCompetitorEvent) regattaOnTarget .getRegattaLog().getFirstFixAtOrAfter(regattaLogTimepoint); - Assert.assertNotNull(registerEventOnTarget); - Assert.assertEquals(registerEvent.getId(), registerEventOnTarget.getId()); - Assert.assertEquals(competitor.getId(), registerEventOnTarget.getCompetitor().getId()); + Assertions.assertNotNull(registerEventOnTarget); + Assertions.assertEquals(registerEvent.getId(), registerEventOnTarget.getId()); + Assertions.assertEquals(competitor.getId(), registerEventOnTarget.getCompetitor().getId()); // Check for import of racelogtracking fix SensorFixStore sensorFixStore = destService.getSensorFixStore(); - Assert.assertEquals(1, sensorFixStore.getNumberOfFixes(deviceIdentifier)); + Assertions.assertEquals(1, sensorFixStore.getNumberOfFixes(deviceIdentifier)); verifyFix(gpsFix, sensorFixStore, logTimePoint, logTimePoint3, deviceIdentifier); // Check that fix counts around the batch size are imported verifyFixCount(sensorFixStore, deviceBatch1, 4999); verifyFixCount(sensorFixStore, deviceBatch2, 5000); verifyFixCount(sensorFixStore, deviceBatch3, 5001); // Check for import of sensor fix - Assert.assertEquals(1, sensorFixStore.getNumberOfFixes(deviceIdentifier2)); + Assertions.assertEquals(1, sensorFixStore.getNumberOfFixes(deviceIdentifier2)); verifyFix(doubleVectorFix, sensorFixStore, logTimePoint, logTimePoint3, deviceIdentifier2); // Check for persisting of race log events: RacingEventService dest2 = new RacingEventServiceImplMock(){}; Leaderboard lb2 = dest2.getLeaderboardByName(TEST_LEADERBOARD_NAME); RaceColumn raceColumn2 = lb2.getRaceColumns().iterator().next(); RaceLog raceLog2 = raceColumn2.getRaceLog(raceColumn2.getFleetByName(fleet1OnTarget.getName())); - Assert.assertEquals(logEvent.getId(), raceLog2.getFirstRawFixAtOrAfter(logTimePoint).getId()); + Assertions.assertEquals(logEvent.getId(), raceLog2.getFirstRawFixAtOrAfter(logTimePoint).getId()); RaceLogEvent postImportLogEventFromDB = raceLog2.getFirstRawFixAtOrAfter(logTimePoint5); - Assert.assertEquals(postImportEventId, postImportLogEventFromDB.getId()); + Assertions.assertEquals(postImportEventId, postImportLogEventFromDB.getId()); // Check for persisting of regatta log events Regatta regattaOnTarget2 = dest2.getRegattaByName(TEST_LEADERBOARD_NAME); RegattaLogRegisterCompetitorEvent registerEventOnTarget2 = (RegattaLogRegisterCompetitorEvent) regattaOnTarget2 .getRegattaLog().getFirstFixAtOrAfter(regattaLogTimepoint); - Assert.assertNotNull(registerEventOnTarget2); - Assert.assertEquals(registerEvent.getId(), registerEventOnTarget2.getId()); + Assertions.assertNotNull(registerEventOnTarget2); + Assertions.assertEquals(registerEvent.getId(), registerEventOnTarget2.getId()); } private DeviceIdentifier addDeviceMappingWithFixes(RacingEventService sourceService, Regatta regatta, CompetitorImpl competitor, @@ -659,22 +659,22 @@ public class MasterDataImportTest { MasterDataImportObjectCreationCount creationCount = destService.getDataImportLock().getProgress(randomUUID) .getResult(); - Assert.assertNotNull(creationCount); + Assertions.assertNotNull(creationCount); Event eventOnTarget = destService.getEvent(eventUUID); - Assert.assertNotNull(eventOnTarget); + Assertions.assertNotNull(eventOnTarget); LeaderboardGroup leaderboardGroupOnTarget = destService.getLeaderboardGroupByID(TEST_GROUP_UUID); - Assert.assertNotNull(leaderboardGroupOnTarget); + Assertions.assertNotNull(leaderboardGroupOnTarget); Leaderboard leaderboardOnTarget = destService.getLeaderboardByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(leaderboardOnTarget); + Assertions.assertNotNull(leaderboardOnTarget); Regatta regattaOnTarget = destService.getRegattaByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(regattaOnTarget); + Assertions.assertNotNull(regattaOnTarget); - Assert.assertEquals(courseAreaUUID, eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); + Assertions.assertEquals(courseAreaUUID, eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); RaceColumn raceColumnOnTarget = leaderboardOnTarget.getRaceColumnByName(raceColumnName); - Assert.assertNotNull(raceColumnOnTarget); + Assertions.assertNotNull(raceColumnOnTarget); - Assert.assertTrue(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); + Assertions.assertTrue(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); Competitor competitorOnTarget = domainFactory.getExistingCompetitorById(competitorUUID); Competitor competitorOnTarget2 = domainFactory.getCompetitorAndBoatStore().getExistingCompetitorById(competitor2UUID); Set competitorsCreatedOnTarget = new HashSet<>(); @@ -688,21 +688,21 @@ public class MasterDataImportTest { Iterable competitorsOnTarget = leaderboardOnTarget.getAllCompetitors(); Iterator competitorIterator = competitorsOnTarget.iterator(); - Assert.assertTrue(competitorIterator.hasNext()); - Assert.assertEquals(competitorOnTarget, competitorIterator.next()); + Assertions.assertTrue(competitorIterator.hasNext()); + Assertions.assertEquals(competitorOnTarget, competitorIterator.next()); // Check for score corrections - Assert.assertEquals( + Assertions.assertEquals( scoreCorrection, leaderboardOnTarget.getScoreCorrection().getExplicitScoreCorrection(competitorOnTarget, raceColumnOnTarget), 0.0000001); - Assert.assertEquals( + Assertions.assertEquals( maxPointsReason, leaderboardOnTarget.getScoreCorrection().getMaxPointsReason(competitorOnTarget, raceColumnOnTarget, MillisecondsTimePoint.now())); // Checks if score correction was not set if not set on source - Assert.assertFalse(leaderboardOnTarget.getScoreCorrection().isScoreCorrected(competitorOnTarget2, + Assertions.assertFalse(leaderboardOnTarget.getScoreCorrection().isScoreCorrected(competitorOnTarget2, raceColumnOnTarget, MillisecondsTimePoint.now())); } @@ -828,18 +828,18 @@ public class MasterDataImportTest { MasterDataImportObjectCreationCount creationCount = destService.getDataImportLock().getProgress(randomUUID) .getResult(); - Assert.assertNotNull(creationCount); + Assertions.assertNotNull(creationCount); Event eventOnTarget = destService.getEvent(eventUUID); - Assert.assertNotNull(eventOnTarget); + Assertions.assertNotNull(eventOnTarget); LeaderboardGroup leaderboardGroupOnTarget = destService.getLeaderboardGroupByID(TEST_GROUP_UUID); - Assert.assertNotNull(leaderboardGroupOnTarget); + Assertions.assertNotNull(leaderboardGroupOnTarget); Leaderboard leaderboardOnTarget = destService.getLeaderboardByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(leaderboardOnTarget); + Assertions.assertNotNull(leaderboardOnTarget); Regatta regattaOnTarget = destService.getRegattaByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(regattaOnTarget); - Assert.assertEquals(courseAreaUUID, eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); + Assertions.assertNotNull(regattaOnTarget); + Assertions.assertEquals(courseAreaUUID, eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); RaceColumn raceColumnOnTarget = leaderboardOnTarget.getRaceColumnByName(raceColumnName); - Assert.assertNotNull(raceColumnOnTarget); + Assertions.assertNotNull(raceColumnOnTarget); Competitor competitorOnTarget = domainFactory.getExistingCompetitorById(competitorUUID); Boat boatOnTarget = domainFactory.getExistingBoatById(competitorUUID); Map competitorsAndBoatsOnTarget = new HashMap<>(); @@ -853,12 +853,12 @@ public class MasterDataImportTest { windTrackOnDest.lockForRead(); try { Iterable fixes = windTrackOnDest.getFixes(); - Assert.assertNotNull(fixes); + Assertions.assertNotNull(fixes); Iterator iterator = fixes.iterator(); - Assert.assertTrue(iterator.hasNext()); + Assertions.assertTrue(iterator.hasNext()); Wind firstWindFix = iterator.next(); - Assert.assertNotNull(firstWindFix); - Assert.assertFalse(iterator.hasNext()); + Assertions.assertNotNull(firstWindFix); + Assertions.assertFalse(iterator.hasNext()); } finally { windTrackOnDest.unlockAfterRead(); } @@ -989,19 +989,19 @@ public class MasterDataImportTest { } MasterDataImportObjectCreationCount creationCount = destService.getDataImportLock().getProgress(randomUUID) .getResult(); - Assert.assertNotNull(creationCount); + Assertions.assertNotNull(creationCount); Event eventOnTarget = destService.getEvent(eventUUID); - Assert.assertNotNull(eventOnTarget); + Assertions.assertNotNull(eventOnTarget); LeaderboardGroup leaderboardGroupOnTarget = destService.getLeaderboardGroupByID(TEST_GROUP_UUID); - Assert.assertNotNull(leaderboardGroupOnTarget); + Assertions.assertNotNull(leaderboardGroupOnTarget); Leaderboard leaderboardOnTarget = destService.getLeaderboardByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(leaderboardOnTarget); + Assertions.assertNotNull(leaderboardOnTarget); Regatta regattaOnTarget = destService.getRegattaByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(regattaOnTarget); - Assert.assertEquals(courseArea.getId(), eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); + Assertions.assertNotNull(regattaOnTarget); + Assertions.assertEquals(courseArea.getId(), eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); RaceColumn raceColumnOnTarget = leaderboardOnTarget.getRaceColumnByName(raceColumnName); - Assert.assertNotNull(raceColumnOnTarget); - Assert.assertTrue(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); + Assertions.assertNotNull(raceColumnOnTarget); + Assertions.assertTrue(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); Competitor competitorOnTarget = domainFactory.getCompetitorAndBoatStore().getExistingCompetitorById(competitorUUID); Set competitorsCreatedOnTarget = new HashSet<>(); competitorsCreatedOnTarget.add(competitorOnTarget); @@ -1011,10 +1011,10 @@ public class MasterDataImportTest { raceColumnOnTarget.setTrackedRace(fleet1OnTarget, trackedRaceForTarget); Iterable competitorsOnTarget = leaderboardOnTarget.getAllCompetitors(); Iterator competitorIterator = competitorsOnTarget.iterator(); - Assert.assertTrue(competitorIterator.hasNext()); - Assert.assertEquals(competitorOnTarget, competitorIterator.next()); + Assertions.assertTrue(competitorIterator.hasNext()); + Assertions.assertEquals(competitorOnTarget, competitorIterator.next()); // Check for score corrections - Assert.assertEquals( + Assertions.assertEquals( MaxPointsReason.DNS, leaderboardOnTarget.getScoreCorrection().getMaxPointsReason(competitorOnTarget, raceColumnOnTarget, MillisecondsTimePoint.now())); @@ -1171,37 +1171,37 @@ public class MasterDataImportTest { // ---Asserts--- // Test correct number of creations - Assert.assertNotNull(creationCount); - Assert.assertEquals(0, creationCount.getEventCount()); - Assert.assertEquals(0, creationCount.getRegattaCount()); - Assert.assertEquals(0, creationCount.getLeaderboardCount()); - Assert.assertEquals(0, creationCount.getLeaderboardGroupCount()); + Assertions.assertNotNull(creationCount); + Assertions.assertEquals(0, creationCount.getEventCount()); + Assertions.assertEquals(0, creationCount.getRegattaCount()); + Assertions.assertEquals(0, creationCount.getLeaderboardCount()); + Assertions.assertEquals(0, creationCount.getLeaderboardGroupCount()); Event eventOnTarget = destService.getEvent(eventUUID); - Assert.assertNotNull(eventOnTarget); + Assertions.assertNotNull(eventOnTarget); // Check if existing event survived import - Assert.assertEquals(venueNameNotToOverride, eventOnTarget.getVenue().getName()); + Assertions.assertEquals(venueNameNotToOverride, eventOnTarget.getVenue().getName()); // Check if existing course area survived import - Assert.assertEquals(courseAreaNotToOverride.getName(), eventOnTarget.getVenue().getCourseAreas().iterator() + Assertions.assertEquals(courseAreaNotToOverride.getName(), eventOnTarget.getVenue().getCourseAreas().iterator() .next().getName()); LeaderboardGroup leaderboardGroupOnTarget = destService.getLeaderboardGroupByID(TEST_GROUP_UUID); - Assert.assertNotNull(leaderboardGroupOnTarget); + Assertions.assertNotNull(leaderboardGroupOnTarget); // Check if existing leaderboard group survived import - Assert.assertEquals(groupNotToOverride.getDescription(), leaderboardGroupOnTarget.getDescription()); + Assertions.assertEquals(groupNotToOverride.getDescription(), leaderboardGroupOnTarget.getDescription()); Leaderboard leaderboardOnTarget = destService.getLeaderboardByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(leaderboardOnTarget); + Assertions.assertNotNull(leaderboardOnTarget); Regatta regattaOnTarget = destService.getRegattaByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(regattaOnTarget); + Assertions.assertNotNull(regattaOnTarget); - Assert.assertEquals(courseAreaUUID, eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); + Assertions.assertEquals(courseAreaUUID, eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); RaceColumn raceColumnOnTarget = leaderboardOnTarget.getRaceColumnByName(raceColumnNameNotToOveride); - Assert.assertNotNull(raceColumnOnTarget); + Assertions.assertNotNull(raceColumnOnTarget); // Check if existing leaderboard survived import - Assert.assertEquals(leaderboardNotToOverride.getDisplayName(), leaderboardOnTarget.getDisplayName()); - Assert.assertFalse(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); + Assertions.assertEquals(leaderboardNotToOverride.getDisplayName(), leaderboardOnTarget.getDisplayName()); + Assertions.assertFalse(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); } @@ -1366,40 +1366,40 @@ public class MasterDataImportTest { MasterDataImportObjectCreationCount creationCount = destService.getDataImportLock().getProgress(randomUUID).getResult(); // ---Asserts--- // Test correct number of creations - Assert.assertNotNull(creationCount); - Assert.assertEquals(1, creationCount.getEventCount()); - Assert.assertEquals(1, creationCount.getRegattaCount()); - Assert.assertEquals(1, creationCount.getLeaderboardCount()); - Assert.assertEquals(1, creationCount.getLeaderboardGroupCount()); + Assertions.assertNotNull(creationCount); + Assertions.assertEquals(1, creationCount.getEventCount()); + Assertions.assertEquals(1, creationCount.getRegattaCount()); + Assertions.assertEquals(1, creationCount.getLeaderboardCount()); + Assertions.assertEquals(1, creationCount.getLeaderboardGroupCount()); Event eventOnTarget = destService.getEvent(eventUUID); - Assert.assertNotNull(eventOnTarget); + Assertions.assertNotNull(eventOnTarget); // Check if existing event didn't survive import - Assert.assertEquals(event.getVenue().getName(), eventOnTarget.getVenue().getName()); + Assertions.assertEquals(event.getVenue().getName(), eventOnTarget.getVenue().getName()); // Check if existing course area survive import - Assert.assertEquals(courseAreaNotToOverride.getName(), eventOnTarget.getVenue().getCourseAreas().iterator().next().getName()); + Assertions.assertEquals(courseAreaNotToOverride.getName(), eventOnTarget.getVenue().getCourseAreas().iterator().next().getName()); LeaderboardGroup leaderboardGroupOnTarget = destService.getLeaderboardGroupByID(TEST_GROUP_UUID); - Assert.assertNotNull(leaderboardGroupOnTarget); + Assertions.assertNotNull(leaderboardGroupOnTarget); // Check if existing leaderboard group didn't survive import - Assert.assertEquals(group.getDescription(), leaderboardGroupOnTarget.getDescription()); + Assertions.assertEquals(group.getDescription(), leaderboardGroupOnTarget.getDescription()); Leaderboard leaderboardOnTarget = destService.getLeaderboardByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(leaderboardOnTarget); + Assertions.assertNotNull(leaderboardOnTarget); Regatta regattaOnTarget = destService.getRegattaByName(TEST_REGATTA_NAME + " (" + TEST_BOAT_CLASS_NAME + ")"); - Assert.assertNotNull(regattaOnTarget); + Assertions.assertNotNull(regattaOnTarget); RegattaLeaderboard regattaLeaderboard = (RegattaLeaderboard) leaderboardOnTarget; Regatta regattaInLeaderboard = regattaLeaderboard.getRegatta(); - Assert.assertSame(regattaOnTarget, regattaInLeaderboard); - Assert.assertEquals(courseAreaUUID, eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); + Assertions.assertSame(regattaOnTarget, regattaInLeaderboard); + Assertions.assertEquals(courseAreaUUID, eventOnTarget.getVenue().getCourseAreas().iterator().next().getId()); RaceColumn raceColumnOnTarget = leaderboardOnTarget.getRaceColumnByName(raceColumnName); - Assert.assertNotNull(raceColumnOnTarget); + Assertions.assertNotNull(raceColumnOnTarget); // Check if existing leaderboard didn't survive import - Assert.assertEquals(leaderboard.getDisplayName(), leaderboardOnTarget.getDisplayName()); - Assert.assertTrue(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); + Assertions.assertEquals(leaderboard.getDisplayName(), leaderboardOnTarget.getDisplayName()); + Assertions.assertTrue(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); // Check that tracked race of regatta leaderboard has been removed - Assert.assertNull(destService.getTrackedRace(identifierOfRegattaTrackedRace)); + Assertions.assertNull(destService.getTrackedRace(identifierOfRegattaTrackedRace)); // Assert that competitor details were overridden Competitor competitorOnTarget = destService.getBaseDomainFactory().getExistingCompetitorById(competitorUUID); - Assert.assertEquals(competitor.getName(), competitorOnTarget.getName()); - Assert.assertEquals(competitor.getColor(), competitorOnTarget.getColor()); + Assertions.assertEquals(competitor.getName(), competitorOnTarget.getName()); + Assertions.assertEquals(competitor.getColor(), competitorOnTarget.getColor()); } @Test @@ -1590,10 +1590,10 @@ public class MasterDataImportTest { .getResult(); // ---Asserts--- - Assert.assertNotNull(creationCount); + Assertions.assertNotNull(creationCount); // Check if existing event survived import - Assert.assertNotNull(destService.getRegattaByName(regatta.getName())); + Assertions.assertNotNull(destService.getRegattaByName(regatta.getName())); } @@ -1722,23 +1722,23 @@ public class MasterDataImportTest { // ---Asserts--- - Assert.assertNotNull(creationCount); + Assertions.assertNotNull(creationCount); Event eventOnTarget = destService.getEvent(eventUUID); - Assert.assertNotNull(eventOnTarget); + Assertions.assertNotNull(eventOnTarget); Regatta regattaOnTarget = destService.getRegattaByName(TEST_LEADERBOARD_NAME); - Assert.assertNotNull(regattaOnTarget); + Assertions.assertNotNull(regattaOnTarget); // Check if dummy race id has been imported to destination service ConcurrentHashMap map = destService.getPersistentRegattasForRaceIDs(); - Assert.assertEquals(regattaOnTarget, map.get("dummy")); - Assert.assertEquals(regattaOnTarget, map.get("dummy2")); + Assertions.assertEquals(regattaOnTarget, map.get("dummy")); + Assertions.assertEquals(regattaOnTarget, map.get("dummy2")); // Check if persistent regatta for race id has been persisted RacingEventServiceImplMock destService2 = new RacingEventServiceImplMock(new DataImportProgressImpl(randomUUID)){}; ConcurrentHashMap map2 = destService2.getPersistentRegattasForRaceIDs(); Regatta regattaOnTarget2 = destService2.getRegattaByName(TEST_LEADERBOARD_NAME); - Assert.assertEquals(regattaOnTarget2, map2.get("dummy")); + Assertions.assertEquals(regattaOnTarget2, map2.get("dummy")); } @@ -1825,19 +1825,19 @@ public class MasterDataImportTest { // ---Asserts--- - Assert.assertNotNull(creationCount); + Assertions.assertNotNull(creationCount); Iterable targetTracks = destService.getAllMediaTracks(); - Assert.assertEquals(1, Util.size(targetTracks)); + Assertions.assertEquals(1, Util.size(targetTracks)); MediaTrack trackOnTarget = targetTracks.iterator().next(); - Assert.assertEquals(trackOnSource.dbId, trackOnTarget.dbId); + Assertions.assertEquals(trackOnSource.dbId, trackOnTarget.dbId); - Assert.assertEquals(trackOnSource.url, trackOnTarget.url); + Assertions.assertEquals(trackOnSource.url, trackOnTarget.url); - Assert.assertEquals(trackOnSource.assignedRaces, trackOnTarget.assignedRaces); + Assertions.assertEquals(trackOnSource.assignedRaces, trackOnTarget.assignedRaces); } @@ -1946,20 +1946,20 @@ public class MasterDataImportTest { .getResult(); // Test correct number of creations - Assert.assertNotNull(creationCount); - Assert.assertEquals(1, creationCount.getEventCount()); - Assert.assertEquals(1, creationCount.getRegattaCount()); - Assert.assertEquals(1, creationCount.getLeaderboardCount()); - Assert.assertEquals(2, creationCount.getLeaderboardGroupCount()); + Assertions.assertNotNull(creationCount); + Assertions.assertEquals(1, creationCount.getEventCount()); + Assertions.assertEquals(1, creationCount.getRegattaCount()); + Assertions.assertEquals(1, creationCount.getLeaderboardCount()); + Assertions.assertEquals(2, creationCount.getLeaderboardGroupCount()); Event eventOnTarget = destService.getEvent(eventUUID); - Assert.assertNotNull(eventOnTarget); + Assertions.assertNotNull(eventOnTarget); LeaderboardGroup leaderboardGroupOnTarget = destService.getLeaderboardGroupByID(TEST_GROUP_UUID); - Assert.assertNotNull(leaderboardGroupOnTarget); - Assert.assertTrue(leaderboardGroupOnTarget.getLeaderboards().iterator().hasNext()); + Assertions.assertNotNull(leaderboardGroupOnTarget); + Assertions.assertTrue(leaderboardGroupOnTarget.getLeaderboards().iterator().hasNext()); LeaderboardGroup leaderboardGroup2OnTarget = destService.getLeaderboardGroupByID(TEST_GROUP_UUID2); - Assert.assertNotNull(leaderboardGroup2OnTarget); - Assert.assertTrue(leaderboardGroup2OnTarget.getLeaderboards().iterator().hasNext()); + Assertions.assertNotNull(leaderboardGroup2OnTarget); + Assertions.assertTrue(leaderboardGroup2OnTarget.getLeaderboards().iterator().hasNext()); } @@ -2012,52 +2012,52 @@ public class MasterDataImportTest { .getResult(); // Test correct number of creations - Assert.assertEquals(1, creationCount.getLeaderboardGroupCount()); + Assertions.assertEquals(1, creationCount.getLeaderboardGroupCount()); LeaderboardGroup leaderboardGroupOnTarget = destService.getLeaderboardGroupByID(TEST_GROUP_UUID); - Assert.assertNotNull(leaderboardGroupOnTarget); + Assertions.assertNotNull(leaderboardGroupOnTarget); LeaderboardGroupMetaLeaderboard overallLeaderboard = (LeaderboardGroupMetaLeaderboard) leaderboardGroupOnTarget .getOverallLeaderboard(); - Assert.assertNotNull(overallLeaderboard); + Assertions.assertNotNull(overallLeaderboard); Leaderboard overallLeaderboardRetrievedByName = destService.getLeaderboardByName(overallLeaderboard.getName()); assertSame(overallLeaderboard, overallLeaderboardRetrievedByName); - Assert.assertNotNull(overallLeaderboard.getResultDiscardingRule()); + Assertions.assertNotNull(overallLeaderboard.getResultDiscardingRule()); - Assert.assertNotNull(overallLeaderboard.getScoringScheme()); + Assertions.assertNotNull(overallLeaderboard.getScoringScheme()); - Assert.assertEquals(scheme.getType(), overallLeaderboard.getScoringScheme().getType()); + Assertions.assertEquals(scheme.getType(), overallLeaderboard.getScoringScheme().getType()); - Assert.assertEquals(3, ((ThresholdBasedResultDiscardingRule) overallLeaderboard.getResultDiscardingRule()) + Assertions.assertEquals(3, ((ThresholdBasedResultDiscardingRule) overallLeaderboard.getResultDiscardingRule()) .getDiscardIndexResultsStartingWithHowManyRaces()[2]); Iterable metaColumns = overallLeaderboard.getRaceColumns(); RaceColumn metaColumn = metaColumns.iterator().next(); - Assert.assertNotNull(metaColumn); - Assert.assertEquals(factor, overallLeaderboard.getScoringScheme().getScoreFactor(metaColumn), 0.0000001); + Assertions.assertNotNull(metaColumn); + Assertions.assertEquals(factor, overallLeaderboard.getScoringScheme().getScoreFactor(metaColumn), 0.0000001); // Verify that overall leaderboard data has been persisted RacingEventService persistenceVerifier = new RacingEventServiceImplMock(){}; LeaderboardGroup lg = persistenceVerifier.getLeaderboardGroupByID(TEST_GROUP_UUID); - Assert.assertNotNull(lg); + Assertions.assertNotNull(lg); overallLeaderboard = (LeaderboardGroupMetaLeaderboard) lg.getOverallLeaderboard(); - Assert.assertNotNull(overallLeaderboard); + Assertions.assertNotNull(overallLeaderboard); - Assert.assertNotNull(overallLeaderboard.getResultDiscardingRule()); + Assertions.assertNotNull(overallLeaderboard.getResultDiscardingRule()); - Assert.assertNotNull(overallLeaderboard.getScoringScheme()); + Assertions.assertNotNull(overallLeaderboard.getScoringScheme()); - Assert.assertEquals(scheme.getType(), overallLeaderboard.getScoringScheme().getType()); + Assertions.assertEquals(scheme.getType(), overallLeaderboard.getScoringScheme().getType()); - Assert.assertEquals(3, ((ThresholdBasedResultDiscardingRule) overallLeaderboard.getResultDiscardingRule()) + Assertions.assertEquals(3, ((ThresholdBasedResultDiscardingRule) overallLeaderboard.getResultDiscardingRule()) .getDiscardIndexResultsStartingWithHowManyRaces()[2]); metaColumns = overallLeaderboard.getRaceColumns(); metaColumn = metaColumns.iterator().next(); - Assert.assertNotNull(metaColumn); - Assert.assertEquals(factor, overallLeaderboard.getScoringScheme().getScoreFactor(metaColumn), 0.0000001); + Assertions.assertNotNull(metaColumn); + Assertions.assertEquals(factor, overallLeaderboard.getScoringScheme().getScoreFactor(metaColumn), 0.0000001); } @@ -2197,16 +2197,16 @@ public class MasterDataImportTest { MasterDataImportObjectCreationCount creationCount = destService.getDataImportLock().getProgress(randomUUID) .getResult(); - Assert.assertNotNull(creationCount); + Assertions.assertNotNull(creationCount); LeaderboardGroup leaderboardGroupOnTarget = destService.getLeaderboardGroupByID(TEST_GROUP_UUID); - Assert.assertNotNull(leaderboardGroupOnTarget); + Assertions.assertNotNull(leaderboardGroupOnTarget); Leaderboard leaderboardOnTarget = destService.getLeaderboardByName(flexLeaderboardName); - Assert.assertNotNull(leaderboardOnTarget); + Assertions.assertNotNull(leaderboardOnTarget); RaceColumn raceColumnOnTarget = leaderboardOnTarget.getRaceColumns().iterator().next(); Fleet defaultFleetOnTarget = raceColumnOnTarget.getFleets().iterator().next(); - Assert.assertNotNull(raceColumnOnTarget); - Assert.assertNull(raceColumnOnTarget.getTrackedRace(defaultFleetOnTarget)); + Assertions.assertNotNull(raceColumnOnTarget); + Assertions.assertNull(raceColumnOnTarget.getTrackedRace(defaultFleetOnTarget)); Regatta regattaOnTarget = destService.createRegatta( RegattaImpl.getDefaultName(TEST_REGATTA_NAME, TEST_BOAT_CLASS_NAME), TEST_BOAT_CLASS_NAME, @@ -2219,46 +2219,46 @@ public class MasterDataImportTest { raceColumnOnTarget.setTrackedRace(defaultFleetOnTarget, new DummyTrackedRace(raceId, createCompetitorsAndBoatsMap(boatClass, competitors), regattaOnTarget, null, sourceService.getWindStore())); - Assert.assertTrue(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); + Assertions.assertTrue(leaderboardOnTarget.getScoreCorrection().hasCorrectionFor(raceColumnOnTarget)); Competitor competitorOnTarget = domainFactory.getExistingCompetitorById(competitorUUID); Set competitorsCreatedOnTarget = new HashSet<>(); competitorsCreatedOnTarget.add(competitorOnTarget); - Assert.assertEquals(defaultFleetOnTarget, leaderboardOnTarget.getFleet(null)); + Assertions.assertEquals(defaultFleetOnTarget, leaderboardOnTarget.getFleet(null)); TrackedRace trackedRaceForTarget = new DummyTrackedRace(raceId, createCompetitorsAndBoatsMap(boatClass, competitorsCreatedOnTarget), regattaOnTarget, null, sourceService.getWindStore()); raceColumnOnTarget.setTrackedRace(defaultFleetOnTarget, trackedRaceForTarget); - Assert.assertEquals(factor, leaderboardOnTarget.getScoringScheme().getScoreFactor(raceColumnOnTarget), 0.0000001); + Assertions.assertEquals(factor, leaderboardOnTarget.getScoringScheme().getScoreFactor(raceColumnOnTarget), 0.0000001); // Check for score corrections - Assert.assertEquals( + Assertions.assertEquals( scoreCorrection, leaderboardOnTarget.getScoreCorrection().getExplicitScoreCorrection(competitorOnTarget, raceColumnOnTarget), 0.0000001); - Assert.assertEquals(maxPointsReason, leaderboardOnTarget.getScoreCorrection() + Assertions.assertEquals(maxPointsReason, leaderboardOnTarget.getScoreCorrection() .getMaxPointsReason(competitorOnTarget, raceColumnOnTarget, MillisecondsTimePoint.now())); // Check for carried points - Assert.assertEquals(carriedPoints, leaderboardOnTarget.getCarriedPoints(competitorOnTarget), 0.0000001); + Assertions.assertEquals(carriedPoints, leaderboardOnTarget.getCarriedPoints(competitorOnTarget), 0.0000001); // Check for suppressed competitor - Assert.assertTrue(leaderboardOnTarget.getSuppressedCompetitors().iterator().hasNext()); + Assertions.assertTrue(leaderboardOnTarget.getSuppressedCompetitors().iterator().hasNext()); Competitor suppressedCompetitorOnTarget = domainFactory.getCompetitorAndBoatStore().getExistingCompetitorById( competitorToSuppressUUID); - Assert.assertEquals(suppressedCompetitorOnTarget, leaderboardOnTarget.getSuppressedCompetitors().iterator() + Assertions.assertEquals(suppressedCompetitorOnTarget, leaderboardOnTarget.getSuppressedCompetitors().iterator() .next()); // Check for competitor display name - Assert.assertEquals(nickName, leaderboardOnTarget.getDisplayName(suppressedCompetitorOnTarget)); + Assertions.assertEquals(nickName, leaderboardOnTarget.getDisplayName(suppressedCompetitorOnTarget)); // Check for race log event - Assert.assertNotNull(raceColumnOnTarget.getRaceLog(defaultFleetOnTarget).getFirstRawFixAtOrAfter(logTimePoint)); - Assert.assertEquals(logEvent.getId(), raceColumnOnTarget.getRaceLog(defaultFleetOnTarget) + Assertions.assertNotNull(raceColumnOnTarget.getRaceLog(defaultFleetOnTarget).getFirstRawFixAtOrAfter(logTimePoint)); + Assertions.assertEquals(logEvent.getId(), raceColumnOnTarget.getRaceLog(defaultFleetOnTarget) .getFirstRawFixAtOrAfter(logTimePoint).getId()); - Assert.assertNotNull(raceColumnOnTarget.getRaceLog(defaultFleetOnTarget).getFirstFixAtOrAfter(logTimePoint2)); - Assert.assertEquals(wind, ((RaceLogWindFixEvent) raceColumnOnTarget.getRaceLog(defaultFleetOnTarget) + Assertions.assertNotNull(raceColumnOnTarget.getRaceLog(defaultFleetOnTarget).getFirstFixAtOrAfter(logTimePoint2)); + Assertions.assertEquals(wind, ((RaceLogWindFixEvent) raceColumnOnTarget.getRaceLog(defaultFleetOnTarget) .getFirstFixAtOrAfter(logTimePoint2)).getWindFix()); // Check for persisting of race log events: @@ -2266,7 +2266,7 @@ public class MasterDataImportTest { Leaderboard lb2 = dest2.getLeaderboardByName(flexLeaderboardName); RaceColumn raceColumn2 = lb2.getRaceColumns().iterator().next(); RaceLog raceLog2 = raceColumn2.getRaceLog(raceColumn2.getFleets().iterator().next()); - Assert.assertEquals(logEvent.getId(), raceLog2.getFirstRawFixAtOrAfter(logTimePoint).getId()); + Assertions.assertEquals(logEvent.getId(), raceLog2.getFirstRawFixAtOrAfter(logTimePoint).getId()); } } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/OperationalTransformationTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/OperationalTransformationTest.java index 19f2c7d525d..cb579fa20a1 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/OperationalTransformationTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/OperationalTransformationTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.HashSet; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.leaderboard.FlexibleLeaderboard; @@ -34,7 +34,7 @@ public class OperationalTransformationTest { private Peer, RacingEventService> server; private Peer, RacingEventService> replica; - @Before + @BeforeEach public void setUp() { // ensure that leaderboards will be loaded from and stored to the test database which is MongoDBService.INSTANCE.getDB().drop(); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceColumnReloadTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceColumnReloadTest.java index 10a2a810a97..21560aab8db 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceColumnReloadTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceColumnReloadTest.java @@ -8,9 +8,9 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +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; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -77,7 +77,7 @@ public class RaceColumnReloadTest { private RaceLogWindFixEventImpl testWindEvent1, testWindEvent2; private Fleet defaultFleet; - @Before + @BeforeEach public void setUp() { MongoDBService.INSTANCE.getDB().drop(); final RacingEventServiceImpl service = new RacingEventServiceImpl(); @@ -212,7 +212,7 @@ public class RaceColumnReloadTest { } private void assertWindFixCount(int expected) { - Assert.assertEquals(expected, loggedWindFixes.size()); + Assertions.assertEquals(expected, loggedWindFixes.size()); } } @@ -232,7 +232,7 @@ public class RaceColumnReloadTest { } private void assertWindFixCount(int expected) { - Assert.assertEquals(expected, loggedWindFixes.size()); + Assertions.assertEquals(expected, loggedWindFixes.size()); } } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogInRaceColumnTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogInRaceColumnTest.java index ebf0d8f6a1c..a88f33e87cc 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogInRaceColumnTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogInRaceColumnTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -38,7 +38,7 @@ public class RaceLogInRaceColumnTest { private Peer, RacingEventService> server; private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); - @Before + @BeforeEach public void setUp() { MongoDBService.INSTANCE.getDB().drop(); racingEventServiceServer = new RacingEventServiceImpl(); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogOperationalTransformationTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogOperationalTransformationTest.java index 7f603f9dcff..69dc5d672ec 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogOperationalTransformationTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogOperationalTransformationTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.UUID; import java.util.concurrent.CountDownLatch; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -40,7 +40,7 @@ public class RaceLogOperationalTransformationTest { private CountDownLatch client2Latch; private CountDownLatch serverLatch; - @Before + @BeforeEach public void setUp() { raceLogClient1 = new RaceLogImpl("Test Race Log Client1"); raceLogClient2 = new RaceLogImpl("Test Race Log Client2"); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java index a0dda6ce812..24e4b6fe745 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +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.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.io.IOException; @@ -19,8 +19,8 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; @@ -68,7 +68,7 @@ public class RaceTrackerStartStopTest { private RaceTrackerMock raceTracker2; private RaceTrackerMock raceTracker3; - @Before + @BeforeEach public void setUp() { racingEventService = new RacingEventServiceImplMock(){}; boatClass = new BoatClassImpl(BOATCLASSNAME, /* typicallyStartsUpwind */ true); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java index 62dffedd87d..b6d09176f96 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.MalformedURLException; @@ -13,9 +13,9 @@ import java.net.URL; import java.util.Optional; import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; @@ -67,7 +67,7 @@ public class RaceTrackerTest { tracTracPassword = "tracTest"; } - @Before + @BeforeEach public void setUp() throws Exception { service = new RacingEventServiceImpl(); logger.info("Calling service.addTracTracRace"); @@ -86,7 +86,7 @@ public class RaceTrackerTest { assertTrue(!Util.isEmpty(raceHandle.getRegatta().getAllRaces())); } - @After + @AfterEach public void tearDown() throws MalformedURLException, IOException, InterruptedException { logger.info("calling stopTrackingAndRemove("+raceHandle.getRegatta().getName()+" ("+raceHandle.getRegatta().hashCode()+"))"); service.stopTrackingAndRemove(raceHandle.getRegatta()); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RemoveLeaderboardGroupTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RemoveLeaderboardGroupTest.java index 2a4a66d32d7..3c89b7ec20b 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RemoveLeaderboardGroupTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RemoveLeaderboardGroupTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +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 java.util.ArrayList; import java.util.Calendar; @@ -14,8 +14,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.common.LeaderboardNameConstants; @@ -46,7 +46,7 @@ public class RemoveLeaderboardGroupTest { private Event pfingstbusch; private UUID newGroupId; - @Before + @BeforeEach public void setUp() { final SecurityService securityService = SecurityServiceMockFactory.mockSecurityService(); server = new RacingEventServiceImpl() { diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RemoveLeaderboardTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RemoveLeaderboardTest.java index f993f0ca3d2..d43f75d9f1f 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RemoveLeaderboardTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RemoveLeaderboardTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import java.util.ArrayList; @@ -13,8 +13,8 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.base.BoatClass; @@ -68,7 +68,7 @@ public class RemoveLeaderboardTest { private Fleet defaultFleet; private FlexibleLeaderboard leaderboard; - @Before + @BeforeEach public void setUp() { server = new RacingEventServiceImpl(); List allEvents = new ArrayList<>(); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java index f68f410ce2a..1671d45b995 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -20,8 +20,8 @@ import java.util.UUID; import org.apache.shiro.SecurityUtils; import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.subject.Subject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sailing.domain.base.CompetitorWithBoat; @@ -114,7 +114,7 @@ public class SearchServiceTest { private DynamicTrackedRace aalOrcTrackedR2; private SecurityService securityService; - @Before + @BeforeEach public void setUp() { UserGroupImpl defaultTenant = new UserGroupImpl(new UUID(0, 1), "defaultTenant"); User currentUser = Mockito.mock(User.class); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TagDTODeSerializerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TagDTODeSerializerTest.java index 24c6e427bfd..cddebe6f13a 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TagDTODeSerializerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TagDTODeSerializerTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.List; @@ -8,7 +8,7 @@ import java.util.logging.Logger; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sailing.server.tagging.TagDTODeSerializer; @@ -39,20 +39,20 @@ public class TagDTODeSerializerTest { final TagDTO revokedTag = new TagDTO(title, comment, hiddenInfo, imageURL, imageURL, false, username, raceTimePoint, createdAt, revokedAt); final JSONObject tagJson = serializer.serialize(tag); - assertEquals("title equals serialized title", title, tagJson.get(TagDTODeSerializer.FIELD_TAG)); - assertEquals("comment equals serialized comment", comment, tagJson.get(TagDTODeSerializer.FIELD_COMMENT)); - assertEquals("hidden info equals serialized hidden info", hiddenInfo, tagJson.get(TagDTODeSerializer.FIELD_HIDDEN_INFO)); - assertEquals("imageURL equals serialized imageURL", imageURL, tagJson.get(TagDTODeSerializer.FIELD_ORIGINAL_IMAGE_URL)); - assertEquals("username equals serialized username", username, tagJson.get(TagDTODeSerializer.FIELD_USERNAME)); - assertEquals("raceTimepoint equals serialized raceTimepoint", raceTimePoint.asMillis(), - tagJson.get(TagDTODeSerializer.FIELD_RACE_TIMEPOINT)); - assertEquals("createdAt timepoint equals serialized createdAt timepoint", createdAt.asMillis(), - tagJson.get(TagDTODeSerializer.FIELD_CREATED_AT)); - assertEquals("revokedAt timepoint is null for non-revoked tags", null, - tagJson.get(TagDTODeSerializer.FIELD_REVOKED_AT)); + assertEquals(title, tagJson.get(TagDTODeSerializer.FIELD_TAG), "title equals serialized title"); + assertEquals(comment, tagJson.get(TagDTODeSerializer.FIELD_COMMENT), "comment equals serialized comment"); + assertEquals(hiddenInfo, tagJson.get(TagDTODeSerializer.FIELD_HIDDEN_INFO), "hidden info equals serialized hidden info"); + assertEquals(imageURL, tagJson.get(TagDTODeSerializer.FIELD_ORIGINAL_IMAGE_URL), "imageURL equals serialized imageURL"); + assertEquals(username, tagJson.get(TagDTODeSerializer.FIELD_USERNAME), "username equals serialized username"); + assertEquals(raceTimePoint.asMillis(), tagJson.get(TagDTODeSerializer.FIELD_RACE_TIMEPOINT), + "raceTimepoint equals serialized raceTimepoint"); + assertEquals(createdAt.asMillis(), tagJson.get(TagDTODeSerializer.FIELD_CREATED_AT), + "createdAt timepoint equals serialized createdAt timepoint"); + assertEquals(null, tagJson.get(TagDTODeSerializer.FIELD_REVOKED_AT), + "revokedAt timepoint is null for non-revoked tags"); final JSONObject revokedTagJson = serializer.serialize(revokedTag); - assertEquals("revokedAt timepoint equals serialized revokedAt", revokedAt.asMillis(), - revokedTagJson.get(TagDTODeSerializer.FIELD_REVOKED_AT)); + assertEquals(revokedAt.asMillis(), revokedTagJson.get(TagDTODeSerializer.FIELD_REVOKED_AT), + "revokedAt timepoint equals serialized revokedAt"); logger.exiting(getClass().getName(), "testSerializeSingleTag"); } @@ -76,10 +76,10 @@ public class TagDTODeSerializerTest { final JSONObject tag2Json = serializer.serialize(tag2); final List tags = Arrays.asList(tag1, tag2); final JSONArray tagsJson = serializer.serialize(tags); - assertEquals("First serialized tag equals serialized version of JSON array", tag1Json, - (JSONObject) tagsJson.get(0)); - assertEquals("Second serialized tag equals serialized version of JSON array", tag2Json, - (JSONObject) tagsJson.get(1)); + assertEquals(tag1Json, (JSONObject) tagsJson.get(0), + "First serialized tag equals serialized version of JSON array"); + assertEquals(tag2Json, (JSONObject) tagsJson.get(1), + "Second serialized tag equals serialized version of JSON array"); logger.exiting(getClass().getName(), "testSerializeMultipleTags"); } @@ -109,8 +109,8 @@ public class TagDTODeSerializerTest { tagJson.put(TagDTODeSerializer.FIELD_RACE_TIMEPOINT, raceTimePoint.asMillis()); tagJson.put(TagDTODeSerializer.FIELD_CREATED_AT, createdAt.asMillis()); tagJson.put(TagDTODeSerializer.FIELD_REVOKED_AT, revokedAt.asMillis()); - assertEquals("Deserialize tag from string", tag, serializer.deserializeTag(tagJson.toJSONString())); - assertEquals("Deserialize tag from JSON object", tag, serializer.deserialize(tagJson)); + assertEquals(tag, serializer.deserializeTag(tagJson.toJSONString()), "Deserialize tag from string"); + assertEquals(tag, serializer.deserialize(tagJson), "Deserialize tag from JSON object"); logger.exiting(getClass().getName(), "testDeserializeSingleTag"); } @@ -156,10 +156,10 @@ public class TagDTODeSerializerTest { tagsJson.add(tag2Json); List deserialzedFromString = serializer.deserializeTags(tagsJson.toJSONString()); List deserialzedFromArray = serializer.deserialize(tagsJson); - assertEquals("Deserialize tag1 from string", tag1, deserialzedFromString.get(0)); - assertEquals("Deserialize tag2 from string", tag2, deserialzedFromString.get(1)); - assertEquals("Deserialize tag1 from JSON array", tag1, deserialzedFromArray.get(0)); - assertEquals("Deserialize tag2 from JSON array", tag2, deserialzedFromArray.get(1)); + assertEquals(tag1, deserialzedFromString.get(0), "Deserialize tag1 from string"); + assertEquals(tag2, deserialzedFromString.get(1), "Deserialize tag2 from string"); + assertEquals(tag1, deserialzedFromArray.get(0), "Deserialize tag1 from JSON array"); + assertEquals(tag2, deserialzedFromArray.get(1), "Deserialize tag2 from JSON array"); logger.exiting(getClass().getName(), "testDeserializeMultipleTags"); } @@ -167,9 +167,9 @@ public class TagDTODeSerializerTest { public void testSerializeTimePoint() { logger.entering(getClass().getName(), "testSerializeTimePoint"); long millis = 1234; - assertEquals("Serialize timepoint with null value", 0, serializer.serializeTimePoint(null)); - assertEquals("Serialize timepoint with non-null value", 1234, - serializer.serializeTimePoint(new MillisecondsTimePoint(millis))); + assertEquals(0, serializer.serializeTimePoint(null), "Serialize timepoint with null value"); + assertEquals(1234, serializer.serializeTimePoint(new MillisecondsTimePoint(millis)), + "Serialize timepoint with non-null value"); logger.exiting(getClass().getName(), "testSerializeTimePoint"); } @@ -177,7 +177,7 @@ public class TagDTODeSerializerTest { public void testDeserializeTimePoint() { logger.entering(getClass().getName(), "testDeserializeTimePoint"); long millis = 1234; - assertEquals("Deserialize timepoint", millis, serializer.deserializeTimePoint(millis).asMillis()); + assertEquals(millis, serializer.deserializeTimePoint(millis).asMillis(), "Deserialize timepoint"); logger.exiting(getClass().getName(), "testDeserializeTimePoint"); } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java index 7cbd2b42208..e3a3422305d 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.List; import java.util.Locale; @@ -15,11 +15,11 @@ import org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.support.SubjectThreadState; import org.apache.shiro.util.ThreadContext; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sailing.domain.abstractlog.race.RaceLog; @@ -80,7 +80,7 @@ public class TaggingServiceTest { private static Subject subject; private static SubjectThreadState threadState; - @BeforeClass + @BeforeAll public synchronized static void setUpClass() throws Exception { logger.info("current thread: "+Thread.currentThread()); MongoDBService.INSTANCE.getDB().drop(); @@ -107,7 +107,7 @@ public class TaggingServiceTest { Mockito.doReturn(taggingService).when(racingService).getTaggingService(); } - @AfterClass + @AfterAll public synchronized static void tearDownClass() { logger.info("current thread: "+Thread.currentThread()); try { @@ -119,7 +119,7 @@ public class TaggingServiceTest { MongoDBService.INSTANCE.getDB().drop(); } - @Before + @BeforeEach public void resetEnvironment() { logger.info("current thread: "+Thread.currentThread()); synchronized (TaggingServiceTest.class) { @@ -151,7 +151,7 @@ public class TaggingServiceTest { } } - @After + @AfterEach public void restoreEnvironment() { logger.info("current thread: "+Thread.currentThread()); synchronized (TaggingServiceTest.class) { @@ -173,15 +173,15 @@ public class TaggingServiceTest { true, raceTimepoint); fail("Tag should not be added because the tag title is missing!"); } catch (IllegalArgumentException e) { - assertTrue("Invalid arguments were caught correctly!", true); + assertTrue(true, "Invalid arguments were caught correctly!"); } taggingService.addTag(leaderboardName, raceColumnName, fleetName, tag, comment, hiddenInfo, imageURL, imageURL, false, raceTimepoint); String preference = securityService.getPreference(username, serializer.generateUniqueKey(leaderboardName, raceColumnName, fleetName)); List privateTags = serializer.deserializeTags(preference); - assertTrue("Create private tag", privateTags.size() == 1 && privateTags.get(0).equals(tag, comment, hiddenInfo, - imageURL, imageURL, false, subject.getPrincipal().toString(), raceTimepoint)); + assertTrue(privateTags.size() == 1 && privateTags.get(0).equals(tag, comment, hiddenInfo, + imageURL, imageURL, false, subject.getPrincipal().toString(), raceTimepoint), "Create private tag"); // we used to test for permission checking here, but it was wrong in the first place to check permissions // in TaggingService; permission checks shall happen in the REST API layer and in the GWT RPC service layer try { @@ -190,21 +190,21 @@ public class TaggingServiceTest { taggingService.addTag(leaderboardName, "bla", fleetName, tag, comment, hiddenInfo, imageURL, imageURL, true, raceTimepoint); fail("Tag should not be added because racelog does not exist!"); } catch (RaceLogNotFoundException e) { - assertTrue("Missing racelog was caught correctly!", true); + assertTrue(true, "Missing racelog was caught correctly!"); } logger.info("Trying to add public tag, should succeed"); taggingService.addTag(leaderboardName, raceColumnName, fleetName, tag, comment, hiddenInfo, imageURL, imageURL, true, raceTimepoint); List publicTags = taggingService.getPublicTags(leaderboardName, raceColumnName, fleetName, null, false); - assertTrue("", publicTags.size() == 1 && publicTags.get(0).equals(tag, comment, hiddenInfo, imageURL, imageURL, - true, subject.getPrincipal().toString(), raceTimepoint)); + assertTrue(publicTags.size() == 1 && publicTags.get(0).equals(tag, comment, hiddenInfo, imageURL, imageURL, + true, subject.getPrincipal().toString(), raceTimepoint), ""); try { logger.info("Trying to add already existing public tag which should be catched by this test."); taggingService.addTag(leaderboardName, raceColumnName, fleetName, tag, comment, hiddenInfo, imageURL, imageURL, true, raceTimepoint); fail("Tag should not be added because it already exists!"); } catch (TagAlreadyExistsException e) { - assertTrue("Tag already exists was caught correctly!", true); + assertTrue(true, "Tag already exists was caught correctly!"); } logger.exiting(getClass().getName(), "testAddTag"); } @@ -222,16 +222,16 @@ public class TaggingServiceTest { false, raceTimepoint); taggingService.addTag(leaderboardName, raceColumnName, fleetName, tag, comment, hiddenInfo, imageURL, imageURL, true, raceTimepoint); - assertTrue("Private tags contain added tag", - taggingService.getPrivateTags(leaderboardName, raceColumnName, fleetName).get(0).equals(tag, comment, - hiddenInfo, imageURL, imageURL, false, subject.getPrincipal().toString(), raceTimepoint)); - assertTrue("Public tags contain added tag", - taggingService.getPublicTags(leaderboardName, raceColumnName, fleetName, null, false).get(0).equals(tag, - comment, hiddenInfo, imageURL, imageURL, true, subject.getPrincipal().toString(), raceTimepoint)); - assertEquals("Public tags contain added tag with matching creation date filter", 1, - taggingService.getPublicTags(leaderboardName, raceColumnName, fleetName, raceTimepoint, false).size()); - assertEquals("Public tags do not contain added tag with non-matching creation date filter", 0, taggingService - .getPublicTags(leaderboardName, raceColumnName, fleetName, MillisecondsTimePoint.now(), false).size()); + assertTrue(taggingService.getPrivateTags(leaderboardName, raceColumnName, fleetName).get(0).equals(tag, comment, + hiddenInfo, imageURL, imageURL, false, subject.getPrincipal().toString(), raceTimepoint), + "Private tags contain added tag"); + assertTrue(taggingService.getPublicTags(leaderboardName, raceColumnName, fleetName, null, false).get(0).equals(tag, + comment, hiddenInfo, imageURL, imageURL, true, subject.getPrincipal().toString(), raceTimepoint), + "Public tags contain added tag"); + assertEquals(1, taggingService.getPublicTags(leaderboardName, raceColumnName, fleetName, raceTimepoint, false).size(), + "Public tags contain added tag with matching creation date filter"); + assertEquals(0, taggingService + .getPublicTags(leaderboardName, raceColumnName, fleetName, MillisecondsTimePoint.now(), false).size(), "Public tags do not contain added tag with non-matching creation date filter"); logger.exiting(getClass().getName(), "testGetTags"); } @@ -256,32 +256,32 @@ public class TaggingServiceTest { taggingService.updateTag(leaderboardName, raceColumnName, fleetName, tagObject, updatedTag, comment, hiddenInfo, imageURL, imageURL, false); tagObject = taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false).get(0); - assertEquals("Updated tag title", updatedTag, tagObject.getTag()); + assertEquals(updatedTag, tagObject.getTag(), "Updated tag title"); // update comment taggingService.updateTag(leaderboardName, raceColumnName, fleetName, tagObject, tag, updatedComment, hiddenInfo, imageURL, imageURL, false); tagObject = taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false).get(0); - assertEquals("Updated comment", updatedComment, tagObject.getComment()); + assertEquals(updatedComment, tagObject.getComment(), "Updated comment"); // update hidden info taggingService.updateTag(leaderboardName, raceColumnName, fleetName, tagObject, tag, updatedComment, updatedHiddenInfo, imageURL, imageURL, false); tagObject = taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false).get(0); - assertEquals("Updated hidden info", updatedHiddenInfo, tagObject.getHiddenInfo()); + assertEquals(updatedHiddenInfo, tagObject.getHiddenInfo(), "Updated hidden info"); // update image URL taggingService.updateTag(leaderboardName, raceColumnName, fleetName, tagObject, tag, comment, hiddenInfo, updatedImageURL, updatedImageURL, false); tagObject = taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false).get(0); - assertEquals("Updated image URL", updatedImageURL, tagObject.getImageURL()); + assertEquals(updatedImageURL, tagObject.getImageURL(), "Updated image URL"); // update visibility (private -> public) taggingService.updateTag(leaderboardName, raceColumnName, fleetName, tagObject, tag, comment, hiddenInfo, imageURL, imageURL, true); tagObject = taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false).get(0); - assertEquals("Updated visibility (private -> public)", true, tagObject.isVisibleForPublic()); + assertEquals(true, tagObject.isVisibleForPublic(), "Updated visibility (private -> public)"); // update visibility (public -> private) taggingService.updateTag(leaderboardName, raceColumnName, fleetName, tagObject, tag, comment, hiddenInfo, imageURL, imageURL, false); tagObject = taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false).get(0); - assertEquals("Updated visibility (public -> private)", false, tagObject.isVisibleForPublic()); + assertEquals(false, tagObject.isVisibleForPublic(), "Updated visibility (public -> private)"); logger.exiting(getClass().getName(), "testUpdateTag"); } @@ -298,12 +298,12 @@ public class TaggingServiceTest { taggingService.addTag(leaderboardName, raceColumnName, fleetName, tag, comment, /* hiddenInfo */ null, imageURL, imageURL, true, raceTimepoint); final List tags = taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false); - assertEquals("Tags were added successfully so they can be removed afterwards", 2, tags.size()); + assertEquals(2, tags.size(), "Tags were added successfully so they can be removed afterwards"); for (TagDTO tagObject : tags) { taggingService.removeTag(leaderboardName, raceColumnName, fleetName, tagObject); } - assertEquals("Tag list should be empty after deleting all tags", 0, - taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false).size()); + assertEquals(0, taggingService.getTags(leaderboardName, raceColumnName, fleetName, null, false).size(), + "Tag list should be empty after deleting all tags"); logger.exiting(getClass().getName(), "testRemoveTag"); } } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TrailingSlashInEventBaseNameTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TrailingSlashInEventBaseNameTest.java index ed1cf79d541..b5a91dcef4c 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TrailingSlashInEventBaseNameTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TrailingSlashInEventBaseNameTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -10,8 +10,8 @@ import java.net.URL; import java.util.Locale; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.common.RegattaNameAndRaceName; @@ -28,7 +28,7 @@ public class TrailingSlashInEventBaseNameTest { private static final String raceboardMode = "PLAYER"; private static final String eventBaseUrlWithoutTrailingSlash = "https://myevent.example.com"; - @Before + @BeforeEach public void setUp() throws MalformedURLException { trackedRace = mock(TrackedRace.class); when(trackedRace.getRaceIdentifier()).thenReturn(new RegattaNameAndRaceName("Regatta with spaces", "Race with spaces")); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java index 77158d580b9..77130f62131 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.server.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -10,8 +10,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; @@ -76,7 +76,7 @@ public class WindByRaceLogTest { private RacingEventService service; private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); - @Before + @BeforeEach public void setup() throws Exception { this.service = new RacingEventServiceImpl(); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/util/EventUtilTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/util/EventUtilTest.java index 98f7eeac204..fb1abcb7976 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/util/EventUtilTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/util/EventUtilTest.java @@ -4,8 +4,8 @@ import java.util.Calendar; import java.util.Collections; import java.util.UUID; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.EventBase; import com.sap.sailing.domain.base.impl.StrippedEventImpl; @@ -16,7 +16,7 @@ public class EventUtilTest { @Test public void testGetYearOfEvent() { EventBase event = getEventForDate(2017, 6, 27); - Assert.assertEquals(Integer.valueOf(2017), EventUtil.getYearOfEvent(event)); + Assertions.assertEquals(Integer.valueOf(2017), EventUtil.getYearOfEvent(event)); } private EventBase getEventForDate(int year, int month, int date) { diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/util/ShardingLeaderBoardEncodingTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/util/ShardingLeaderBoardEncodingTest.java index 7aa86e63eec..9b93082c988 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/util/ShardingLeaderBoardEncodingTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/util/ShardingLeaderBoardEncodingTest.java @@ -1,17 +1,17 @@ package com.sap.sailing.server.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.sharding.ShardingType; public class ShardingLeaderBoardEncodingTest { @Test public void testEncoding() { - Assert.assertEquals("/leaderboard/pureascistring", ShardingType.LEADERBOARDNAME.encodeShardingInfo("pureascistring")); - Assert.assertEquals("/leaderboard/unpure_asci_string", ShardingType.LEADERBOARDNAME.encodeShardingInfo("unpure asci string")); - Assert.assertEquals("/leaderboard/c_dille", ShardingType.LEADERBOARDNAME.encodeShardingInfo("cédille")); - Assert.assertEquals("/leaderboard/Hello_World", ShardingType.LEADERBOARDNAME.encodeShardingInfo("Hello+World")); - Assert.assertEquals("/leaderboard/Hello_World_", ShardingType.LEADERBOARDNAME.encodeShardingInfo("Hello(World)")); + Assertions.assertEquals("/leaderboard/pureascistring", ShardingType.LEADERBOARDNAME.encodeShardingInfo("pureascistring")); + Assertions.assertEquals("/leaderboard/unpure_asci_string", ShardingType.LEADERBOARDNAME.encodeShardingInfo("unpure asci string")); + Assertions.assertEquals("/leaderboard/c_dille", ShardingType.LEADERBOARDNAME.encodeShardingInfo("cédille")); + Assertions.assertEquals("/leaderboard/Hello_World", ShardingType.LEADERBOARDNAME.encodeShardingInfo("Hello+World")); + Assertions.assertEquals("/leaderboard/Hello_World_", ShardingType.LEADERBOARDNAME.encodeShardingInfo("Hello(World)")); } } diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/AbstractBravoDataImportTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/AbstractBravoDataImportTest.java index 47d8c941406..2209a2c70ee 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/AbstractBravoDataImportTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/AbstractBravoDataImportTest.java @@ -5,8 +5,8 @@ import java.io.InputStream; import java.nio.charset.Charset; import java.util.Map; -import org.junit.Assert; -import org.junit.Before; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier; import com.sap.sailing.domain.trackimport.DoubleVectorFixImporter; @@ -34,7 +34,7 @@ public abstract class AbstractBravoDataImportTest { int getExpectedFixesConsolidated(); } - @Before + @BeforeEach public void setUp() { this.callbackCallCount = 0; bravoDataImporter = new BaseBravoDataImporterImpl(getColumnData(), BravoDataImporterImpl.BRAVO_TYPE) { @@ -53,9 +53,9 @@ public abstract class AbstractBravoDataImportTest { bravoDataImporter.importFixes(is, Charset.defaultCharset(), (fixes, device) -> { callbackCallCount+=Util.size(fixes); }, "filename", "source", /* downsample */ true); - Assert.assertEquals(importData.getExpectedFixesCount(), downsampler.getCountSourceTtl()); - Assert.assertEquals(importData.getExpectedFixesConsolidated(), downsampler.getCountImportedTtl()); - Assert.assertEquals(importData.getExpectedFixesConsolidated(), callbackCallCount); + Assertions.assertEquals(importData.getExpectedFixesCount(), downsampler.getCountSourceTtl()); + Assertions.assertEquals(importData.getExpectedFixesConsolidated(), downsampler.getCountImportedTtl()); + Assertions.assertEquals(importData.getExpectedFixesConsolidated(), callbackCallCount); } } diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java index 8bb95137aeb..3faa95cdba5 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java @@ -6,7 +6,7 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.sensordata.BravoSensorDataMetadata; import com.sap.sailing.domain.trackimport.FormatNotSupportedException; diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoExtendedDataImportTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoExtendedDataImportTest.java index e56a928fbe5..c0890f384b7 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoExtendedDataImportTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoExtendedDataImportTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.trackfiles.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -10,7 +10,7 @@ import java.nio.charset.StandardCharsets; import java.util.Iterator; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.sensordata.BravoExtendedSensorDataMetadata; diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/DownsamplerTo1HzProcessorTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/DownsamplerTo1HzProcessorTest.java index 5cc3b9dc8c9..ed81b8f77c5 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/DownsamplerTo1HzProcessorTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/DownsamplerTo1HzProcessorTest.java @@ -1,15 +1,14 @@ package com.sap.sailing.server.trackfiles.test; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.server.trackfiles.impl.doublefix.DoubleFixProcessor; import com.sap.sailing.server.trackfiles.impl.doublefix.DoubleVectorFixData; import com.sap.sailing.server.trackfiles.impl.doublefix.DownsamplerTo1HzProcessor; -import static org.junit.Assert.assertEquals; - -import org.junit.Assert; - public class DownsamplerTo1HzProcessorTest { @Test @@ -44,13 +43,13 @@ public class DownsamplerTo1HzProcessorTest { processor.accept(new DoubleVectorFixData(second + 920, new Double[] { 0d, 0d, 0d, 0d })); second = 50 * 1000; processor.accept(new DoubleVectorFixData(second + 130, new Double[] { 0d, 0d, 0d, 0d })); - Assert.assertEquals("Count consolidated fixes", 3, delegate.countAccepted); - Assert.assertFalse("Not finished yet", delegate.fineshedWasCalled); + Assertions.assertEquals(3, delegate.countAccepted, "Count consolidated fixes"); + Assertions.assertFalse(delegate.fineshedWasCalled, "Not finished yet"); processor.finish(); - Assert.assertEquals("Count consolidated fixes", 4, delegate.countAccepted); - Assert.assertTrue("Finished", delegate.fineshedWasCalled); + Assertions.assertEquals(4, delegate.countAccepted, "Count consolidated fixes"); + Assertions.assertTrue(delegate.fineshedWasCalled, "Finished"); } @Test @@ -65,14 +64,14 @@ public class DownsamplerTo1HzProcessorTest { processor.accept(new DoubleVectorFixData(second + 999, new Double[] { 0.00d, 1d, 1d, 0d })); processor.finish(); - Assert.assertTrue("Finished", delegate.fineshedWasCalled); - Assert.assertEquals("Count consolidated fixes", 1, delegate.countAccepted); + Assertions.assertTrue(delegate.fineshedWasCalled, "Finished"); + Assertions.assertEquals(1, delegate.countAccepted, "Count consolidated fixes"); DoubleVectorFixData lastFix = delegate.lastFix; - Assert.assertNotNull("Lastfix", lastFix); - assertEquals("Avg col 1", (12.4d + 0.01d - 10d + 1d + 0d) / 5d, (double) lastFix.getFix()[0], 0.000001); - assertEquals("Avg col 2", 9d / 5d, (double) lastFix.getFix()[1], 0.000001); - assertEquals("Avg col 3", 1d, (double) lastFix.getFix()[2], 0.000001); - assertEquals("Avg col 4", 0d, (double) lastFix.getFix()[3], 0.000001); + Assertions.assertNotNull(lastFix, "Lastfix"); + assertEquals((12.4d + 0.01d - 10d + 1d + 0d) / 5d, (double) lastFix.getFix()[0], 0.000001, "Avg col 1"); + assertEquals(9d / 5d, (double) lastFix.getFix()[1], 0.000001, "Avg col 2"); + assertEquals(1d, (double) lastFix.getFix()[2], 0.000001, "Avg col 3"); + assertEquals(0d, (double) lastFix.getFix()[3], 0.000001, "Avg col 4"); } private final class MyProcessor implements DoubleFixProcessor { diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/ExpeditionDataImportTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/ExpeditionDataImportTest.java index ffaeab4cca0..9d84e652997 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/ExpeditionDataImportTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/ExpeditionDataImportTest.java @@ -1,14 +1,14 @@ package com.sap.sailing.server.trackfiles.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.sensordata.ExpeditionExtendedSensorDataMetadata; import com.sap.sailing.domain.common.tracking.DoubleVectorFix; @@ -27,7 +27,7 @@ public class ExpeditionDataImportTest { int getExpectedFixesCount(); } - @Before + @BeforeEach public void setUp() { expeditionDataImporter = new ExpeditionExtendedDataImporterImpl(); } @@ -45,7 +45,7 @@ public class ExpeditionDataImportTest { } } }, "filename.csv", "source", /* downsample */ false); - Assert.assertEquals(importData.getExpectedFixesCount(), callbackCallCount); + Assertions.assertEquals(importData.getExpectedFixesCount(), callbackCallCount); } } diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/JumpyTrackSmootheningTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/JumpyTrackSmootheningTest.java index 78fadf9af03..cc5089e974a 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/JumpyTrackSmootheningTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/JumpyTrackSmootheningTest.java @@ -1,10 +1,10 @@ package com.sap.sailing.server.trackfiles.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import static org.mockito.Mockito.mock; import java.io.InputStream; @@ -20,7 +20,7 @@ import java.util.UUID; import java.util.logging.Logger; import java.util.zip.GZIPInputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; @@ -199,8 +199,8 @@ public class JumpyTrackSmootheningTest { assertNotNull(markPassings); assertEquals(13, markPassings.size()); } - assertTrue("Expected duration for mark passing analysis on adjusted track to be at least eight times less than for original track", - durationForAdjustedTrack.times(8).compareTo(durationForOriginalTrack) < 0); + assertTrue(durationForAdjustedTrack.times(8).compareTo(durationForOriginalTrack) < 0, + "Expected duration for mark passing analysis on adjusted track to be at least eight times less than for original track"); } private DynamicGPSFixTrack readTrack(String filename) throws Exception { @@ -340,8 +340,8 @@ public class JumpyTrackSmootheningTest { final Pair> numberOfInconsistenciesAndReplacedTrack = new OutlierFilter().findAndRemoveInconsistenciesOnRawFixes(track); assertTrue(numberOfInconsistenciesAndReplacedTrack.getA() > maximumNumberOfOutliersAllowed); final int actualNumberOfOutliers = getNumberOfFixesWithInconsistentCogSog(numberOfInconsistenciesAndReplacedTrack.getB()); - assertTrue("Expected number of inconsistencies to be less than or equal to "+maximumNumberOfOutliersAllowed+" but was "+actualNumberOfOutliers, - actualNumberOfOutliers <= maximumNumberOfOutliersAllowed); + assertTrue(actualNumberOfOutliers <= maximumNumberOfOutliersAllowed, + "Expected number of inconsistencies to be less than or equal to "+maximumNumberOfOutliersAllowed+" but was "+actualNumberOfOutliers); } /** diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/LearningBatchProcessorTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/LearningBatchProcessorTest.java index 0256593121f..bfeb06b3b62 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/LearningBatchProcessorTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/LearningBatchProcessorTest.java @@ -2,7 +2,8 @@ package com.sap.sailing.server.trackfiles.test; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.tracking.DoubleVectorFix; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier; @@ -13,8 +14,6 @@ import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsTimePoint; -import org.junit.Assert; - public class LearningBatchProcessorTest { @@ -28,39 +27,39 @@ public class LearningBatchProcessorTest { processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 100, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 300, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 550, new Double[] { 0d, 0d, 0d, 0d })); - Assert.assertEquals("Batch not full", 0, delegate.batchesDelivered); + Assertions.assertEquals(0, delegate.batchesDelivered, "Batch not full"); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 900, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 999, new Double[] { 0d, 0d, 0d, 0d })); - Assert.assertEquals("Batch not full, should be learing", 0, delegate.batchesDelivered); + Assertions.assertEquals(0, delegate.batchesDelivered, "Batch not full, should be learing"); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 130, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 200, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 560, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 600, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 130, new Double[] { 0d, 0d, 0d, 0d })); - Assert.assertEquals("Batches after learning", 2, delegate.batchesDelivered); - Assert.assertEquals("Last batch after learning", 5, delegate.lastBatchSize); + Assertions.assertEquals(2, delegate.batchesDelivered, "Batches after learning"); + Assertions.assertEquals(5, delegate.lastBatchSize, "Last batch after learning"); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 200, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 560, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 561, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 562, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 563, new Double[] { 0d, 0d, 0d, 0d })); - Assert.assertEquals("Next batch received", 3, delegate.batchesDelivered); - Assert.assertEquals("First batch after learning", 5, delegate.lastBatchSize); + Assertions.assertEquals(3, delegate.batchesDelivered, "Next batch received"); + Assertions.assertEquals(5, delegate.lastBatchSize, "First batch after learning"); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 564, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 600, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 700, new Double[] { 0d, 0d, 0d, 0d })); processor.accept(new DoubleVectorFixData(currentSecondAsMillis + 800, new Double[] { 0d, 0d, 0d, 0d })); - Assert.assertEquals("Still on same batch", 3, delegate.batchesDelivered); + Assertions.assertEquals(3, delegate.batchesDelivered, "Still on same batch"); processor.finish(); - Assert.assertEquals("Batch count after finish", 4, delegate.batchesDelivered); - Assert.assertEquals("Last batch size after finish", 4, delegate.lastBatchSize); - Assert.assertEquals("Last fix ", (currentSecondAsMillis + 800), delegate.lastFix.getTimePoint().asMillis()); + Assertions.assertEquals(4, delegate.batchesDelivered, "Batch count after finish"); + Assertions.assertEquals(4, delegate.lastBatchSize, "Last batch size after finish"); + Assertions.assertEquals((currentSecondAsMillis + 800), delegate.lastFix.getTimePoint().asMillis(), "Last fix "); } diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/RouteConverterGpx11ExtensionsTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/RouteConverterGpx11ExtensionsTest.java index 866314564ec..9e5c124bce1 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/RouteConverterGpx11ExtensionsTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/RouteConverterGpx11ExtensionsTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.trackfiles.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; @@ -9,7 +9,7 @@ import java.io.InputStream; import java.nio.charset.Charset; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.w3c.dom.Element; diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackFileImportTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackFileImportTest.java index 02612ec6ec5..782aa089b08 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackFileImportTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackFileImportTest.java @@ -1,13 +1,13 @@ package com.sap.sailing.server.trackfiles.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -19,7 +19,7 @@ import com.sap.sailing.server.trackfiles.impl.RouteConverterGPSFixImporterImpl; public class TrackFileImportTest { private boolean callbackCalled = false; - @Before + @BeforeEach public void setup() { callbackCalled = false; } diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackedRacesExportTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackedRacesExportTest.java index 227fc3f97f6..6454504757b 100755 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackedRacesExportTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackedRacesExportTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.trackfiles.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; import java.io.File; @@ -12,8 +12,8 @@ import java.net.URL; import java.util.Collections; import java.util.zip.ZipOutputStream; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.trackfiles.TrackFilesDataSource; import com.sap.sailing.domain.common.trackfiles.TrackFilesFormat; @@ -35,7 +35,7 @@ public class TrackedRacesExportTest extends OnlineTracTracBasedTest { return "49er European Championship"; } - @Before + @BeforeEach public void setUp() throws URISyntaxException, IOException, InterruptedException, SubscriberInitializationException, CreateModelException { URI storedUri = new URI("file:///" + new File("resources/event_20120905_erEuropean-Gold_fleet_-_race_1.mtb") diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/ConfigurationManagerTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/ConfigurationManagerTest.java index c389b582198..981f1c51716 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/ConfigurationManagerTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/ConfigurationManagerTest.java @@ -3,8 +3,9 @@ package com.sap.sailing.simulator.test; import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.simulator.BoatClassProperties; @@ -13,14 +14,12 @@ import com.sap.sailing.simulator.impl.BoatClassPropertiesImpl; import com.sap.sailing.simulator.impl.ConfigurationManager; import com.sap.sailing.simulator.impl.RacePropertiesImpl; -import org.junit.Assert; - public class ConfigurationManagerTest { private final List _boatClassesInfo = new ArrayList(); private final List _racesInfo = new ArrayList(); - @Before + @BeforeEach public void initialize() { this._boatClassesInfo.add(new BoatClassPropertiesImpl("49er Static", new MeterDistance(4.995), "PolarDiagram49.csv", 0)); this._boatClassesInfo.add(new BoatClassPropertiesImpl("49er Bethwaite", new MeterDistance(4.876), "PolarDiagram49Bethwaite.csv", 1)); @@ -56,30 +55,30 @@ public class ConfigurationManagerTest { @Test public void test_getPolarDiagramFileLocation() { - Assert.assertEquals("PolarDiagram49.csv", ConfigurationManager.INSTANCE + Assertions.assertEquals("PolarDiagram49.csv", ConfigurationManager.INSTANCE .getPolarDiagramFileLocation(0)); - Assert.assertEquals("PolarDiagram49Bethwaite.csv", ConfigurationManager.INSTANCE + Assertions.assertEquals("PolarDiagram49Bethwaite.csv", ConfigurationManager.INSTANCE .getPolarDiagramFileLocation(1)); - Assert.assertEquals("PolarDiagram49ORC.csv", ConfigurationManager.INSTANCE + Assertions.assertEquals("PolarDiagram49ORC.csv", ConfigurationManager.INSTANCE .getPolarDiagramFileLocation(2)); - Assert.assertEquals("PolarDiagram49STG.csv", ConfigurationManager.INSTANCE + Assertions.assertEquals("PolarDiagram49STG.csv", ConfigurationManager.INSTANCE .getPolarDiagramFileLocation(3)); - Assert.assertEquals("PolarDiagram505STG.csv", ConfigurationManager.INSTANCE + Assertions.assertEquals("PolarDiagram505STG.csv", ConfigurationManager.INSTANCE .getPolarDiagramFileLocation(4)); } @Test public void test_getBoatClassesInfoCount() { - Assert.assertEquals(5, ConfigurationManager.INSTANCE.getBoatClassesInfoCount()); + Assertions.assertEquals(5, ConfigurationManager.INSTANCE.getBoatClassesInfoCount()); } @Test public void test_getBoatClassesInfo() { int index = 0; for (final BoatClassProperties tuple : ConfigurationManager.INSTANCE.getBoatClassesInfo()) { - Assert.assertEquals(this._boatClassesInfo.get(index).getName(), tuple.getName()); - Assert.assertEquals(this._boatClassesInfo.get(index).getLength(), tuple.getLength()); - Assert.assertEquals(this._boatClassesInfo.get(index).getPolar(), tuple.getPolar()); + Assertions.assertEquals(this._boatClassesInfo.get(index).getName(), tuple.getName()); + Assertions.assertEquals(this._boatClassesInfo.get(index).getLength(), tuple.getLength()); + Assertions.assertEquals(this._boatClassesInfo.get(index).getPolar(), tuple.getPolar()); index++; } } @@ -88,9 +87,9 @@ public class ConfigurationManagerTest { public void test_getRacesInfo() { int index = 0; for (final RaceProperties tuple : ConfigurationManager.INSTANCE.getRacesInfo()) { - Assert.assertEquals(this._racesInfo.get(index).getName(), tuple.getName()); - Assert.assertEquals(this._racesInfo.get(index).getBoatClass(), tuple.getBoatClass()); - Assert.assertEquals(this._racesInfo.get(index).getURL(), tuple.getURL()); + Assertions.assertEquals(this._racesInfo.get(index).getName(), tuple.getName()); + Assertions.assertEquals(this._racesInfo.get(index).getBoatClass(), tuple.getBoatClass()); + Assertions.assertEquals(this._racesInfo.get(index).getURL(), tuple.getURL()); index++; } } diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/PolarDiagramCSVTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/PolarDiagramCSVTest.java index 5ee3ebe5224..669c43059a4 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/PolarDiagramCSVTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/PolarDiagramCSVTest.java @@ -5,9 +5,8 @@ import java.util.Map.Entry; import java.util.NavigableMap; import java.util.Set; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; @@ -205,14 +204,14 @@ public class PolarDiagramCSVTest { private static void testMapOfSpeedsAndSpeeds(NavigableMap expectedMap, NavigableMap actualMap, String mapName, String polarDiagramType) { - Assert.assertEquals("Incorrect size for actual map object.", expectedMap.size(), actualMap.size()); + Assertions.assertEquals(expectedMap.size(), actualMap.size(), "Incorrect size for actual map object."); Set expectedKeys = expectedMap.keySet(); String debugMessage = ""; for (Speed speedKey : expectedKeys) { debugMessage = " (mapName = " + mapName + ", polarDiagramType = " + polarDiagramType + ", speedKey.getKnots() = " + speedKey.getKnots() + ")"; - Assert.assertTrue("Actual map does not contain key " + speedKey.getKnots(), actualMap.containsKey(speedKey)); + Assertions.assertTrue(actualMap.containsKey(speedKey), "Actual map does not contain key " + speedKey.getKnots()); testSpeeds(expectedMap.get(speedKey), actualMap.get(speedKey), debugMessage); } @@ -220,14 +219,14 @@ public class PolarDiagramCSVTest { private static void testMapOfSpeedsAndBearings(NavigableMap expectedMap, NavigableMap actualMap, String mapName, String polarDiagramType) { - Assert.assertEquals("Incorrect size for actual map object.", expectedMap.size(), actualMap.size()); + Assertions.assertEquals(expectedMap.size(), actualMap.size(), "Incorrect size for actual map object."); Set expectedKeys = expectedMap.keySet(); String debugMessage = ""; for (Speed speedKey : expectedKeys) { debugMessage = " (mapName = " + mapName + ", polarDiagramType = " + polarDiagramType + ", speedKey.getKnots() = " + speedKey.getKnots() + ")"; - Assert.assertTrue("Actual map does not contain key " + speedKey.getKnots(), actualMap.containsKey(speedKey)); + Assertions.assertTrue(actualMap.containsKey(speedKey), "Actual map does not contain key " + speedKey.getKnots()); testBearing(expectedMap.get(speedKey), actualMap.get(speedKey), debugMessage); } @@ -270,9 +269,9 @@ public class PolarDiagramCSVTest { Set expectedPDPValuesKeys = null; String debugMessage = ""; - Assert.assertEquals("Incorrect size for actual Polar Diagram Plot object.\r\n" + "Expected: \r\n" - + convertToString(expectedMap) + "\r\n" + "Actual: \r\n" + convertToString(actualMap), - expectedMap.size(), actualMap.size()); + Assertions.assertEquals(expectedMap.size(), + actualMap.size(), "Incorrect size for actual Polar Diagram Plot object.\r\n" + "Expected: \r\n" + + convertToString(expectedMap) + "\r\n" + "Actual: \r\n" + convertToString(actualMap)); expectedPDPKeys = expectedMap.keySet(); @@ -280,20 +279,20 @@ public class PolarDiagramCSVTest { debugMessage = "(speedKey = " + speedKey.getKnots() + ", typeName = " + polarDiagramType + ", mapName = " + mapName + ")"; - Assert.assertTrue("\r\nActual Polar Diagram Plot does not contain key! \r\n" + debugMessage + " \r\n", - actualMap.containsKey(speedKey)); + Assertions.assertTrue(actualMap.containsKey(speedKey), + "\r\nActual Polar Diagram Plot does not contain key! \r\n" + debugMessage + " \r\n"); expectedPDPValues = expectedMap.get(speedKey); actualPDPValues = actualMap.get(speedKey); - Assert.assertEquals("\r\nIncorrect size for actual Polar Diagram Plot Values object! \r\n" + debugMessage - + " \r\n", expectedPDPValues.size(), actualPDPValues.size()); + Assertions.assertEquals(expectedPDPValues.size(), actualPDPValues.size(), "\r\nIncorrect size for actual Polar Diagram Plot Values object! \r\n" + debugMessage + + " \r\n"); expectedPDPValuesKeys = expectedPDPValues.keySet(); for (Bearing bearingKey : expectedPDPValuesKeys) { - Assert.assertTrue("\r\nActual Polar Diagram Plot Values does not contain key: " + bearingKey + "\r\n" - + debugMessage + " \r\n", actualPDPValues.containsKey(bearingKey)); + Assertions.assertTrue(actualPDPValues.containsKey(bearingKey), "\r\nActual Polar Diagram Plot Values does not contain key: " + bearingKey + "\r\n" + + debugMessage + " \r\n"); debugMessage = " (typeName = " + polarDiagramType + ", bearingKey = " + bearingKey + ", speedKey = " + speedKey.getKnots() + ")"; @@ -304,37 +303,37 @@ public class PolarDiagramCSVTest { private static void testBearing(Bearing expectedBearing, Bearing actualBearing, String debugMessage) { if (expectedBearing == null) { - Assert.assertNull("Actual bearing value must be NULL!" + debugMessage, actualBearing); + Assertions.assertNull(actualBearing, "Actual bearing value must be NULL!" + debugMessage); } else { - Assert.assertNotNull("Actual bearing value must not be NULL!" + debugMessage, actualBearing); + Assertions.assertNotNull(actualBearing, "Actual bearing value must not be NULL!" + debugMessage); - Assert.assertEquals("Beaufort values do not match!" + debugMessage, expectedBearing.getDegrees(), - actualBearing.getDegrees(), expectedBearing.getDegrees() * DELTA_PERCENTAGE); + Assertions.assertEquals(expectedBearing.getDegrees(), actualBearing.getDegrees(), + expectedBearing.getDegrees() * DELTA_PERCENTAGE, "Beaufort values do not match!" + debugMessage); - Assert.assertEquals("KilometersPerHour values do not match!" + debugMessage, expectedBearing.getRadians(), - actualBearing.getRadians(), expectedBearing.getRadians() * DELTA_PERCENTAGE); + Assertions.assertEquals(expectedBearing.getRadians(), actualBearing.getRadians(), + expectedBearing.getRadians() * DELTA_PERCENTAGE, "KilometersPerHour values do not match!" + debugMessage); } } private static void testSpeeds(Speed expectedSpeed, Speed actualSpeed, String debugMessage) { if (expectedSpeed == null) { - Assert.assertNull("Actual speed value must be NULL!" + debugMessage, actualSpeed); + Assertions.assertNull(actualSpeed, "Actual speed value must be NULL!" + debugMessage); } else { - Assert.assertNotNull("Actual speed value must not be NULL!" + debugMessage, actualSpeed); + Assertions.assertNotNull(actualSpeed, "Actual speed value must not be NULL!" + debugMessage); - Assert.assertEquals("Beaufort values do not match!" + debugMessage, expectedSpeed.getBeaufort(), - actualSpeed.getBeaufort(), expectedSpeed.getBeaufort() * DELTA_PERCENTAGE); + Assertions.assertEquals(expectedSpeed.getBeaufort(), actualSpeed.getBeaufort(), + expectedSpeed.getBeaufort() * DELTA_PERCENTAGE, "Beaufort values do not match!" + debugMessage); - Assert.assertEquals("KilometersPerHour values do not match!" + debugMessage, - expectedSpeed.getKilometersPerHour(), actualSpeed.getKilometersPerHour(), - expectedSpeed.getKilometersPerHour() * DELTA_PERCENTAGE); + Assertions.assertEquals(expectedSpeed.getKilometersPerHour(), + actualSpeed.getKilometersPerHour(), expectedSpeed.getKilometersPerHour() * DELTA_PERCENTAGE, + "KilometersPerHour values do not match!" + debugMessage); - Assert.assertEquals("Knots values do not match!" + debugMessage, expectedSpeed.getKnots(), - actualSpeed.getKnots(), expectedSpeed.getKnots() * DELTA_PERCENTAGE); + Assertions.assertEquals(expectedSpeed.getKnots(), actualSpeed.getKnots(), + expectedSpeed.getKnots() * DELTA_PERCENTAGE, "Knots values do not match!" + debugMessage); - Assert.assertEquals("MetersPerSecond values do not match!" + debugMessage, - expectedSpeed.getMetersPerSecond(), actualSpeed.getMetersPerSecond(), - expectedSpeed.getMetersPerSecond() * DELTA_PERCENTAGE); + Assertions.assertEquals(expectedSpeed.getMetersPerSecond(), + actualSpeed.getMetersPerSecond(), expectedSpeed.getMetersPerSecond() * DELTA_PERCENTAGE, + "MetersPerSecond values do not match!" + debugMessage); } } } diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/RectangularBoundaryTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/RectangularBoundaryTest.java index 05c8dd9191e..93ec30561a1 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/RectangularBoundaryTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/RectangularBoundaryTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.simulator.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.DegreePosition; @@ -18,7 +18,7 @@ public class RectangularBoundaryTest { Grid b = new RectangularGrid(p1, p2); Position[][] grid = b.generatePositions(20,20,0,0); - assertEquals("Number of lattice points",400,grid.length*grid[0].length); + assertEquals(400,grid.length*grid[0].length,"Number of lattice points"); } diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SerializationUtilsTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SerializationUtilsTest.java index 8db5bcb71a2..b5954915c85 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SerializationUtilsTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SerializationUtilsTest.java @@ -1,8 +1,7 @@ package com.sap.sailing.simulator.test; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.simulator.impl.SimulatorUtils; @@ -11,19 +10,19 @@ public class SerializationUtilsTest { @Test public void test_getRaceIt() { - Assert.assertEquals( + Assertions.assertEquals( "d1f521fa-ec52-11e0-a523-406186cbf87c", SimulatorUtils .getRaceID("http://germanmaster.traclive.dk/events/event_20110929_Internatio/clientparams.php?event=event_20110929_Internatio&race=d1f521fa-ec52-11e0-a523-406186cbf87c")); - Assert.assertEquals( + Assertions.assertEquals( "eb06795a-ec52-11e0-a523-406186cbf87c", SimulatorUtils .getRaceID("http://germanmaster.traclive.dk/events/event_20110929_Internatio/clientparams.php?event=event_20110929_Internatio&race=eb06795a-ec52-11e0-a523-406186cbf87c")); - Assert.assertEquals( + Assertions.assertEquals( "6bb0829e-ec44-11e0-a523-406186cbf87c", SimulatorUtils .getRaceID("http://germanmaster.traclive.dk/events/event_20110929_Internatio/clientparams.php?event=event_20110929_Internatio&race=6bb0829e-ec44-11e0-a523-406186cbf87c")); - Assert.assertEquals( + Assertions.assertEquals( "0b5969cc-b789-11e1-a845-406186cbf87c", SimulatorUtils .getRaceID("http://germanmaster.traclive.dk/events/event_20120615_KielerWoch/clientparams.php?event=event_20120615_KielerWoch&race=0b5969cc-b789-11e1-a845-406186cbf87c")); diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SimulatorTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SimulatorTest.java index 12d9c85debc..311a41d4eff 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SimulatorTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SimulatorTest.java @@ -6,9 +6,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.PathType; import com.sap.sailing.domain.common.Position; @@ -67,8 +66,8 @@ public class SimulatorTest { paths.put(PathType.OMNISCIENT, pathOmniscient); paths.put(PathType.OPPORTUNIST_LEFT, pathOpportunist); - Assert.assertNotNull(paths.get(PathType.OPPORTUNIST_LEFT).getPathPoints()); - Assert.assertNotNull(paths.get(PathType.OMNISCIENT).getPathPoints()); + Assertions.assertNotNull(paths.get(PathType.OPPORTUNIST_LEFT).getPathPoints()); + Assertions.assertNotNull(paths.get(PathType.OMNISCIENT).getPathPoints()); } } diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/TreeGrowTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/TreeGrowTest.java index 54d09373b6d..abf7f5ce95b 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/TreeGrowTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/TreeGrowTest.java @@ -4,9 +4,8 @@ import java.sql.Date; import java.util.LinkedList; import java.util.List; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; @@ -71,7 +70,7 @@ public class TreeGrowTest { Path path = treeGrow.getPath(); // System.out.println("tree-grow path points: "+path.getPathPoints().size()); - Assert.assertNotNull(path.getPathPoints()); + Assertions.assertNotNull(path.getPathPoints()); // for(TimedPositionWithSpeed pos : path.getPathPoints()) { // System.out.println(""+pos.getPosition().getLatDeg()+", "+pos.getPosition().getLngDeg()); diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/WindFieldGeneratorTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/WindFieldGeneratorTest.java index 89e5479a3f5..c015dab9677 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/WindFieldGeneratorTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/WindFieldGeneratorTest.java @@ -3,15 +3,15 @@ */ package com.sap.sailing.simulator.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.impl.KilometersPerHourSpeedWithBearingImpl; import com.sap.sailing.domain.common.Position; @@ -65,13 +65,13 @@ public class WindFieldGeneratorTest { } wf.setPositionGrid(bd.generatePositions(hSteps, vSteps, 0, 0)); Position[][] positionGrid = wf.getPositionGrid(); - assertNotNull("Position Grid is not null", positionGrid); - assertEquals("Position Grid Number of Rows", vSteps, positionGrid.length); - assertEquals("Position Grid Number of Columns", hSteps, positionGrid[0].length); + assertNotNull(positionGrid, "Position Grid is not null"); + assertEquals(vSteps, positionGrid.length, "Position Grid Number of Rows"); + assertEquals(hSteps, positionGrid[0].length, "Position Grid Number of Columns"); for (int i = 0; i < vSteps; ++i) { for (int j = 0; j < hSteps; ++j) { logger.info("P[" + i + "][" + j + "]:" + positionGrid[i][j]); - assertEquals("Map index check", positionGrid[i][j], wf.getPosition(i, j)); + assertEquals(positionGrid[i][j], wf.getPosition(i, j), "Map index check"); } } } @@ -116,25 +116,25 @@ public class WindFieldGeneratorTest { windList.add(localWind); } } - assertEquals("Size of windList ", hSteps * vSteps, windList.size()); + assertEquals(hSteps * vSteps, windList.size(), "Size of windList "); double epsilon = 1e-6; // Check the speed - assertEquals("StartTime First Wind Speed ", 7, windList.get(0).getKnots(), 0); - assertEquals("StartTime Last Wind Speed in first row ", 9, windList.get(hSteps - 1).getKnots(), 0); + assertEquals(7, windList.get(0).getKnots(), 0, "StartTime First Wind Speed "); + assertEquals(9, windList.get(hSteps - 1).getKnots(), 0, "StartTime Last Wind Speed in first row "); - assertEquals("StartTime One before Middle Wind Speed ", 7.896551, windList.get(windList.size() / 2 - 2) - .getKnots(), epsilon); - assertEquals("StartTime Middle Wind Speed ", 7.965517, windList.get(windList.size() / 2 - 1).getKnots(), epsilon); - assertEquals("StartTime Last Wind Speed ", 9, windList.get(windList.size() - 1).getKnots(), 0); + assertEquals(7.896551, windList.get(windList.size() / 2 - 2) + .getKnots(), epsilon, "StartTime One before Middle Wind Speed "); + assertEquals(7.965517, windList.get(windList.size() / 2 - 1).getKnots(), epsilon, "StartTime Middle Wind Speed "); + assertEquals(9, windList.get(windList.size() - 1).getKnots(), 0, "StartTime Last Wind Speed "); // Check the angle - assertEquals("StartTime First Wind Angle ", 0, windList.get(0).getBearing().getRadians(), 0); + assertEquals(0, windList.get(0).getBearing().getRadians(), 0, "StartTime First Wind Angle "); Util.Pair pairIndex = getIndex(windList.size(), hSteps); logger.info(pairIndex.toString()); - assertEquals("StartTime One before Middle Wind Angle ", 0.3224948, windList.get(windList.size() / 2 - 2).getBearing() - .getRadians(), epsilon); - assertEquals("StartTime Middle Wind Angle ", 0.3224948, windList.get(windList.size() / 2 - 1).getBearing().getRadians(), - epsilon); - assertEquals("StartTime Last Wind Angle ", 0.2468268, windList.get(windList.size() - 1).getBearing().getRadians(), epsilon); + assertEquals(0.3224948, windList.get(windList.size() / 2 - 2).getBearing() + .getRadians(), epsilon, "StartTime One before Middle Wind Angle "); + assertEquals(0.3224948, windList.get(windList.size() / 2 - 1).getBearing().getRadians(), epsilon, + "StartTime Middle Wind Angle "); + assertEquals(0.2468268, windList.get(windList.size() - 1).getBearing().getRadians(), epsilon, "StartTime Last Wind Angle "); /** * Check the speed at the next time @@ -151,22 +151,22 @@ public class WindFieldGeneratorTest { windList.add(localWind); } } - assertEquals("Size of windList ", hSteps * vSteps, windList.size()); + assertEquals(hSteps * vSteps, windList.size(), "Size of windList "); // Check the speed - assertEquals("One Time Unit First Wind Speed ", 7, windList.get(0).getKnots(), 0); - assertEquals("One Time Unit One before Middle Wind Speed ", 7.896551, windList.get(windList.size() / 2 - 2).getKnots(), - epsilon); - assertEquals("One Time Unit Middle Wind Speed ", 7.965517, windList.get(windList.size() / 2 - 1).getKnots(), epsilon); - assertEquals("One Time Unit Last Wind Speed ", 9, windList.get(windList.size() - 1).getKnots(), 0); + assertEquals(7, windList.get(0).getKnots(), 0, "One Time Unit First Wind Speed "); + assertEquals(7.896551, windList.get(windList.size() / 2 - 2).getKnots(), epsilon, + "One Time Unit One before Middle Wind Speed "); + assertEquals(7.965517, windList.get(windList.size() / 2 - 1).getKnots(), epsilon, "One Time Unit Middle Wind Speed "); + assertEquals(9, windList.get(windList.size() - 1).getKnots(), 0, "One Time Unit Last Wind Speed "); // Check the angle - assertEquals("One Time Unit First Wind Angle ",0.0068534, windList.get(0).getBearing().getRadians(), epsilon); - assertEquals("One Time Unit One before Middle Wind Angle ", 0.3250553, windList.get(windList.size() / 2 - 2).getBearing() - .getRadians(), epsilon); - assertEquals("One Time Unit Middle Wind Angle ", 0.3250553, windList.get(windList.size() / 2 - 1).getBearing() - .getRadians(), epsilon); - assertEquals("One Time Unit Last Wind Angle ", 0.241933, windList.get(windList.size() - 1).getBearing().getRadians(), - epsilon); + assertEquals(0.0068534,windList.get(0).getBearing().getRadians(), epsilon, "One Time Unit First Wind Angle "); + assertEquals(0.3250553, windList.get(windList.size() / 2 - 2).getBearing() + .getRadians(), epsilon, "One Time Unit One before Middle Wind Angle "); + assertEquals(0.3250553, windList.get(windList.size() / 2 - 1).getBearing() + .getRadians(), epsilon, "One Time Unit Middle Wind Angle "); + assertEquals(0.241933, windList.get(windList.size() - 1).getBearing().getRadians(), epsilon, + "One Time Unit Last Wind Angle "); } @@ -259,18 +259,18 @@ public class WindFieldGeneratorTest { windList.add(localWind); } } - assertEquals("Size of windList ", hSteps * vSteps, windList.size()); + assertEquals(hSteps * vSteps, windList.size(), "Size of windList "); double epsilon = 1e-6; // Check the speed - assertEquals("StartTime First Wind Speed ", 7, windList.get(0).getKnots(), 0); - assertEquals("StartTime Last Wind Speed in first row ", 9, windList.get(hSteps - 1).getKnots(), 0); + assertEquals(7, windList.get(0).getKnots(), 0, "StartTime First Wind Speed "); + assertEquals(9, windList.get(hSteps - 1).getKnots(), 0, "StartTime Last Wind Speed in first row "); - assertEquals("StartTime One before Middle Wind Speed ", 7.896551, windList.get(windList.size() / 2 - 2) - .getKnots(), epsilon); - assertEquals("StartTime Middle Wind Speed ", 7.965517, windList.get(windList.size() / 2 - 1).getKnots(), epsilon); - assertEquals("StartTime Last Wind Speed ", 9, windList.get(windList.size() - 1).getKnots(), 0); + assertEquals(7.896551, windList.get(windList.size() / 2 - 2) + .getKnots(), epsilon, "StartTime One before Middle Wind Speed "); + assertEquals(7.965517, windList.get(windList.size() / 2 - 1).getKnots(), epsilon, "StartTime Middle Wind Speed "); + assertEquals(9, windList.get(windList.size() - 1).getKnots(), 0, "StartTime Last Wind Speed "); // Check the angle - assertEquals("StartTime First Wind Angle ", 0, windList.get(0).getBearing().getRadians(), 0); + assertEquals(0, windList.get(0).getBearing().getRadians(), 0, "StartTime First Wind Angle "); } @@ -283,17 +283,17 @@ public class WindFieldGeneratorTest { @Test public void testIndex() { Util.Pair pairIndex = getIndex(1, 30); - assertEquals("Index 1 RowIndex ", 1, (int) pairIndex.getA()); - assertEquals("Index 1 ColIndex ", 1, (int) pairIndex.getB()); + assertEquals(1, (int) pairIndex.getA(), "Index 1 RowIndex "); + assertEquals(1, (int) pairIndex.getB(), "Index 1 ColIndex "); pairIndex = getIndex(30, 30); - assertEquals("Index 30 RowIndex ", 1, (int) pairIndex.getA()); - assertEquals("Index 30 ColIndex ", 30, (int) pairIndex.getB()); + assertEquals(1, (int) pairIndex.getA(), "Index 30 RowIndex "); + assertEquals(30, (int) pairIndex.getB(), "Index 30 ColIndex "); pairIndex = getIndex(31, 30); - assertEquals("Index 31 RowIndex ", 2, (int) pairIndex.getA()); - assertEquals("Index 31 ColIndex ", 1, (int) pairIndex.getB()); + assertEquals(2, (int) pairIndex.getA(), "Index 31 RowIndex "); + assertEquals(1, (int) pairIndex.getB(), "Index 31 ColIndex "); pairIndex = getIndex(450, 30); - assertEquals("Index 450 RowIndex ", 15, (int) pairIndex.getA()); - assertEquals("Index 450 ColIndex ", 30, (int) pairIndex.getB()); + assertEquals(15, (int) pairIndex.getA(), "Index 450 RowIndex "); + assertEquals(30, (int) pairIndex.getB(), "Index 450 ColIndex "); } } diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGenerator1TurnerEval.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGenerator1TurnerEval.java index 29a6dc06c5b..cdf41cc1330 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGenerator1TurnerEval.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGenerator1TurnerEval.java @@ -8,7 +8,7 @@ import java.io.InputStream; import java.io.ObjectInput; import java.io.ObjectInputStream; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.DegreePosition; @@ -64,17 +64,17 @@ public class PathGenerator1TurnerEval { TimedPositionWithSpeed result = this._pathGenerator.get1Turner(this._windField, this._polarDiagram, start, end, startTime, leftSide, stepMax, timeStep); - Assert.assertNotNull(result); - Assert.assertNotNull(result.getPosition()); - Assert.assertNotNull(result.getSpeed()); - Assert.assertNotNull(result.getSpeed().getBearing()); - Assert.assertNotNull(result.getTimePoint()); + Assertions.assertNotNull(result); + Assertions.assertNotNull(result.getPosition()); + Assertions.assertNotNull(result.getSpeed()); + Assertions.assertNotNull(result.getSpeed().getBearing()); + Assertions.assertNotNull(result.getTimePoint()); - Assert.assertEquals(3.375, result.getSpeed().getKnots(), 0.001); - Assert.assertEquals(131.919809, result.getSpeed().getBearing().getDegrees(), 0.000001); - Assert.assertEquals(53.969782, result.getPosition().getLatDeg(), 0.000001); - Assert.assertEquals(10.894810, result.getPosition().getLngDeg(), 0.000001); - Assert.assertEquals(1360533820118L, result.getTimePoint().asMillis()); + Assertions.assertEquals(3.375, result.getSpeed().getKnots(), 0.001); + Assertions.assertEquals(131.919809, result.getSpeed().getBearing().getDegrees(), 0.000001); + Assertions.assertEquals(53.969782, result.getPosition().getLatDeg(), 0.000001); + Assertions.assertEquals(10.894810, result.getPosition().getLngDeg(), 0.000001); + Assertions.assertEquals(1360533820118L, result.getTimePoint().asMillis()); } public void test_get1Turner_segment1() { @@ -89,17 +89,17 @@ public class PathGenerator1TurnerEval { TimedPositionWithSpeed result = this._pathGenerator.get1Turner(this._windField, this._polarDiagram, start, end, startTime, leftSide, stepMax, timeStep); - Assert.assertNotNull(result); - Assert.assertNotNull(result.getPosition()); - Assert.assertNotNull(result.getSpeed()); - Assert.assertNotNull(result.getSpeed().getBearing()); - Assert.assertNotNull(result.getTimePoint()); + Assertions.assertNotNull(result); + Assertions.assertNotNull(result.getPosition()); + Assertions.assertNotNull(result.getSpeed()); + Assertions.assertNotNull(result.getSpeed().getBearing()); + Assertions.assertNotNull(result.getTimePoint()); - Assert.assertEquals(3.375, result.getSpeed().getKnots(), 0.001); - Assert.assertEquals(131.917200, result.getSpeed().getBearing().getDegrees(), 0.000001); - Assert.assertEquals(53.970290, result.getPosition().getLatDeg(), 0.000001); - Assert.assertEquals(10.895261, result.getPosition().getLngDeg(), 0.000001); - Assert.assertEquals(1317552764000L, result.getTimePoint().asMillis()); + Assertions.assertEquals(3.375, result.getSpeed().getKnots(), 0.001); + Assertions.assertEquals(131.917200, result.getSpeed().getBearing().getDegrees(), 0.000001); + Assertions.assertEquals(53.970290, result.getPosition().getLatDeg(), 0.000001); + Assertions.assertEquals(10.895261, result.getPosition().getLngDeg(), 0.000001); + Assertions.assertEquals(1317552764000L, result.getTimePoint().asMillis()); } public void test_get1Turner_segment2() { @@ -116,17 +116,17 @@ public class PathGenerator1TurnerEval { TimedPositionWithSpeed result = this._pathGenerator.get1Turner(this._windField, this._polarDiagram, end, start, startTime, leftSide, stepMax, timeStep); - Assert.assertNotNull(result); - Assert.assertNotNull(result.getPosition()); - Assert.assertNotNull(result.getSpeed()); - Assert.assertNotNull(result.getSpeed().getBearing()); - Assert.assertNotNull(result.getTimePoint()); + Assertions.assertNotNull(result); + Assertions.assertNotNull(result.getPosition()); + Assertions.assertNotNull(result.getSpeed()); + Assertions.assertNotNull(result.getSpeed().getBearing()); + Assertions.assertNotNull(result.getTimePoint()); - Assert.assertEquals(3.375, result.getSpeed().getKnots(), 0.001); - Assert.assertEquals(131.916561, result.getSpeed().getBearing().getDegrees(), 0.000001); - Assert.assertEquals(53.969532, result.getPosition().getLatDeg(), 0.000001); - Assert.assertEquals(10.894251, result.getPosition().getLngDeg(), 0.000001); - Assert.assertEquals(1317552752000L, result.getTimePoint().asMillis()); + Assertions.assertEquals(3.375, result.getSpeed().getKnots(), 0.001); + Assertions.assertEquals(131.916561, result.getSpeed().getBearing().getDegrees(), 0.000001); + Assertions.assertEquals(53.969532, result.getPosition().getLatDeg(), 0.000001); + Assertions.assertEquals(10.894251, result.getPosition().getLngDeg(), 0.000001); + Assertions.assertEquals(1317552752000L, result.getTimePoint().asMillis()); } public WindFieldGenerator readWindFieldGeneratorFromExternalFile(final String fileName) { diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGeneratorTracTracEval.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGeneratorTracTracEval.java index 808cf9d7c86..8c7f7559b5a 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGeneratorTracTracEval.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGeneratorTracTracEval.java @@ -3,7 +3,7 @@ package com.sap.sailing.simulator.test.util; import java.io.IOException; import java.util.List; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.simulator.Path; @@ -43,19 +43,19 @@ public class PathGeneratorTracTracEval { PathGeneratorTracTracEval.pathGenerator.setSelectionParameters(0, 0); Path leg0 = PathGeneratorTracTracEval.pathGenerator.getPath(); - Assert.assertEquals(99, leg0.getPathPoints().size()); + Assertions.assertEquals(99, leg0.getPathPoints().size()); PathGeneratorTracTracEval.pathGenerator.setSelectionParameters(1, 0); Path leg1 = PathGeneratorTracTracEval.pathGenerator.getPath(); - Assert.assertEquals(110, leg1.getPathPoints().size()); + Assertions.assertEquals(110, leg1.getPathPoints().size()); PathGeneratorTracTracEval.pathGenerator.setSelectionParameters(2, 0); Path leg2 = PathGeneratorTracTracEval.pathGenerator.getPath(); - Assert.assertEquals(151, leg2.getPathPoints().size()); + Assertions.assertEquals(151, leg2.getPathPoints().size()); PathGeneratorTracTracEval.pathGenerator.setSelectionParameters(3, 0); Path leg3 = PathGeneratorTracTracEval.pathGenerator.getPath(); - Assert.assertEquals(98, leg3.getPathPoints().size()); + Assertions.assertEquals(98, leg3.getPathPoints().size()); } public void testGetLegPolyline() { @@ -64,29 +64,29 @@ public class PathGeneratorTracTracEval { PathGeneratorTracTracEval.pathGenerator.setSelectionParameters(0, 0); Path legPolyline0 = PathGeneratorTracTracEval.pathGenerator.getPathPolyline(maxDistance); - Assert.assertEquals(10, legPolyline0.getPathPoints().size()); + Assertions.assertEquals(10, legPolyline0.getPathPoints().size()); PathGeneratorTracTracEval.pathGenerator.setSelectionParameters(1, 0); Path legPolyline1 = PathGeneratorTracTracEval.pathGenerator.getPathPolyline(maxDistance); - Assert.assertEquals(7, legPolyline1.getPathPoints().size()); + Assertions.assertEquals(7, legPolyline1.getPathPoints().size()); PathGeneratorTracTracEval.pathGenerator.setSelectionParameters(2, 0); Path legPolyline2 = PathGeneratorTracTracEval.pathGenerator.getPathPolyline(maxDistance); - Assert.assertEquals(8, legPolyline2.getPathPoints().size()); + Assertions.assertEquals(8, legPolyline2.getPathPoints().size()); PathGeneratorTracTracEval.pathGenerator.setSelectionParameters(3, 0); Path legPolyline3 = PathGeneratorTracTracEval.pathGenerator.getPathPolyline(maxDistance); - Assert.assertEquals(7, legPolyline3.getPathPoints().size()); + Assertions.assertEquals(7, legPolyline3.getPathPoints().size()); } public void testGetLegsNames() { List legsNames = PathGeneratorTracTracEval.pathGenerator.getLegsNames(); - Assert.assertEquals(4, legsNames.size()); - Assert.assertEquals("G1 Start-Finish -> G1 Mark 1", legsNames.get(0)); - Assert.assertEquals("G1 Mark 1 -> G1 Mark 4", legsNames.get(1)); - Assert.assertEquals("G1 Mark 4 -> G1 Mark 1", legsNames.get(2)); - Assert.assertEquals("G1 Mark 1 -> G1 Start-Finish", legsNames.get(3)); + Assertions.assertEquals(4, legsNames.size()); + Assertions.assertEquals("G1 Start-Finish -> G1 Mark 1", legsNames.get(0)); + Assertions.assertEquals("G1 Mark 1 -> G1 Mark 4", legsNames.get(1)); + Assertions.assertEquals("G1 Mark 4 -> G1 Mark 1", legsNames.get(2)); + Assertions.assertEquals("G1 Mark 1 -> G1 Start-Finish", legsNames.get(3)); } } diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramCurrentDataPolar.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramCurrentDataPolar.java index d3ee0557e9c..18010f665cf 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramCurrentDataPolar.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramCurrentDataPolar.java @@ -1,6 +1,6 @@ package com.sap.sailing.simulator.test.util; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.FileWriter; import java.io.IOException; @@ -63,7 +63,7 @@ public class PolarDiagramCurrentDataPolar { } fw.close(); - assertEquals("no test", 1, 1); + assertEquals(1, 1, "no test"); System.out.println("Finished."); } diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java index 857bdeb5503..ff1f19fe96b 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java @@ -1,6 +1,6 @@ package com.sap.sailing.simulator.test.util; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.FileWriter; import java.io.IOException; @@ -49,7 +49,7 @@ public class PolarDiagramPlotDataPolar { } fw.close(); - assertEquals("no test", 1, 1); + assertEquals(1, 1, "no test"); } diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataXY.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataXY.java index bcb9e8bcef7..6d76a7afe81 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataXY.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataXY.java @@ -1,6 +1,6 @@ package com.sap.sailing.simulator.test.util; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.FileWriter; import java.io.IOException; @@ -41,7 +41,7 @@ public class PolarDiagramPlotDataXY { } fw.close(); - assertEquals("no test", 1, 1); + assertEquals(1, 1, "no test"); } diff --git a/java/com.sap.sailing.velum.resultimport.test/src/com/sap/sailing/velum/resultimport/test/ParserTest.java b/java/com.sap.sailing.velum.resultimport.test/src/com/sap/sailing/velum/resultimport/test/ParserTest.java index 0f42cd364e2..88f10a6b85b 100644 --- a/java/com.sap.sailing.velum.resultimport.test/src/com/sap/sailing/velum/resultimport/test/ParserTest.java +++ b/java/com.sap.sailing.velum.resultimport.test/src/com/sap/sailing/velum/resultimport/test/ParserTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.velum.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; import java.io.File; import java.io.FileInputStream; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.RegattaScoreCorrections; diff --git a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/hmm/WindRangeCalculationTest.java b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/hmm/WindRangeCalculationTest.java index 4c1f783306e..4228a3fd6e2 100644 --- a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/hmm/WindRangeCalculationTest.java +++ b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/hmm/WindRangeCalculationTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.windestimation.aggregator.hmm; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.windestimation.aggregator.hmm.WindCourseRange.CombinationModeOnViolation; diff --git a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/msthmm/AbstractMstGraphGeneratorTest.java b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/msthmm/AbstractMstGraphGeneratorTest.java index 846d2db7064..398e4314d31 100644 --- a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/msthmm/AbstractMstGraphGeneratorTest.java +++ b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/msthmm/AbstractMstGraphGeneratorTest.java @@ -1,11 +1,11 @@ package com.sap.sailing.windestimation.aggregator.msthmm; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.windestimation.aggregator.msthmm.AbstractMstGraphGenerator.NodeWithDistance; import com.sap.sailing.windestimation.aggregator.msthmm.AbstractMstGraphGenerator.NodeWithNeighbors; @@ -22,7 +22,7 @@ public class AbstractMstGraphGeneratorTest { private int counter; - @Before + @BeforeEach public void beforeStart() { counter = 1; } diff --git a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/msthmm/DijkstraTest.java b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/msthmm/DijkstraTest.java index ed714068cf6..a81a73c94bd 100755 --- a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/msthmm/DijkstraTest.java +++ b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/aggregator/msthmm/DijkstraTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.windestimation.aggregator.msthmm; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.Arrays; import java.util.Collections; @@ -12,8 +12,8 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.windestimation.aggregator.graph.DijkstraShortestPathFinderImpl; import com.sap.sailing.windestimation.aggregator.graph.DijsktraShortestPathFinder; @@ -87,7 +87,7 @@ public class DijkstraTest { } } - @Before + @BeforeEach public void setUp() { startNode = new Node("Start", 1.0); endNode = new Node("End", 1.0); diff --git a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java index 80d2371bf35..8598478ed8e 100644 --- a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java +++ b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.windestimation.integration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.net.URI; @@ -19,8 +19,8 @@ import java.util.TimeZone; import java.util.TreeMap; import java.util.logging.Level; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.NoWindException; @@ -112,7 +112,7 @@ public class IncrementalMstHmmWindEstimationForTrackedRaceTest extends OnlineTra windEstimationFactoryService.importAllModelsFromModelStore(modelStore); } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///" @@ -149,7 +149,7 @@ public class IncrementalMstHmmWindEstimationForTrackedRaceTest extends OnlineTra @Test public void testIncrementalMstHmmWindEstimationForTrackedRace() throws NoWindException, ModelPersistenceException { - assertTrue("Wind estimation models are empty", windEstimationFactoryService.isReady()); + assertTrue(windEstimationFactoryService.isReady(), "Wind estimation models are empty"); DynamicTrackedRaceImpl trackedRace = getTrackedRace(); WindTrack estimatedWindTrackOfTrackedRace = trackedRace .getOrCreateWindTrack(new WindSourceImpl(WindSourceType.MANEUVER_BASED_ESTIMATION)); @@ -223,16 +223,16 @@ public class IncrementalMstHmmWindEstimationForTrackedRaceTest extends OnlineTra foundCount++; } } - assertTrue("Expected ratio of matching fixes to be at least "+PERCENT_QUANTILE+" but was only "+(double) foundCount / (double) estimatedWindFixes.size(), - (double) foundCount / (double) estimatedWindFixes.size() > PERCENT_QUANTILE); + assertTrue((double) foundCount / (double) estimatedWindFixes.size() > PERCENT_QUANTILE, + "Expected ratio of matching fixes to be at least "+PERCENT_QUANTILE+" but was only "+(double) foundCount / (double) estimatedWindFixes.size()); foundCount = 0; for (Wind wind : targetWindFixes) { if (findWithinTolerance(estimatedWindFixesMap, new Pair<>(wind.getPosition(), wind.getTimePoint())) != null) { foundCount++; } } - assertTrue("Expected ratio of matching fixes to be at least "+PERCENT_QUANTILE+" but was only "+(double) foundCount / (double) estimatedWindFixes.size(), - (double) foundCount / (double) targetWindFixes.size() > PERCENT_QUANTILE); + assertTrue((double) foundCount / (double) targetWindFixes.size() > PERCENT_QUANTILE, + "Expected ratio of matching fixes to be at least "+PERCENT_QUANTILE+" but was only "+(double) foundCount / (double) estimatedWindFixes.size()); } /** @@ -269,11 +269,11 @@ public class IncrementalMstHmmWindEstimationForTrackedRaceTest extends OnlineTra } } final Bearing averageBearing = bearingSum.divide(targetWindFixes.size()); - assertTrue("Expected at least "+((int) (100*PERCENT_QUANTILE))+"% of the wind fixes to be in range "+ - new DegreeBearingImpl(expectedTWDAverageInDegrees).add(new DegreeBearingImpl(-toleranceForPercentQuantile))+ - " to "+new DegreeBearingImpl(expectedTWDAverageInDegrees).add(new DegreeBearingImpl(toleranceForPercentQuantile))+ - " but only "+(int) (100*(double) insideRange / targetWindFixes.size())+"% were.", - (double) insideRange / targetWindFixes.size() >= PERCENT_QUANTILE); + assertTrue((double) insideRange / targetWindFixes.size() >= PERCENT_QUANTILE, + "Expected at least "+((int) (100*PERCENT_QUANTILE))+"% of the wind fixes to be in range "+ + new DegreeBearingImpl(expectedTWDAverageInDegrees).add(new DegreeBearingImpl(-toleranceForPercentQuantile))+ + " to "+new DegreeBearingImpl(expectedTWDAverageInDegrees).add(new DegreeBearingImpl(toleranceForPercentQuantile))+ + " but only "+(int) (100*(double) insideRange / targetWindFixes.size())+"% were."); assertEquals(expectedTWDAverageInDegrees, averageBearing.getDegrees(), averageToleranceInDegrees); } diff --git a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstManeuverGraphGeneratorTest.java b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstManeuverGraphGeneratorTest.java index 3b39927057d..ae48e056466 100644 --- a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstManeuverGraphGeneratorTest.java +++ b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstManeuverGraphGeneratorTest.java @@ -1,6 +1,6 @@ package com.sap.sailing.windestimation.integration; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.net.MalformedURLException; @@ -15,8 +15,8 @@ import java.util.Set; import java.util.TimeZone; import java.util.TreeSet; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.Position; @@ -59,7 +59,7 @@ public class IncrementalMstManeuverGraphGeneratorTest extends OnlineTracTracBase IncrementalMstHmmWindEstimationForTrackedRaceTest.modelFilesNames); } - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); URI storedUri = new URI("file:///" @@ -81,8 +81,8 @@ public class IncrementalMstManeuverGraphGeneratorTest extends OnlineTracTracBase gaussianBasedTwdTransitionDistributionCache, true); ManeuverClassifiersCache maneuverClassifiersCache = new ManeuverClassifiersCache(modelStore, true, Long.MAX_VALUE, new ManeuverFeatures(false, false, false)); - assertTrue("Wind estimation models are empty", - gaussianBasedTwdTransitionDistributionCache.isReady() && maneuverClassifiersCache.isReady()); + assertTrue(gaussianBasedTwdTransitionDistributionCache.isReady() && maneuverClassifiersCache.isReady(), + "Wind estimation models are empty"); DynamicTrackedRaceImpl trackedRace = getTrackedRace(); IncrementalMstManeuverGraphGenerator generator = new IncrementalMstManeuverGraphGenerator( new CompleteManeuverCurveToManeuverForEstimationConverter(trackedRace, null), @@ -133,10 +133,10 @@ public class IncrementalMstManeuverGraphGeneratorTest extends OnlineTracTracBase .forEach(pair -> cleanManeuversFromGraph.add(pair)); for (Pair pair : cleanManeuversFromGraph) { - assertTrue("Target set does not contain maneuver at " + pair, cleanManeuvers.contains(pair)); + assertTrue(cleanManeuvers.contains(pair), "Target set does not contain maneuver at " + pair); } for (Pair pair : cleanManeuvers) { - assertTrue("Set from graph does not contain maneuver at " + pair, cleanManeuversFromGraph.contains(pair)); + assertTrue(cleanManeuversFromGraph.contains(pair), "Set from graph does not contain maneuver at " + pair); } } diff --git a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/jaxrs/api/WindEstimationDataResourceTest.java b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/jaxrs/api/WindEstimationDataResourceTest.java index 8f628d61e28..a041fc6da8c 100644 --- a/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/jaxrs/api/WindEstimationDataResourceTest.java +++ b/java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/jaxrs/api/WindEstimationDataResourceTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.windestimation.jaxrs.api; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sailing.windestimation.integration.IncrementalMstHmmWindEstimationForTrackedRaceTest; import com.sap.sailing.windestimation.integration.WindEstimationFactoryServiceImpl; diff --git a/java/com.sap.sailing.xrr.resultimport.test/src/com/sap/sailing/xrr/resultimport/test/ParserTest.java b/java/com.sap.sailing.xrr.resultimport.test/src/com/sap/sailing/xrr/resultimport/test/ParserTest.java index 62690abe1d4..fb2d98d3197 100755 --- a/java/com.sap.sailing.xrr.resultimport.test/src/com/sap/sailing/xrr/resultimport/test/ParserTest.java +++ b/java/com.sap.sailing.xrr.resultimport.test/src/com/sap/sailing/xrr/resultimport/test/ParserTest.java @@ -1,9 +1,9 @@ package com.sap.sailing.xrr.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.FileInputStream; @@ -24,7 +24,7 @@ import java.util.TimeZone; import javax.xml.bind.JAXBException; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.domain.common.MaxPointsReason; diff --git a/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/CharlstonRaceWeek2015_ParserTest.java b/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/CharlstonRaceWeek2015_ParserTest.java index 030f3640e4f..cebd8f1236f 100644 --- a/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/CharlstonRaceWeek2015_ParserTest.java +++ b/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/CharlstonRaceWeek2015_ParserTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.yachtscoring.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.mock; import java.io.IOException; @@ -12,7 +12,7 @@ import java.util.Set; import javax.xml.bind.JAXBException; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.domain.common.RegattaScoreCorrections; diff --git a/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/CompetitorImportTest.java b/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/CompetitorImportTest.java index 7bd38e17e81..5b2ec5349bc 100644 --- a/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/CompetitorImportTest.java +++ b/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/CompetitorImportTest.java @@ -1,8 +1,8 @@ package com.sap.sailing.yachtscoring.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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 static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -14,7 +14,7 @@ import java.util.Arrays; import javax.xml.bind.JAXBException; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.domain.common.CompetitorDescriptor; diff --git a/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/KeyWestRaceWeek2016_ParserTest.java b/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/KeyWestRaceWeek2016_ParserTest.java index 7ec71fa14d0..778036ef635 100644 --- a/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/KeyWestRaceWeek2016_ParserTest.java +++ b/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/KeyWestRaceWeek2016_ParserTest.java @@ -1,7 +1,7 @@ package com.sap.sailing.yachtscoring.resultimport.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.mock; import java.io.IOException; @@ -16,7 +16,7 @@ import javax.xml.bind.DatatypeConverter; import javax.xml.bind.JAXBException; import javax.xml.parsers.ParserConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import com.sap.sailing.domain.common.RegattaScoreCorrections; diff --git a/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/PersistenceTest.java b/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/PersistenceTest.java index 0fd342447ba..3e8f63e6fe9 100644 --- a/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/PersistenceTest.java +++ b/java/com.sap.sailing.yachtscoring.resultimport.test/src/com/sap/sailing/yachtscoring/resultimport/test/PersistenceTest.java @@ -5,9 +5,8 @@ import java.net.URL; import java.util.Map; import java.util.Set; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.persistence.DomainObjectFactory; import com.sap.sailing.domain.persistence.MongoObjectFactory; @@ -32,16 +31,16 @@ public class PersistenceTest { resultUrlRegistry.registerResultUrl(testProviderName, testUrl); Map> resultUrls = domainObjectFactory.loadResultUrls(); - Assert.assertTrue(resultUrls.containsKey(testProviderName)); + Assertions.assertTrue(resultUrls.containsKey(testProviderName)); Set urls = resultUrls.get(testProviderName); - Assert.assertEquals(1, urls.size()); + Assertions.assertEquals(1, urls.size()); URL url = urls.iterator().next(); - Assert.assertEquals(testUrl, url); + Assertions.assertEquals(testUrl, url); resultUrlRegistry.unregisterResultUrl(testProviderName, testUrl); resultUrls = domainObjectFactory.loadResultUrls(); - Assert.assertFalse(resultUrls.containsKey(testProviderName)); + Assertions.assertFalse(resultUrls.containsKey(testProviderName)); } diff --git a/java/com.sap.sse.aicore.test/src/com/sap/sse/aicore/impl/ReadCredentialsTest.java b/java/com.sap.sse.aicore.test/src/com/sap/sse/aicore/impl/ReadCredentialsTest.java index 0618e5e315e..22e530c1b6e 100644 --- a/java/com.sap.sse.aicore.test/src/com/sap/sse/aicore/impl/ReadCredentialsTest.java +++ b/java/com.sap.sse.aicore.test/src/com/sap/sse/aicore/impl/ReadCredentialsTest.java @@ -1,15 +1,15 @@ package com.sap.sse.aicore.impl; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.io.InputStreamReader; import java.net.URISyntaxException; import org.json.simple.parser.ParseException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.aicore.Credentials; import com.sap.sse.aicore.CredentialsParser; diff --git a/java/com.sap.sse.aicore.test/src/com/sap/sse/aicore/impl/TestWithSecretCredentials.java b/java/com.sap.sse.aicore.test/src/com/sap/sse/aicore/impl/TestWithSecretCredentials.java index d522575c3de..5f9a1d8141c 100644 --- a/java/com.sap.sse.aicore.test/src/com/sap/sse/aicore/impl/TestWithSecretCredentials.java +++ b/java/com.sap.sse.aicore.test/src/com/sap/sse/aicore/impl/TestWithSecretCredentials.java @@ -1,9 +1,9 @@ package com.sap.sse.aicore.impl; -import static org.junit.Assert.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import static org.hamcrest.Matchers.lessThan; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.MalformedURLException; @@ -13,9 +13,9 @@ import java.util.Optional; import org.apache.http.client.ClientProtocolException; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.sap.sse.aicore.AICore; import com.sap.sse.aicore.ChatSession; @@ -24,12 +24,12 @@ import com.sap.sse.aicore.CredentialsParser; import com.sap.sse.aicore.Deployment; import com.sap.sse.common.Util; -@Ignore("Requires system property sap.aicore.credentials to be set and contain a JSON credentials string; for format, see resources/sample_credentials.json") +@Disabled("Requires system property sap.aicore.credentials to be set and contain a JSON credentials string; for format, see resources/sample_credentials.json") public class TestWithSecretCredentials { private Credentials credentials; private AICore aiCore; - @Before + @BeforeEach public void setUp() throws MalformedURLException, ParseException { final String credentialsJsonString = System.getProperty(AICore.CREDENTIALS_SYSTEM_PROPERTY_NAME); credentials = CredentialsParser.create().parse(credentialsJsonString); diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/TimingStatsTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/TimingStatsTest.java index df4989d0859..af6d22e2ffa 100755 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/TimingStatsTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/TimingStatsTest.java @@ -1,11 +1,11 @@ package com.sap.sse.common; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java index ca995482f80..5a93b8c3802 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java @@ -1,9 +1,10 @@ package com.sap.sse.common.impl.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sse.common.impl.AbstractColor; import com.sap.sse.common.impl.HSVColor; @@ -11,78 +12,76 @@ import com.sap.sse.common.impl.RGBColor; import com.sap.sse.common.Color; import com.sap.sse.common.Util.Triple; -import org.junit.Assert; - public class AbstractColorTest { @Test public void testShortRGBColor() { Color color = AbstractColor.getCssColor("#0"); - Assert.assertEquals("#000000", color.getAsHtml()); + Assertions.assertEquals("#000000", color.getAsHtml()); color = AbstractColor.getCssColor("#00F"); - Assert.assertEquals("#0000FF", color.getAsHtml()); + Assertions.assertEquals("#0000FF", color.getAsHtml()); color = AbstractColor.getCssColor("F"); - Assert.assertEquals("#0F0F0F", color.getAsHtml()); + Assertions.assertEquals("#0F0F0F", color.getAsHtml()); color = AbstractColor.getCssColor("0F0"); - Assert.assertEquals("#00FF00", color.getAsHtml()); + Assertions.assertEquals("#00FF00", color.getAsHtml()); } @Test public void testRGBColor() throws Exception { Color color = AbstractColor.getCssColor("rgb(255,255,255)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assertions.assertEquals("#FFFFFF", color.getAsHtml()); color = AbstractColor.getCssColor("rgb(1, 2, 3)"); - Assert.assertEquals("#010203", color.getAsHtml()); + Assertions.assertEquals("#010203", color.getAsHtml()); color = AbstractColor.getCssColor("rgb(100%,100%,100%)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assertions.assertEquals("#FFFFFF", color.getAsHtml()); color = AbstractColor.getCssColor("rgb(255,255,255,777,354)"); - Assert.assertEquals(null, color); + Assertions.assertEquals(null, color); color = AbstractColor.getCssColor("rgb(255 ,255,255)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assertions.assertEquals("#FFFFFF", color.getAsHtml()); color = AbstractColor.getCssColor("rgb(3666 ,255,255)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assertions.assertEquals("#FFFFFF", color.getAsHtml()); color = AbstractColor.getCssColor("rgb(3666.98 ,255,255)"); - Assert.assertEquals(null, color); + Assertions.assertEquals(null, color); } @Test public void testRGBA() throws Exception { Color color = AbstractColor.getCssColor("rgba(255,255,255,0.3)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assertions.assertEquals("#FFFFFF", color.getAsHtml()); color = AbstractColor.getCssColor("rgba(255 ,255,255,90)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assertions.assertEquals("#FFFFFF", color.getAsHtml()); color = AbstractColor.getCssColor("rgba(3666 ,255,255,0.3)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assertions.assertEquals("#FFFFFF", color.getAsHtml()); color = AbstractColor.getCssColor("rgba(3666.98 ,255,255,0.777)"); - Assert.assertEquals(null, color); + Assertions.assertEquals(null, color); } @Test public void testHSL() throws Exception { Color color = AbstractColor.getCssColor("hsl(360, 100%, 100%)"); - Assert.assertEquals("#FF00FF", color.getAsHtml()); + Assertions.assertEquals("#FF00FF", color.getAsHtml()); color = AbstractColor.getCssColor("HSL(360, 1.0, 1.0)"); - Assert.assertEquals("#FF00FF", color.getAsHtml()); + Assertions.assertEquals("#FF00FF", color.getAsHtml()); color = AbstractColor.getCssColor("hsl(360, 1.0, 1.0,435,789)"); - Assert.assertEquals(null, color); + Assertions.assertEquals(null, color); } @Test public void testHSLA() throws Exception { Color color = AbstractColor.getCssColor("hsla(360, 100%, 100%,hjhb)"); - Assert.assertEquals("#FF00FF", color.getAsHtml()); + Assertions.assertEquals("#FF00FF", color.getAsHtml()); color = AbstractColor.getCssColor("HSLa(360, 1.0, 1.0,0.4)"); - Assert.assertEquals("#FF00FF", color.getAsHtml()); + Assertions.assertEquals("#FF00FF", color.getAsHtml()); color = AbstractColor.getCssColor("hsla(360, 1.0, 1.0,435,789)"); - Assert.assertEquals(null, color); + Assertions.assertEquals(null, color); } @Test public void testColorName() { Color color = AbstractColor.getCssColor("BrOwn"); - Assert.assertEquals(Color.BROWN, color); + Assertions.assertEquals(Color.BROWN, color); color = AbstractColor.getCssColor("caffee"); - Assert.assertEquals("#CAFFEE", color.getAsHtml()); + Assertions.assertEquals("#CAFFEE", color.getAsHtml()); } @Test diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/media/MediaTypeTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/media/MediaTypeTest.java index cd01541a787..7f577514b00 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/media/MediaTypeTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/media/MediaTypeTest.java @@ -1,8 +1,8 @@ package com.sap.sse.common.media; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MediaTypeTest { diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ArraySortTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ArraySortTest.java index 44ff4b020f9..4e3926a76cb 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ArraySortTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ArraySortTest.java @@ -1,10 +1,10 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ColorMapperTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ColorMapperTest.java index e2f0fbc0a6a..882202ca3f3 100755 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ColorMapperTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ColorMapperTest.java @@ -1,7 +1,7 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -9,8 +9,8 @@ import static org.mockito.Mockito.verify; import java.util.HashSet; import java.util.Set; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.ColorMapper; import com.sap.sse.common.ColorMapper.ValueSpreader; @@ -25,7 +25,7 @@ public class ColorMapperTest { Set valueSet; Set colorSet; - @Before + @BeforeEach public void setUp() { valueRange = new ValueRangeFlexibleBoundaries(-5.0, 5.0, 0.0, 0.0); colorMapper = new ColorMapper(valueRange, false, ValueSpreader.LINEAR); diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/GetDominantObjectTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/GetDominantObjectTest.java index 9eabff3574e..8159d61fb92 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/GetDominantObjectTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/GetDominantObjectTest.java @@ -3,8 +3,8 @@ package com.sap.sse.common.test; import java.util.ArrayList; import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; @@ -12,13 +12,13 @@ public class GetDominantObjectTest { @Test public void testNullCollection() { - Assert.assertNull(Util.getDominantObject(null)); + Assertions.assertNull(Util.getDominantObject(null)); } @Test public void testEmptyCollection() { Iterable objects = new ArrayList<>(); - Assert.assertEquals(null, Util.getDominantObject(objects)); + Assertions.assertEquals(null, Util.getDominantObject(objects)); } @Test @@ -26,7 +26,7 @@ public class GetDominantObjectTest { List objectCollection = new ArrayList<>(); String dominant = "Test"; objectCollection.add(dominant); - Assert.assertEquals(dominant, Util.getDominantObject(objectCollection)); + Assertions.assertEquals(dominant, Util.getDominantObject(objectCollection)); } @Test @@ -38,7 +38,7 @@ public class GetDominantObjectTest { objectCollection.add(dominantTwo); String result = Util.getDominantObject(objectCollection); if(!(result == dominant || result == dominantTwo)) { - Assert.assertEquals(dominant, result); + Assertions.assertEquals(dominant, result); } } @@ -49,6 +49,6 @@ public class GetDominantObjectTest { objectCollection.add("not Dominant"); objectCollection.add(dominant); objectCollection.add(dominant); - Assert.assertEquals(dominant, Util.getDominantObject(objectCollection)); + Assertions.assertEquals(dominant, Util.getDominantObject(objectCollection)); } } diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/IsOnlyAddingTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/IsOnlyAddingTest.java index 452658c1edb..1a6fdbfcbe0 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/IsOnlyAddingTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/IsOnlyAddingTest.java @@ -1,13 +1,13 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/IterableConcatTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/IterableConcatTest.java index 41747085040..1dec01437a8 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/IterableConcatTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/IterableConcatTest.java @@ -1,13 +1,13 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/LongestCommonSubsequenceTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/LongestCommonSubsequenceTest.java index afc0de76ce4..f1bdbd450f5 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/LongestCommonSubsequenceTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/LongestCommonSubsequenceTest.java @@ -1,8 +1,8 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/LongestCommonSubstringTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/LongestCommonSubstringTest.java index 0122867c826..21510419c6c 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/LongestCommonSubstringTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/LongestCommonSubstringTest.java @@ -1,8 +1,8 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/MultiTimeRangeTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/MultiTimeRangeTest.java index c9c807ff38e..dc36f41c04a 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/MultiTimeRangeTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/MultiTimeRangeTest.java @@ -1,14 +1,14 @@ package com.sap.sse.common.test; import static com.sap.sse.common.test.TimeTestHelpers.create; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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 java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.MultiTimeRange; import com.sap.sse.common.TimeRange; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/NaturalComparatorTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/NaturalComparatorTest.java index a6ca2460e38..c46a8238311 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/NaturalComparatorTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/NaturalComparatorTest.java @@ -1,14 +1,14 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.util.NaturalComparator; @@ -17,7 +17,7 @@ public class NaturalComparatorTest { private NaturalComparator comparator; private NaturalComparator caseInsensitive; - @Before + @BeforeEach public void setUp() { comparator = new NaturalComparator(); caseInsensitive = new NaturalComparator(false); diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/NumberPaddingTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/NumberPaddingTest.java index b3fd7f16ebe..0be2d57c29a 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/NumberPaddingTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/NumberPaddingTest.java @@ -1,8 +1,9 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import static com.sap.sse.common.Util.padPositiveValue; public class NumberPaddingTest { diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/SplittingStringsTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/SplittingStringsTest.java index 6628aeb9f60..7a722902c3d 100755 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/SplittingStringsTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/SplittingStringsTest.java @@ -2,13 +2,13 @@ package com.sap.sse.common.test; import static com.sap.sse.common.Util.isEmpty; import static com.sap.sse.common.Util.splitAlongWhitespaceRespectingDoubleQuotedPhrases; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/StringCompareTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/StringCompareTest.java index c69627bb8df..18dfce362cc 100755 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/StringCompareTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/StringCompareTest.java @@ -1,9 +1,9 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimePointTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimePointTest.java index a0adac8422c..3f43ca841ad 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimePointTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimePointTest.java @@ -1,15 +1,15 @@ package com.sap.sse.common.test; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +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 static org.junit.Assert.assertTrue; import java.util.Calendar; import java.util.GregorianCalendar; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimeRangeTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimeRangeTest.java index cc411334da8..cdd25bda6a6 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimeRangeTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimeRangeTest.java @@ -1,14 +1,14 @@ package com.sap.sse.common.test; import static com.sap.sse.common.test.TimeTestHelpers.create; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sse.common.MultiTimeRange; import com.sap.sse.common.TimePoint; @@ -22,10 +22,10 @@ public class TimeRangeTest { TimeRange outer = create(fromOuter, toOuter); TimeRange inner = create(fromInner, toInner); - Assert.assertTrue(inner.liesWithin(outer)); - Assert.assertTrue(outer.includes(inner)); - Assert.assertFalse(inner.includes(outer)); - Assert.assertFalse(outer.liesWithin(inner)); + Assertions.assertTrue(inner.liesWithin(outer)); + Assertions.assertTrue(outer.includes(inner)); + Assertions.assertFalse(inner.includes(outer)); + Assertions.assertFalse(outer.liesWithin(inner)); } @Test @@ -38,11 +38,11 @@ public class TimeRangeTest { @Test public void includesTimePoint() { TimeRange range = create(0, 100); - Assert.assertTrue(range.includes(create(0))); - Assert.assertTrue(range.includes(create(1))); - Assert.assertTrue(range.includes(create(99))); - Assert.assertFalse(range.includes(create(100))); // exclusive end - Assert.assertFalse(range.includes(create(101))); + Assertions.assertTrue(range.includes(create(0))); + Assertions.assertTrue(range.includes(create(1))); + Assertions.assertTrue(range.includes(create(99))); + Assertions.assertFalse(range.includes(create(100))); // exclusive end + Assertions.assertFalse(range.includes(create(101))); } @Test @@ -57,10 +57,10 @@ public class TimeRangeTest { TimeRange one = create(0, 50); TimeRange two = create(20, 70); - Assert.assertFalse(one.liesWithin(two)); - Assert.assertFalse(two.liesWithin(one)); - Assert.assertTrue(one.intersects(two)); - Assert.assertTrue(two.intersects(one)); + Assertions.assertFalse(one.liesWithin(two)); + Assertions.assertFalse(two.liesWithin(one)); + Assertions.assertTrue(one.intersects(two)); + Assertions.assertTrue(two.intersects(one)); } @Test @@ -245,13 +245,13 @@ public class TimeRangeTest { TimeRange all = create(allFrom, allTo); TimeRange minuend = create(minuendFrom, minuendTo); MultiTimeRange diff = all.subtract(minuend); - assertEquals("Expected to obtain "+expected.length/2+" time ranges but got "+Util.size(diff), expected.length/2, Util.size(diff)); + assertEquals(expected.length/2, Util.size(diff), "Expected to obtain "+expected.length/2+" time ranges but got "+Util.size(diff)); int i=0; for (final TimeRange timeRangeFromDiff : diff) { - assertEquals("expected "+i+"-th time range's \"from\" time point with millis "+expected[2*i]+" but got "+timeRangeFromDiff.from().asMillis(), - create(expected[2*i]), timeRangeFromDiff.from()); - assertEquals("expected "+i+"-th time range's \"to\" time point with millis "+expected[2*i+1]+" but got "+timeRangeFromDiff.to().asMillis(), - create(expected[2*i+1]), timeRangeFromDiff.to()); + assertEquals(create(expected[2*i]), + timeRangeFromDiff.from(), "expected "+i+"-th time range's \"from\" time point with millis "+expected[2*i]+" but got "+timeRangeFromDiff.from().asMillis()); + assertEquals(create(expected[2*i+1]), + timeRangeFromDiff.to(), "expected "+i+"-th time range's \"to\" time point with millis "+expected[2*i+1]+" but got "+timeRangeFromDiff.to().asMillis()); i++; } } diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimeWindowTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimeWindowTest.java index 9b89f4694e7..fe11f922a29 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimeWindowTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/TimeWindowTest.java @@ -1,14 +1,14 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/UtilTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/UtilTest.java index 35315d44738..d5b1fa34816 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/UtilTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/UtilTest.java @@ -1,11 +1,11 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ValueRangeFlexibleBoundariesTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ValueRangeFlexibleBoundariesTest.java index c5c66ff03e7..c348ed544c5 100755 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ValueRangeFlexibleBoundariesTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ValueRangeFlexibleBoundariesTest.java @@ -1,10 +1,10 @@ package com.sap.sse.common.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.ValueRangeFlexibleBoundaries; import com.sap.sse.common.ValueRangeFlexibleBoundariesChangedListener; @@ -17,7 +17,7 @@ public class ValueRangeFlexibleBoundariesTest { private double maxRight; private ValueRangeFlexibleBoundariesChangedListener listener; - @Before + @BeforeEach public void setUp() { // a ten percent range at each end of an original range of length 10, so length 1 at each end, // spread symmetrically around the min/max value diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/settings/generic/support/SettingsUtilTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/settings/generic/support/SettingsUtilTest.java index de67b3d095b..29507ea2a01 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/settings/generic/support/SettingsUtilTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/settings/generic/support/SettingsUtilTest.java @@ -1,13 +1,13 @@ package com.sap.sse.common.test.settings.generic.support; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.math.BigDecimal; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.settings.generic.AbstractGenericSerializableSettings; import com.sap.sse.common.settings.generic.DecimalSetting; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestAbortingHeavyLoadQuery.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestAbortingHeavyLoadQuery.java index 3dd11d1eb8b..39b117f86fa 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestAbortingHeavyLoadQuery.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestAbortingHeavyLoadQuery.java @@ -1,9 +1,9 @@ package com.sap.sse.datamining.impl; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import java.lang.reflect.Method; import java.text.SimpleDateFormat; @@ -23,9 +23,9 @@ import java.util.concurrent.RunnableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.QueryState; @@ -131,15 +131,15 @@ public class TestAbortingHeavyLoadQuery { // Checking query, result and processor chain state assertThat(query.getState(), is(QueryState.ABORTED)); assertThat(result.getState(), is(QueryResultState.ABORTED)); - assertTrue("The result is not empty", result.isEmpty()); + assertTrue(result.isEmpty(), "The result is not empty"); for (Processor processor : processors) { - assertTrue("Processor wasn't aborted", processor.isAborted()); + assertTrue(processor.isAborted(), "Processor wasn't aborted"); } // Execution of unfinished instructions executor.shutdown(); boolean terminated = executor.awaitTermination(TerminationTimeout, TimeUnit.MILLISECONDS); printExecutionRecord(); - assertTrue("The executor didn't terminate in the given time", terminated); + assertTrue(terminated, "The executor didn't terminate in the given time"); // The query execution returned, so all processors have received the abort signal (checked below). // The number of unfinished instructions mustn't change after this point int unfinishedInstructionsCount = unfinishedInstructions.size(); @@ -160,26 +160,26 @@ public class TestAbortingHeavyLoadQuery { assertThat("Number of unfinished instructions changed", unfinishedInstructions.size(), is(unfinishedInstructionsCount)); for (StatefulProcessorInstruction instruction : unfinishedInstructions) { boolean previouslyContained = runningInstructions.contains(instruction) || notStartedInstructions.contains(instruction); - assertTrue("A new instruction has been scheduled after aborting the query", previouslyContained); + assertTrue(previouslyContained, "A new instruction has been scheduled after aborting the query"); } for (StatefulProcessorInstruction instruction : runningInstructions) { - assertTrue("A previously running instruction was removed from unfinished instructions", unfinishedInstructions.contains(instruction)); + assertTrue(unfinishedInstructions.contains(instruction), "A previously running instruction was removed from unfinished instructions"); } for (StatefulProcessorInstruction instruction : notStartedInstructions) { - assertTrue("A previously unstarted instruction was removed from unfinished instructions", unfinishedInstructions.contains(instruction)); + assertTrue(unfinishedInstructions.contains(instruction), "A previously unstarted instruction was removed from unfinished instructions"); } // Checking state of unfinished instructions for (StatefulProcessorInstruction instruction : runningInstructions) { - assertTrue("computeResult() of a running unfinished instruction didn't finish", instruction.computeResultWasCalled() == instruction.computeResultWasFinished()); + assertTrue(instruction.computeResultWasCalled() == instruction.computeResultWasFinished(), "computeResult() of a running unfinished instruction didn't finish"); if (instruction instanceof StatefulBlockingInstruction) { StatefulBlockingInstruction blockingInstruction = (StatefulBlockingInstruction) instruction; - assertTrue("computeResult() of a running heavy load instruction wasn't aborted", !blockingInstruction.computeResultWasCalled() || blockingInstruction.computeResultWasAborted()); + assertTrue(!blockingInstruction.computeResultWasCalled() || blockingInstruction.computeResultWasAborted(), "computeResult() of a running heavy load instruction wasn't aborted"); } } for (StatefulProcessorInstruction instruction : notStartedInstructions) { - assertTrue("run() of an unstarted unfinished instruction wasn't called", instruction.runWasCalled()); - assertFalse("computeResult() of an unstarted unfinished instruction was called", instruction.computeResultWasCalled()); - assertFalse("computeResult() of an unstarted unfinished instruction was finished", instruction.computeResultWasFinished()); + assertTrue(instruction.runWasCalled(), "run() of an unstarted unfinished instruction wasn't called"); + assertFalse(instruction.computeResultWasCalled(), "computeResult() of an unstarted unfinished instruction was called"); + assertFalse(instruction.computeResultWasFinished(), "computeResult() of an unstarted unfinished instruction was finished"); } } @@ -232,7 +232,7 @@ public class TestAbortingHeavyLoadQuery { * A concurrent set ({@link ConcurrentHashMap#newKeySet()}) is used to track the unfinished instructions. An instruction * is added to the set upon its construction and is removed when the instruction finished callback method is called. */ - @Before + @BeforeEach @SuppressWarnings("unchecked") public void initialize() { if (RecordExecution) { @@ -454,7 +454,7 @@ public class TestAbortingHeavyLoadQuery { } - @After + @AfterEach public void resetComputeResultAccessibility() throws SecurityException, NoSuchMethodException { AbstractProcessorInstruction.class.getDeclaredMethod("computeResult").setAccessible(false); } diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataMiningServer.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataMiningServer.java index a17f4172e56..c02041471fe 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataMiningServer.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataMiningServer.java @@ -5,7 +5,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.DataSourceProvider; import com.sap.sse.datamining.ModifiableDataMiningServer; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDimensionsValuesQuery.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDimensionsValuesQuery.java index f7bdd406695..0ce4fc945a8 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDimensionsValuesQuery.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDimensionsValuesQuery.java @@ -10,8 +10,8 @@ import java.util.Locale; import java.util.Map; import java.util.concurrent.ExecutionException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.Query; @@ -60,7 +60,7 @@ public class TestDimensionsValuesQuery { private Function dimensionCompetitorSailID; @SuppressWarnings("unchecked") - @Before + @BeforeEach public void initializeDataRetrieverChain() { dataRetrieverChainDefinition = new SimpleDataRetrieverChainDefinition<>((Class>)(Class) Collection.class, Test_HasLegOfCompetitorContext.class, "TestRetrieverChain"); Class, Test_Regatta>> regattaRetrieverClass = (Class, Test_Regatta>>)(Class) TestRegattaRetrievalProcessor.class; @@ -165,7 +165,7 @@ public class TestDimensionsValuesQuery { return expectedResultData; } - @Before + @BeforeEach public void initializeDimensions() throws NoSuchMethodException, SecurityException { Method getNameMethod = Test_Named.class.getMethod("getName", new Class[0]); Function getName = FunctionTestsUtil.getFunctionFactory().createMethodWrappingFunction(getNameMethod); @@ -202,7 +202,7 @@ public class TestDimensionsValuesQuery { dimensionCompetitorSailID = FunctionTestsUtil.getFunctionFactory().createCompoundFunction(Arrays.asList(getCompetitor, getBoat, getSailID)); } - @Before + @BeforeEach public void initializeDataSource() { dataSource = ComponentTestsUtil.createExampleDataSource(); } diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestProcessorQuery.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestProcessorQuery.java index cdf9f6aa4cc..b0ff39d4634 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestProcessorQuery.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestProcessorQuery.java @@ -2,8 +2,8 @@ package com.sap.sse.datamining.impl; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; +import static org.junit.jupiter.api.Assertions.fail; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.Collection; @@ -16,7 +16,7 @@ import java.util.concurrent.TimeoutException; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.AdditionalQueryData; import com.sap.sse.datamining.Query; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestStatisticQuery.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestStatisticQuery.java index c54e8557c90..97452ab98ea 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestStatisticQuery.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestStatisticQuery.java @@ -13,7 +13,7 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.Query; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorElementProcessing.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorElementProcessing.java index 0cd3dd5f73e..e249eeddb7d 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorElementProcessing.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorElementProcessing.java @@ -1,9 +1,9 @@ package com.sap.sse.datamining.impl.components; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Collections; @@ -12,8 +12,8 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util.Pair; import com.sap.sse.datamining.components.AdditionalResultDataBuilder; @@ -28,7 +28,7 @@ public class TestAbstractParallelProcessorElementProcessing { private Processor, Object> processor; private List> createdInstructions; - @Before + @BeforeEach public void initialize() { int corePoolSize = Runtime.getRuntime().availableProcessors(); executor = new ThreadPoolExecutor(corePoolSize, corePoolSize, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue()); @@ -61,12 +61,12 @@ public class TestAbstractParallelProcessorElementProcessing { assertThat("Unexpected amount of created instructions", createdInstructions.size(), is(elementCount)); double executionTime = Math.ceil((double) elementCount / executor.getMaximumPoolSize()) * stepDuration * numberOfSteps; executor.shutdown(); - assertTrue("Executor couldn't terminate", executor.awaitTermination((long) (executionTime * 1.2), TimeUnit.SECONDS)); + assertTrue(executor.awaitTermination((long) (executionTime * 1.2), TimeUnit.SECONDS), "Executor couldn't terminate"); for (StatefulBlockingInstruction instruction : createdInstructions) { - assertTrue("run wasn't called", instruction.runWasCalled()); - assertTrue("computeResult wasn't called", instruction.computeResultWasCalled()); - assertTrue("computeResult didn't finish", instruction.computeResultWasFinished()); - assertFalse("computeResult was aborted", instruction.computeResultWasAborted()); + assertTrue(instruction.runWasCalled(), "run wasn't called"); + assertTrue(instruction.computeResultWasCalled(), "computeResult wasn't called"); + assertTrue(instruction.computeResultWasFinished(), "computeResult didn't finish"); + assertFalse(instruction.computeResultWasAborted(), "computeResult was aborted"); } } @@ -86,22 +86,22 @@ public class TestAbstractParallelProcessorElementProcessing { do { Thread.sleep(1); } while (!finishingThread.isAlive()); - assertFalse("Processor is already finished", processor.isFinished()); + assertFalse(processor.isFinished(), "Processor is already finished"); // Processor not yet finished. New elements will be accepted processor.processElement(input); elementCount++; assertThat("Unexpected amount of created instructions", createdInstructions.size(), is(elementCount)); finishingThread.join(); - assertTrue("Processor isn't finished", processor.isFinished()); + assertTrue(processor.isFinished(), "Processor isn't finished"); processor.processElement(input); assertThat("Unexpected amount of created instructions", createdInstructions.size(), is(elementCount)); for (StatefulBlockingInstruction instruction : createdInstructions) { - assertTrue("run wasn't called", instruction.runWasCalled()); - assertTrue("computeResult wasn't called", instruction.computeResultWasCalled()); - assertTrue("computeResult didn't finish", instruction.computeResultWasFinished()); - assertFalse("computeResult was aborted", instruction.computeResultWasAborted()); + assertTrue(instruction.runWasCalled(), "run wasn't called"); + assertTrue(instruction.computeResultWasCalled(), "computeResult wasn't called"); + assertTrue(instruction.computeResultWasFinished(), "computeResult didn't finish"); + assertFalse(instruction.computeResultWasAborted(), "computeResult was aborted"); } } @@ -125,26 +125,26 @@ public class TestAbstractParallelProcessorElementProcessing { assertThat("Unexpected amount of created instructions", createdInstructions.size(), is(elementCount)); executor.shutdown(); - assertTrue("Executor couldn't terminate", executor.awaitTermination(2 * stepDuration, TimeUnit.MILLISECONDS)); + assertTrue(executor.awaitTermination(2 * stepDuration, TimeUnit.MILLISECONDS), "Executor couldn't terminate"); for (int i = 0; i < createdInstructions.size(); i++) { StatefulBlockingInstruction instruction = createdInstructions.get(i); // run should be called for all instructions - assertTrue("run wasn't called", instruction.runWasCalled()); + assertTrue(instruction.runWasCalled(), "run wasn't called"); if (i < executor.getMaximumPoolSize()) { // First set of instructions should be processed normally - assertTrue("computeResult wasn't called", instruction.computeResultWasCalled()); - assertTrue("computeResult didn't finish", instruction.computeResultWasFinished()); - assertFalse("computeResult was aborted", instruction.computeResultWasAborted()); + assertTrue(instruction.computeResultWasCalled(), "computeResult wasn't called"); + assertTrue(instruction.computeResultWasFinished(), "computeResult didn't finish"); + assertFalse(instruction.computeResultWasAborted(), "computeResult was aborted"); } else if (i < executor.getMaximumPoolSize() * 2) { // Second set of instructions was running when the processor was aborted. computeResult should be aborted - assertTrue("computeResult wasn't called", instruction.computeResultWasCalled()); - assertTrue("computeResult didn't finish", instruction.computeResultWasFinished()); - assertTrue("computeResult wasn't aborted", instruction.computeResultWasAborted()); + assertTrue(instruction.computeResultWasCalled(), "computeResult wasn't called"); + assertTrue(instruction.computeResultWasFinished(), "computeResult didn't finish"); + assertTrue(instruction.computeResultWasAborted(), "computeResult wasn't aborted"); } else { // Last instructions was still scheduled when the processor was aborted. computeResult should not be called - assertFalse("computeResult of last instruction was called", instruction.computeResultWasCalled()); - assertFalse("computeResult of last instruction finished", instruction.computeResultWasFinished()); - assertFalse("computeResult was aborted", instruction.computeResultWasAborted()); + assertFalse(instruction.computeResultWasCalled(), "computeResult of last instruction was called"); + assertFalse(instruction.computeResultWasFinished(), "computeResult of last instruction finished"); + assertFalse(instruction.computeResultWasAborted(), "computeResult was aborted"); } } } diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorFinishing.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorFinishing.java index a0ab2a6483e..3bb3a9e97c3 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorFinishing.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorFinishing.java @@ -1,14 +1,14 @@ package com.sap.sse.datamining.impl.components; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.fail; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; import java.util.Collection; import java.util.HashSet; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; @@ -24,7 +24,7 @@ public class TestAbstractParallelProcessorFinishing { private boolean instructionIsWorking; private boolean receiverWasToldToFinish; - @Before + @BeforeEach public void initializeProcessorAndReceiver() { instructionIsWorking = true; receiverWasToldToFinish = false; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorWithManySimpleInstructions.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorWithManySimpleInstructions.java index c81591966d3..f5653c14091 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorWithManySimpleInstructions.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorWithManySimpleInstructions.java @@ -6,8 +6,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.util.ArrayList; import java.util.Collection; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; @@ -22,7 +22,7 @@ public class TestAbstractParallelProcessorWithManySimpleInstructions { private int sum = 0; private boolean receiverWasToldToFinish = false; - @Before + @BeforeEach public void initializeProcessor() { Processor receiver = new NullProcessor(Integer.class, Void.class) { @Override diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAggregationProcessorDefinition.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAggregationProcessorDefinition.java index 2f0a257e45a..53936004c72 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAggregationProcessorDefinition.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAggregationProcessorDefinition.java @@ -1,6 +1,6 @@ package com.sap.sse.datamining.impl.components; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.test.util.components.aggregators.TestAggregationProcessorDummyWithInvalidConstructor; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestDataRetrieverChainCreation.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestDataRetrieverChainCreation.java index ac856ea55a4..0427989c95a 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestDataRetrieverChainCreation.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestDataRetrieverChainCreation.java @@ -3,14 +3,14 @@ package com.sap.sse.datamining.impl.components; import static com.sap.sse.datamining.test.util.ConcurrencyTestsUtil.getSharedExecutor; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; +import static org.junit.jupiter.api.Assertions.fail; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; import java.util.Collection; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.components.DataRetrieverChainBuilder; @@ -48,7 +48,7 @@ public class TestDataRetrieverChainCreation { }; @SuppressWarnings("unchecked") - @Before + @BeforeEach public void initializeRetrieverChain() { dataRetrieverChainDefinition = new SimpleDataRetrieverChainDefinition<>((Class>)(Class) Collection.class, Test_HasLegOfCompetitorContext.class, "TestRetrieverChain"); dataRetrieverChainDefinition.startWith(TestRegattaRetrievalProcessor.class, Test_Regatta.class, "regatta"); @@ -62,7 +62,7 @@ public class TestDataRetrieverChainCreation { Test_HasLegOfCompetitorContext.class, "legOfCompetitor"); } - @Before + @BeforeEach public void initializeFilters() { raceFilter = new AbstractFilterCriterion(Test_HasRaceContext.class) { @Override diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestFilteringProcessors.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestFilteringProcessors.java index ea12f64d2a8..5d52ac67c5c 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestFilteringProcessors.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestFilteringProcessors.java @@ -9,8 +9,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.components.Processor; @@ -70,7 +70,7 @@ public class TestFilteringProcessors { } } - @Before + @BeforeEach public void initializeReceivers() { receivedElements = new HashMap<>(); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestParallelExtractionProcessor.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestParallelExtractionProcessor.java index e5ac78436b0..217a84fee2d 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestParallelExtractionProcessor.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestParallelExtractionProcessor.java @@ -10,8 +10,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.functions.Function; @@ -34,7 +34,7 @@ public class TestParallelExtractionProcessor { */ private Function invalidFunction; - @Before + @BeforeEach public void initializeReceivers() { receivedValues = new HashMap<>(); @@ -52,7 +52,7 @@ public class TestParallelExtractionProcessor { receivers.add(receiver); } - @Before + @BeforeEach public void initializeExtractionFunctions() { Method getCrossSumMethod = FunctionTestsUtil.getMethodFromClass(Number.class, "getCrossSum"); getCrossSumFunction = FunctionTestsUtil.getFunctionFactory().createMethodWrappingFunction(getCrossSumMethod); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestParallelMultiDimensionalGroupingProcessor.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestParallelMultiDimensionalGroupingProcessor.java index 420bb2a3949..04f4cb72205 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestParallelMultiDimensionalGroupingProcessor.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestParallelMultiDimensionalGroupingProcessor.java @@ -7,8 +7,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.factories.ProcessorFactory; @@ -34,7 +34,7 @@ public class TestParallelMultiDimensionalGroupingProcessor { private GroupedDataEntry groupedElement; - @Before + @BeforeEach public void intializeProcessor() throws IllegalArgumentException, NoSuchMethodException, SecurityException { @SuppressWarnings("unchecked") Processor, Void> receiver = new NullProcessor, Void>((Class>)(Class) GroupedDataEntry.class, Void.class) { diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestProcessorInstructionOrdering.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestProcessorInstructionOrdering.java index 79ed49b1e11..10311002dd2 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestProcessorInstructionOrdering.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestProcessorInstructionOrdering.java @@ -6,7 +6,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.util.PriorityQueue; import java.util.Queue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.test.util.components.NullProcessorInstruction; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestRetrieverFilterProcessorChain.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestRetrieverFilterProcessorChain.java index de4c61d0b66..88abba9401c 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestRetrieverFilterProcessorChain.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestRetrieverFilterProcessorChain.java @@ -9,8 +9,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.components.Processor; @@ -26,7 +26,7 @@ public class TestRetrieverFilterProcessorChain { private Collection receivedResults = new ArrayList<>(); - @Before + @BeforeEach public void setUpDataSource() { dataSource = Arrays.asList(-2, -1, 0, 1, 2); } @@ -98,7 +98,7 @@ public class TestRetrieverFilterProcessorChain { } @SuppressWarnings("unchecked") - @Before + @BeforeEach public void setUpResultReceiverAndProcessors() { Processor resultReceiver = new NullProcessor(Integer.class, Void.class) { @Override diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/AbstractTestParallelAveragingProcessors.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/AbstractTestParallelAveragingProcessors.java index 75411bbd750..8dc6aad8d67 100755 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/AbstractTestParallelAveragingProcessors.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/AbstractTestParallelAveragingProcessors.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.GroupedDataEntry; @@ -90,7 +90,7 @@ public abstract class AbstractTestParallelAveragingProcessors { return elements; } - @Before + @BeforeEach public void initializeResultReceivers() { @SuppressWarnings("unchecked") Processor, Void> receiver = new NullProcessor, Void>((Class>)(Class) Map.class, Void.class) { diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestAbstractStoringParallelAggregationProcessor.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestAbstractStoringParallelAggregationProcessor.java index 763ee4aeebd..fc8b564a36a 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestAbstractStoringParallelAggregationProcessor.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestAbstractStoringParallelAggregationProcessor.java @@ -9,8 +9,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.GroupedDataEntry; @@ -28,7 +28,7 @@ public class TestAbstractStoringParallelAggregationProcessor { private Collection> elementStore = new ArrayList<>(); - @Before + @BeforeEach public void initializeReceivers() { @SuppressWarnings("unchecked") Processor, Void> receiver = new NullProcessor, Void>((Class>)(Class) Map.class, Void.class) { diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelAggregationProcessors.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelAggregationProcessors.java index 2d90d6f4312..70cbadb08bc 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelAggregationProcessors.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelAggregationProcessors.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.GroupedDataEntry; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelAveragingProcessors.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelAveragingProcessors.java index 1b6fa0900fe..e6d0156a9c0 100755 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelAveragingProcessors.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelAveragingProcessors.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.GroupedDataEntry; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelGroupedDataCollectingAsSetProcessor.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelGroupedDataCollectingAsSetProcessor.java index bdee1ed0eec..7049095e84f 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelGroupedDataCollectingAsSetProcessor.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/aggregators/TestParallelGroupedDataCollectingAsSetProcessor.java @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.GroupedDataEntry; @@ -21,7 +21,7 @@ public class TestParallelGroupedDataCollectingAsSetProcessor { private Collection>, ?>> receivers; private Map> receivedData = null; - @Before + @BeforeEach public void initializeReceivers() { @SuppressWarnings("unchecked") Processor>, Void> receiver = new NullProcessor>, Void>((Class>>)(Class) Map.class, Void.class) { diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestAggregationProcessorManagement.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestAggregationProcessorManagement.java index 9b5e8917734..3628fe283ab 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestAggregationProcessorManagement.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestAggregationProcessorManagement.java @@ -2,15 +2,15 @@ package com.sap.sse.datamining.impl.components.management; import org.hamcrest.Matchers; import static org.hamcrest.Matchers.nullValue; +import static org.junit.jupiter.api.Assertions.fail; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; import java.util.Collection; import java.util.Date; import java.util.HashSet; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.components.AggregationProcessorDefinition; @@ -33,7 +33,7 @@ public class TestAggregationProcessorManagement { private static AggregationProcessorDefinition raceAggregatorDefinition; private static AggregationProcessorDefinition competitorAggregatorDefinition; - @BeforeClass + @BeforeAll public static void initializeAggregationProcessorDefinitions() { anyDataAggregatorDefinition = new SimpleAggregationProcessorDefinition<>(Object.class, Double.class, "AnyDataAggregator", TestAnyDataTypeAggregationProcessorDummy.class); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestDataRetrieverChainDefinitionManagement.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestDataRetrieverChainDefinitionManagement.java index 7efddbebfb4..ad5629e8251 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestDataRetrieverChainDefinitionManagement.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestDataRetrieverChainDefinitionManagement.java @@ -2,8 +2,8 @@ package com.sap.sse.datamining.impl.components.management; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; +import static org.junit.jupiter.api.Assertions.fail; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.Collection; @@ -11,8 +11,8 @@ import java.util.Date; import java.util.HashSet; import java.util.concurrent.ExecutorService; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.components.DataRetrieverChainDefinition; @@ -43,7 +43,7 @@ public class TestDataRetrieverChainDefinitionManagement { private ModifiableDataMiningServer server; @SuppressWarnings("unchecked") - @Before + @BeforeEach public void initializeRetrieverChainsAndRegistry() { regattaRetrieverChainDefinition = new SingleDataRetrieverChainDefinition<>((Class>)(Class) Collection.class, Test_Regatta.class, "TestRaceRetrieverChain"); regattaRetrieverChainDefinition.startWith(TestRegattaRetrievalProcessor.class, Test_Regatta.class, "regatta"); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestMemoryMonitorAction.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestMemoryMonitorAction.java index a03a4a7e703..07fe5bbe7c0 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestMemoryMonitorAction.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestMemoryMonitorAction.java @@ -1,14 +1,14 @@ package com.sap.sse.datamining.impl.components.management; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.management.MemoryMonitorAction; import com.sap.sse.datamining.test.util.components.management.Test_MemoryMonitorAction; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestQueryDefinitionDTOManagement.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestQueryDefinitionDTOManagement.java index 9ec3c456db5..3b5373e57bf 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestQueryDefinitionDTOManagement.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestQueryDefinitionDTOManagement.java @@ -6,8 +6,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.util.ArrayList; import java.util.Date; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.exceptions.DataMiningComponentAlreadyRegisteredForKeyException; @@ -26,7 +26,7 @@ public class TestQueryDefinitionDTOManagement { private static StatisticQueryDefinitionDTO pseudoQueryDefinition; private static StatisticQueryDefinitionDTO differentQueryDefinition; - @BeforeClass + @BeforeAll public static void initializeQueryDefinitions() { FunctionDTO statisticToCalculate = new FunctionDTO(false, "Test", "Test", "Test", new ArrayList(), "Test", 0); AggregationProcessorDefinitionDTO aggregatorDefinition = new AggregationProcessorDefinitionDTO("Test", "Test", "Test", "Test"); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestQueryManagerMemoryMonitor.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestQueryManagerMemoryMonitor.java index 6fcef3b3f48..32c5d47300f 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestQueryManagerMemoryMonitor.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestQueryManagerMemoryMonitor.java @@ -8,8 +8,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.concurrent.TimeUnit; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.management.DataMiningQueryManager; import com.sap.sse.datamining.components.management.MemoryInfoProvider; @@ -26,7 +26,7 @@ public class TestQueryManagerMemoryMonitor { private Test_MemoryInfoProvider infoProvider; - @Before + @BeforeEach public void initializeActionsAndInfoProvider() { veryLow = new Test_MemoryMonitorAction(0.9, 1l*1024*1024*1024); low = new Test_MemoryMonitorAction(0.8, 1l*1024*1024*1024); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestServerQueryManagement.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestServerQueryManagement.java index 74fe5368bd9..1268fbaed16 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestServerQueryManagement.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/management/TestServerQueryManagement.java @@ -3,7 +3,7 @@ package com.sap.sse.datamining.impl.components.management; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.lang.reflect.Method; import java.util.ArrayList; @@ -12,8 +12,8 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.AdditionalQueryData; import com.sap.sse.datamining.DataMiningServer; @@ -39,7 +39,7 @@ public class TestServerQueryManagement { private static final FunctionFactory functionFactory = new FunctionFactory(); private DataMiningServer server; - @Before + @BeforeEach public void initializeServer() { server = TestsUtil.createNewServer(); } diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/criterias/TestFilterCriteria.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/criterias/TestFilterCriteria.java index 98aac3b8d10..e8254f4c941 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/criterias/TestFilterCriteria.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/criterias/TestFilterCriteria.java @@ -1,14 +1,14 @@ package com.sap.sse.datamining.impl.criterias; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.functions.Function; @@ -37,15 +37,15 @@ public class TestFilterCriteria { regexFilterCriterion = new StringRegexFilterCriterion(stringsToMatch[0] + "|" + stringsToMatch[1] + "|" + stringsToMatch[2]); for (String stringToMatch : stringsToMatch) { - assertTrue("Failed to match " + stringToMatch, regexFilterCriterion.matches(stringToMatch)); + assertTrue(regexFilterCriterion.matches(stringToMatch), "Failed to match " + stringToMatch); } - assertFalse("'Fourth Regatta' shouldn't be matched", regexFilterCriterion.matches("Fourth Regatta")); + assertFalse(regexFilterCriterion.matches("Fourth Regatta"), "'Fourth Regatta' shouldn't be matched"); regexFilterCriterion = new StringRegexFilterCriterion(".*Regatta"); for (String stringToMatch : stringsToMatch) { - assertTrue("Failed to match " + stringToMatch, regexFilterCriterion.matches(stringToMatch)); + assertTrue(regexFilterCriterion.matches(stringToMatch), "Failed to match " + stringToMatch); } - assertFalse("'Regatta (29ER)' shouldn't be matched", regexFilterCriterion.matches("Regatta (29ER)")); + assertFalse(regexFilterCriterion.matches("Regatta (29ER)"), "'Regatta (29ER)' shouldn't be matched"); } @Test diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestClustersWithBoundaries.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestClustersWithBoundaries.java index 90a68ad2ffc..ecec8267a2c 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestClustersWithBoundaries.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestClustersWithBoundaries.java @@ -6,7 +6,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.util.Comparator; import java.util.Locale; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterBoundary; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestComparableClusterBoundary.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestComparableClusterBoundary.java index 88d08a392b6..47474455394 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestComparableClusterBoundary.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestComparableClusterBoundary.java @@ -1,9 +1,10 @@ package com.sap.sse.datamining.impl.data; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; import com.sap.sse.datamining.data.ClusterBoundary; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestFixClusterGroup.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestFixClusterGroup.java index 60ddeac5837..91a7fdfb550 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestFixClusterGroup.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestFixClusterGroup.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterBoundary; @@ -67,7 +67,7 @@ public class TestFixClusterGroup { return new FixClusterGroup<>(clusters); } - @Before + @BeforeEach public void initializeClusters() { ClusterBoundary lowerThanZero = new ComparatorClusterBoundary(0, ComparisonStrategy.LOWER_THAN, comparator); clusterLowerThanZero = new ClusterWithSingleBoundary<>(lowerThanZero); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestLinearDoubleClusterGroup.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestLinearDoubleClusterGroup.java index f01a6146df3..b5ff189f47f 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestLinearDoubleClusterGroup.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestLinearDoubleClusterGroup.java @@ -4,8 +4,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.data.Cluster; @@ -14,7 +14,7 @@ public class TestLinearDoubleClusterGroup { private LinearDoubleClusterGroup hardPercentageClusterGroup; private LinearDoubleClusterGroup softLinearClusterGroup; - @Before + @BeforeEach public void initialize() { hardPercentageClusterGroup = new LinearDoubleClusterGroup(0.0, 1.0, 0.1, true); softLinearClusterGroup = new LinearDoubleClusterGroup(0, 100, 10, false); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestPercentageClusterFormatter.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestPercentageClusterFormatter.java index 9e966b03822..ba56dee421f 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestPercentageClusterFormatter.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/data/TestPercentageClusterFormatter.java @@ -3,8 +3,8 @@ package com.sap.sse.datamining.impl.data; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterGroup; @@ -14,7 +14,7 @@ public class TestPercentageClusterFormatter { private ClusterGroup percentageClusterGroup; private PercentageClusterFormatter formatter; - @Before + @BeforeEach public void initialize() { percentageClusterGroup = new LinearDoubleClusterGroup(0.0, 1.0, 0.1, true); formatter = new PercentageClusterFormatter(); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestCompoundFunction.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestCompoundFunction.java index f6963b46d7b..2707bbb46f3 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestCompoundFunction.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestCompoundFunction.java @@ -7,8 +7,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.test.data.impl.ContainerElement; @@ -27,7 +27,7 @@ public class TestCompoundFunction { private Function compoundFunction; private Function compoundFunctionWithSecondTakingSingleIntParameter; - @Before + @BeforeEach public void initializeCompoundFunction() throws ClassCastException, NoSuchMethodException, SecurityException { { List> functions = new ArrayList<>(); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionDTOConstruction.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionDTOConstruction.java index cd93606aa8e..2bef32a190f 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionDTOConstruction.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionDTOConstruction.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; @@ -28,7 +28,7 @@ public class TestFunctionDTOConstruction { private Method externalLibraryMethod; private Method incrementMethod; - @Before + @BeforeEach public void initializeMethods() { dimensionMethod = FunctionTestsUtil.getMethodFromClass(SimpleClassWithMarkedMethods.class, "dimension"); sideEffectFreeValueMethod = FunctionTestsUtil.getMethodFromClass(SimpleClassWithMarkedMethods.class, "sideEffectFreeValue"); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionProvider.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionProvider.java index 60bbb614346..845e7d324cf 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionProvider.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionProvider.java @@ -14,8 +14,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; import com.sap.sse.datamining.ModifiableDataMiningServer; @@ -51,7 +51,7 @@ public class TestFunctionManagerAsFunctionProvider { private ExpectedFunctionRegistryUtil functionRegistryUtil; private ModifiableDataMiningServer server; - @Before + @BeforeEach public void initializeDataMiningServer() throws NoSuchMethodException, SecurityException { functionRegistryUtil = new ExpectedFunctionRegistryUtil(); server = TestsUtil.createNewServer(); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionRegistry.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionRegistry.java index f90e8e8d8ee..504cdb51019 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionRegistry.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionRegistry.java @@ -8,9 +8,9 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionRegistry; @@ -40,12 +40,12 @@ public class TestFunctionManagerAsFunctionRegistry { private Set> internalClassesToScan; private HashSet> externalClassesToScan; - @BeforeClass + @BeforeAll public static void intializeExpectedFunctions() throws NoSuchMethodException, SecurityException { expectedFunctionRegistryUtil = new ExpectedFunctionRegistryUtil(); } - @Before + @BeforeEach public void initializeClassesToScan() { internalClassesToScan = new HashSet<>(); internalClassesToScan.add(Test_HasLegOfCompetitorContext.class); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestMethodWrappingFunction.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestMethodWrappingFunction.java index 89b22ce679a..00342d44832 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestMethodWrappingFunction.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestMethodWrappingFunction.java @@ -6,8 +6,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.lang.reflect.Method; import java.util.Locale; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.test.data.impl.SimpleClassWithMarkedMethods; @@ -22,7 +22,7 @@ public class TestMethodWrappingFunction { private Method sideEffectFreeValueMethod; private Method externalLibraryMethod; - @Before + @BeforeEach public void initializeMethods() { dimensionMethod = FunctionTestsUtil.getMethodFromClass(SimpleClassWithMarkedMethods.class, "dimension"); sideEffectFreeValueMethod = FunctionTestsUtil.getMethodFromClass(SimpleClassWithMarkedMethods.class, "sideEffectFreeValue"); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestMethodWrappingFunctionInvocation.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestMethodWrappingFunctionInvocation.java index 4de148ca49c..32a03e06f59 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestMethodWrappingFunctionInvocation.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestMethodWrappingFunctionInvocation.java @@ -4,8 +4,8 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.test.data.impl.DataTypeWithContext; @@ -18,7 +18,7 @@ public class TestMethodWrappingFunctionInvocation { private Function getRegattaName; private Function increment; - @Before + @BeforeEach public void setUpFunctions() { getRegattaName = FunctionTestsUtil.getFunctionFactory().createMethodWrappingFunction(FunctionTestsUtil.getMethodFromClass(DataTypeWithContext.class, "getRegattaName")); increment = FunctionTestsUtil.getFunctionFactory().createMethodWrappingFunction(FunctionTestsUtil.getMethodFromClass(SimpleClassWithMarkedMethods.class, "increment", int.class)); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/criterias/TestDeclaringTypeOrParameterTypeCriteria.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/criterias/TestDeclaringTypeOrParameterTypeCriteria.java index 84b2c9ba58c..7b3431744cd 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/criterias/TestDeclaringTypeOrParameterTypeCriteria.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/criterias/TestDeclaringTypeOrParameterTypeCriteria.java @@ -3,8 +3,8 @@ package com.sap.sse.datamining.impl.functions.criterias; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.functions.Function; @@ -23,7 +23,7 @@ public class TestDeclaringTypeOrParameterTypeCriteria { private Function libraryFunction; - @Before + @BeforeEach public void setUpFunctions() { getSpeedInKnotsValue = FunctionTestsUtil.getFunctionFactory().createMethodWrappingFunction(FunctionTestsUtil.getMethodFromClass(DataTypeInterface.class, "getSpeedInKnots")); getRaceNameLengthValue = FunctionTestsUtil.getFunctionFactory().createMethodWrappingFunction(FunctionTestsUtil.getMethodFromClass(ExtendingInterface.class, "getRaceNameLength")); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/criterias/TestMethodFilterCriterias.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/criterias/TestMethodFilterCriterias.java index ada668c6004..fafd383d6fc 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/criterias/TestMethodFilterCriterias.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/criterias/TestMethodFilterCriterias.java @@ -5,7 +5,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.lang.reflect.Method; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.test.util.FunctionTestsUtil; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java index 0fad065a8e1..21b36a52fec 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java @@ -1,15 +1,15 @@ package com.sap.sse.datamining.impl.i18n; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.fail; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; import java.util.Date; import java.util.Locale; import java.util.MissingResourceException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.test.util.ConcurrencyTestsUtil; @@ -30,7 +30,7 @@ public class TestI18N { private ResourceBundleStringMessages testStringMessages; - @Before + @BeforeEach public void initializeBundleManager() { testStringMessages = TestsUtil.getTestStringMessages(); } diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/ConcurrencyTestsUtil.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/ConcurrencyTestsUtil.java index e5e890cc59d..352b28327d0 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/ConcurrencyTestsUtil.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/ConcurrencyTestsUtil.java @@ -2,8 +2,8 @@ package com.sap.sse.datamining.test.util; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; +import static org.junit.jupiter.api.Assertions.fail; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; import java.util.Collection; import java.util.Map; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/DataMiningQuerySerializerTest.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/DataMiningQuerySerializerTest.java index 1ac269f119d..65be97f1d79 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/DataMiningQuerySerializerTest.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/DataMiningQuerySerializerTest.java @@ -1,7 +1,7 @@ package com.sap.sse.datamining.test.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sailing.datamining.SailingPredefinedQueries; import com.sap.sse.datamining.impl.DataMiningServerImpl; @@ -25,6 +25,6 @@ public class DataMiningQuerySerializerTest { /* executorService */ null, /* functionRegistry */ null, /* dataSourceProviderRegistry */ null, /* dataRetrieverChainDefinitionRegistry */ null, /* aggregationProcessorDefinitionRegistry */ null, /* queryDefinitionRegistry */ null).fromBase64String(base64); - Assert.assertEquals(dto, deserialized); + Assertions.assertEquals(dto, deserialized); } } diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/FunctionTestsUtil.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/FunctionTestsUtil.java index a6011767db0..2ee7ae349c9 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/FunctionTestsUtil.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/FunctionTestsUtil.java @@ -1,6 +1,6 @@ package com.sap.sse.datamining.test.util; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.lang.reflect.Method; import java.util.Collection; diff --git a/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/propertystore/test/MongoStoreTest.java b/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/propertystore/test/MongoStoreTest.java index d954cfd2aed..618942d516b 100644 --- a/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/propertystore/test/MongoStoreTest.java +++ b/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/propertystore/test/MongoStoreTest.java @@ -5,9 +5,9 @@ import static org.hamcrest.Matchers.equalTo; import java.util.Map; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.TypeBasedServiceFinder; import com.sap.sse.common.impl.SingleTypeBasedServiceFinderImpl; @@ -23,12 +23,12 @@ import com.sap.sse.mongodb.MongoDBConfiguration; public class MongoStoreTest { private MongoDBConfiguration config = MongoDBConfiguration.getDefaultTestConfiguration(); - @Before + @BeforeEach public void setup() { config.getService().getDB().drop(); } - @After + @AfterEach public void tearDown() { config.getService().getDB().drop(); } diff --git a/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/replication/test/SimpleFileStorageManagementServiceReplicationTest.java b/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/replication/test/SimpleFileStorageManagementServiceReplicationTest.java index 39363634bae..7254f97f267 100755 --- a/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/replication/test/SimpleFileStorageManagementServiceReplicationTest.java +++ b/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/replication/test/SimpleFileStorageManagementServiceReplicationTest.java @@ -3,8 +3,8 @@ package com.sap.sse.filestorage.replication.test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sse.common.NoCorrespondingServiceRegisteredException; import com.sap.sse.filestorage.FileStorageService; @@ -33,7 +33,7 @@ public class SimpleFileStorageManagementServiceReplicationTest extends replicaReplicator.waitUntilQueueIsEmpty(); Thread.sleep(3000); - Assert.assertThrows(NoCorrespondingServiceRegisteredException.class, ()->replica.getActiveFileStorageService()); + Assertions.assertThrows(NoCorrespondingServiceRegisteredException.class, ()->replica.getActiveFileStorageService()); assertThat("service property on replica set after replication", Util.findProperty(serviceOnReplica, DummyFileStorageService.PROPERTY_NAME).getValue(), equalTo("456")); } diff --git a/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/services/test/AmazonS3Test.java b/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/services/test/AmazonS3Test.java index 40e6021016b..ce42c7a63a5 100644 --- a/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/services/test/AmazonS3Test.java +++ b/java/com.sap.sse.filestorage.test/src/com/sap/sse/filestorage/services/test/AmazonS3Test.java @@ -1,6 +1,6 @@ package com.sap.sse.filestorage.services.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.io.InputStream; @@ -10,8 +10,8 @@ import java.net.URISyntaxException; import org.apache.commons.io.IOUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.sap.sse.filestorage.FileStorageService; @@ -21,7 +21,7 @@ import com.sap.sse.filestorage.testsupport.AmazonS3TestSupport; import com.sap.sse.security.testsupport.SecurityServiceMockFactory; public class AmazonS3Test { - @Before + @BeforeEach public void setup() throws InvalidPropertiesException, IOException { setUpSecurity(); storageService = AmazonS3TestSupport.createService(SecurityServiceMockFactory.mockSecurityService()); diff --git a/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/AsyncActionsExecutorTest.java b/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/AsyncActionsExecutorTest.java index bfa637b822d..2eac267c8f5 100644 --- a/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/AsyncActionsExecutorTest.java +++ b/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/AsyncActionsExecutorTest.java @@ -1,9 +1,9 @@ package com.sap.sse.gwt.client.async; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.google.gwt.user.client.rpc.AsyncCallback; import com.sap.sse.common.Duration; diff --git a/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/TimeRangeActionsExecutorTest.java b/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/TimeRangeActionsExecutorTest.java index a2293ed75a2..07889de9472 100644 --- a/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/TimeRangeActionsExecutorTest.java +++ b/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/TimeRangeActionsExecutorTest.java @@ -1,9 +1,9 @@ package com.sap.sse.gwt.client.async; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.util.HashMap; import java.util.List; @@ -12,7 +12,7 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.google.gwt.user.client.rpc.AsyncCallback; import com.sap.sse.common.TimeRange; diff --git a/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/TimeRangeResultCacheTest.java b/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/TimeRangeResultCacheTest.java index f605d29f577..04f18a56c96 100644 --- a/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/TimeRangeResultCacheTest.java +++ b/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/client/async/TimeRangeResultCacheTest.java @@ -1,9 +1,9 @@ package com.sap.sse.gwt.client.async; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +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 java.util.ArrayList; import java.util.Collections; @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.google.gwt.user.client.rpc.AsyncCallback; import com.sap.sse.common.TimeRange; @@ -25,18 +25,18 @@ public class TimeRangeResultCacheTest { public void onFailure(Throwable caught) { assertTriggeredOnce(); if (assertSuccess) { - assertTrue("Expected onSuccess but got onFailure", false); // Fail test + assertTrue(false, "Expected onSuccess but got onFailure"); // Fail test } } @Override public void onSuccess(Void result) { assertTriggeredOnce(); if (!assertSuccess) { - assertTrue("Expected onFailure but got onSuccess", false); // Fail test + assertTrue(false, "Expected onFailure but got onSuccess"); // Fail test } } private void assertTriggeredOnce() { - assertFalse("Callback was triggered more than once", triggered); + assertFalse(triggered, "Callback was triggered more than once"); triggered = true; } }; diff --git a/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/server/TestCacheKeyInMap.java b/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/server/TestCacheKeyInMap.java index a157ebb09d3..e69d8e67ae7 100755 --- a/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/server/TestCacheKeyInMap.java +++ b/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/server/TestCacheKeyInMap.java @@ -1,13 +1,13 @@ package com.sap.sse.gwt.server; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.ref.ReferenceQueue; import java.util.HashMap; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.CacheableRPCResult; @@ -23,7 +23,7 @@ public class TestCacheKeyInMap { private HashMap map; private ReferenceQueue queue; - @Before + @BeforeEach public void setUp() { map = new HashMap<>(); queue = new ReferenceQueue<>(); diff --git a/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/test/dispatch/client/system/caching/CacheDispatchTest.java b/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/test/dispatch/client/system/caching/CacheDispatchTest.java index 3dc2443d344..605bafb03c5 100644 --- a/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/test/dispatch/client/system/caching/CacheDispatchTest.java +++ b/java/com.sap.sse.gwt.test/src/com/sap/sse/gwt/test/dispatch/client/system/caching/CacheDispatchTest.java @@ -5,9 +5,8 @@ import java.util.UUID; import javax.servlet.http.HttpServletRequest; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.google.gwt.user.client.rpc.AsyncCallback; import com.sap.sse.gwt.dispatch.client.system.DispatchContext; @@ -30,10 +29,10 @@ public class CacheDispatchTest { checkIfCached(holder, new SomeDefaultCacheAction(), 20); checkIfCached(holder, new SomeDefaultCacheAction(), 20); checkIfCached(holder, new SomeDefaultCacheAction(), 20); - Assert.assertEquals("One element in cache", 3, cd.ttlItemsInCache()); + Assertions.assertEquals(3, cd.ttlItemsInCache(), "One element in cache"); wait(210); cd.cleanupExpiredItems(); - Assert.assertEquals("No element in cache", 0, cd.ttlItemsInCache()); + Assertions.assertEquals(0, cd.ttlItemsInCache(), "No element in cache"); } @Test @@ -50,7 +49,7 @@ public class CacheDispatchTest { cd.execute(action, new SimpleCallback() { @Override public void onSuccess(SomeResult result) { - Assert.assertNotSame("Not caching, should not be same", holder.value, result); + Assertions.assertNotSame(holder.value, result, "Not caching, should not be same"); } }); } @@ -117,7 +116,7 @@ public class CacheDispatchTest { cd.execute(action, new SimpleCallback() { @Override public void onSuccess(Result result) { - Assert.assertSame("Should be the same", holder.value, result); + Assertions.assertSame(holder.value, result, "Should be the same"); } }); } @@ -128,7 +127,7 @@ public class CacheDispatchTest { cd.execute(action, new SimpleCallback() { @Override public void onSuccess(Result result) { - Assert.assertNotSame("Should have expired, should not be same", holder.value, result); + Assertions.assertNotSame(holder.value, result, "Should have expired, should not be same"); } }); } diff --git a/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/DefaultRedirectConversionTest.java b/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/DefaultRedirectConversionTest.java index 5fc0eb51a08..05f8222feec 100644 --- a/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/DefaultRedirectConversionTest.java +++ b/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/DefaultRedirectConversionTest.java @@ -1,9 +1,9 @@ package com.sap.sse.landscape.aws.common.shared; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultRedirectConversionTest { @Test diff --git a/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/LoadBalancerRuleInserterTest.java b/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/LoadBalancerRuleInserterTest.java index 70ebc8f4add..d74139868ea 100644 --- a/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/LoadBalancerRuleInserterTest.java +++ b/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/LoadBalancerRuleInserterTest.java @@ -1,8 +1,8 @@ package com.sap.sse.landscape.aws.common.shared; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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 java.util.Arrays; import java.util.Collections; @@ -10,8 +10,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.IntStream; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; @@ -89,7 +89,7 @@ public class LoadBalancerRuleInserterTest { } } - @Before + @BeforeEach public void setUp() { loadBalancerAdapter = new TestLoadBalancerAdapter(); loadBalancerAdapter.addRules(Arrays.asList(new TestRuleAdapter(/* isDefault */ true, 0, DEFAULT_RULE_NAME))); diff --git a/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/ShardTargetGroupNameTest.java b/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/ShardTargetGroupNameTest.java index b2d2e613008..59ff7de237b 100644 --- a/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/ShardTargetGroupNameTest.java +++ b/java/com.sap.sse.landscape.aws.common.test/src/com/sap/sse/landscape/aws/common/shared/ShardTargetGroupNameTest.java @@ -1,11 +1,11 @@ package com.sap.sse.landscape.aws.common.shared; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ShardTargetGroupNameTest { private static final String TARGET_GROUP_NAME_PREFIX = "TG-"; diff --git a/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/ConnectivityTest.java b/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/ConnectivityTest.java index b53e92ca4b6..387e297fcb3 100755 --- a/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/ConnectivityTest.java +++ b/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/ConnectivityTest.java @@ -1,11 +1,11 @@ package com.sap.sse.landscape.aws; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayOutputStream; import java.io.File; @@ -23,9 +23,9 @@ import java.util.concurrent.ExecutionException; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; @@ -87,7 +87,7 @@ import software.amazon.awssdk.services.sts.model.Credentials; * @author Axel Uhl (D043530) * */ -@Ignore("Needs AWS key ID, key secret and session token in system properties") +@Disabled("Needs AWS key ID, key secret and session token in system properties") public class ConnectivityTest> { private static final Logger logger = Logger.getLogger(ConnectivityTest.class.getName()); private static final Optional optionalTimeout = Optional.of(Duration.ONE_MINUTE.times(10)); @@ -98,7 +98,7 @@ public class ConnectivityTest r.field("host-header").hostHeaderConfig(hhc -> hhc.values(hostnameCondition))) .actions(a -> a.type(ActionTypeEnum.FIXED_RESPONSE).fixedResponseConfig(frc -> frc.statusCode("200").messageBody("Hello world"))).build()); assertEquals(1, Util.size(rulesCreated)); - assertTrue(hostnameCondition, rulesCreated.iterator().next().conditions().iterator().next().hostHeaderConfig().values().contains(hostnameCondition)); + assertTrue(rulesCreated.iterator().next().conditions().iterator().next().hostHeaderConfig().values().contains(hostnameCondition), hostnameCondition); } finally { alb.delete(); } diff --git a/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/MongoTests.java b/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/MongoTests.java index 2ad1ed255ca..95468edf93a 100755 --- a/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/MongoTests.java +++ b/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/MongoTests.java @@ -1,9 +1,9 @@ package com.sap.sse.landscape.aws; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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 static org.junit.jupiter.api.Assertions.fail; import java.net.InetAddress; import java.net.URISyntaxException; @@ -12,9 +12,9 @@ import java.util.Optional; import java.util.Random; import org.bson.Document; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.mongodb.client.MongoDatabase; @@ -27,7 +27,7 @@ import com.sap.sse.landscape.mongodb.impl.MongoProcessImpl; import com.sap.sse.landscape.mongodb.impl.MongoProcessInReplicaSetImpl; import com.sap.sse.landscape.mongodb.impl.MongoReplicaSetImpl; -@Ignore("Needs a specific MongoDB replica set named 'rs0' in the environment") +@Disabled("Needs a specific MongoDB replica set named 'rs0' in the environment") public class MongoTests { private static final Optional optionalTimeout = Optional.of(Duration.ONE_MINUTE.times(5)); @@ -36,7 +36,7 @@ public class MongoTests { private MongoProcessInReplicaSetImpl mongoProcessInReplicaSet; private MongoReplicaSetImpl mongoReplicaSet; - @Before + @BeforeEach public void setUp() throws UnknownHostException { localhost = Mockito.mock(Host.class); Mockito.when(localhost.getPrivateAddress()).thenReturn(InetAddress.getByName("127.0.0.1")); diff --git a/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/MongoUriParserTest.java b/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/MongoUriParserTest.java index 6b791610022..04f50b04d2d 100755 --- a/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/MongoUriParserTest.java +++ b/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/MongoUriParserTest.java @@ -1,19 +1,18 @@ package com.sap.sse.landscape.aws; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.net.InetAddress; import java.net.URISyntaxException; import java.net.UnknownHostException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import static org.mockito.Mockito.when; +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.mockito.Mockito.mock; import com.sap.sse.common.Util; @@ -29,7 +28,7 @@ public class MongoUriParserTest { private MongoUriParser parser; @SuppressWarnings("unchecked") - @Before + @BeforeEach public void setUp() throws UnknownHostException { final AwsLandscape landscape = Mockito.mock(AwsLandscape.class); final InetAddress wwwExampleCom = InetAddress.getByName(WWW_EXAMPLE_COM); diff --git a/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/impl/ReverseProxyTargetGroupHealthCheckPathTest.java b/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/impl/ReverseProxyTargetGroupHealthCheckPathTest.java index dedbd90673e..937f437f0b7 100644 --- a/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/impl/ReverseProxyTargetGroupHealthCheckPathTest.java +++ b/java/com.sap.sse.landscape.aws.test/src/com/sap/sse/landscape/aws/impl/ReverseProxyTargetGroupHealthCheckPathTest.java @@ -1,8 +1,8 @@ package com.sap.sse.landscape.aws.impl; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.landscape.application.ApplicationProcess; import com.sap.sse.landscape.application.ApplicationProcessMetrics; diff --git a/java/com.sap.sse.landscape.test/src/com/sap/sse/landscape/mongodb/test/TestMongoEndpointEquality.java b/java/com.sap.sse.landscape.test/src/com/sap/sse/landscape/mongodb/test/TestMongoEndpointEquality.java index 7f01cf572c4..d8f95d5d33f 100644 --- a/java/com.sap.sse.landscape.test/src/com/sap/sse/landscape/mongodb/test/TestMongoEndpointEquality.java +++ b/java/com.sap.sse.landscape.test/src/com/sap/sse/landscape/mongodb/test/TestMongoEndpointEquality.java @@ -1,7 +1,7 @@ package com.sap.sse.landscape.mongodb.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.io.Serializable; import java.net.InetAddress; @@ -9,7 +9,7 @@ import java.net.UnknownHostException; import java.util.Optional; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.jcraft.jsch.ChannelSftp; import com.sap.sse.common.Duration; diff --git a/java/com.sap.sse.mail.replication.test/src/com/sap/sse/mail/replication/test/SimpleMailServiceReplicationTest.java b/java/com.sap.sse.mail.replication.test/src/com/sap/sse/mail/replication/test/SimpleMailServiceReplicationTest.java index 5ae39a8d85e..1b5e9b392f4 100755 --- a/java/com.sap.sse.mail.replication.test/src/com/sap/sse/mail/replication/test/SimpleMailServiceReplicationTest.java +++ b/java/com.sap.sse.mail.replication.test/src/com/sap/sse/mail/replication/test/SimpleMailServiceReplicationTest.java @@ -3,7 +3,7 @@ package com.sap.sse.mail.replication.test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.mail.MailException; import com.sap.sse.mail.replication.testsupport.AbstractMailServiceReplicationTest; diff --git a/java/com.sap.sse.mail.replication.testsupport/src/com/sap/sse/mail/replication/testsupport/AbstractMailServiceReplicationTest.java b/java/com.sap.sse.mail.replication.testsupport/src/com/sap/sse/mail/replication/testsupport/AbstractMailServiceReplicationTest.java index 9fdbf407923..56f080afb3d 100644 --- a/java/com.sap.sse.mail.replication.testsupport/src/com/sap/sse/mail/replication/testsupport/AbstractMailServiceReplicationTest.java +++ b/java/com.sap.sse.mail.replication.testsupport/src/com/sap/sse/mail/replication/testsupport/AbstractMailServiceReplicationTest.java @@ -3,7 +3,7 @@ package com.sap.sse.mail.replication.testsupport; import java.util.HashMap; import java.util.Map; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import com.sap.sse.common.mail.MailException; import com.sap.sse.mail.MailService; @@ -20,7 +20,7 @@ public class AbstractMailServiceReplicationTest extends AbstractServerWithSingle public static final Map numberOfMailsSent = new HashMap<>(); - @Before + @BeforeEach public void clearNumberOfMailsSent() { numberOfMailsSent.clear(); } diff --git a/java/com.sap.sse.operationaltransformation.test/src/com/sap/sse/operationaltransformation/test/OperationalTransformationTest.java b/java/com.sap.sse.operationaltransformation.test/src/com/sap/sse/operationaltransformation/test/OperationalTransformationTest.java index 30f001ffd8c..3a9127d8abc 100755 --- a/java/com.sap.sse.operationaltransformation.test/src/com/sap/sse/operationaltransformation/test/OperationalTransformationTest.java +++ b/java/com.sap.sse.operationaltransformation.test/src/com/sap/sse/operationaltransformation/test/OperationalTransformationTest.java @@ -1,7 +1,7 @@ package com.sap.sse.operationaltransformation.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Random; import java.util.UUID; @@ -11,8 +11,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Logger; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.operationaltransformation.ClientServerOperationPair; import com.sap.sse.operationaltransformation.Operation; @@ -126,7 +126,7 @@ public class OperationalTransformationTest { } } - @Before + @BeforeEach public void setUp() { server = new PeerImpl( "Server", new StringInsertTransformer(), new StringState(""), Role.SERVER); 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 a4c9d988a56..8e3d2638da2 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 @@ -1,6 +1,6 @@ package com.sap.sse.replication.testsupport; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -224,7 +224,7 @@ public abstract class AbstractServerReplicationTestSetUp> testSetUps = new HashSet<>(); - @Before + @BeforeEach public void setUp() throws Exception { for (AbstractServerReplicationTestSetUp testSetUp : testSetUps) { testSetUp.setUp(); } } - @After + @AfterEach public void tearDown() throws Exception { for (AbstractServerReplicationTestSetUp testSetUp : testSetUps) { testSetUp.tearDown(); diff --git a/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerWithSingleServiceReplicationTest.java b/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerWithSingleServiceReplicationTest.java index e68f7f496d9..78469016202 100755 --- a/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerWithSingleServiceReplicationTest.java +++ b/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerWithSingleServiceReplicationTest.java @@ -2,8 +2,8 @@ package com.sap.sse.replication.testsupport; import java.io.IOException; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import com.sap.sse.common.Util.Pair; import com.sap.sse.replication.Replicable; @@ -21,7 +21,7 @@ public abstract class AbstractServerWithSingleServiceReplicationTest allHasPermissions = Arrays.asList(type1, type2); - @Before + @BeforeEach public void setUp() throws UserGroupManagementException, UserManagementException { final String adminTenantName = "admin-tenant"; userStore = new UserStoreImpl(adminTenantName); diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PermissionConverterTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PermissionConverterTest.java index 296ca1ef6f4..1146095eb0a 100755 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PermissionConverterTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PermissionConverterTest.java @@ -1,13 +1,13 @@ package com.sap.sse.security.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import java.util.Set; import org.apache.shiro.authz.Permission; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; import com.sap.sse.security.UsernamePasswordRealm; diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PreferenceObjectBasedNotificationSetTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PreferenceObjectBasedNotificationSetTest.java index 012fdcefd47..c379a1b6879 100644 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PreferenceObjectBasedNotificationSetTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PreferenceObjectBasedNotificationSetTest.java @@ -11,9 +11,9 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.client.MongoDatabase; @@ -51,7 +51,7 @@ public class PreferenceObjectBasedNotificationSetTest { private static final HashSet values2 = values(B, C); private static final HashSet allValues = values(A, B, C); - @Before + @BeforeEach public void setUp() throws UnknownHostException, MongoException, UserGroupManagementException, UserManagementException { final MongoDBConfiguration dbConfiguration = MongoDBConfiguration.getDefaultTestConfiguration(); final MongoDBService service = dbConfiguration.getService(); @@ -65,7 +65,7 @@ public class PreferenceObjectBasedNotificationSetTest { @Test public void noPreferenceAvailableTest() { PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); - Assert.assertTrue(Util.isEmpty(notificationSet.getUserNamesToNotifyFor(prefKey))); + Assertions.assertTrue(Util.isEmpty(notificationSet.getUserNamesToNotifyFor(prefKey))); } @Test @@ -73,9 +73,9 @@ public class PreferenceObjectBasedNotificationSetTest { store.registerPreferenceConverter(prefKey, prefConverter); store.setPreferenceObject(user1, prefKey, values1); PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values(user1))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values(user1))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); } @Test @@ -83,9 +83,9 @@ public class PreferenceObjectBasedNotificationSetTest { store.registerPreferenceConverter(prefKey, prefConverter); PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); store.setPreferenceObject(user1, prefKey, values1); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values(user1))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values(user1))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); } @Test @@ -94,9 +94,9 @@ public class PreferenceObjectBasedNotificationSetTest { store.setPreferenceObject(user1, prefKey, values1); store.setPreferenceObject(user2, prefKey, values2); PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values(user1))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1, user2))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values(user2))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values(user1))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1, user2))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values(user2))); } @Test @@ -105,9 +105,9 @@ public class PreferenceObjectBasedNotificationSetTest { store.setPreferenceObject(user1, prefKey, values1); PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); store.setPreferenceObject(user1, prefKey, values2); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values())); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values(user1))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values(user1))); } @Test @@ -117,9 +117,9 @@ public class PreferenceObjectBasedNotificationSetTest { store.setPreferenceObject(user2, prefKey, allValues); PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); store.setPreferenceObject(user1, prefKey, values2); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values(user2))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1, user2))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values(user1, user2))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values(user2))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1, user2))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values(user1, user2))); } @Test @@ -129,9 +129,9 @@ public class PreferenceObjectBasedNotificationSetTest { store.setPreferenceObject(user2, prefKey, values2); PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); store.unsetPreference(user1, prefKey); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values())); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user2))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values(user2))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user2))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values(user2))); } @Test @@ -140,9 +140,9 @@ public class PreferenceObjectBasedNotificationSetTest { PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); store.setPreferenceObject(user1, prefKey, values1); store.unsetPreference(user1, prefKey); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values())); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values())); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); } @Test @@ -150,7 +150,7 @@ public class PreferenceObjectBasedNotificationSetTest { store.registerPreferenceConverter(prefKey, prefConverter); store.setPreferenceObject(user1, prefKey, values1); PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor("x"), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor("x"), values())); } @Test @@ -160,9 +160,9 @@ public class PreferenceObjectBasedNotificationSetTest { store.setPreferenceObject(user1, prefKey, values1); store.setPreferenceObject(user1, otherPrefKey, values2); PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values(user1))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1))); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values(user1))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values(user1))); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); } @Test @@ -173,7 +173,7 @@ public class PreferenceObjectBasedNotificationSetTest { UserConsumerMock mock = new UserConsumerMock(); notificationSet.forUsersWithVerifiedEmailMappedTo(A, mock); - Assert.assertEquals(0, mock.calls.size()); + Assertions.assertEquals(0, mock.calls.size()); } @Test @@ -186,7 +186,7 @@ public class PreferenceObjectBasedNotificationSetTest { UserConsumerMock mock = new UserConsumerMock(); notificationSet.forUsersWithVerifiedEmailMappedTo(A, mock); - Assert.assertEquals(users(store.getUserByName(user1)), mock.calls); + Assertions.assertEquals(users(store.getUserByName(user1)), mock.calls); } @Test @@ -199,7 +199,7 @@ public class PreferenceObjectBasedNotificationSetTest { UserConsumerMock mock = new UserConsumerMock(); notificationSet.forUsersWithVerifiedEmailMappedTo(A, mock); - Assert.assertTrue(mock.calls.isEmpty()); + Assertions.assertTrue(mock.calls.isEmpty()); } @Test @@ -213,11 +213,11 @@ public class PreferenceObjectBasedNotificationSetTest { UserConsumerMock mock = new UserConsumerMock(); notificationSet.forUsersWithVerifiedEmailMappedTo(A, mock); - Assert.assertEquals(users(store.getUserByName(user1)), mock.calls); + Assertions.assertEquals(users(store.getUserByName(user1)), mock.calls); mock = new UserConsumerMock(); notificationSet.forUsersWithVerifiedEmailMappedTo(B, mock); - Assert.assertEquals(users(store.getUserByName(user1), store.getUserByName(user2)), mock.calls); + Assertions.assertEquals(users(store.getUserByName(user1), store.getUserByName(user2)), mock.calls); } @Test @@ -230,7 +230,7 @@ public class PreferenceObjectBasedNotificationSetTest { UserConsumerMock mock = new UserConsumerMock(); notificationSet.forUsersWithVerifiedEmailMappedTo(B, mock); - Assert.assertEquals(users(store.getUserByName(user1)), mock.calls); + Assertions.assertEquals(users(store.getUserByName(user1)), mock.calls); } /** @@ -243,9 +243,9 @@ public class PreferenceObjectBasedNotificationSetTest { store.setPreferenceObject(user1, prefKey, values1); PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); store.deleteUser(user1); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values())); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values())); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); } @Test @@ -255,9 +255,9 @@ public class PreferenceObjectBasedNotificationSetTest { store.setPreferenceObject(user1, prefKey, values1); PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store); store.removePreferenceConverter(prefKey); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values())); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values())); - Assert.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(A), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(B), values())); + Assertions.assertTrue(Util.equals(notificationSet.getUserNamesToNotifyFor(C), values())); } private static HashSet values(String... values) { diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PrivilegeEscalationTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PrivilegeEscalationTest.java index eea102165d6..4fb89580d07 100644 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PrivilegeEscalationTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PrivilegeEscalationTest.java @@ -1,15 +1,15 @@ package com.sap.sse.security.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collections; import java.util.UUID; import java.util.function.Predicate; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.security.SecurityService; import com.sap.sse.security.impl.SecurityServiceImpl; @@ -59,7 +59,7 @@ public class PrivilegeEscalationTest { private SecurityService securityService; private RoleDefinition rd; - @Before + @BeforeEach public void setup() throws UserStoreManagementException { userStore = new UserStoreImpl(PersistenceFactory.INSTANCE.getDefaultDomainObjectFactory(), PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(), TEST_DEFAULT_TENANT); @@ -108,7 +108,7 @@ public class PrivilegeEscalationTest { new Ownership(null, null), noopAclResolver)); } - @After + @AfterEach public void cleanup() { userStore.clear(); accessControlStore.clear(); diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RoleDefinitionsTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RoleDefinitionsTest.java index b9bd13291bf..f19f0c015e1 100644 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RoleDefinitionsTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RoleDefinitionsTest.java @@ -1,12 +1,12 @@ package com.sap.sse.security.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collections; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.security.interfaces.UserStore; import com.sap.sse.security.shared.RoleDefinition; @@ -34,7 +34,7 @@ public class RoleDefinitionsTest { userStore = new UserStoreImpl("TestDefaultTenant"); } - @Before + @BeforeEach public void doBefore() throws UserStoreManagementException { userStore.clear(); user = userStore.createUser(username, email, new LockingAndBanningImpl()); diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RoleIdentifierTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RoleIdentifierTest.java index 65a1ef8c343..86062ba54ac 100755 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RoleIdentifierTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RoleIdentifierTest.java @@ -1,11 +1,11 @@ package com.sap.sse.security.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.security.shared.HasPermissions.DefaultActions; import com.sap.sse.security.shared.QualifiedObjectIdentifier; diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RolesTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RolesTest.java index eb403deb122..75f53a4009d 100755 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RolesTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/RolesTest.java @@ -1,11 +1,11 @@ package com.sap.sse.security.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.security.shared.dto.RoleDTO; import com.sap.sse.security.shared.dto.StrippedRoleDefinitionDTO; diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/SecurityServiceAndHasPermissionsProviderTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/SecurityServiceAndHasPermissionsProviderTest.java index c6c1b29278e..f56470179b9 100644 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/SecurityServiceAndHasPermissionsProviderTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/SecurityServiceAndHasPermissionsProviderTest.java @@ -1,15 +1,15 @@ package com.sap.sse.security.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.function.Function; import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.subject.SimplePrincipalCollection; import org.apache.shiro.subject.Subject; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.security.SecurityService; import com.sap.sse.security.impl.SecurityServiceImpl; @@ -30,7 +30,7 @@ public class SecurityServiceAndHasPermissionsProviderTest { private AccessControlStoreImpl accessControlStore; private final WildcardPermission permission = new WildcardPermission("USER:READ:*"); - @Before + @BeforeEach public void setup() throws UserStoreManagementException { new UserStoreImpl(PersistenceFactory.INSTANCE.getDefaultMajorityDomainObjectFactory(), PersistenceFactory.INSTANCE.getDefaultMajorityMongoObjectFactory(), TEST_DEFAULT_TENANT).clear(); @@ -44,7 +44,7 @@ public class SecurityServiceAndHasPermissionsProviderTest { PersistenceFactory.INSTANCE.getDefaultMajorityMongoObjectFactory(), userStore); } - @After + @AfterEach public void cleanup() { userStore.clear(); accessControlStore.clear(); diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserPreferenceObjectAndConverterTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserPreferenceObjectAndConverterTest.java index 45fb64e100a..6abf23929f8 100644 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserPreferenceObjectAndConverterTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserPreferenceObjectAndConverterTest.java @@ -3,9 +3,9 @@ package com.sap.sse.security.test; import java.io.Serializable; import java.net.UnknownHostException; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.client.MongoDatabase; @@ -33,7 +33,7 @@ public class UserPreferenceObjectAndConverterTest { private static final SimplePreferenceForSerialization pref2 = new SimplePreferenceForSerialization("some sailing value", true, 9.87654321); private static final String serializedPref2 = prefConverter.toPreferenceString(pref2); - @Before + @BeforeEach public void setUp() throws UnknownHostException, MongoException, UserGroupManagementException, UserManagementException { final MongoDBConfiguration dbConfiguration = MongoDBConfiguration.getDefaultTestConfiguration(); final MongoDBService service = dbConfiguration.getService(); @@ -48,21 +48,21 @@ public class UserPreferenceObjectAndConverterTest { @Test public void noConverterSetTest() { store.setPreference(user1, prefKey1, serializedPref1); - Assert.assertNull(store.getPreferenceObject(user1, prefKey1)); + Assertions.assertNull(store.getPreferenceObject(user1, prefKey1)); } @Test public void converterAlreadyRegisteredWhenSettingPreferenceTest() { store.registerPreferenceConverter(prefKey1, prefConverter); store.setPreference(user1, prefKey1, serializedPref1); - Assert.assertEquals(pref1, store.getPreferenceObject(user1, prefKey1)); + Assertions.assertEquals(pref1, store.getPreferenceObject(user1, prefKey1)); } @Test public void converterSetWhenPreferenceAlreadyRegisteredTest() { store.setPreference(user1, prefKey1, serializedPref1); store.registerPreferenceConverter(prefKey1, prefConverter); - Assert.assertEquals(pref1, store.getPreferenceObject(user1, prefKey1)); + Assertions.assertEquals(pref1, store.getPreferenceObject(user1, prefKey1)); } @Test @@ -70,8 +70,8 @@ public class UserPreferenceObjectAndConverterTest { store.setPreference(user1, prefKey1, serializedPref1); store.setPreference(user2, prefKey1, serializedPref2); store.registerPreferenceConverter(prefKey1, prefConverter); - Assert.assertEquals(pref1, store.getPreferenceObject(user1, prefKey1)); - Assert.assertEquals(pref2, store.getPreferenceObject(user2, prefKey1)); + Assertions.assertEquals(pref1, store.getPreferenceObject(user1, prefKey1)); + Assertions.assertEquals(pref2, store.getPreferenceObject(user2, prefKey1)); } @Test @@ -80,16 +80,16 @@ public class UserPreferenceObjectAndConverterTest { store.setPreference(user1, prefKey2, serializedPref2); store.registerPreferenceConverter(prefKey1, prefConverter); store.registerPreferenceConverter(prefKey2, prefConverter); - Assert.assertEquals(pref1, store.getPreferenceObject(user1, prefKey1)); - Assert.assertEquals(pref2, store.getPreferenceObject(user1, prefKey2)); + Assertions.assertEquals(pref1, store.getPreferenceObject(user1, prefKey1)); + Assertions.assertEquals(pref2, store.getPreferenceObject(user1, prefKey2)); } @Test public void setPreferenceObjectTest() { store.registerPreferenceConverter(prefKey1, prefConverter); store.setPreferenceObject(user1, prefKey1, pref1); - Assert.assertEquals(serializedPref1, store.getPreference(user1, prefKey1)); - Assert.assertEquals(pref1, store.getPreferenceObject(user1, prefKey1)); + Assertions.assertEquals(serializedPref1, store.getPreference(user1, prefKey1)); + Assertions.assertEquals(pref1, store.getPreferenceObject(user1, prefKey1)); } @Test @@ -97,7 +97,7 @@ public class UserPreferenceObjectAndConverterTest { store.registerPreferenceConverter(prefKey1, prefConverter); store.setPreferenceObject(user1, prefKey1, pref1); store.unsetPreference(user1, prefKey1); - Assert.assertNull(store.getPreferenceObject(user1, prefKey1)); + Assertions.assertNull(store.getPreferenceObject(user1, prefKey1)); } @Test @@ -105,7 +105,7 @@ public class UserPreferenceObjectAndConverterTest { store.registerPreferenceConverter(prefKey1, prefConverter); store.setPreferenceObject(user1, prefKey1, pref1); store.setPreferenceObject(user1, prefKey1, null); - Assert.assertNull(store.getPreferenceObject(user1, prefKey1)); + Assertions.assertNull(store.getPreferenceObject(user1, prefKey1)); } /** @@ -119,7 +119,7 @@ public class UserPreferenceObjectAndConverterTest { store.registerPreferenceConverter(prefKey1, prefConverter); store.setPreferenceObject(user1, prefKey1, pref1); store.deleteUser(user1); - Assert.assertNull(store.getPreferenceObject(user1, prefKey1)); + Assertions.assertNull(store.getPreferenceObject(user1, prefKey1)); } @Test @@ -128,7 +128,7 @@ public class UserPreferenceObjectAndConverterTest { store.registerPreferenceConverter(prefKey1, prefConverter); store.setPreference(user1, prefKey1, serializedPref1); store.removePreferenceConverter(prefKey1); - Assert.assertNull(store.getPreferenceObject(user1, prefKey1)); + Assertions.assertNull(store.getPreferenceObject(user1, prefKey1)); } public static class SimplePreferenceForSerialization implements Serializable { diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreTest.java index 7798fb94994..22afb02284e 100644 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreTest.java @@ -1,10 +1,10 @@ package com.sap.sse.security.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.security.interfaces.UserStore; import com.sap.sse.security.shared.UserGroupManagementException; @@ -24,7 +24,7 @@ public class UserStoreTest { userStore = new UserStoreImpl(null, null, "TestDefaultTenant"); } - @Before + @BeforeEach public void setUp() throws UserManagementException, UserGroupManagementException { userStore.createUser(username, email, new LockingAndBanningImpl()); userStore.setAccessToken(username, accessToken); @@ -54,6 +54,6 @@ public class UserStoreTest { @Test public void testDeleteUserWithPreference() throws UserManagementException { userStore.deleteUser(username); - assertNull(prefValue, userStore.getPreference(username, prefKey)); + assertNull(userStore.getPreference(username, prefKey), prefValue); } } diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java index a4d9a1de69f..842a9df86c5 100644 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java @@ -1,11 +1,11 @@ package com.sap.sse.security.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +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.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.UnknownHostException; import java.util.ArrayList; @@ -17,8 +17,8 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.mongodb.MongoException; import com.mongodb.client.MongoDatabase; @@ -60,7 +60,7 @@ public class UserStoreWithPersistenceTest { private UserStoreImpl store; - @Before + @BeforeEach public void setUp() throws UnknownHostException, MongoException, UserGroupManagementException { final MongoDBConfiguration dbConfiguration = MongoDBConfiguration.getDefaultTestConfiguration(); final MongoDBService service = dbConfiguration.getService(); diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/WildcardPermissionEncoderTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/WildcardPermissionEncoderTest.java index 76aeb993612..fb1b04c44a4 100755 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/WildcardPermissionEncoderTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/WildcardPermissionEncoderTest.java @@ -1,9 +1,9 @@ package com.sap.sse.security.test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.security.shared.WildcardPermission; import com.sap.sse.security.shared.impl.WildcardPermissionEncoder; diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/WildcardPermissionTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/WildcardPermissionTest.java index 7861affaf06..84feddfabe4 100755 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/WildcardPermissionTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/WildcardPermissionTest.java @@ -1,8 +1,8 @@ package com.sap.sse.security.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.security.shared.WildcardPermission; diff --git a/java/com.sap.sse.security.ui.test/src/com/sap/sse/security/ui/server/subscription/TestPlanSubscriptionRules.java b/java/com.sap.sse.security.ui.test/src/com/sap/sse/security/ui/server/subscription/TestPlanSubscriptionRules.java index 38c7d1b0334..258569fd8da 100644 --- a/java/com.sap.sse.security.ui.test/src/com/sap/sse/security/ui/server/subscription/TestPlanSubscriptionRules.java +++ b/java/com.sap.sse.security.ui.test/src/com/sap/sse/security/ui/server/subscription/TestPlanSubscriptionRules.java @@ -1,12 +1,12 @@ package com.sap.sse.security.ui.server.subscription; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.subscription.SailingSubscriptionPlan; import com.sap.sse.common.TimePoint; @@ -27,7 +27,7 @@ public class TestPlanSubscriptionRules { private SecurityService securityService; private ChargebeeSubscriptionWriteServiceImpl service; - @Before + @BeforeEach public void setUp() { user = mock(User.class); premiumYearlySubscription = new ChargebeeSubscription("subscriptionId1", premiumYearly.getId(), "customerId", diff --git a/java/com.sap.sse.security.ui.test/src/com/sap/sse/security/ui/server/subscription/TestSubscriptionService.java b/java/com.sap.sse.security.ui.test/src/com/sap/sse/security/ui/server/subscription/TestSubscriptionService.java index bb930e2aa84..67c3ef79397 100644 --- a/java/com.sap.sse.security.ui.test/src/com/sap/sse/security/ui/server/subscription/TestSubscriptionService.java +++ b/java/com.sap.sse.security.ui.test/src/com/sap/sse/security/ui/server/subscription/TestSubscriptionService.java @@ -6,9 +6,9 @@ import static org.mockito.Mockito.when; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sailing.domain.common.subscription.SailingSubscriptionPlan; import com.sap.sse.common.TimePoint; @@ -31,7 +31,7 @@ public class TestSubscriptionService { private Subscription dataMiningAllYearlySubscription; private SubscriptionServiceImpl serviceImpl; - @Before + @BeforeEach public void setUp() { user = mock(User.class); premiumYearlySubscription = new ChargebeeSubscription("subscriptionId1", premiumYearly.getId(), "customerId", @@ -76,7 +76,7 @@ public class TestSubscriptionService { when(user.getSubscriptions()) .thenReturn(Stream.of(new Subscription[] { premiumYearlySubscription }).collect(Collectors.toList())); boolean result = serviceImpl.isNewPlanCompletelyIncludedInCurrentPlan(user, dataMiningArchiveYearly); - Assert.assertFalse(result); + Assertions.assertFalse(result); } @Test @@ -84,7 +84,7 @@ public class TestSubscriptionService { when(user.getSubscriptions()).thenReturn( Stream.of(new Subscription[] { dataMiningArchiveYearlySubscription }).collect(Collectors.toList())); boolean result = serviceImpl.isNewPlanCompletelyIncludedInCurrentPlan(user, premiumYearly); - Assert.assertTrue(result); + Assertions.assertTrue(result); } @Test @@ -92,7 +92,7 @@ public class TestSubscriptionService { when(user.getSubscriptions()).thenReturn( Stream.of(new Subscription[] { dataMiningArchiveYearlySubscription }).collect(Collectors.toList())); boolean result = serviceImpl.isNewPlanCompletelyIncludedInCurrentPlan(user, dataMiningAllYearly); - Assert.assertFalse(result); + Assertions.assertFalse(result); } @Test @@ -100,7 +100,7 @@ public class TestSubscriptionService { when(user.getSubscriptions()).thenReturn( Stream.of(new Subscription[] { dataMiningAllYearlySubscription }).collect(Collectors.toList())); boolean result = serviceImpl.isNewPlanCompletelyIncludedInCurrentPlan(user, premiumYearly); - Assert.assertTrue(result); + Assertions.assertTrue(result); } } 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 dca4a14615a..45e741efcf3 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,11 +1,11 @@ package com.sap.sse.shared.android.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.math.BigDecimal; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.filter.TextOperator; import com.sap.sse.common.filter.TextOperator.Operators; diff --git a/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/AbstractSettingsSerializationTestWithSettingsMap.java b/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/AbstractSettingsSerializationTestWithSettingsMap.java index 9be0e2f7ef9..4b37b4eadbc 100644 --- a/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/AbstractSettingsSerializationTestWithSettingsMap.java +++ b/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/AbstractSettingsSerializationTestWithSettingsMap.java @@ -1,13 +1,13 @@ package com.sap.sse.shared.android.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.filter.TextOperator; import com.sap.sse.common.filter.TextOperator.Operators; diff --git a/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/ArrayListNavigableSetTest.java b/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/ArrayListNavigableSetTest.java index a23f99ca318..dc13342cd64 100755 --- a/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/ArrayListNavigableSetTest.java +++ b/java/com.sap.sse.shared.android.test/src/com/sap/sse/shared/android/test/ArrayListNavigableSetTest.java @@ -1,10 +1,10 @@ package com.sap.sse.shared.android.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Comparator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.shared.util.impl.ArrayListNavigableSet; diff --git a/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/CommonPrefixStatsTest.java b/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/CommonPrefixStatsTest.java index 79e6a871cc3..f08cf638bc7 100755 --- a/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/CommonPrefixStatsTest.java +++ b/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/CommonPrefixStatsTest.java @@ -1,6 +1,6 @@ package com.sap.see.pairinglist.test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Collections; @@ -10,7 +10,7 @@ import java.util.List; import java.util.Random; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Constructs randomized number sequences of equal length, for each element in the sequence using a random number diff --git a/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateFactoryTest.java b/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateFactoryTest.java index 8bd33e27db0..aa88516567b 100644 --- a/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateFactoryTest.java +++ b/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateFactoryTest.java @@ -1,24 +1,24 @@ package com.sap.see.pairinglist.test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.ArrayList; import java.util.Arrays; import java.util.stream.IntStream; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.pairinglist.PairingListTemplate; import com.sap.sse.pairinglist.impl.PairingListTemplateFactoryImpl; -import org.junit.Assert; - public class PairingListTemplateFactoryTest { public PairingListTemplateFactoryImpl factoryImpl; - @Before + @BeforeEach public void testSetup() { factoryImpl = new PairingListTemplateFactoryImpl(); } @@ -31,11 +31,11 @@ public class PairingListTemplateFactoryTest { int[][] plTemplate = factoryImpl .createPairingListTemplate(new PairingFrameProviderTest(flights, groups, competitors)) .getPairingListTemplate(); - Assert.assertNotNull(plTemplate); + Assertions.assertNotNull(plTemplate); for (int[] group : plTemplate) { for (int competitorNumber : group) { if (competitorNumber < 0 && competitorNumber < competitors) { - Assert.fail("Values of Pairing List Template must not be smaller 0, when there are no dummies!"); + Assertions.fail("Values of Pairing List Template must not be smaller 0, when there are no dummies!"); } } } @@ -43,19 +43,19 @@ public class PairingListTemplateFactoryTest { .createPairingListTemplate(new PairingFrameProviderTest(flights, groups, competitors + 1)) .getPairingListTemplate(); int dummyCount = 0; - Assert.assertNotNull(plTemplate2); + Assertions.assertNotNull(plTemplate2); for (int[] group : plTemplate2) { for (int competitorNumber : group) { if (competitorNumber == -1) { dummyCount++; } if (competitorNumber < -1 && competitorNumber < competitors) { - Assert.fail("Values of Pairing List Template must not be smaller -1, when there are dummies!"); + Assertions.fail("Values of Pairing List Template must not be smaller -1, when there are dummies!"); } } } if (dummyCount != (groups - 1) * flights) { - Assert.fail("There are not as much dummies as there should be!"); + Assertions.fail("There are not as much dummies as there should be!"); } } @@ -65,7 +65,7 @@ public class PairingListTemplateFactoryTest { PairingListTemplate template1 = factoryImpl.createPairingListTemplate(new PairingFrameProviderTest(15, 3, 18)); PairingListTemplate template2 = factoryImpl.createPairingListTemplate(new PairingFrameProviderTest(15, 3, 18)); - Assert.assertFalse(Arrays.equals(template1.getPairingListTemplate(), template2.getPairingListTemplate())); + Assertions.assertFalse(Arrays.equals(template1.getPairingListTemplate(), template2.getPairingListTemplate())); } /** @@ -114,14 +114,14 @@ public class PairingListTemplateFactoryTest { System.out.println(Arrays.deepToString(template.getPairingListTemplate())); System.out.println(template.getQuality()); if (template.getQuality() >= 0.7) { - Assert.fail("Quality of Pairinglist is worse than usual!"); + Assertions.fail("Quality of Pairinglist is worse than usual!"); } PairingListTemplate template2 = factoryImpl.createPairingListTemplate(new PairingFrameProviderTest(10, 3, 30)); System.out.println(Arrays.deepToString(template2.getPairingListTemplate())); System.out.println(template2.getQuality()); if (template2.getQuality() >= 1.2) { - Assert.fail("Quality of Pairinglist is worse than usual!"); + Assertions.fail("Quality of Pairinglist is worse than usual!"); } } @@ -152,7 +152,7 @@ public class PairingListTemplateFactoryTest { if (availableCompetitors.isEmpty()) { continue; } else { - Assert.fail("The competitors are not divided up correctly!"); + Assertions.fail("The competitors are not divided up correctly!"); } } } diff --git a/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateTest.java b/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateTest.java index 7b89d8d3a05..e40055ed827 100644 --- a/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateTest.java +++ b/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateTest.java @@ -1,15 +1,14 @@ package com.sap.see.pairinglist.test; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.sap.sse.pairinglist.impl.PairingListTemplateImpl; -import org.junit.Assert; - public class PairingListTemplateTest extends PairingListTemplateImpl { public PairingListTemplateTest() { @@ -28,10 +27,10 @@ public class PairingListTemplateTest extends PairingListTemplateImpl { for (int x = 0; x < associations.length; x++) { for (int y = 0; y < associations[0].length; y++) { if ((x == y) && (associations[x][y] != -1)) { - Assert.fail("The diagonal of association matrix has to be -1."); + Assertions.fail("The diagonal of association matrix has to be -1."); } if (associations[x][y] > flights && (associations[x][y] < -1)) { - Assert.fail("Calculation of assosciation matrix failed!"); + Assertions.fail("Calculation of assosciation matrix failed!"); } } } @@ -56,7 +55,7 @@ public class PairingListTemplateTest extends PairingListTemplateImpl { double average = sum / tests + 1; System.out.println("Average Time: " + (average / 1000) + "s"); if (average > 10000) { - Assert.fail("The calculation of Pairing Lists took longer than expected!"); + Assertions.fail("The calculation of Pairing Lists took longer than expected!"); } } @@ -74,7 +73,7 @@ public class PairingListTemplateTest extends PairingListTemplateImpl { for (double quality : results) { sum += quality; } - Assert.assertEquals(0.574, sum / count, 0.01); + Assertions.assertEquals(0.574, sum / count, 0.01); } @Test @@ -87,7 +86,7 @@ public class PairingListTemplateTest extends PairingListTemplateImpl { for (int[] key : associations) { for (int value : key) { if (value > 0) { - Assert.fail("Associations array should only have values 0 and -1!"); + Assertions.fail("Associations array should only have values 0 and -1!"); } } } @@ -107,10 +106,10 @@ public class PairingListTemplateTest extends PairingListTemplateImpl { { 17, 4, 5, 16, 8, 6 }, { 17, 4, 12, 15, 10, 7 }, { 3, 1, 11, 0, 8, 16 }, { 2, 9, 6, 5, 13, 14 }, { 0, 9, 17, 5, 3, 15 }, { 12, 7, 1, 13, 16, 6 }, { 10, 14, 2, 8, 11, 4 }, { 7, 14, 2, 17, 3, 16 }, { 15, 5, 10, 11, 1, 6 }, { 4, 12, 8, 9, 0, 13 } }; - Assert.assertEquals(0.5998846486579744, + Assertions.assertEquals(0.5998846486579744, calcStandardDev(incrementAssociations(givenPairingList, new int[18][18])), 0.0); int[][] testPairingList = { { 0, 1, 2, 3, 4 }, { 5, 6, 7, 8, 9 } }; - Assert.assertEquals(0.4967673, (calcStandardDev(incrementAssociations(testPairingList, new int[10][10]))), + Assertions.assertEquals(0.4967673, (calcStandardDev(incrementAssociations(testPairingList, new int[10][10]))), 0.01); } @@ -146,6 +145,6 @@ public class PairingListTemplateTest extends PairingListTemplateImpl { { 17, 4, 5, 16, 8, 6 }, { 17, 4, 12, 15, 10, 7 }, { 3, 1, 11, 0, 8, 16 }, { 2, 9, 6, 5, 13, 14 }, { 0, 9, 17, 5, 3, 15 }, { 12, 7, 1, 13, 16, 6 }, { 10, 14, 2, 8, 11, 4 }, { 7, 14, 2, 17, 3, 16 }, { 15, 5, 10, 11, 1, 6 }, { 4, 12, 8, 9, 0, 13 } }; - Assert.assertEquals(56,this.getBoatChangesFromPairingList(givenPairingList, 15, 3, 18)); + Assertions.assertEquals(56,this.getBoatChangesFromPairingList(givenPairingList, 15, 3, 18)); } } diff --git a/java/com.sap.sse.test/src/com/sap/sse/i18n/impl/PropertiesUnquoterTest.java b/java/com.sap.sse.test/src/com/sap/sse/i18n/impl/PropertiesUnquoterTest.java index 26ecbd3b280..25c4c7425eb 100755 --- a/java/com.sap.sse.test/src/com/sap/sse/i18n/impl/PropertiesUnquoterTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/i18n/impl/PropertiesUnquoterTest.java @@ -1,10 +1,10 @@ package com.sap.sse.i18n.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Random; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * A class whose {@link #main(String[])} method can be used to convert a .properties file written in the conventions as diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/AbortingTaskScheduledAtFixedRateTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/AbortingTaskScheduledAtFixedRateTest.java index fec2dd3e4bf..d1790be86d7 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/test/AbortingTaskScheduledAtFixedRateTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/AbortingTaskScheduledAtFixedRateTest.java @@ -1,13 +1,13 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.util.ThreadPoolUtil; diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/CORSFilterConfigurationTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/CORSFilterConfigurationTest.java index 18e255d4a30..1eb93ca3774 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/test/CORSFilterConfigurationTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/CORSFilterConfigurationTest.java @@ -1,6 +1,6 @@ package com.sap.sse.test; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -14,7 +14,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.internal.verification.VerificationModeFactory; import com.sap.sse.rest.CORSFilter; diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/CPUTimeMeasurementTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/CPUTimeMeasurementTest.java index 63c3dff2ae9..19c7e7fdf1c 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/test/CPUTimeMeasurementTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/CPUTimeMeasurementTest.java @@ -1,7 +1,7 @@ package com.sap.sse.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; @@ -9,16 +9,16 @@ import java.util.function.IntConsumer; import java.util.logging.Logger; import java.util.stream.IntStream; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class CPUTimeMeasurementTest { private static final Logger logger = Logger.getLogger(CPUTimeMeasurementTest.class.getName()); private final static ThreadMXBean threadMxBean = ManagementFactory.getThreadMXBean(); - @BeforeClass + @BeforeAll public static void setUp() { logger.info("CPU time enabled by default: "+threadMxBean.isThreadCpuTimeEnabled()); if (!threadMxBean.isThreadCpuTimeEnabled()) { @@ -26,7 +26,7 @@ public class CPUTimeMeasurementTest { } } - @Ignore("Use this to find out whether there is a significant penalty for CPU metering; it seems there isn't...") + @Disabled("Use this to find out whether there is a significant penalty for CPU metering; it seems there isn't...") @Test public void measurePerformancePenalty() { final int AMOUNT_OF_WORK = 10_000_000; @@ -49,8 +49,8 @@ public class CPUTimeMeasurementTest { final long cpuTimeConsumedInMillis = cpuTimeConsumedInNanos / 1_000_000; final double factor = (double) Math.max(durationWithCpuTimeEnabledInMillis, cpuTimeConsumedInMillis) / (double) Math.min(durationWithCpuTimeEnabledInMillis, cpuTimeConsumedInMillis); logger.info("CPU time measured: "+cpuTimeConsumedInMillis+"ms; duration measured: "+durationWithCpuTimeEnabledInMillis+"ms; factor "+factor); - assertTrue("off by more than factor "+FACTOR_THRESHOLD+" ("+factor+"): cpuTimeConsumed="+cpuTimeConsumedInMillis+"; actual duration: "+durationWithCpuTimeEnabledInMillis, - (double) Math.max(durationWithCpuTimeEnabledInMillis, cpuTimeConsumedInMillis) / (double) Math.min(durationWithCpuTimeEnabledInMillis, cpuTimeConsumedInMillis) < FACTOR_THRESHOLD); + assertTrue((double) Math.max(durationWithCpuTimeEnabledInMillis, cpuTimeConsumedInMillis) / (double) Math.min(durationWithCpuTimeEnabledInMillis, cpuTimeConsumedInMillis) < FACTOR_THRESHOLD, + "off by more than factor "+FACTOR_THRESHOLD+" ("+factor+"): cpuTimeConsumed="+cpuTimeConsumedInMillis+"; actual duration: "+durationWithCpuTimeEnabledInMillis); } @Test @@ -92,8 +92,8 @@ public class CPUTimeMeasurementTest { // we assume that running each thread did take CPU time in the area of overall duration, with true parallelism final double factor = (double) Math.max(duration, averageCpuTimeMillis) / (double) Math.min(duration, averageCpuTimeMillis); logger.info("CPU time average: "+averageCpuTimeMillis+"ms; duration measured: "+duration+"ms; factor "+factor); - assertTrue("off by more than factor "+FACTOR_THRESHOLD+" ("+factor+"): cpuTimeConsumed="+averageCpuTimeMillis+"; actual duration: "+duration, - (double) Math.max(duration, averageCpuTimeMillis) / (double) Math.min(duration, averageCpuTimeMillis) < FACTOR_THRESHOLD); + assertTrue((double) Math.max(duration, averageCpuTimeMillis) / (double) Math.min(duration, averageCpuTimeMillis) < FACTOR_THRESHOLD, + "off by more than factor "+FACTOR_THRESHOLD+" ("+factor+"): cpuTimeConsumed="+averageCpuTimeMillis+"; actual duration: "+duration); } private long useSingleCPUOnCurrentThread(int howMuch) { diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/CSVParserTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/CSVParserTest.java index 2085974dc96..6c430da163f 100755 --- a/java/com.sap.sse.test/src/com/sap/sse/test/CSVParserTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/CSVParserTest.java @@ -1,7 +1,7 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.BufferedReader; import java.io.IOException; @@ -10,7 +10,7 @@ import java.io.StringReader; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/EnumMapSerializationTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/EnumMapSerializationTest.java index 912b64c3007..5ca3904116b 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/test/EnumMapSerializationTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/EnumMapSerializationTest.java @@ -1,11 +1,11 @@ package com.sap.sse.test; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; import java.io.IOException; import java.util.EnumMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.SortingOrder; diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/ForkJoinPoolTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/ForkJoinPoolTest.java index 366bc2976cc..cbbd67eef39 100755 --- a/java/com.sap.sse.test/src/com/sap/sse/test/ForkJoinPoolTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/ForkJoinPoolTest.java @@ -1,12 +1,12 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.ExecutionException; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.RecursiveTask; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the concept of a {@link ForkJoinPool} by producing a deep hierarchy of {@link RecursiveTask}s diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/GraphTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/GraphTest.java index 9643972148a..853733aa3e7 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/test/GraphTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/GraphTest.java @@ -1,7 +1,7 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -11,7 +11,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/ImageConverterTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/ImageConverterTest.java index 378d7c5fb38..7be0eaa2e36 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/test/ImageConverterTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/ImageConverterTest.java @@ -1,15 +1,15 @@ package com.sap.sse.test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.IOException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.util.ImageConverter; import com.sap.sse.util.ImageConverter.ImageWithMetadata; @@ -36,7 +36,7 @@ public class ImageConverterTest { /** * Setting up the testing environment */ - @Before + @BeforeEach public void setUp() { converter = new ImageConverter(); pngImage = converter.loadImage(new ByteArrayInputStream(onePixelPngExample), "png"); diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/JvmMemorySizeSpecTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/JvmMemorySizeSpecTest.java index 0cd8f0a1c62..481d8135a97 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/test/JvmMemorySizeSpecTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/JvmMemorySizeSpecTest.java @@ -1,8 +1,8 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.util.JvmUtils; diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/LockSerializationTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/LockSerializationTest.java index 9269c0cf836..fbeacff6589 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/test/LockSerializationTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/LockSerializationTest.java @@ -1,7 +1,7 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,8 +9,8 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.sap.sse.concurrent.LockUtil; import com.sap.sse.concurrent.NamedReentrantReadWriteLock; @@ -26,7 +26,7 @@ import com.sap.sse.concurrent.NamedReentrantReadWriteLock; public class LockSerializationTest { private NamedReentrantReadWriteLock lock; - @Before + @BeforeEach public void setUp() { lock = new NamedReentrantReadWriteLock("A", /* fair */ false); } diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/RegexTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/RegexTest.java index f025fc0340c..36c1694cea0 100755 --- a/java/com.sap.sse.test/src/com/sap/sse/test/RegexTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/RegexTest.java @@ -1,15 +1,15 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class RegexTest { private static final Logger logger = Logger.getLogger(RegexTest.class.getName()); diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/SubstringTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/SubstringTest.java index f935493a525..102646d711b 100755 --- a/java/com.sap.sse.test/src/com/sap/sse/test/SubstringTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/SubstringTest.java @@ -1,8 +1,8 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SubstringTest { @Test diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/TestIPAddressUtil.java b/java/com.sap.sse.test/src/com/sap/sse/test/TestIPAddressUtil.java index 8ba4dcb4787..9497060bf1c 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/test/TestIPAddressUtil.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/TestIPAddressUtil.java @@ -1,9 +1,9 @@ package com.sap.sse.test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.util.IPAddressUtil; diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/TestRepeatingTaskCancelsUponException.java b/java/com.sap.sse.test/src/com/sap/sse/test/TestRepeatingTaskCancelsUponException.java index c30245fafa8..e6d35e4f0be 100755 --- a/java/com.sap.sse.test/src/com/sap/sse/test/TestRepeatingTaskCancelsUponException.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/TestRepeatingTaskCancelsUponException.java @@ -1,10 +1,10 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.util.ThreadPoolUtil; 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 fcf6891e97b..8dc4738b247 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 @@ -1,6 +1,6 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -8,9 +8,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.Timeout; import com.sap.sse.util.impl.ThreadFactoryWithPriority; @@ -31,7 +31,7 @@ public class ThreadPoolWithExceptionsTest { private ThreadPoolExecutor executor; - @Before + @BeforeEach public void setUp() { executor = new ThreadPoolExecutor(/* corePoolSize */ THREAD_POOL_SIZE, /* maximumPoolSize */ THREAD_POOL_SIZE, diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/ThreadPriorityTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/ThreadPriorityTest.java index 7b2d2d35fc4..c5673356b92 100755 --- a/java/com.sap.sse.test/src/com/sap/sse/test/ThreadPriorityTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/ThreadPriorityTest.java @@ -2,7 +2,7 @@ package com.sap.sse.test; import java.util.logging.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.util.ThreadPoolUtil; diff --git a/java/com.sap.sse.test/src/com/sap/sse/test/TopologicalComparatorTest.java b/java/com.sap.sse.test/src/com/sap/sse/test/TopologicalComparatorTest.java index b3a7433f2d7..82c02aeaf1d 100755 --- a/java/com.sap.sse.test/src/com/sap/sse/test/TopologicalComparatorTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/test/TopologicalComparatorTest.java @@ -1,7 +1,7 @@ package com.sap.sse.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.HashSet; @@ -9,7 +9,7 @@ import java.util.Random; import java.util.Set; import java.util.stream.StreamSupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; @@ -58,8 +58,8 @@ public class TopologicalComparatorTest { public void testSimpleSortWithTrivialCycle() { addLessThan("A", "B"); addLessThan("B", "C"); addLessThan("C", "A"); createGraph(); - assertEquals("Cycle not detected properly", 1, Util.size(graph.getCycleClusters().getClusters())); - assertEquals("Cycle cluster not detected properly", 1, Util.size(graph.getCycleClusters().getClusters())); + assertEquals(1, Util.size(graph.getCycleClusters().getClusters()), "Cycle not detected properly"); + assertEquals(1, Util.size(graph.getCycleClusters().getClusters()), "Cycle cluster not detected properly"); TopologicalComparator comparator = new TopologicalComparator<>(graph); assertMutualEquality(comparator, "A", "B", "C"); } @@ -109,7 +109,7 @@ public class TopologicalComparatorTest { private void assertOnCycle(String... nodes) { for (final String node : nodes) { - assertTrue("Expected "+node+" on cycle but wasn't", StreamSupport.stream(graph.getCycleClusters().getClusters().spliterator(), /* parallel */ false).anyMatch(c->c.contains(node))); + assertTrue(StreamSupport.stream(graph.getCycleClusters().getClusters().spliterator(), /* parallel */ false).anyMatch(c->c.contains(node)), "Expected "+node+" on cycle but wasn't"); } } @@ -144,8 +144,8 @@ public class TopologicalComparatorTest { private void assertMutualEquality(TopologicalComparator comparator, String... strings) { for (int i=0; i comparator, String... strings) { for (int i=0; i germanGuessesForQuertz); + assertTrue(defaultGuessesForQuertz > germanGuessesForQuertz, + ""+defaultGuessesForQuertz+" is not greater than "+germanGuessesForQuertz+" but should have been"); } { final double defaultGuessesForQuertz = zxcvbn.measure(DE_PASSWD2).getGuesses(); final double germanGuessesForQuertz = zxcvbnWithGermanKeyboard.measure(DE_PASSWD2).getGuesses(); - assertTrue(""+defaultGuessesForQuertz+" is not greater than "+germanGuessesForQuertz+" but should have been", - defaultGuessesForQuertz > germanGuessesForQuertz); + assertTrue(defaultGuessesForQuertz > germanGuessesForQuertz, + ""+defaultGuessesForQuertz+" is not greater than "+germanGuessesForQuertz+" but should have been"); } } } \ No newline at end of file diff --git a/java/com.sap.sse.test/src/com/sap/sse/util/apachelog/ApacheLogAnalysisTest.java b/java/com.sap.sse.test/src/com/sap/sse/util/apachelog/ApacheLogAnalysisTest.java index ff93bc84fe8..f17dbf7185e 100644 --- a/java/com.sap.sse.test/src/com/sap/sse/util/apachelog/ApacheLogAnalysisTest.java +++ b/java/com.sap.sse.test/src/com/sap/sse/util/apachelog/ApacheLogAnalysisTest.java @@ -1,13 +1,13 @@ package com.sap.sse.util.apachelog; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.text.ParseException; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.TimeZone; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ApacheLogAnalysisTest { @Test diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/event/AbstractSentenceListenerTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/event/AbstractSentenceListenerTest.java index 68e562a0244..d95fb9e0e13 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/event/AbstractSentenceListenerTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/event/AbstractSentenceListenerTest.java @@ -1,16 +1,17 @@ package net.sf.marineapi.nmea.event; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import net.sf.marineapi.nmea.parser.BODTest; import net.sf.marineapi.nmea.parser.GGATest; import net.sf.marineapi.nmea.parser.SentenceFactory; import net.sf.marineapi.nmea.sentence.BODSentence; import net.sf.marineapi.nmea.sentence.Sentence; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class AbstractSentenceListenerTest { @@ -19,7 +20,7 @@ public class AbstractSentenceListenerTest { private SentenceFactory factory; - @Before + @BeforeEach public void setUp() throws Exception { result = null; listener = new TestListener(); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/io/SentenceReaderTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/io/SentenceReaderTest.java index 94a3b05a9f0..8b4044ce832 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/io/SentenceReaderTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/io/SentenceReaderTest.java @@ -1,11 +1,11 @@ package net.sf.marineapi.nmea.io; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.FileInputStream; @@ -19,9 +19,9 @@ import net.sf.marineapi.nmea.parser.SentenceFactory; import net.sf.marineapi.nmea.sentence.Sentence; import net.sf.marineapi.nmea.sentence.SentenceId; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class SentenceReaderTest { @@ -37,7 +37,7 @@ public class SentenceReaderTest { private boolean stopped; private InputStream stream; - @Before + @BeforeEach public void setUp() throws Exception { File file = new File(TEST_DATA); stream = new FileInputStream(file); @@ -76,7 +76,7 @@ public class SentenceReaderTest { } @Test - @Ignore + @Disabled public void testSetDatagramSocket() { // TODO mock socket } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/APBTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/APBTest.java index 127c822f55e..b542107af83 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/APBTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/APBTest.java @@ -1,15 +1,16 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.sentence.APBSentence; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.DataStatus; import net.sf.marineapi.nmea.util.Direction; -import org.junit.Before; -import org.junit.Test; +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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class APBTest { @@ -18,7 +19,7 @@ public class APBTest { private APBSentence apb; private APBSentence empty; - @Before + @BeforeEach public void setUp() throws Exception { apb = new APBParser(EXAMPLE); empty = new APBParser(TalkerId.AG); 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 2b24eab41d5..e61a6bd3d35 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 @@ -4,9 +4,9 @@ import junit.framework.TestCase; import net.sf.marineapi.nmea.sentence.BODSentence; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests the BOD sentence parser. @@ -24,7 +24,7 @@ public class BODTest extends TestCase { * setUp */ @Override - @Before + @BeforeEach public void setUp() throws Exception { try { empty = new BODParser(TalkerId.GP); @@ -38,7 +38,7 @@ public class BODTest extends TestCase { * tearDown */ @Override - @After + @AfterEach public void tearDown() throws Exception { } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ChecksumTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ChecksumTest.java index 272c574c891..fbf578e5be7 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ChecksumTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ChecksumTest.java @@ -20,10 +20,11 @@ */ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; import net.sf.marineapi.nmea.sentence.Checksum; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; /** * Tests the Checksum class. diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DBTTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DBTTest.java index 43e64211715..ac8983ef838 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DBTTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DBTTest.java @@ -1,11 +1,12 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; import net.sf.marineapi.nmea.sentence.DBTSentence; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DBTTest { @@ -13,7 +14,7 @@ public class DBTTest { private DBTSentence dbt; private DBTSentence empty; - @Before + @BeforeEach public void setUp() throws Exception { empty = new DBTParser(TalkerId.II); dbt = new DBTParser(EXAMPLE); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DPTTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DPTTest.java index 5c9ff04e8ce..5d1d09f6021 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DPTTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DPTTest.java @@ -1,11 +1,12 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; import net.sf.marineapi.nmea.sentence.DPTSentence; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DPTTest { @@ -13,7 +14,7 @@ public class DPTTest { DPTSentence empty; DPTSentence dpt; - @Before + @BeforeEach public void setUp() throws Exception { empty = new DPTParser(TalkerId.II); dpt = new DPTParser(EXAMPLE); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DTMTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DTMTest.java index e207d2cd1d4..0fd721b8d2e 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DTMTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/DTMTest.java @@ -1,12 +1,13 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.DTMSentence; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class DTMTest { @@ -15,7 +16,7 @@ public class DTMTest { private DTMSentence dtm; private DTMSentence empty; - @Before + @BeforeEach public void setUp() throws Exception { dtm = new DTMParser(EXAMPLE); empty = new DTMParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GGATest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GGATest.java index dfd8034ac1c..caa23ec0688 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GGATest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GGATest.java @@ -1,9 +1,5 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.CompassPoint; @@ -13,8 +9,13 @@ import net.sf.marineapi.nmea.util.Position; import net.sf.marineapi.nmea.util.Time; import net.sf.marineapi.nmea.util.Units; -import org.junit.Before; -import org.junit.Test; +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 static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test the GGA sentence parser. @@ -28,7 +29,7 @@ public class GGATest { private GGAParser gga; private GGAParser empty; - @Before + @BeforeEach public void setUp() { try { empty = new GGAParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GLLTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GLLTest.java index 122cf12c7cd..47d26ab713f 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GLLTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GLLTest.java @@ -1,17 +1,18 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.CompassPoint; import net.sf.marineapi.nmea.util.DataStatus; import net.sf.marineapi.nmea.util.Position; import net.sf.marineapi.nmea.util.Time; -import org.junit.Before; -import org.junit.Test; +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 static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests the GLL sentence parser. @@ -31,7 +32,7 @@ public class GLLTest { /** * setUp */ - @Before + @BeforeEach public void setUp() { try { empty = new GLLParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GNSTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GNSTest.java index 7931f0ba1a2..2c0fbdf1fde 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GNSTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GNSTest.java @@ -27,9 +27,11 @@ import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.CompassPoint; import net.sf.marineapi.nmea.util.Position; import net.sf.marineapi.nmea.util.Time; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * GNS parser tests @@ -43,7 +45,7 @@ public class GNSTest { GNSSentence gns; GNSSentence empty; - @Before + @BeforeEach public void setUp() throws Exception { gns = new GNSParser(EXAMPLE); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GSATest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GSATest.java index 734bb76bef0..9ea5ae7e9fe 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GSATest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GSATest.java @@ -1,15 +1,16 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.GSASentence; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.FaaMode; import net.sf.marineapi.nmea.util.GpsFixStatus; -import org.junit.Before; -import org.junit.Test; +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.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests the GSA sentence parser. @@ -24,7 +25,7 @@ public class GSATest { private GSASentence empty; private GSASentence instance; - @Before + @BeforeEach public void setUp() { try { empty = new GSAParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GSVTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GSVTest.java index 48782aea4a3..006b2441e46 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GSVTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/GSVTest.java @@ -1,9 +1,9 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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 java.util.ArrayList; import java.util.List; @@ -12,8 +12,8 @@ import net.sf.marineapi.nmea.sentence.GSVSentence; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.SatelliteInfo; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test the GSV sentence parser. @@ -28,7 +28,7 @@ public class GSVTest { private GSVSentence empty; private GSVSentence gsv; - @Before + @BeforeEach public void setUp() { try { empty = new GSVParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDGTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDGTest.java index 05e37e59773..af78161f331 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDGTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDGTest.java @@ -20,16 +20,17 @@ */ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.HDGSentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -43,7 +44,7 @@ public class HDGTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { hdg = new HDGParser(EXAMPLE); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDMTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDMTest.java index f6a90c3d3c3..77262a74718 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDMTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDMTest.java @@ -20,15 +20,16 @@ */ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.HDMSentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * HDM parser tests. @@ -44,7 +45,7 @@ public class HDMTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { hdm = new HDMParser(EXAMPLE); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDTTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDTTest.java index 905ea5c082a..4296d5dfe3c 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDTTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/HDTTest.java @@ -20,15 +20,16 @@ */ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.HDTSentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +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.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -41,7 +42,7 @@ public class HDTTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { hdt = new HDTParser(EXAMPLE); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MDATest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MDATest.java index ae113ccf63d..4cb374f0921 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MDATest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MDATest.java @@ -1,13 +1,14 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.sentence.MDASentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Richard van Nieuwenhoven @@ -25,7 +26,7 @@ public class MDATest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { mda = new MDAParser(EXAMPLE); mda2 = new MDAParser(EXAMPLE2); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MHUTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MHUTest.java index fbad5f2e519..7e815c81350 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MHUTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MHUTest.java @@ -23,10 +23,11 @@ package net.sf.marineapi.nmea.parser; import net.sf.marineapi.nmea.sentence.MHUSentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * MHU parser tests. @@ -40,7 +41,7 @@ public class MHUTest { private MHUSentence mhu; private MHUSentence empty; - @Before + @BeforeEach public void setUp() { mhu = new MHUParser(EXAMPLE); empty = new MHUParser(TalkerId.II); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MMBTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MMBTest.java index 40d8d36e2c3..00181547ccb 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MMBTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MMBTest.java @@ -3,10 +3,11 @@ package net.sf.marineapi.nmea.parser; import net.sf.marineapi.nmea.sentence.MMBSentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * MMBTest @@ -20,7 +21,7 @@ public class MMBTest { MMBSentence mmb; MMBSentence empty; - @Before + @BeforeEach public void setUp() throws Exception { mmb = new MMBParser(EXAMPLE); empty = new MMBParser(TalkerId.WI); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MTATest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MTATest.java index d23bccb19d0..4f4dc2a5cae 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MTATest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MTATest.java @@ -1,13 +1,14 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.sentence.MTASentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class MTATest { @@ -15,7 +16,7 @@ public class MTATest { private MTASentence mta; - @Before + @BeforeEach public void setUp() throws Exception { mta = new MTAParser(EXAMPLE); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MTWTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MTWTest.java index 5a2408a23c6..5441e66edc9 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MTWTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MTWTest.java @@ -1,11 +1,12 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; import net.sf.marineapi.nmea.sentence.MTWSentence; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * MTW parser tests. @@ -21,7 +22,7 @@ public class MTWTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { mtw = new MTWParser(EXAMPLE); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MWDTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MWDTest.java index cc563294542..cfb15f7754a 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MWDTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MWDTest.java @@ -1,13 +1,14 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.sentence.MWDSentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Richard van Nieuwenhoven @@ -21,7 +22,7 @@ public class MWDTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { mwd = new MWDParser(EXAMPLE); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MWVTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MWVTest.java index 5d8e283e7ee..9fcf98766ac 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MWVTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/MWVTest.java @@ -20,18 +20,19 @@ */ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.MWVSentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.DataStatus; import net.sf.marineapi.nmea.util.Units; -import org.junit.Before; -import org.junit.Test; +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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -45,7 +46,7 @@ public class MWVTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { mwv = new MWVParser(EXAMPLE); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/PositionParserTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/PositionParserTest.java index 7e0a31fd694..b36b7b174c2 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/PositionParserTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/PositionParserTest.java @@ -20,15 +20,16 @@ */ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.util.CompassPoint; import net.sf.marineapi.nmea.util.Position; -import org.junit.Before; -import org.junit.Test; +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.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Unit tests for PositionParser class. @@ -42,7 +43,7 @@ public class PositionParserTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { instance = new PositionParser(GLLTest.EXAMPLE, SentenceId.GLL) { }; diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RMBTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RMBTest.java index c965ddf5be2..d571ff0859a 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RMBTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RMBTest.java @@ -1,10 +1,5 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.RMBSentence; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.CompassPoint; @@ -12,8 +7,14 @@ import net.sf.marineapi.nmea.util.DataStatus; import net.sf.marineapi.nmea.util.Direction; import net.sf.marineapi.nmea.util.Waypoint; -import org.junit.Before; -import org.junit.Test; +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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests the RMB sentence parser. @@ -31,7 +32,7 @@ public class RMBTest { /** * setUp */ - @Before + @BeforeEach public void setUp() { try { empty = new RMBParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RMCTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RMCTest.java index c2681401e8a..6f6556b3654 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RMCTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RMCTest.java @@ -1,9 +1,5 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.CompassPoint; import net.sf.marineapi.nmea.util.DataStatus; @@ -12,8 +8,13 @@ import net.sf.marineapi.nmea.util.FaaMode; import net.sf.marineapi.nmea.util.Position; import net.sf.marineapi.nmea.util.Time; -import org.junit.Before; -import org.junit.Test; +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 static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests the RMC sentence parser. @@ -32,7 +33,7 @@ public class RMCTest { RMCParser rmc; RMCParser legacy; - @Before + @BeforeEach public void setUp() { try { empty = new RMCParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ROTTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ROTTest.java index 69ac43440eb..c137946a7fa 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ROTTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ROTTest.java @@ -1,14 +1,15 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.ROTSentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.DataStatus; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Created by SJK on 22/01/14. @@ -20,7 +21,7 @@ public class ROTTest { ROTSentence rot; ROTSentence irot; - @Before + @BeforeEach public void setUp() throws Exception { rot = new ROTParser(EXAMPLE); irot = new ROTParser(INVALID_EXAMPLE); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RPMTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RPMTest.java index ee35963907c..8f9c7c55b6c 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RPMTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RPMTest.java @@ -1,15 +1,16 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.RPMSentence; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.DataStatus; -import org.junit.Before; -import org.junit.Test; +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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class RPMTest { @@ -18,7 +19,7 @@ public class RPMTest { RPMSentence rpm; RPMSentence empty; - @Before + @BeforeEach public void setUp() throws Exception { rpm = new RPMParser(EXAMPLE); empty = new RPMParser(TalkerId.II); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RSATest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RSATest.java index 93a3259dcff..961c59d4eff 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RSATest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RSATest.java @@ -1,14 +1,15 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; import net.sf.marineapi.nmea.sentence.RSASentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.DataStatus; import net.sf.marineapi.nmea.util.Side; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class RSATest { @@ -17,7 +18,7 @@ public class RSATest { RSASentence empty; RSASentence instance; - @Before + @BeforeEach public void setUp() throws Exception { empty = new RSAParser(TalkerId.II); instance = new RSAParser(EXAMPLE); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RTETest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RTETest.java index a73f24acd07..167d2b97075 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RTETest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/RTETest.java @@ -1,10 +1,10 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.Arrays; @@ -12,8 +12,8 @@ import net.sf.marineapi.nmea.sentence.RTESentence; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.RouteType; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * RTETest @@ -28,7 +28,7 @@ public class RTETest { private RTESentence empty; private RTESentence rte; - @Before + @BeforeEach public void setUp() { try { empty = new RTEParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/SentenceFactoryTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/SentenceFactoryTest.java index dac369dfa42..995cd6b8af2 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/SentenceFactoryTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/SentenceFactoryTest.java @@ -1,10 +1,10 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.List; @@ -17,8 +17,8 @@ import net.sf.marineapi.test.util.FOOParser; import net.sf.marineapi.test.util.FOOSentence; import net.sf.marineapi.test.util.VDMParser; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -30,7 +30,7 @@ public class SentenceFactoryTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { instance.reset(); } @@ -44,7 +44,7 @@ public class SentenceFactoryTest { public void testSupportedTypesRegistered() { for (SentenceId id : SentenceId.values()) { String msg = "Parser not registered: " + id; - assertTrue(msg, instance.hasParser(id.toString())); + assertTrue(instance.hasParser(id.toString()), msg); } } 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 c71b1c9907d..5a41ae1d5ce 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 @@ -1,17 +1,18 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.Sentence; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.test.util.FOOParser; import net.sf.marineapi.test.util.FOOSentence; -import org.junit.Before; -import org.junit.Test; +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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests the sentence parser base class. @@ -28,7 +29,7 @@ public class SentenceParserTest { /** * setUp */ - @Before + @BeforeEach public void setUp() { instance = new SentenceParser(RMCTest.EXAMPLE); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/TTMTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/TTMTest.java index dc54f065f03..e4877ff7496 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/TTMTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/TTMTest.java @@ -1,16 +1,17 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.AcquisitionType; import net.sf.marineapi.nmea.util.TargetStatus; import net.sf.marineapi.nmea.util.Time; -import org.junit.Before; -import org.junit.Test; +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 static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests the RMC sentence parser. @@ -25,7 +26,7 @@ public class TTMTest { TTMParser empty; TTMParser ttm; - @Before + @BeforeEach public void setUp() { try { empty = new TTMParser(TalkerId.RA); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VBWTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VBWTest.java index c55fcc407c3..f240ab45802 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VBWTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VBWTest.java @@ -1,14 +1,15 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.sentence.VBWSentence; import net.sf.marineapi.nmea.util.DataStatus; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class VBWTest { @@ -17,7 +18,7 @@ public class VBWTest { private VBWSentence vbw; private VBWSentence empty; - @Before + @BeforeEach public void setUp() throws Exception { vbw = new VBWParser(EXAMPLE); empty = new VBWParser(TalkerId.II); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDMTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDMTest.java index 93cf604cc43..21c1a7e07f6 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDMTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDMTest.java @@ -1,13 +1,14 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.sentence.AISSentence; -import org.junit.Before; -import org.junit.Test; +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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -25,7 +26,7 @@ public class VDMTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { vdm = new VDMParser(EXAMPLE); frag1 = new VDMParser(PART1); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDOTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDOTest.java index 669066c1cde..1d622cabb10 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDOTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDOTest.java @@ -22,12 +22,13 @@ package net.sf.marineapi.nmea.parser; import net.sf.marineapi.nmea.sentence.AISSentence; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +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 org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * VDOTest @@ -47,7 +48,7 @@ public class VDOTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { vdo = new VDOParser(EXAMPLE); frag1 = new VDOParser(PART1); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDRTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDRTest.java index e1165a54a36..b92afddd264 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDRTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VDRTest.java @@ -1,13 +1,14 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.sentence.VDRSentence; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class VDRTest { @@ -16,7 +17,7 @@ public class VDRTest { private VDRSentence vdr; private VDRSentence empty; - @Before + @BeforeEach public void setUp() throws Exception { vdr = new VDRParser(EXAMPLE); empty = new VDRParser(TalkerId.IN); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VHWTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VHWTest.java index 02aea766bff..1b0b0b8e7ad 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VHWTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VHWTest.java @@ -20,13 +20,14 @@ */ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -40,7 +41,7 @@ public class VHWTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { vhw = new VHWParser(EXAMPLE); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VLWTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VLWTest.java index 407e9fc22bf..cecdf2bc004 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VLWTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VLWTest.java @@ -1,11 +1,12 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.sentence.VLWSentence; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class VLWTest { @@ -14,7 +15,7 @@ public class VLWTest { VLWSentence vlw; VLWSentence empty; - @Before + @BeforeEach public void setUp() throws Exception { vlw = new VLWParser(EXAMPLE); empty = new VLWParser(TalkerId.VD); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VTGTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VTGTest.java index 7c9aa91d8a4..f5c7fd75812 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VTGTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/VTGTest.java @@ -1,14 +1,15 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.sentence.VTGSentence; import net.sf.marineapi.nmea.util.FaaMode; -import org.junit.Before; -import org.junit.Test; +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.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests the VTG sentence parser. @@ -23,7 +24,7 @@ public class VTGTest { private VTGSentence empty; private VTGSentence vtg; - @Before + @BeforeEach public void setUp() { try { empty = new VTGParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/WPLTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/WPLTest.java index 4150e4890ec..ac53976f657 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/WPLTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/WPLTest.java @@ -1,16 +1,17 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.sentence.WPLSentence; import net.sf.marineapi.nmea.util.CompassPoint; import net.sf.marineapi.nmea.util.Waypoint; -import org.junit.Before; -import org.junit.Test; +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 static org.junit.jupiter.api.Assertions.fail; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * WPLTest @@ -25,7 +26,7 @@ public class WPLTest { private WPLSentence empty; private WPLSentence wpl; - @Before + @BeforeEach public void setUp() { try { empty = new WPLParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/XDRTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/XDRTest.java index 0dc0e3fa520..d79dca40da6 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/XDRTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/XDRTest.java @@ -1,17 +1,17 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Test; + import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.Measurement; -import org.junit.Test; - /** * @author Kimmo Tuukkanen */ diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/XTETest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/XTETest.java index 062b5a7749f..38deba14597 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/XTETest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/XTETest.java @@ -1,7 +1,5 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.sentence.SentenceId; import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.sentence.XTESentence; @@ -9,8 +7,11 @@ import net.sf.marineapi.nmea.util.DataStatus; import net.sf.marineapi.nmea.util.Direction; import net.sf.marineapi.nmea.util.FaaMode; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class XTETest { @@ -19,7 +20,7 @@ public class XTETest { private XTESentence empty; private XTESentence instance; - @Before + @BeforeEach public void setUp() throws Exception { instance = new XTEParser(EXAMPLE); empty = new XTEParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ZDATest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ZDATest.java index 7767aba932d..0ad87c95531 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ZDATest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/parser/ZDATest.java @@ -1,9 +1,9 @@ package net.sf.marineapi.nmea.parser; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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 static org.junit.jupiter.api.Assertions.fail; import java.util.Calendar; import java.util.GregorianCalendar; @@ -12,8 +12,8 @@ import net.sf.marineapi.nmea.sentence.TalkerId; import net.sf.marineapi.nmea.util.Date; import net.sf.marineapi.nmea.util.Time; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests the ZDA sentence parser. @@ -28,7 +28,7 @@ public class ZDATest { private ZDAParser empty; private ZDAParser zda; - @Before + @BeforeEach public void setUp() { try { empty = new ZDAParser(TalkerId.GP); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/SentenceIdTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/SentenceIdTest.java index 340692bc77d..93d7b2bd7db 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/SentenceIdTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/SentenceIdTest.java @@ -20,10 +20,10 @@ */ package net.sf.marineapi.nmea.sentence; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/SentenceValidatorTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/SentenceValidatorTest.java index 09b40510a89..a89a911c0e1 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/SentenceValidatorTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/SentenceValidatorTest.java @@ -20,8 +20,6 @@ */ package net.sf.marineapi.nmea.sentence; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import net.sf.marineapi.nmea.parser.BODTest; import net.sf.marineapi.nmea.parser.GGATest; import net.sf.marineapi.nmea.parser.GLLTest; @@ -34,7 +32,10 @@ import net.sf.marineapi.nmea.parser.VTGTest; import net.sf.marineapi.nmea.parser.WPLTest; import net.sf.marineapi.nmea.parser.ZDATest; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/TalkerIdTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/TalkerIdTest.java index 4efcd621a04..940745a0f97 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/TalkerIdTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/sentence/TalkerIdTest.java @@ -1,30 +1,10 @@ package net.sf.marineapi.nmea.sentence; -/* - * TalkerIdTest.java - * Copyright (C) 2011 Kimmo Tuukkanen - * - * This file is part of Java Marine API. - * - * - * Java Marine API is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * Java Marine API is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Java Marine API. If not, see . - */ -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -34,7 +14,7 @@ public class TalkerIdTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/DateTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/DateTest.java index 7ae88768a3a..0e62cbfd2d8 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/DateTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/DateTest.java @@ -20,16 +20,16 @@ */ package net.sf.marineapi.nmea.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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 java.util.Calendar; import java.util.GregorianCalendar; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -43,7 +43,7 @@ public class DateTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { instance = new Date(); cal = new GregorianCalendar(); diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/PositionTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/PositionTest.java index 38a77a5d1c2..7bce31f563a 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/PositionTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/PositionTest.java @@ -1,10 +1,10 @@ package net.sf.marineapi.nmea.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class PositionTest { @@ -13,7 +13,7 @@ public class PositionTest { /** * Setup */ - @Before + @BeforeEach public void setUp() { instance = new Position(60.0, 25.0, Datum.WGS84); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/TimeTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/TimeTest.java index 59e2bee9ac3..7c99159a93b 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/TimeTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/TimeTest.java @@ -20,17 +20,17 @@ */ package net.sf.marineapi.nmea.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +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 java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -42,7 +42,7 @@ public class TimeTest { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { time = new Time(1, 2, 3.4, 0, 0); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/WaypointTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/WaypointTest.java index a006c09501f..013a65b13be 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/WaypointTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/nmea/util/WaypointTest.java @@ -20,10 +20,10 @@ */ package net.sf.marineapi.nmea.util; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * WaypointTest @@ -37,7 +37,7 @@ public class WaypointTest { private final String desc = "Description text"; Waypoint point; - @Before + @BeforeEach public void setUp() { point = new Waypoint(id1, 60.0, 25.0, Datum.WGS84); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/provider/HeadingProviderTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/provider/HeadingProviderTest.java index 14b4b1792b9..dd02a1fd669 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/provider/HeadingProviderTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/provider/HeadingProviderTest.java @@ -1,10 +1,10 @@ package net.sf.marineapi.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.assertTrue; import java.io.File; import java.io.FileInputStream; @@ -19,9 +19,9 @@ import net.sf.marineapi.nmea.sentence.Sentence; import net.sf.marineapi.provider.event.HeadingEvent; import net.sf.marineapi.provider.event.HeadingListener; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -37,7 +37,7 @@ public class HeadingProviderTest implements HeadingListener { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { factory = SentenceFactory.getInstance(); File file = new File("resources/data/sample1.txt"); @@ -48,7 +48,7 @@ public class HeadingProviderTest implements HeadingListener { event = null; } - @After + @AfterEach public void tearDown() { instance.removeListener(this); } diff --git a/java/net.sf.marineapi.test/src/net/sf/marineapi/provider/PositionProviderTest.java b/java/net.sf.marineapi.test/src/net/sf/marineapi/provider/PositionProviderTest.java index d043f3ada1f..9a64d0dfd3a 100755 --- a/java/net.sf.marineapi.test/src/net/sf/marineapi/provider/PositionProviderTest.java +++ b/java/net.sf.marineapi.test/src/net/sf/marineapi/provider/PositionProviderTest.java @@ -20,8 +20,8 @@ */ package net.sf.marineapi.provider; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.File; import java.io.FileInputStream; @@ -36,9 +36,9 @@ import net.sf.marineapi.nmea.sentence.Sentence; import net.sf.marineapi.provider.event.PositionEvent; import net.sf.marineapi.provider.event.PositionListener; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Kimmo Tuukkanen @@ -51,7 +51,7 @@ public class PositionProviderTest implements PositionListener { /** * @throws java.lang.Exception */ - @Before + @BeforeEach public void setUp() throws Exception { File f = new File("resources/data/Navibe-GM720.txt"); FileInputStream str = new FileInputStream(f); @@ -63,7 +63,7 @@ public class PositionProviderTest implements PositionListener { /** * @throws java.lang.Exception */ - @After + @AfterEach public void tearDown() throws Exception { instance.removeListener(this); }