Merge branch 'master' into dependabot/maven/testrunner-gradle-plugin/…

…org.gradle-gradle-core-6.0
TestingResearchIllinois · May 24, 2024 · 8fb528a · 8fb528a
2 parents 3120945 + 65c97a9
commit 8fb528a
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,19 @@
+
+name: auto-check-build
+
+on: [push, pull_request]
+
+jobs:
+  basicBuild:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8.0.292+10'
+          distribution: 'adopt'
+
+      - name: Installs packages
+        run: mvn install -B
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
-                <version>3.5.4</version>
+                <version>3.8.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>

diff --git a/testrunner-gradle-plugin/pom.xml b/testrunner-gradle-plugin/pom.xml
@@ -14,6 +14,7 @@
 
     <properties>
         <gradle.version>6.0</gradle.version>
+        <log4j.version>2.17.1</log4j.version>
     </properties>
 
     <dependencies>
@@ -28,17 +29,17 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.16.0</version>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.16.0</version>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.7</version>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>

diff --git a/testrunner-running/src/main/scala/edu/illinois/cs/testrunner/runner/Runner.scala b/testrunner-running/src/main/scala/edu/illinois/cs/testrunner/runner/Runner.scala
@@ -12,6 +12,7 @@ import edu.illinois.cs.testrunner.execution.Executor
 import edu.illinois.cs.testrunner.util._
 
 import scala.collection.JavaConverters._
+import scala.collection.mutable.ListBuffer
 import scala.io.Source
 import scala.util.{Failure, Try}
 
@@ -39,6 +40,17 @@ trait Runner {
             builder.javaAgent(Paths.get(Configuration.config().getProperty("testplugin.javaagent")))
         }
 
+        if (!Configuration.config().getProperty("testplugin.javaopts", "").equals("")) {
+            val javaopts = Configuration.config().getProperty("testplugin.javaopts", "").split(",")
+            val javaoptsList = new ListBuffer[String]()
+            for (opt <- javaopts) {
+                javaoptsList += opt
+            }
+            if (!javaoptsList.isEmpty) {
+                builder.javaOpts(javaoptsList.toList)
+            }
+        }
+
         builder.environment(environment())
     }
 

diff --git a/testrunner-running/src/main/scala/edu/illinois/cs/testrunner/util/Utility.scala b/testrunner-running/src/main/scala/edu/illinois/cs/testrunner/util/Utility.scala
@@ -16,10 +16,12 @@ object Utility {
         val nameSet = HashSet[String]()
         while (curClz != null) {
             for (m <- curClz.getDeclaredMethods) {
-                if (!nameSet.contains(m.getName)) {
-                    // exclude override method
+                val paramsStr = m.getParameterTypes.map(c => c.getName).mkString(",")
+                val methodName = m.getName ++ "(" ++ paramsStr ++ ")"
+                if (!nameSet.contains(methodName)) {
+                    // exclude overridden method
                     methods.append(m)
-                    nameSet.add(m.getName)
+                    nameSet.add(methodName)
                 }
             }
             curClz = curClz.getSuperclass