Java: Introduce a graph construction API.

And use it in the Graph unittests.

Subtle point: DT_STRING does not correspond to java.lang.String, but rather byte[]
Change: 141223979

1 files changed, 19 insertions, 17 deletions

diff --git a/tensorflow/java/BUILD b/tensorflow/java/BUILD
index c9e6248bf8..4522c4a59e 100644
--- a/tensorflow/java/BUILD
+++ b/tensorflow/java/BUILD
@@ -12,43 +12,45 @@ java_library(
     visibility = ["//visibility:public"],
 )
 
+java_library(
+    name = "testutil",
+    testonly = 1,
+    srcs = ["src/test/java/org/tensorflow/TestUtil.java"],
+    deps = [":tensorflow"],
+)
+
 java_test(
     name = "GraphTest",
     size = "small",
     srcs = ["src/test/java/org/tensorflow/GraphTest.java"],
-    data = [":test_graph_def"],
     test_class = "org.tensorflow.GraphTest",
     deps = [
         ":tensorflow",
+        ":testutil",
         "//external:junit",
     ],
 )
 
-# Temporary targets to assist with unittests till the Java API becomes
-# expressive enough. Delete this target and corresponding python source code
-# when the Java API can construct graphs.
-genrule(
-    name = "test_graph_def",
-    outs = [":test_graph_def.data"],
-    cmd = "$(location :graphdef) $@",
-    tools = [":graphdef"],
-)
-
-py_binary(
-    name = "graphdef",
-    srcs = ["src/test/python/graphdef.py"],
-    srcs_version = "PY2AND3",
-    deps = ["//tensorflow:tensorflow_py"],
+java_test(
+    name = "OperationBuilderTest",
+    size = "small",
+    srcs = ["src/test/java/org/tensorflow/OperationBuilderTest.java"],
+    test_class = "org.tensorflow.OperationBuilderTest",
+    deps = [
+        ":tensorflow",
+        ":testutil",
+        "//external:junit",
+    ],
 )
 
 java_test(
     name = "SessionTest",
     size = "small",
     srcs = ["src/test/java/org/tensorflow/SessionTest.java"],
-    data = [":test_graph_def"],
     test_class = "org.tensorflow.SessionTest",
     deps = [
         ":tensorflow",
+        ":testutil",
         "//external:junit",
     ],
 )