diff --git a/releng/target-platform/target-platform.target b/releng/target-platform/target-platform.target index a2561a6d9..30f0cbaff 100644 --- a/releng/target-platform/target-platform.target +++ b/releng/target-platform/target-platform.target @@ -1,7 +1,7 @@ - + @@ -169,6 +169,12 @@ 1.11.0 jar + + com.google.truth + truth + 1.4.4 + jar + jakarta.servlet jakarta.servlet-api diff --git a/releng/target-platform/target-platform.tpd b/releng/target-platform/target-platform.tpd index 20cc1b45b..1c7e31954 100644 --- a/releng/target-platform/target-platform.tpd +++ b/releng/target-platform/target-platform.tpd @@ -140,6 +140,11 @@ maven MavenDependencies scope=compile dependencyDepth=infinite missingManifest=g artifactId="auto-value-annotations" version="1.11.0" } + dependency { + groupId="com.google.truth" + artifactId="truth" + version="1.4.4" + } dependency { // Logback provides a Servlet Container service which is also loaded and that needs servlet (by default optional) groupId="jakarta.servlet" artifactId="jakarta.servlet-api" diff --git a/tests/com.salesforce.bazel.importedsource.tests/.classpath b/tests/com.salesforce.bazel.importedsource.tests/.classpath index c4d608305..989abd861 100644 --- a/tests/com.salesforce.bazel.importedsource.tests/.classpath +++ b/tests/com.salesforce.bazel.importedsource.tests/.classpath @@ -6,7 +6,6 @@ - diff --git a/tests/com.salesforce.bazel.importedsource.tests/META-INF/MANIFEST.MF b/tests/com.salesforce.bazel.importedsource.tests/META-INF/MANIFEST.MF index ed93d5e1d..d32a74f9e 100644 --- a/tests/com.salesforce.bazel.importedsource.tests/META-INF/MANIFEST.MF +++ b/tests/com.salesforce.bazel.importedsource.tests/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-SymbolicName: com.salesforce.bazel.importedsource.tests Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Bazel Eclipse Feature Fragment-Host: com.salesforce.bazel.importedsource;bundle-version="2.0.0.qualifier" -Import-Package: org.junit.jupiter.api;version="[5.11.0,6.0.0)", +Import-Package: com.google.common.truth;version="[1.4.0,2.0.0)", + org.junit.jupiter.api;version="[5.11.0,6.0.0)", org.junit.jupiter.api.condition;version="[5.11.0,6.0.0)" Automatic-Module-Name: com.salesforce.bazel.java.sdk.tests Bundle-RequiredExecutionEnvironment: JavaSE-17 -Bundle-ClassPath: lib/truth-0.31.jar, - . +Bundle-ClassPath: . diff --git a/tests/com.salesforce.bazel.importedsource.tests/build.properties b/tests/com.salesforce.bazel.importedsource.tests/build.properties index 4b1eebe71..bce0c43d2 100644 --- a/tests/com.salesforce.bazel.importedsource.tests/build.properties +++ b/tests/com.salesforce.bazel.importedsource.tests/build.properties @@ -1,11 +1,10 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - .,\ - lib/truth-0.31.jar + . additional.bundles = org.hamcrest.core,\ org.mockito.mockito-core,\ junit-jupiter-api,\ org.hamcrest,\ net.bytebuddy.byte-buddy,\ - org.junit + wrapped.com.google.truth.truth diff --git a/tests/com.salesforce.bazel.importedsource.tests/lib/truth-0.31.jar b/tests/com.salesforce.bazel.importedsource.tests/lib/truth-0.31.jar deleted file mode 100644 index 2b98ebc76..000000000 Binary files a/tests/com.salesforce.bazel.importedsource.tests/lib/truth-0.31.jar and /dev/null differ diff --git a/tests/com.salesforce.bazel.importedsource.tests/src/com/google/idea/blaze/base/model/primitives/TargetExpressionTest.java b/tests/com.salesforce.bazel.importedsource.tests/src/com/google/idea/blaze/base/model/primitives/TargetExpressionTest.java index 9a22c2c3a..ff61640be 100644 --- a/tests/com.salesforce.bazel.importedsource.tests/src/com/google/idea/blaze/base/model/primitives/TargetExpressionTest.java +++ b/tests/com.salesforce.bazel.importedsource.tests/src/com/google/idea/blaze/base/model/primitives/TargetExpressionTest.java @@ -31,7 +31,7 @@ public void emptyExpressionShouldThrow() { @Test public void globExpressionShouldYieldGeneralTargetExpression() { var target = TargetExpression.fromStringSafe("//package/..."); - assertThat(target.getClass()).isSameAs(TargetExpression.class); + assertThat(target.getClass()).isSameInstanceAs(TargetExpression.class); } @Test