Update Google Truth library

salesforce · Nov 7, 2024 · 26bda32 · 26bda32
1 parent 25e9e70
commit 26bda32
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/releng/target-platform/target-platform.target b/releng/target-platform/target-platform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="bazel-eclipse-feature-target-platform" sequenceNumber="1730981039">
+<target name="bazel-eclipse-feature-target-platform" sequenceNumber="1730995499">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.e4.rcp.feature.group" version="4.33.0.v20240903-0618"/>
@@ -169,6 +169,12 @@
           <version>1.11.0</version>
           <type>jar</type>
         </dependency>
+        <dependency>
+          <groupId>com.google.truth</groupId>
+          <artifactId>truth</artifactId>
+          <version>1.4.4</version>
+          <type>jar</type>
+        </dependency>
         <dependency>
           <groupId>jakarta.servlet</groupId>
           <artifactId>jakarta.servlet-api</artifactId>

diff --git 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
@@ -6,7 +6,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/truth-0.31.jar"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
 			<attribute name="ignore_optional_problems" value="true"/>

diff --git 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
@@ -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
diff --git a/...tedsource.tests/src/com/google/idea/blaze/base/model/primitives/TargetExpressionTest.java b/...tedsource.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