add 'lib-test' jar dir to junit command

Nosto · Mar 7, 2024 · 91f904f · 91f904f
1 parent 285bd8d
commit 91f904f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/framework/build.gradle b/framework/build.gradle
@@ -21,7 +21,7 @@ plugins {
 }
 
 group 'com.nosto.play'
-version '1.7.1-nosto-GA5-gradle-1'
+version '1.7.1-nosto-GA5-gradle-3'
 
 sourceSets {
     main {
@@ -83,6 +83,7 @@ dependencies {
     compileOnly group: 'com.google.code.maven-play-plugin.org.playframework', name: 'jj-simplecaptcha', version: '1.1'
 
     testImplementation(group: 'org.apache.ant', name: 'ant', version: '1.10.14')
+    testImplementation(group: 'org.apache.ant', name: 'ant-junit', version: '1.10.14')
     testImplementation(group: 'org.easytesting', name: 'fest-assert', version: '1.4')
     testImplementation(group: 'org.easytesting', name: 'fest-util', version: '1.1.6')
     testImplementation(group: 'org.mockito', name: 'mockito-core', version: '2.21.0')
@@ -106,8 +107,9 @@ task assembleRunscripts(type: Zip) {
     from("pym") {
         into("framework/pym")
     }
-    from("src/play/version") {
-        into("framework/src/play")
+
+    from("../modules/testrunner/lib") {
+        into("modules/testrunner/lib")
     }
 }
 

diff --git a/framework/pym/play/commands/junit.py b/framework/pym/play/commands/junit.py
@@ -71,7 +71,12 @@ def junit(app, args):
         print("~ cleaning test results")
         shutil.rmtree(test_result)
     args.append('-Dplay.autotest')
-    java_cmd = app.java_cmd(args, className='play.test.Runner')
+
+    classpath = app.getClasspath()
+    if os.path.exists(os.path.join(app.path, 'lib-test')):
+        app.find_and_add_all_jars(classpath, os.path.join(app.path, 'lib-test'))
+
+    java_cmd = app.java_cmd(args, cp_args=':'.join(classpath), className='play.test.Runner')
     try:
         process = subprocess.Popen(java_cmd, env=os.environ)
         signal.signal(signal.SIGTERM, handle_sigterm)
@@ -83,4 +88,3 @@ def junit(app, args):
     except OSError:
         print("Could not execute the java executable, please make sure the JAVA_HOME environment variable is set properly (the java executable should reside at JAVA_HOME/bin/java). ")
         sys.exit(-1)
-