Move contrib/tools/jdk to build/platform/java/jdk/testing

4 files changed, 39 insertions, 1 deletions

diff --git a/library/python/testing/yatest_common/ut/test.py b/library/python/testing/yatest_common/ut/test.py
new file mode 100644
index 00000000000..bffdf1e3535
--- /dev/null
+++ b/library/python/testing/yatest_common/ut/test.py
@@ -0,0 +1,17 @@
+import os
+import tarfile
+
+import yatest.common
+
+import yalibrary.tools
+
+
+def test_jdk_from_package_equals_jdk_tool_from_yaconf_json():
+    jdk_path = yatest.common.binary_path(os.path.join('build', 'platform', 'java', 'jdk', 'testing'))
+    os.makedirs("extracted")
+    with tarfile.open(os.path.join(jdk_path, "jdk.tar")) as tf:
+        tf.extractall("extracted")
+    jdk_tool_path = yalibrary.tools.toolchain_root('java', None, None)
+    with open(os.path.join("extracted", "release")) as jdk_path_release:
+        with open(os.path.join(jdk_tool_path, "release")) as jdk_tool_path_release:
+            assert jdk_path_release.read() == jdk_tool_path_release.read()
diff --git a/library/python/testing/yatest_common/ut/ya.make b/library/python/testing/yatest_common/ut/ya.make
new file mode 100644
index 00000000000..cc56fa1b6ce
--- /dev/null
+++ b/library/python/testing/yatest_common/ut/ya.make
@@ -0,0 +1,17 @@
+PY2TEST()
+
+TEST_SRCS(test.py)
+
+PEERDIR(
+    devtools/ya/yalibrary/tools
+)
+
+DEPENDS(
+    build/platform/java/jdk/testing
+)
+
+REQUIREMENTS(
+    network:full
+)
+
+END()
diff --git a/library/python/testing/yatest_common/ya.make b/library/python/testing/yatest_common/ya.make
index 2f5aa3bf390..9798bb40bbc 100644
--- a/library/python/testing/yatest_common/ya.make
+++ b/library/python/testing/yatest_common/ya.make
@@ -36,3 +36,7 @@ IF (NOT CATBOOST_OPENSOURCE)
 ENDIF()
 
 END()
+
+RECURSE(
+    ut
+)
diff --git a/library/python/testing/yatest_common/yatest/common/runtime.py b/library/python/testing/yatest_common/yatest/common/runtime.py
index b43666b596f..7f6f9df4405 100644
--- a/library/python/testing/yatest_common/yatest/common/runtime.py
+++ b/library/python/testing/yatest_common/yatest/common/runtime.py
@@ -158,7 +158,7 @@ def java_path():
     """
     from . import runtime_java
 
-    return runtime_java.get_java_path(binary_path(os.path.join('contrib', 'tools', 'jdk')))
+    return runtime_java.get_java_path(binary_path(os.path.join('build', 'platform', 'java', 'jdk', 'testing')))
 
 
 def java_home():