diff --git a/mock/src/test_old/java/seng302/DataInput/BoatXMLReaderTest.java b/racevisionGame/src/test/java/mock/dataInput/BoatXMLReaderTest.java similarity index 95% rename from mock/src/test_old/java/seng302/DataInput/BoatXMLReaderTest.java rename to racevisionGame/src/test/java/mock/dataInput/BoatXMLReaderTest.java index 89afea62..d5634684 100644 --- a/mock/src/test_old/java/seng302/DataInput/BoatXMLReaderTest.java +++ b/racevisionGame/src/test/java/mock/dataInput/BoatXMLReaderTest.java @@ -1,4 +1,4 @@ -package seng302.DataInput; +package mock.dataInput; import org.junit.Before; import org.junit.Test; @@ -11,8 +11,6 @@ import javax.xml.parsers.ParserConfigurationException; import java.io.IOException; import java.util.ArrayList; import java.util.List; - -import static org.junit.Assert.assertEquals; //import static org.testng.Assert.*; /** diff --git a/mock/src/test_old/java/seng302/DataInput/PolarParserTest.java b/racevisionGame/src/test/java/mock/dataInput/PolarParserTest.java similarity index 90% rename from mock/src/test_old/java/seng302/DataInput/PolarParserTest.java rename to racevisionGame/src/test/java/mock/dataInput/PolarParserTest.java index b10adece..c5c49d0c 100644 --- a/mock/src/test_old/java/seng302/DataInput/PolarParserTest.java +++ b/racevisionGame/src/test/java/mock/dataInput/PolarParserTest.java @@ -1,11 +1,11 @@ -package seng302.DataInput; +package mock.dataInput; import org.testng.annotations.Test; import seng302.Exceptions.InvalidPolarFileException; import seng302.Model.Polars; -import static org.testng.Assert.*; +import static org.testng.Assert.assertTrue; /** * Created by f123 on 10-May-17. diff --git a/mock/src/test_old/java/seng302/Model/BoatTest.java b/racevisionGame/src/test/java/mock/model/BoatTest.java similarity index 98% rename from mock/src/test_old/java/seng302/Model/BoatTest.java rename to racevisionGame/src/test/java/mock/model/BoatTest.java index 10c898c9..3f021f69 100644 --- a/mock/src/test_old/java/seng302/Model/BoatTest.java +++ b/racevisionGame/src/test/java/mock/model/BoatTest.java @@ -1,11 +1,9 @@ -package seng302.Model; +package mock.model; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; - /** * Created by esa46 on 22/03/17. */ diff --git a/mock/src/test_old/java/seng302/Model/CompoundMarkTest.java b/racevisionGame/src/test/java/mock/model/CompoundMarkTest.java similarity index 96% rename from mock/src/test_old/java/seng302/Model/CompoundMarkTest.java rename to racevisionGame/src/test/java/mock/model/CompoundMarkTest.java index 72b2a9c0..95f193aa 100644 --- a/mock/src/test_old/java/seng302/Model/CompoundMarkTest.java +++ b/racevisionGame/src/test/java/mock/model/CompoundMarkTest.java @@ -1,9 +1,8 @@ -package seng302.Model; +package mock.model; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; //import static org.testng.AssertJUnit.assertEquals; diff --git a/mock/src/test_old/java/seng302/Model/GPSCoordinateTest.java b/racevisionGame/src/test/java/mock/model/GPSCoordinateTest.java similarity index 99% rename from mock/src/test_old/java/seng302/Model/GPSCoordinateTest.java rename to racevisionGame/src/test/java/mock/model/GPSCoordinateTest.java index 9f789069..c67f97a8 100644 --- a/mock/src/test_old/java/seng302/Model/GPSCoordinateTest.java +++ b/racevisionGame/src/test/java/mock/model/GPSCoordinateTest.java @@ -1,4 +1,4 @@ -package seng302.Model; +package mock.model; import org.junit.Before; import org.junit.Test; @@ -6,8 +6,8 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.assertFalse; +import static junit.framework.TestCase.assertTrue; /** * Created by jjg64 on 11/05/17. diff --git a/mock/src/test_old/java/seng302/Model/LegTest.java b/racevisionGame/src/test/java/mock/model/LegTest.java similarity index 97% rename from mock/src/test_old/java/seng302/Model/LegTest.java rename to racevisionGame/src/test/java/mock/model/LegTest.java index cb8d70d4..a4871cab 100644 --- a/mock/src/test_old/java/seng302/Model/LegTest.java +++ b/racevisionGame/src/test/java/mock/model/LegTest.java @@ -1,14 +1,11 @@ -package seng302.Model; +package mock.model; import org.geotools.referencing.GeodeticCalculator; import org.junit.Test; import seng302.Constants; - import java.awt.geom.Point2D; -import static junit.framework.TestCase.assertEquals; - /** * Created by esa46 on 22/03/17. */ diff --git a/mock/src/test_old/java/seng302/Model/PolarsTest.java b/racevisionGame/src/test/java/mock/model/PolarsTest.java similarity index 98% rename from mock/src/test_old/java/seng302/Model/PolarsTest.java rename to racevisionGame/src/test/java/mock/model/PolarsTest.java index f7835662..493d921d 100644 --- a/mock/src/test_old/java/seng302/Model/PolarsTest.java +++ b/racevisionGame/src/test/java/mock/model/PolarsTest.java @@ -1,11 +1,12 @@ -package seng302.Model; +package mock.model; import org.junit.Before; import org.junit.Test; import seng302.DataInput.PolarParser; import seng302.Exceptions.InvalidPolarFileException; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; /** * Created by f123 on 10-May-17. diff --git a/mock/src/test_old/java/seng302/Model/RaceTest.java b/racevisionGame/src/test/java/mock/model/RaceTest.java similarity index 99% rename from mock/src/test_old/java/seng302/Model/RaceTest.java rename to racevisionGame/src/test/java/mock/model/RaceTest.java index 3151c2ea..68f268c3 100644 --- a/mock/src/test_old/java/seng302/Model/RaceTest.java +++ b/racevisionGame/src/test/java/mock/model/RaceTest.java @@ -1,4 +1,4 @@ -package seng302.Model; +package mock.model; import org.junit.Before; @@ -18,7 +18,6 @@ import java.io.IOException; import java.text.ParseException; import java.util.ArrayList; - import static org.junit.Assert.*; import static org.mockito.Mockito.*; diff --git a/mock/src/test_old/resources/mockXML/boatTest.xml b/racevisionGame/src/test/resources/mock/mockXML/boatTest.xml similarity index 100% rename from mock/src/test_old/resources/mockXML/boatTest.xml rename to racevisionGame/src/test/resources/mock/mockXML/boatTest.xml diff --git a/mock/src/test_old/resources/mockXML/raceTest.xml b/racevisionGame/src/test/resources/mock/mockXML/raceTest.xml similarity index 100% rename from mock/src/test_old/resources/mockXML/raceTest.xml rename to racevisionGame/src/test/resources/mock/mockXML/raceTest.xml diff --git a/mock/src/test_old/resources/mockXML/regattaTest.xml b/racevisionGame/src/test/resources/mock/mockXML/regattaTest.xml similarity index 100% rename from mock/src/test_old/resources/mockXML/regattaTest.xml rename to racevisionGame/src/test/resources/mock/mockXML/regattaTest.xml diff --git a/mock/src/test_old/resources/polars/acc_polars.csv b/racevisionGame/src/test/resources/mock/polars/acc_polars.csv similarity index 100% rename from mock/src/test_old/resources/polars/acc_polars.csv rename to racevisionGame/src/test/resources/mock/polars/acc_polars.csv diff --git a/mock/src/test_old/resources/raceXML/Boats.xml b/racevisionGame/src/test/resources/mock/raceXML/Boats.xml similarity index 100% rename from mock/src/test_old/resources/raceXML/Boats.xml rename to racevisionGame/src/test/resources/mock/raceXML/Boats.xml diff --git a/mock/src/test_old/resources/raceXML/Race.xml b/racevisionGame/src/test/resources/mock/raceXML/Race.xml similarity index 100% rename from mock/src/test_old/resources/raceXML/Race.xml rename to racevisionGame/src/test/resources/mock/raceXML/Race.xml diff --git a/mock/src/test_old/resources/raceXML/Regatta.xml b/racevisionGame/src/test/resources/mock/raceXML/Regatta.xml similarity index 100% rename from mock/src/test_old/resources/raceXML/Regatta.xml rename to racevisionGame/src/test/resources/mock/raceXML/Regatta.xml diff --git a/mock/src/test_old/resources/raceXML/bermuda_AC35.xml b/racevisionGame/src/test/resources/mock/raceXML/bermuda_AC35.xml similarity index 100% rename from mock/src/test_old/resources/raceXML/bermuda_AC35.xml rename to racevisionGame/src/test/resources/mock/raceXML/bermuda_AC35.xml