be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithmTest.java

@@ -21,19 +21,18 @@ import org.junit.Test;
 public class DijkstraAlgorithmTest {
 
     // TODO finish this
-    public static GraphReader reader;
+    public GraphReader reader;
-    public static Graph graph;
+    public Graph graph;
-    public static PathReader pathReader;
+    public PathReader pathReader;
-    public static Path path;
+    public Path path;
 
 
     @BeforeClass
-    public static void init() {
+    public void init() {
         // Visit these directory to see the list of available files on Commetud.
         // When running with VSC, paths are relative to the BE_Graphes directory.
-        final String mapName = "../Maps/insa.mapgr";
+        final String mapName = "./Maps/insa.mapgr";
-
+        final String pathName = "./Paths/path_fr31insa_rangueil_r2.path";
-        final String pathName = "../Paths/path_fr31insa_rangueil_r2.path";
         System.out.println("Working Directory = " + System.getProperty("user.dir"));
         // Create a graph reader.
         try {
@@ -41,7 +40,7 @@ public class DijkstraAlgorithmTest {
                     new DataInputStream(new BufferedInputStream(new FileInputStream(mapName))));
 
             // Read the graph. X
-            graph = reader.read();
+            this.graph = reader.read();
             // free resources
             reader.close();
 
@@ -51,7 +50,7 @@ public class DijkstraAlgorithmTest {
             pathReader.close();
 
             // Read the path.
-            path = pathReader.readPath(graph);
+            this.path = pathReader.readPath(graph);
         }
         catch (FileNotFoundException e) {
             System.err.println("File not found: " + e.getMessage());
@@ -69,6 +68,7 @@ public class DijkstraAlgorithmTest {
     // appeler constructeur dijkstra
     // donner le path à afficher en renvoyant le path de dijkstra dans path.
     // Chemin court => Bellman OK et vérifié. On compare les résultats obtenus par les 2 algos
+    public void Test_Toulouse_court_chemin() {
         ArcInspector arcInspector;
         ShortestPathData data = new ShortestPathData(this.graph, this.path.getOrigin(), this.path.getDestination(), null);
         
@@ -78,11 +78,10 @@ public class DijkstraAlgorithmTest {
         BellmanFordAlgorithm bellman = new BellmanFordAlgorithm(data);
         ShortestPathSolution bell_path = bellman.doRun();
         assert(dijk_path.getPath() == bell_path.getPath());
-    public void testToulouseCourtChemin() {
     }
 
     // Long chemin => Bellman trop long, on compare dijkstra au chemin récupéré directement
-    public void testToulouseLongChemin() {
+    public void Test_Toulouse_long_chemin() {
         init();
         ArcInspector arcInspector;
         ShortestPathData data = new ShortestPathData(this.graph, this.path.getOrigin(), this.path.getDestination(), null);