Commit 5381bc82 authored by Ethan Ordentlich's avatar Ethan Ordentlich
Browse files

Changes

parent 22e5096a
No related merge requests found
Pipeline #47111 canceled with stage
Showing with 4 additions and 6 deletions
+4 -6
...@@ -113,10 +113,8 @@ public class BeaverMapsGraph extends Graph<Long, Double> { ...@@ -113,10 +113,8 @@ public class BeaverMapsGraph extends Graph<Long, Double> {
* @return the JSON data from filename * @return the JSON data from filename
*/ */
private static JsonElement fromFile(String filename) { private static JsonElement fromFile(String filename) {
// try (FileReader reader = new FileReader(filename)) { try (FileReader reader = new FileReader(filename)) {
// return JsonParser.parseReader(reader); return JsonParser.parseReader(reader);
try {
return JSON_PARSER.parse(new FileReader(filename));
} catch (IOException e) { } catch (IOException e) {
return null; return null;
} }
......
...@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.*; ...@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.*;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class BeavermapTests { public class BeavermapTests {
private static String BEAVERMAP_GRAPH_SOURCE = "src/edu/caltech/cs2/edu.caltech.cs2.datastructures/BeaverMapsGraph.java"; private static String BEAVERMAP_GRAPH_SOURCE = "src/edu/caltech/cs2/datastructures/BeaverMapsGraph.java";
private static JsonElement fromFile(String filename) { private static JsonElement fromFile(String filename) {
try (FileReader reader = new FileReader(filename)) { try (FileReader reader = new FileReader(filename)) {
......
...@@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.*; ...@@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.*;
@Tag("C") @Tag("C")
@TestMethodOrder(MethodOrderer.OrderAnnotation.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class GraphTests { public class GraphTests {
private static final String GRAPH_SOURCE = "src/edu/caltech/cs2/edu.caltech.cs2.datastructures/Graph.java"; private static final String GRAPH_SOURCE = "src/edu/caltech/cs2/datastructures/Graph.java";
private static final int SIMPLE_OP_TIMEOUT_MS = 300; private static final int SIMPLE_OP_TIMEOUT_MS = 300;
private static final int MEDIUM_OP_TIMEOUT_MS = 500; private static final int MEDIUM_OP_TIMEOUT_MS = 500;
private static final int STRESS_OP_TIMEOUT_MS = 2200; private static final int STRESS_OP_TIMEOUT_MS = 2200;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment