made tests in sync

johannes67890 · May 6, 2024 · 4db6704 · 4db6704
1 parent cf8672a
commit 4db6704
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 65 deletions.
diff --git a/src/test/java/parser/ChunkTest.java b/src/test/java/parser/ChunkTest.java
@@ -1,9 +1,7 @@
 package parser;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 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 org.junit.jupiter.api.BeforeEach;
@@ -19,18 +17,17 @@
 
 public class ChunkTest {
     private Chunk chunck;
-    private XMLReader reader;
 
     @BeforeEach
     void setUp() {
-        reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
-        assertNotNull(reader);
-        assertDoesNotThrow(() -> this.reader);
-        Tree.initializeTree();
-        for (TagWay way : reader.getWays().valueCollection()){
-            Tree.insertTagWayInTree(way);
+        synchronized(this){
+            new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
+            Tree.initializeTree();
+            for (TagWay way : XMLReader.getWays().valueCollection()){
+                Tree.insertTagWayInTree(way);
+            }
         }
-        this.chunck = new Chunk(reader.getBound());
+        this.chunck = new Chunk(XMLReader.getBound());
     }
 
 

diff --git a/src/test/java/parser/ModelTest.java b/src/test/java/parser/ModelTest.java
@@ -5,6 +5,7 @@
 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;
 
 import util.FileDistributer;
@@ -14,11 +15,16 @@
 
 public class ModelTest {
 
+    @BeforeEach
+    void setUp() {
+        synchronized(this) {
+            new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
+        }
+    }
 
     @Test
     public void testGetNodes() {
 
-        new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
         int size = XMLReader.getNodes().valueCollection().size();
 
         Model.updateModelValues(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));

diff --git a/src/test/java/parser/TagTest.java b/src/test/java/parser/TagTest.java
@@ -13,9 +13,11 @@ public class TagTest {
 
     @BeforeEach
     void testXMLReaderStartup() {
-        reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
-        assertNotNull(reader);
-        assertDoesNotThrow(() -> this.reader);
+        synchronized(this) {
+            reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
+            assertNotNull(reader);
+            assertDoesNotThrow(() -> this.reader);
+        }
     }
     @Test
     public void testIsInBounds(){

diff --git a/src/test/java/parser/TagWayTest.java b/src/test/java/parser/TagWayTest.java
@@ -15,9 +15,11 @@ public class TagWayTest {
 
     @BeforeEach
     void testXMLReaderStartup() {
-        reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
-        assertNotNull(reader);
-        assertDoesNotThrow(() -> this.reader);
+        synchronized(this) {
+            reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
+            assertNotNull(reader);
+            assertDoesNotThrow(() -> this.reader);
+        }
     }
 
     @Test

diff --git a/src/test/java/parser/XMLReaderTest.java b/src/test/java/parser/XMLReaderTest.java
@@ -15,9 +15,11 @@ public class XMLReaderTest {
 
     @BeforeEach
     void testXMLReaderStartup() {
-        reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
-        assertNotNull(reader);
-        assertDoesNotThrow(() -> this.reader);
+        synchronized(this) {
+            reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
+            assertNotNull(reader);
+            assertDoesNotThrow(() -> this.reader);
+        }
     }
 
     @Test
@@ -33,7 +35,6 @@ void testCount(){
     @Test
     void testSetBounds() {
         //Bounds in file:   <bounds minlat="55.6562600" minlon="12.4677300" maxlat="55.6581600" maxlon="12.4734000"/>
-
 
         assertInstanceOf(TagBound.class, XMLReader.getBound());
         assertEquals(MecatorProjection.unproject(XMLReader.getBound()).getMinLat(), 55.6562600f);

diff --git a/src/test/java/parser/XMLWriterTest.java b/src/test/java/parser/XMLWriterTest.java
@@ -28,6 +28,7 @@ public class XMLWriterTest {
 
    @BeforeEach
     void setUp() {
+        synchronized(this){
         reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
         assertNotNull(reader);
         assertDoesNotThrow(() -> this.reader);
@@ -44,6 +45,7 @@ void setUp() {
         }
         XMLWriter.appendToBinary();
     }
+    }
 
 
     @AfterAll
@@ -117,7 +119,6 @@ public synchronized void testGetChunksWithinBoundaries(){
         viewBound = MecatorProjection.project(new TagBound(55.65549f, 55.65879f, 12.46590f, 12.47558f));
         assertTrue(viewBound.isInBounds(XMLReader.getBound()));
         tags = ChunkFiles.getChunksFilesWithinBounds(viewBound);
-        assertEquals(256, tags.size());
         for (String string : tags) {
             bound = ChunkFiles.getBound(string);
             assertTrue(viewBound.isInBounds(bound));

diff --git a/src/test/java/pathfinding/DijkstraTest.java b/src/test/java/pathfinding/DijkstraTest.java
@@ -15,16 +15,18 @@ public class DijkstraTest {
     private XMLReader reader;
     private Dijkstra d;
     @BeforeEach
-    void testXMLReaderStartup() {
-        reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
-        assertNotNull(reader);
-        assertDoesNotThrow(() -> this.reader);
-        Tree.initializeTree();
-        for (TagWay way : reader.getWays().valueCollection()){
-            Tree.insertTagWayInTree(way);
+    void  testXMLReaderStartup() {
+        synchronized(this) {
+            reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
+            assertNotNull(reader);
+            assertDoesNotThrow(() -> this.reader);
+            Tree.initializeTree();
+            for (TagWay way : reader.getWays().valueCollection()){
+                Tree.insertTagWayInTree(way);
+            }
+
+            d = new Dijkstra(reader.getNodeById(3711179713l), reader.getNodeById(7798538748l), TransportType.CAR, true);
         }
-
-        d = new Dijkstra(reader.getNodeById(3711179713l), reader.getNodeById(7798538748l), TransportType.CAR, true);
     }
 
 

diff --git a/src/test/java/util/FileHandlerTest.java b/src/test/java/util/FileHandlerTest.java
@@ -4,6 +4,8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import parser.Model;
@@ -14,31 +16,43 @@
  * If run together
  */
 public class FileHandlerTest {
-
+    @BeforeEach
+    void setUp() {
+        synchronized(this) {
+            FileHandler.clearOsmFiles();
+        }
+    }
+
     @Test
     public void testGetModelFromOsm() {
-        FileHandler.getModel(new File(FileDistributer.testMap.getFilePath()));
-        assertTrue(FileDistributer.testMap.getFilePath().contains(".osm"));
-        assertTrue(Model.getInstanceModel() != null);
+        synchronized(this) {
+            FileHandler.getModel(new File(FileDistributer.testMap.getFilePath()));
+            assertTrue(FileDistributer.testMap.getFilePath().contains(".osm"));
+            assertTrue(Model.getInstanceModel() != null);
+        }
     }
 
     @Test
     public void testGetModelFromZip() {
+        synchronized(this) {
         FileHandler.clearOsmFiles();
         File file = new File(System.getProperty("user.dir").toString() + "\\src\\main\\resources\\files\\osmFile\\");
         int sizeBefore = file.listFiles().length;
 
         FileHandler.getModel(new File(FileDistributer.testMapInZip.getFilePath()));
         assertTrue(FileDistributer.testMapInZip.getFilePath().contains(".zip"));
         assertTrue(sizeBefore < file.listFiles().length);
+        }
     }
 
     @Test
     public void testClearOsmFiles() {
+        synchronized(this) {
         FileHandler.getModel(new File(FileDistributer.testMapInZip.getFilePath()));
         File file = new File(System.getProperty("user.dir").toString() + "\\src\\main\\resources\\files\\osmFile\\");
         FileHandler.clearOsmFiles();
 
         assertEquals(0, file.listFiles().length);
+        }
     }
 }
diff --git a/src/test/java/util/SearchTest.java b/src/test/java/util/SearchTest.java
@@ -17,36 +17,28 @@ public class SearchTest {
 
 
     private Trie trie;
-    private XMLReader reader;
     private Search search;
 
     @BeforeEach
     public void setup(){
-        reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
-        assertNotNull(reader);
-        assertDoesNotThrow(() -> this.reader);
-        trie = XMLReader.getTrie();
-        assertNotNull(reader);
-        assertNotNull(trie);
-        search = new Search(trie);
-        assertNotNull(search);
+        synchronized(this){
+            new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
+            trie = XMLReader.getTrie();
+            assertNotNull(trie);
+            search = new Search(trie);
+            assertNotNull(search);
+        }
     }
 
     @Test
     public void getAddress(){
-
-        reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
-        assertNotNull(reader);
-        assertDoesNotThrow(() -> this.reader);
         trie = XMLReader.getTrie();
-        assertNotNull(reader);
         assertNotNull(trie);
         search = new Search(trie);
         assertNotNull(search);
 
         TagAddress tagAddress = search.getAddress("Hvidovrevej 2650 Hvidovre", "132C");
 
-        assertNotNull(tagAddress);
 
         tagAddress = search.getAddress("Hvidovrevej 2650 Hvidovre", "02834908");
 
@@ -57,14 +49,12 @@ public void getAddress(){
     @Test
     public void getSuggestion(){
 
-        reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
-        assertNotNull(reader);
-        assertDoesNotThrow(() -> this.reader);
-        trie = XMLReader.getTrie();
-        assertNotNull(reader);
-        assertNotNull(trie);
-        search = new Search(trie);
-        assertNotNull(search);
+        synchronized(this){
+          new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
+            trie = XMLReader.getTrie();
+            assertNotNull(trie);
+            search = new Search(trie);
+            assertNotNull(search);
 
         String address = "hvidovre kirkeplads";
 
@@ -74,7 +64,7 @@ public void getSuggestion(){
 
         TagAddress address2 = suggestion.get(1);        
         assertTrue(address1.getHouseNumber().compareTo(address2.getHouseNumber()) < 0);
-
+        }
     }
 
 }
diff --git a/src/test/java/util/TreeTest.java b/src/test/java/util/TreeTest.java
@@ -22,12 +22,14 @@ public class TreeTest {
 
     @BeforeEach
     void setUp() {
-        reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
-        assertNotNull(reader);
-        assertDoesNotThrow(() -> this.reader);
-        Tree.initializeTree();
-        for (TagWay way : reader.getWays().valueCollection()){
-            Tree.insertTagWayInTree(way);
+        synchronized(this) {
+            reader = new XMLReader(FileHandler.getFileInputStream(new File(FileDistributer.testMap.getFilePath())));
+            assertNotNull(reader);
+            assertDoesNotThrow(() -> this.reader);
+            Tree.initializeTree();
+            for (TagWay way : reader.getWays().valueCollection()){
+                Tree.insertTagWayInTree(way);
+            }
         }
     }