diff --git a/smack-core/build.gradle b/smack-core/build.gradle index 82f078423e..27f5a2bb57 100644 --- a/smack-core/build.gradle +++ b/smack-core/build.gradle @@ -42,7 +42,6 @@ dependencies { testFixturesApi "org.assertj:assertj-core:3.26.3" testFixturesApi "org.xmlunit:xmlunit-assertj:$xmlUnitVersion" testFixturesApi 'org.hamcrest:hamcrest-library:2.2' - testFixturesApi "com.google.guava:guava:${guavaVersion}" } class CreateFileTask extends DefaultTask { diff --git a/smack-core/src/test/java/org/jivesoftware/smack/SmackTest.java b/smack-core/src/test/java/org/jivesoftware/smack/SmackTest.java index 169e133377..fe107ec08e 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/SmackTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/SmackTest.java @@ -23,19 +23,19 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import java.util.HashSet; import java.util.Set; -import com.google.common.collect.Sets; import org.junit.jupiter.api.Test; public class SmackTest { @Test public void getNoticeStreamTest() throws IOException { - Set expectedStrings = Sets.newHashSet( + Set expectedStrings = new HashSet<>(Set.of( "Florian Schmaus" , "Paul Schaub" - ); + )); int maxLineLength = 0; try (InputStream inputStream = Smack.getNoticeStream()) { diff --git a/smack-integration-test/build.gradle b/smack-integration-test/build.gradle index 7aaed16e72..285029c0f8 100644 --- a/smack-integration-test/build.gradle +++ b/smack-integration-test/build.gradle @@ -16,7 +16,6 @@ dependencies { api project(':smack-websocket-okhttp') api project(':smack-resolver-dnsjava') implementation project(':smack-websocket-java11') - implementation "com.google.guava:guava:${guavaVersion}" implementation "org.reflections:reflections:${orgReflectionsVersion}" api 'eu.geekplace.javapinning:java-pinning-java11:1.3.0' implementation group: 'commons-io', name: 'commons-io', version: "$commonsIoVersion" diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoManagerSetupHelper.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoManagerSetupHelper.java index 8aaa9e64f4..450f3d1cda 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoManagerSetupHelper.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoManagerSetupHelper.java @@ -37,8 +37,6 @@ import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint; import org.jivesoftware.smackx.pubsub.PubSubException; -import com.google.common.collect.Maps; - public class OmemoManagerSetupHelper { @@ -77,7 +75,7 @@ public static void trustAllIdentitiesWithTests(OmemoManager alice, OmemoManager Map fps2 = alice.getActiveFingerprints(bob.getOwnJid()); assertEquals(fps1.size(), fps2.size()); - assertTrue(Maps.difference(fps1, fps2).areEqual()); + assertEquals(fps1, fps2); assertAllDevicesAreDecided(alice, fps2); assertAllDevicesAreTrusted(alice, fps2); diff --git a/smack-java11-full/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java b/smack-java11-full/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java index 47ec8c453e..d87916a111 100644 --- a/smack-java11-full/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java +++ b/smack-java11-full/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java @@ -31,7 +31,7 @@ import org.jivesoftware.smack.util.EqualsUtil; import org.jivesoftware.smack.util.HashCode; -import com.google.common.io.Resources; + import org.jgrapht.graph.DefaultEdge; import org.jgrapht.graph.DirectedPseudograph; import org.jgrapht.io.DOTImporter; @@ -43,8 +43,8 @@ public class ModularXmppClientToServerConnectionStateGraphTest { @Test public void testStateGraphDotOutput() throws IOException, ImportException { - URL stateGraphDotFileUrl = Resources.getResource("state-graph.dot"); - String expectedStateGraphDot = Resources.toString(stateGraphDotFileUrl, StandardCharsets.UTF_8); + URL stateGraphDotFileUrl = ModularXmppClientToServerConnectionStateGraphTest.class.getClassLoader().getResource("state-graph.dot"); + String expectedStateGraphDot = new String(stateGraphDotFileUrl.openStream().readAllBytes(), StandardCharsets.UTF_8); StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw);