Moved mock.model and mock.dataInput tests into the racevisionGame.tests.mock package.

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.*;
 
 /**

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.

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.
  */

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;
 

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.

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.
  */

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.

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.*;