Respond to review comments

bazel-contrib · Nov 8, 2023 · bb23851 · bb23851
1 parent bdaea57
commit bb23851
Show file tree

Hide file tree

Showing 18 changed files with 474 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ bazel-*
 .bazelrc.user
 .idea
 .ijwb
+
+/comparative-tests/.gradle/
diff --git a/comparative-tests/README.md b/comparative-tests/README.md
@@ -21,3 +21,16 @@ Tests logs may be found:
 * Maven: `comparative-tests/target/surefire-reports`
 * Gradle: `comparative-tests/build/test-results/test`
 * Bazel: `bazel-testlogs/comparative-tests/src/test/java/com/apple/sdp/gradle/`
+
+
+## Updating `gradlew`
+
+Gradle projects typically ship with a `gradlew` script, and this directory 
+is no exception. By doing this, we avoid the need to make users install 
+`gradle` on their systems, but it does mean that we have seemingly random 
+files scattered around.
+
+To [update `gradlew`][gradlew] run the command: `./gradlew wrapper 
+--gradle-version latest`
+
+[gradlew]: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:upgrading_wrapper
diff --git a/...results/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests.xml b/...results/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests" tests="3" skipped="0" failures="0" errors="0" timestamp="2023-11-08T12:49:19" hostname="Simons-Chunky-MBP.local" time="0.002">
+  <properties/>
+  <testcase name="Test of one" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests" time="0.001"/>
+  <testcase name="Test of two" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests" time="0.0"/>
+  <testcase name="Test of three" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests" time="0.0"/>
+  <system-out><![CDATA[]]></system-out>
+  <system-err><![CDATA[]]></system-err>
+</testsuite>
diff --git a/...ts/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.ParameterisedTest.xml b/...ts/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.ParameterisedTest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="com.github.bazel_contrib.contrib_rules_jvm.comparative.ParameterisedTest" tests="3" skipped="0" failures="0" errors="0" timestamp="2023-11-08T12:49:19" hostname="Simons-Chunky-MBP.local" time="0.009">
+  <properties/>
+  <testcase name="[1] alpha" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.ParameterisedTest" time="0.007"/>
+  <testcase name="[2] beta" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.ParameterisedTest" time="0.0"/>
+  <testcase name="[3] gamma" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.ParameterisedTest" time="0.0"/>
+  <system-out><![CDATA[alpha
+beta
+gamma
+]]></system-out>
+  <system-err><![CDATA[]]></system-err>
+</testsuite>
diff --git a/...lts/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.PathologicalTest.xml b/...lts/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.PathologicalTest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="com.github.bazel_contrib.contrib_rules_jvm.comparative.PathologicalTest" tests="1" skipped="1" failures="0" errors="0" timestamp="2023-11-08T12:49:19" hostname="Simons-Chunky-MBP.local" time="0.0">
+  <properties/>
+  <testcase name="bootstrap(String)" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.PathologicalTest" time="0.0">
+    <skipped/>
+  </testcase>
+  <system-out><![CDATA[]]></system-out>
+  <system-err><![CDATA[]]></system-err>
+</testsuite>
diff --git a/...t-results/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.SimpleTest.xml b/...t-results/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.SimpleTest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="com.github.bazel_contrib.contrib_rules_jvm.comparative.SimpleTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2023-11-08T12:49:19" hostname="Simons-Chunky-MBP.local" time="0.0">
+  <properties/>
+  <testcase name="empty()" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.SimpleTest" time="0.0"/>
+  <system-out><![CDATA[]]></system-out>
+  <system-err><![CDATA[]]></system-err>
+</testsuite>
diff --git a/...t-results/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.SuiteTest1.xml b/...t-results/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.SuiteTest1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="com.github.bazel_contrib.contrib_rules_jvm.comparative.SuiteTest1" tests="2" skipped="0" failures="0" errors="0" timestamp="2023-11-08T12:49:19" hostname="Simons-Chunky-MBP.local" time="0.042">
+  <properties/>
+  <testcase name="doSomething()" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.SuiteTest1" time="0.007"/>
+  <testcase name="doSomething()" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.SuiteTest1" time="0.0"/>
+  <system-out><![CDATA[Hello, World!
+Hello, World!
+]]></system-out>
+  <system-err><![CDATA[]]></system-err>
+</testsuite>
diff --git a/...t-results/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.SuiteTest2.xml b/...t-results/test/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.SuiteTest2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="com.github.bazel_contrib.contrib_rules_jvm.comparative.SuiteTest2" tests="2" skipped="0" failures="0" errors="0" timestamp="2023-11-08T12:49:19" hostname="Simons-Chunky-MBP.local" time="0.034">
+  <properties/>
+  <testcase name="doSomethingElse()" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.SuiteTest2" time="0.002"/>
+  <testcase name="doSomethingElse()" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.SuiteTest2" time="0.0"/>
+  <system-out><![CDATA[]]></system-out>
+  <system-err><![CDATA[]]></system-err>
+</testsuite>
diff --git a/comparative-tests/gradle/wrapper/gradle-wrapper.properties b/comparative-tests/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/...ive/DisabledSkippedParameterisedTest.java → ...les_jvm/comparative/PathologicalTest.java b/...ive/DisabledSkippedParameterisedTest.java → ...les_jvm/comparative/PathologicalTest.java
@@ -10,7 +10,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class DisabledSkippedParameterisedTest {
+class PathologicalTest {
 
   private static Stream<Arguments> argsProvider() {
     return Stream.of(Arguments.of("alpha"), Arguments.of("beta"), Arguments.of("gamma"));
@@ -21,6 +21,6 @@ private static Stream<Arguments> argsProvider() {
   @MethodSource("argsProvider")
   public void bootstrap(String goGreek) {
     System.out.println(goGreek);
-    fail("This should be ignored if we are running in bazel");
+    fail("This test should never be run because it's disabled");
   }
 }
diff --git a/...fire-reports/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests.xml b/...fire-reports/TEST-com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests" time="0.005" tests="3" errors="0" skipped="0" failures="0">
+  <properties>
+    <property name="java.specification.version" value="17"/>
+    <property name="sun.jnu.encoding" value="UTF-8"/>
+    <property name="java.class.path" value="/Volumes/Dev/src/github.com/bazel-contrib/rules_jvm/comparative-tests/target/test-classes:/Volumes/Dev/src/github.com/bazel-contrib/rules_jvm/comparative-tests/target/classes:/Users/shs/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.0/junit-jupiter-engine-5.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-engine/1.10.0/junit-platform-engine-1.10.0.jar:/Users/shs/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-commons/1.10.0/junit-platform-commons-1.10.0.jar:/Users/shs/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.0/junit-jupiter-api-5.10.0.jar:/Users/shs/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:/Users/shs/.m2/repository/org/junit/jupiter/junit-jupiter-params/5.10.0/junit-jupiter-params-5.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-suite/1.10.0/junit-platform-suite-1.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-suite-api/1.10.0/junit-platform-suite-api-1.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-suite-engine/1.10.0/junit-platform-suite-engine-1.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-suite-commons/1.10.0/junit-platform-suite-commons-1.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-launcher/1.10.0/junit-platform-launcher-1.10.0.jar:"/>
+    <property name="java.vm.vendor" value="Apple Inc."/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="java.vendor.url" value="https://java.apple.com"/>
+    <property name="os.name" value="Mac OS X"/>
+    <property name="java.vm.specification.version" value="17"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="GB"/>
+    <property name="sun.boot.library.path" value="/Library/Java/JavaVirtualMachines/applejdk-17.0.8.7.2.jdk/Contents/Home/lib"/>
+    <property name="sun.java.command" value="/Volumes/Dev/src/github.com/bazel-contrib/rules_jvm/comparative-tests/target/surefire/surefirebooter-20231108124940878_3.jar /Volumes/Dev/src/github.com/bazel-contrib/rules_jvm/comparative-tests/target/surefire 2023-11-08T12-49-40_832-jvmRun1 surefire-20231108124940878_1tmp surefire_0-20231108124940878_2tmp"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="/Volumes/Dev/src/github.com/bazel-contrib/rules_jvm/comparative-tests/target/test-classes:/Volumes/Dev/src/github.com/bazel-contrib/rules_jvm/comparative-tests/target/classes:/Users/shs/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.10.0/junit-jupiter-engine-5.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-engine/1.10.0/junit-platform-engine-1.10.0.jar:/Users/shs/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-commons/1.10.0/junit-platform-commons-1.10.0.jar:/Users/shs/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.10.0/junit-jupiter-api-5.10.0.jar:/Users/shs/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:/Users/shs/.m2/repository/org/junit/jupiter/junit-jupiter-params/5.10.0/junit-jupiter-params-5.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-suite/1.10.0/junit-platform-suite-1.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-suite-api/1.10.0/junit-platform-suite-api-1.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-suite-engine/1.10.0/junit-platform-suite-engine-1.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-suite-commons/1.10.0/junit-platform-suite-commons-1.10.0.jar:/Users/shs/.m2/repository/org/junit/platform/junit-platform-launcher/1.10.0/junit-platform-launcher-1.10.0.jar:"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="/Users/shs"/>
+    <property name="user.language" value="en"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2023-07-18"/>
+    <property name="java.home" value="/Library/Java/JavaVirtualMachines/applejdk-17.0.8.7.2.jdk/Contents/Home"/>
+    <property name="file.separator" value="/"/>
+    <property name="basedir" value="/Volumes/Dev/src/github.com/bazel-contrib/rules_jvm/comparative-tests"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="surefire.real.class.path" value="/Volumes/Dev/src/github.com/bazel-contrib/rules_jvm/comparative-tests/target/surefire/surefirebooter-20231108124940878_3.jar"/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="java.runtime.version" value="17.0.8+7-LTS"/>
+    <property name="user.name" value="shs"/>
+    <property name="path.separator" value=":"/>
+    <property name="os.version" value="14.2"/>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="java.vendor.version" value="AppleJDK-17.0.8.7.2"/>
+    <property name="localRepository" value="/Users/shs/.m2/repository"/>
+    <property name="java.vendor.url.bug" value="https://rdar.apple.com/new/1003593"/>
+    <property name="java.io.tmpdir" value="/var/folders/3r/7x4j_zmj0js6w0kl19jlmclr0000gn/T/"/>
+    <property name="java.version" value="17.0.8"/>
+    <property name="user.dir" value="/Volumes/Dev/src/github.com/bazel-contrib/rules_jvm/comparative-tests"/>
+    <property name="os.arch" value="aarch64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="native.encoding" value="UTF-8"/>
+    <property name="java.library.path" value="/Users/shs/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="java.vendor" value="Apple Inc."/>
+    <property name="java.vm.version" value="17.0.8+7-LTS"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeBig"/>
+    <property name="java.class.version" value="61.0"/>
+  </properties>
+  <testcase name="translateDynamicTestsFromStream" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests" time="0.001"/>
+  <testcase name="translateDynamicTestsFromStream" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests" time="0.0"/>
+  <testcase name="translateDynamicTestsFromStream" classname="com.github.bazel_contrib.contrib_rules_jvm.comparative.DynamicTests" time="0.0"/>
+</testsuite>