diff --git a/java/server/src/test/java/org/softwareheritage/graph/GraphTest.java b/java/server/src/test/java/org/softwareheritage/graph/GraphTest.java index b58a540..9355989 100644 --- a/java/server/src/test/java/org/softwareheritage/graph/GraphTest.java +++ b/java/server/src/test/java/org/softwareheritage/graph/GraphTest.java @@ -1,30 +1,30 @@ package org.softwareheritage.graph; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collection; import org.junit.Assert; import org.junit.BeforeClass; import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; import org.softwareheritage.graph.Graph; public class GraphTest { static Graph graph; public static void assertEqualsAnyOrder(Collection expecteds, Collection actuals) { Assert.assertThat(expecteds, containsInAnyOrder(actuals.toArray())); } @BeforeClass public static void setUp() throws IOException { - Path graphPath = Paths.get("src", "test", "dataset", "output", "example"); + Path graphPath = Paths.get("..", "..", "tests", "dataset", "output", "example"); graph = new Graph(graphPath.toString()); } public Graph getGraph() { return graph; } } diff --git a/java/server/src/test/dataset/.gitignore b/tests/dataset/.gitignore similarity index 100% rename from java/server/src/test/dataset/.gitignore rename to tests/dataset/.gitignore diff --git a/java/server/src/test/dataset/example.edges.csv b/tests/dataset/example.edges.csv similarity index 100% rename from java/server/src/test/dataset/example.edges.csv rename to tests/dataset/example.edges.csv diff --git a/java/server/src/test/dataset/example.edges.csv.gz b/tests/dataset/example.edges.csv.gz similarity index 100% rename from java/server/src/test/dataset/example.edges.csv.gz rename to tests/dataset/example.edges.csv.gz diff --git a/java/server/src/test/dataset/example.nodes.csv b/tests/dataset/example.nodes.csv similarity index 100% rename from java/server/src/test/dataset/example.nodes.csv rename to tests/dataset/example.nodes.csv diff --git a/java/server/src/test/dataset/example.nodes.csv.gz b/tests/dataset/example.nodes.csv.gz similarity index 100% rename from java/server/src/test/dataset/example.nodes.csv.gz rename to tests/dataset/example.nodes.csv.gz diff --git a/java/server/src/test/dataset/generate_graph.sh b/tests/dataset/generate_graph.sh similarity index 100% rename from java/server/src/test/dataset/generate_graph.sh rename to tests/dataset/generate_graph.sh diff --git a/java/server/src/test/dataset/img/.gitignore b/tests/dataset/img/.gitignore similarity index 100% rename from java/server/src/test/dataset/img/.gitignore rename to tests/dataset/img/.gitignore diff --git a/java/server/src/test/dataset/img/Makefile b/tests/dataset/img/Makefile similarity index 100% rename from java/server/src/test/dataset/img/Makefile rename to tests/dataset/img/Makefile diff --git a/java/server/src/test/dataset/img/example.dot b/tests/dataset/img/example.dot similarity index 100% rename from java/server/src/test/dataset/img/example.dot rename to tests/dataset/img/example.dot diff --git a/java/server/src/test/dataset/output/example-transposed.graph b/tests/dataset/output/example-transposed.graph similarity index 100% rename from java/server/src/test/dataset/output/example-transposed.graph rename to tests/dataset/output/example-transposed.graph diff --git a/java/server/src/test/dataset/output/example-transposed.obl b/tests/dataset/output/example-transposed.obl similarity index 100% rename from java/server/src/test/dataset/output/example-transposed.obl rename to tests/dataset/output/example-transposed.obl diff --git a/java/server/src/test/dataset/output/example-transposed.offsets b/tests/dataset/output/example-transposed.offsets similarity index 100% rename from java/server/src/test/dataset/output/example-transposed.offsets rename to tests/dataset/output/example-transposed.offsets diff --git a/java/server/src/test/dataset/output/example-transposed.properties b/tests/dataset/output/example-transposed.properties similarity index 100% rename from java/server/src/test/dataset/output/example-transposed.properties rename to tests/dataset/output/example-transposed.properties diff --git a/java/server/src/test/dataset/output/example.graph b/tests/dataset/output/example.graph similarity index 100% rename from java/server/src/test/dataset/output/example.graph rename to tests/dataset/output/example.graph diff --git a/java/server/src/test/dataset/output/example.indegree b/tests/dataset/output/example.indegree similarity index 100% rename from java/server/src/test/dataset/output/example.indegree rename to tests/dataset/output/example.indegree diff --git a/java/server/src/test/dataset/output/example.mph b/tests/dataset/output/example.mph similarity index 100% rename from java/server/src/test/dataset/output/example.mph rename to tests/dataset/output/example.mph diff --git a/tests/dataset/output/example.node2pid.bin b/tests/dataset/output/example.node2pid.bin new file mode 100644 index 0000000..7755043 Binary files /dev/null and b/tests/dataset/output/example.node2pid.bin differ diff --git a/java/server/src/test/dataset/output/example.node2pid.csv b/tests/dataset/output/example.node2pid.csv similarity index 100% rename from java/server/src/test/dataset/output/example.node2pid.csv rename to tests/dataset/output/example.node2pid.csv diff --git a/java/server/src/test/dataset/output/example.node2type.map b/tests/dataset/output/example.node2type.map similarity index 100% rename from java/server/src/test/dataset/output/example.node2type.map rename to tests/dataset/output/example.node2type.map diff --git a/java/server/src/test/dataset/output/example.obl b/tests/dataset/output/example.obl similarity index 100% rename from java/server/src/test/dataset/output/example.obl rename to tests/dataset/output/example.obl diff --git a/java/server/src/test/dataset/output/example.offsets b/tests/dataset/output/example.offsets similarity index 100% rename from java/server/src/test/dataset/output/example.offsets rename to tests/dataset/output/example.offsets diff --git a/java/server/src/test/dataset/output/example.order b/tests/dataset/output/example.order similarity index 100% rename from java/server/src/test/dataset/output/example.order rename to tests/dataset/output/example.order diff --git a/java/server/src/test/dataset/output/example.outdegree b/tests/dataset/output/example.outdegree similarity index 100% rename from java/server/src/test/dataset/output/example.outdegree rename to tests/dataset/output/example.outdegree diff --git a/tests/dataset/output/example.pid2node.bin b/tests/dataset/output/example.pid2node.bin new file mode 100644 index 0000000..753264c Binary files /dev/null and b/tests/dataset/output/example.pid2node.bin differ diff --git a/java/server/src/test/dataset/output/example.pid2node.csv b/tests/dataset/output/example.pid2node.csv similarity index 100% rename from java/server/src/test/dataset/output/example.pid2node.csv rename to tests/dataset/output/example.pid2node.csv diff --git a/java/server/src/test/dataset/output/example.properties b/tests/dataset/output/example.properties similarity index 100% rename from java/server/src/test/dataset/output/example.properties rename to tests/dataset/output/example.properties diff --git a/java/server/src/test/dataset/output/example.stats b/tests/dataset/output/example.stats similarity index 100% rename from java/server/src/test/dataset/output/example.stats rename to tests/dataset/output/example.stats