[BugFix][C++] Update the testing path with latest testing repo (#346)

acezen · web-flow · commit 2b0395e139f5 · 2024-01-29T14:24:26.000+08:00
---------

Signed-off-by: acezen &lt;qiaozi.zwb@alibaba-inc.com&gt;
diff --git a/cpp/benchmarks/benchmark_util.h b/cpp/benchmarks/benchmark_util.h
@@ -37,7 +37,7 @@ GAR_NAMESPACE::Status GetTestResourceRoot(std::string* out) {
         "Test resources not found, set GAR_TEST_DATA to <repo root>/testing");
   }
   // FIXME(@acezen): This is a hack to get around the fact that the testing
-  *out = std::string(c_root) + "/new";
+  *out = std::string(c_root);
   return GAR_NAMESPACE::Status::OK();
 }
 
diff --git a/cpp/examples/config.h b/cpp/examples/config.h
@@ -54,14 +54,13 @@
 #define DASSERT(x)
 #endif
 
-// FIXME(@acezen): This is a hack to get around the fact that the testing
 static const std::string TEST_DATA_DIR =  // NOLINT
     std::filesystem::path(__FILE__)
         .parent_path()
         .parent_path()
         .parent_path()
         .parent_path()
         .string() +
-    "/testing/new";
+    "/testing";
 
 #endif  // CPP_EXAMPLES_CONFIG_H_
diff --git a/cpp/test/util.h b/cpp/test/util.h
@@ -30,8 +30,7 @@ GAR_NAMESPACE::Status GetTestResourceRoot(std::string* out) {
     return GAR_NAMESPACE::Status::IOError(
         "Test resources not found, set GAR_TEST_DATA to <repo root>/testing");
   }
-  // FIXME(@acezen): This is a hack to get around the fact that the testing
-  *out = std::string(c_root) + "/new";
+  *out = std::string(c_root);
   return GAR_NAMESPACE::Status::OK();
 }
 
diff --git a/java/src/test/java/com/alibaba/graphar/graphinfo/GraphInfoTest.java b/java/src/test/java/com/alibaba/graphar/graphinfo/GraphInfoTest.java
@@ -25,7 +25,7 @@
 import org.junit.Test;
 
 public class GraphInfoTest {
-    public static final String root = System.getenv("GAR_TEST_DATA");
+    public static final String root = System.getenv("GAR_TEST_DATA") + "/java";
 
     @Test
     public void test1() {
diff --git a/pyspark/tests/test_transform.py b/pyspark/tests/test_transform.py
@@ -26,7 +26,7 @@
 def test_transform(spark):
     initialize(spark)
     source_path = (
-        GRAPHAR_TESTS_EXAMPLES.joinpath("new/ldbc_sample/parquet/ldbc_sample.graph.yml")
+        GRAPHAR_TESTS_EXAMPLES.joinpath("ldbc_sample/parquet/ldbc_sample.graph.yml")
         .absolute()
         .__str__()
     )
diff --git a/spark/src/test/scala/com/alibaba/graphar/ComputeExample.scala b/spark/src/test/scala/com/alibaba/graphar/ComputeExample.scala
@@ -31,7 +31,7 @@ class ComputeExampleSuite extends AnyFunSuite {
 
   test("run cc using graphx") {
     // read vertex DataFrame
-    val file_path = "gar-test/new/ldbc_sample/parquet/"
+    val file_path = "gar-test/ldbc_sample/parquet/"
     val prefix = getClass.getClassLoader.getResource(file_path).getPath
     val vertex_yaml = getClass.getClassLoader
       .getResource(file_path + "person.vertex.yml")
diff --git a/spark/src/test/scala/com/alibaba/graphar/TestGraphInfo.scala b/spark/src/test/scala/com/alibaba/graphar/TestGraphInfo.scala
@@ -29,11 +29,11 @@ class GraphInfoSuite extends AnyFunSuite {
   test("load graph info") {
     // read graph yaml
     val yaml_path = getClass.getClassLoader
-      .getResource("gar-test/new/ldbc_sample/csv/ldbc_sample.graph.yml")
+      .getResource("gar-test/ldbc_sample/csv/ldbc_sample.graph.yml")
       .getPath
     val prefix =
       getClass.getClassLoader
-        .getResource("gar-test/new/ldbc_sample/csv/")
+        .getResource("gar-test/ldbc_sample/csv/")
         .getPath
     val graph_info = GraphInfo.loadGraphInfo(yaml_path, spark)
 
@@ -127,7 +127,7 @@ class GraphInfoSuite extends AnyFunSuite {
 
   test("load edge info") {
     val yaml_path = getClass.getClassLoader
-      .getResource("gar-test/new/ldbc_sample/csv/person_knows_person.edge.yml")
+      .getResource("gar-test/ldbc_sample/csv/person_knows_person.edge.yml")
       .getPath
     val edge_info = EdgeInfo.loadEdgeInfo(yaml_path, spark)
 
diff --git a/spark/src/test/scala/com/alibaba/graphar/TestGraphReader.scala b/spark/src/test/scala/com/alibaba/graphar/TestGraphReader.scala
@@ -31,7 +31,7 @@ class TestGraphReaderSuite extends AnyFunSuite {
   test("read graphs by yaml paths") {
     // conduct reading
     val graph_path = getClass.getClassLoader
-      .getResource("gar-test/new/ldbc_sample/parquet/ldbc_sample.graph.yml")
+      .getResource("gar-test/ldbc_sample/parquet/ldbc_sample.graph.yml")
       .getPath
     val vertex_edge_df_pair = GraphReader.read(graph_path, spark)
     val vertex_dataframes = vertex_edge_df_pair._1
@@ -54,7 +54,7 @@ class TestGraphReaderSuite extends AnyFunSuite {
   test("read graphs by graph infos") {
     // load graph info
     val path = getClass.getClassLoader
-      .getResource("gar-test/new/ldbc_sample/parquet/ldbc_sample.graph.yml")
+      .getResource("gar-test/ldbc_sample/parquet/ldbc_sample.graph.yml")
       .getPath
     val graph_info = GraphInfo.loadGraphInfo(path, spark)
 
diff --git a/spark/src/test/scala/com/alibaba/graphar/TestGraphTransformer.scala b/spark/src/test/scala/com/alibaba/graphar/TestGraphTransformer.scala
@@ -32,7 +32,7 @@ class TestGraphTransformerSuite extends AnyFunSuite {
   test("transform graphs by yaml paths") {
     // conduct transformation
     val source_path = getClass.getClassLoader
-      .getResource("gar-test/new/ldbc_sample/parquet/ldbc_sample.graph.yml")
+      .getResource("gar-test/ldbc_sample/parquet/ldbc_sample.graph.yml")
       .getPath
     val dest_path = getClass.getClassLoader
       .getResource("gar-test/transformer/ldbc_sample.graph.yml")
@@ -71,7 +71,7 @@ class TestGraphTransformerSuite extends AnyFunSuite {
   test("transform graphs by graph infos") {
     // load source graph info
     val source_path = getClass.getClassLoader
-      .getResource("gar-test/new/ldbc_sample/parquet/ldbc_sample.graph.yml")
+      .getResource("gar-test/ldbc_sample/parquet/ldbc_sample.graph.yml")
       .getPath
     val source_graph_info = GraphInfo.loadGraphInfo(source_path, spark)
 
diff --git a/spark/src/test/scala/com/alibaba/graphar/TestReader.scala b/spark/src/test/scala/com/alibaba/graphar/TestReader.scala
@@ -112,7 +112,7 @@ class ReaderSuite extends AnyFunSuite {
 
   test("read vertex chunks") {
     // construct the vertex information
-    val file_path = "gar-test/new/ldbc_sample/parquet/"
+    val file_path = "gar-test/ldbc_sample/parquet/"
     val prefix = getClass.getClassLoader.getResource(file_path).getPath
     val vertex_yaml = getClass.getClassLoader
       .getResource(file_path + "person.vertex.yml")
@@ -210,7 +210,7 @@ class ReaderSuite extends AnyFunSuite {
 
   test("read edge chunks") {
     // construct the edge information
-    val file_path = "gar-test/new/ldbc_sample/csv/"
+    val file_path = "gar-test/ldbc_sample/csv/"
     val prefix = getClass.getClassLoader.getResource(file_path).getPath
     val edge_yaml = getClass.getClassLoader
       .getResource(file_path + "person_knows_person.edge.yml")
diff --git a/spark/src/test/scala/com/alibaba/graphar/TestWriter.scala b/spark/src/test/scala/com/alibaba/graphar/TestWriter.scala
@@ -46,7 +46,7 @@ class WriterSuite extends AnyFunSuite {
 
     // read vertex yaml
     val vertex_yaml_path = getClass.getClassLoader
-      .getResource("gar-test/new/ldbc_sample/parquet/person.vertex.yml")
+      .getResource("gar-test/ldbc_sample/parquet/person.vertex.yml")
       .getPath
     val vertex_info = VertexInfo.loadVertexInfo(vertex_yaml_path, spark)
 
@@ -106,7 +106,7 @@ class WriterSuite extends AnyFunSuite {
 
     // read edge yaml
     val edge_yaml_path = getClass.getClassLoader
-      .getResource("gar-test/new/ldbc_sample/csv/person_knows_person.edge.yml")
+      .getResource("gar-test/ldbc_sample/csv/person_knows_person.edge.yml")
       .getPath
     val edge_info = EdgeInfo.loadEdgeInfo(edge_yaml_path, spark)
     val adj_list_type = AdjListType.ordered_by_source
@@ -245,13 +245,13 @@ class WriterSuite extends AnyFunSuite {
 
     // read vertex yaml
     val vertex_yaml_path = getClass.getClassLoader
-      .getResource("gar-test/new/ldbc_sample/csv/person.vertex.yml")
+      .getResource("gar-test/ldbc_sample/csv/person.vertex.yml")
       .getPath
     val vertex_info = VertexInfo.loadVertexInfo(vertex_yaml_path, spark)
 
     // read edge yaml
     val edge_yaml_path = getClass.getClassLoader
-      .getResource("gar-test/new/ldbc_sample/csv/person_knows_person.edge.yml")
+      .getResource("gar-test/ldbc_sample/csv/person_knows_person.edge.yml")
       .getPath
     val edge_info = EdgeInfo.loadEdgeInfo(edge_yaml_path, spark)
     val vertex_chunk_size = edge_info.getSrc_chunk_size()
diff --git a/spark/src/test/scala/com/alibaba/graphar/TransformExample.scala b/spark/src/test/scala/com/alibaba/graphar/TransformExample.scala
@@ -32,7 +32,7 @@ class TransformExampleSuite extends AnyFunSuite {
 
   test("transform file type") {
     // read from orc files
-    val file_path = "gar-test/new/ldbc_sample/orc/"
+    val file_path = "gar-test/ldbc_sample/orc/"
     val prefix = getClass.getClassLoader.getResource(file_path).getPath
     val vertex_yaml = getClass.getClassLoader
       .getResource(file_path + "person.vertex.yml")
@@ -45,7 +45,7 @@ class TransformExampleSuite extends AnyFunSuite {
     assert(vertex_df_with_index.count() == vertices_num)
 
     // write to parquet files
-    val output_file_path = "gar-test/new/ldbc_sample/parquet/"
+    val output_file_path = "gar-test/ldbc_sample/parquet/"
     val output_prefix: String = "/tmp/example/"
     val output_vertex_yaml = getClass.getClassLoader
       .getResource(output_file_path + "person.vertex.yml")
@@ -69,7 +69,7 @@ class TransformExampleSuite extends AnyFunSuite {
   }
 
   test("transform adjList type") {
-    val file_path = "gar-test/new/ldbc_sample/parquet/"
+    val file_path = "gar-test/ldbc_sample/parquet/"
     val prefix = getClass.getClassLoader.getResource(file_path).getPath
     // get vertex num
     val vertex_yaml = getClass.getClassLoader
diff --git a/testing b/testing
@@ -1 +1 @@
-Subproject commit 909af376f171b319b0425b4e2e9e055aab6ca1e9
+Subproject commit 0ca8e1203f4b08c9301bff4a4b4e0c13c89a8275

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ GAR_NAMESPACE::Status GetTestResourceRoot(std::string* out) {`
`37`	`37`	`"Test resources not found, set GAR_TEST_DATA to <repo root>/testing");`
`38`	`38`	`}`
`39`	`39`	`// FIXME(@acezen): This is a hack to get around the fact that the testing`
`40`		`- *out = std::string(c_root) + "/new";`
	`40`	`+ *out = std::string(c_root);`
`41`	`41`	`return GAR_NAMESPACE::Status::OK();`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ GAR_NAMESPACE::Status GetTestResourceRoot(std::string* out) {`
`30`	`30`	`return GAR_NAMESPACE::Status::IOError(`
`31`	`31`	`"Test resources not found, set GAR_TEST_DATA to <repo root>/testing");`
`32`	`32`	`}`
`33`		`- // FIXME(@acezen): This is a hack to get around the fact that the testing`
`34`		`- *out = std::string(c_root) + "/new";`
	`33`	`+ *out = std::string(c_root);`
`35`	`34`	`return GAR_NAMESPACE::Status::OK();`
`36`	`35`	`}`
`37`	`36`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`def test_transform(spark):`
`27`	`27`	`initialize(spark)`
`28`	`28`	`source_path = (`
`29`		`- GRAPHAR_TESTS_EXAMPLES.joinpath("new/ldbc_sample/parquet/ldbc_sample.graph.yml")`
	`29`	`+ GRAPHAR_TESTS_EXAMPLES.joinpath("ldbc_sample/parquet/ldbc_sample.graph.yml")`
`30`	`30`	`.absolute()`
`31`	`31`	`.__str__()`
`32`	`32`	`)`