From 9042072b13aeda4542d2cb56845a09f26eaa40fe Mon Sep 17 00:00:00 2001 From: August Shi Date: Thu, 13 Jul 2023 21:01:24 -0500 Subject: [PATCH 1/5] Distinguish methods (#38) Use full method signature instead of just name to check for duplicates --- .../scala/edu/illinois/cs/testrunner/util/Utility.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 index 71c06ce..7d2769f 100644 --- 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 From e1c98b93ddfe2736b79ad7b42ae9dc084dc0edda Mon Sep 17 00:00:00 2001 From: August Shi Date: Fri, 5 Jan 2024 17:08:57 -0600 Subject: [PATCH 2/5] Introducing a way to configure additional Java options (#40) --- .../edu/illinois/cs/testrunner/runner/Runner.scala | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 index 01130df..c48274d 100644 --- 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()) } From 8cc5b334f815b035a3a8844e7feccca021c9921a Mon Sep 17 00:00:00 2001 From: August Shi Date: Fri, 24 May 2024 16:12:06 +0000 Subject: [PATCH 3/5] Including some basic Actions build that can at least check that things compile --- .github/workflows/build.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..a0ac794 --- /dev/null +++ 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 From 0407a3cff3ffa98dc9093c0b155c66cbe1f77403 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 11:27:38 -0500 Subject: [PATCH 4/5] Bump org.apache.maven:maven-core from 3.5.4 to 3.8.1 (#39) Bumps [org.apache.maven:maven-core](https://github.com/apache/maven) from 3.5.4 to 3.8.1. - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.5.4...maven-3.8.1) --- updated-dependencies: - dependency-name: org.apache.maven:maven-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e0f8ada..ce074b0 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ org.apache.maven maven-core - 3.5.4 + 3.8.1 org.apache.maven From 65c97a9f0024d42549a08623e95d5c19672c4373 Mon Sep 17 00:00:00 2001 From: August Shi Date: Fri, 24 May 2024 17:10:37 +0000 Subject: [PATCH 5/5] Updating dependencies for log4j --- testrunner-gradle-plugin/pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testrunner-gradle-plugin/pom.xml b/testrunner-gradle-plugin/pom.xml index d6ac97e..18787ed 100644 --- a/testrunner-gradle-plugin/pom.xml +++ b/testrunner-gradle-plugin/pom.xml @@ -14,6 +14,7 @@ 5.6 + 2.17.1 @@ -28,17 +29,17 @@ org.apache.logging.log4j log4j-api - 2.16.0 + ${log4j.version} org.apache.logging.log4j log4j-core - 2.16.0 + ${log4j.version} org.apache.logging.log4j log4j-slf4j-impl - 2.7 + ${log4j.version} org.codehaus.groovy