Add module descriptor to assertj-guava, move tests to separate module

assertj · May 15, 2024 · b7b5ec4 · b7b5ec4
1 parent 2c695fc
commit b7b5ec4
Show file tree

Hide file tree

Showing 94 changed files with 301 additions and 222 deletions.
diff --git a/assertj-guava/pom.xml b/assertj-guava/pom.xml
@@ -42,12 +42,6 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    <!-- Test -->
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/assertj-guava/src/main/java/module-info.java b/assertj-guava/src/main/java/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * Copyright 2012-2024 the original author or authors.
+ */
+
+/**
+ * AssertJ extension for Guava assertions.
+ */
+module org.assertj.guava {
+  requires transitive org.assertj.core;
+  requires com.google.common;
+
+  exports org.assertj.guava.api;
+  exports org.assertj.guava.data;
+  exports org.assertj.guava.error;
+  exports org.assertj.guava.util;
+}
diff --git a/assertj-tests/assertj-integration-tests/assertj-guava-module-path/pom.xml b/assertj-tests/assertj-integration-tests/assertj-guava-module-path/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.assertj</groupId>
+    <artifactId>assertj-integration-tests</artifactId>
+    <version>3.26.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>assertj-guava-module-path</artifactId>
+
+  <name>AssertJ Guava Integration Tests - Module Path</name>
+
+  <properties>
+    <rootDirectory>${project.basedir}/../../../</rootDirectory>
+    <spotless.skip>false</spotless.skip>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>33.2.0-jre</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-guava</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/...-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/module-info.java b/...-tests/assertj-integration-tests/assertj-guava-module-path/src/test/java/module-info.java
@@ -0,0 +1,18 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * Copyright 2012-2024 the original author or authors.
+ */
+open module org.assertj.test.guava {
+  requires com.google.common;
+  requires org.assertj.guava;
+  requires org.junit.jupiter.api;
+  requires org.junit.jupiter.params;
+}
diff --git a/...rtions_assertThat_with_Multimap_Test.java → ...rtions_assertThat_with_Multimap_Test.java b/...rtions_assertThat_with_Multimap_Test.java → ...rtions_assertThat_with_Multimap_Test.java
@@ -10,11 +10,12 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static org.assertj.core.api.BDDAssertions.then;
 import static org.assertj.guava.api.Assertions.assertThat;
 
+import org.assertj.guava.api.MultimapAssert;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.HashMultimap;
@@ -35,14 +36,4 @@ void should_create_Assert() {
     then(assertion).isNotNull();
   }
 
-  @Test
-  void should_pass_actual() {
-    // GIVEN
-    Multimap<String, String> actual = HashMultimap.create();
-    // WHEN
-    Multimap<String, String> result = assertThat(actual).getActual();
-    // THEN
-    then(result).isSameAs(actual);
-  }
-
 }
diff --git a/...rtions_assertThat_with_Optional_Test.java → ...rtions_assertThat_with_Optional_Test.java b/...rtions_assertThat_with_Optional_Test.java → ...rtions_assertThat_with_Optional_Test.java
@@ -10,19 +10,19 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static org.assertj.core.api.BDDAssertions.then;
 import static org.assertj.guava.api.Assertions.assertThat;
 
+import org.assertj.guava.api.OptionalAssert;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.base.Optional;
 
 /**
  * @author Joel Costigliola
  */
-@SuppressWarnings("Guava")
 class Assertions_assertThat_with_Optional_Test {
 
   @Test
@@ -35,14 +35,4 @@ void should_create_Assert() {
     then(assertion).isNotNull();
   }
 
-  @Test
-  void should_pass_actual() {
-    // GIVEN
-    Optional<String> actual = Optional.of("value");
-    // WHEN
-    Optional<String> result = assertThat(actual).getActual();
-    // THEN
-    then(result).isSameAs(actual);
-  }
-
 }
diff --git a/..._with_InstanceOfAssertFactories_Test.java → ..._with_InstanceOfAssertFactories_Test.java b/..._with_InstanceOfAssertFactories_Test.java → ..._with_InstanceOfAssertFactories_Test.java
@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.util.stream.Collectors.toMap;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -34,6 +34,11 @@
 import java.util.stream.Stream;
 
 import org.assertj.core.api.InstanceOfAssertFactory;
+import org.assertj.guava.api.Assertions;
+import org.assertj.guava.api.InstanceOfAssertFactories;
+import org.assertj.guava.api.RangeAssert;
+import org.assertj.guava.api.RangeMapAssert;
+import org.assertj.guava.api.RangeSetAssert;
 import org.junit.jupiter.api.Test;
 
 /**

diff --git a/...teSourceAssert_hasSameContentAs_Test.java → ...teSourceAssert_hasSameContentAs_Test.java b/...teSourceAssert_hasSameContentAs_Test.java → ...teSourceAssert_hasSameContentAs_Test.java
@@ -10,13 +10,13 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static org.assertj.core.api.BDDAssertions.then;
 import static org.assertj.core.util.FailureMessages.actualIsNull;
 import static org.assertj.guava.api.Assertions.assertThat;
 import static org.assertj.guava.error.ShouldHaveSameContent.shouldHaveSameContent;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
+import static org.assertj.guava.tests.testkit.AssertionErrors.expectAssertionError;
 
 import java.io.IOException;
 

diff --git a/...va/api/ByteSourceAssert_hasSize_Test.java → ...ts/api/ByteSourceAssert_hasSize_Test.java b/...va/api/ByteSourceAssert_hasSize_Test.java → ...ts/api/ByteSourceAssert_hasSize_Test.java
@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...va/api/ByteSourceAssert_isEmpty_Test.java → ...ts/api/ByteSourceAssert_isEmpty_Test.java b/...va/api/ByteSourceAssert_isEmpty_Test.java → ...ts/api/ByteSourceAssert_isEmpty_Test.java
@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...va/api/InstanceOfAssertFactoriesTest.java → ...ts/api/InstanceOfAssertFactoriesTest.java b/...va/api/InstanceOfAssertFactoriesTest.java → ...ts/api/InstanceOfAssertFactoriesTest.java
@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.MapEntry.entry;
@@ -29,6 +29,15 @@
 
 import java.io.IOException;
 
+import org.assertj.guava.api.Assertions;
+import org.assertj.guava.api.ByteSourceAssert;
+import org.assertj.guava.api.MultimapAssert;
+import org.assertj.guava.api.MultisetAssert;
+import org.assertj.guava.api.OptionalAssert;
+import org.assertj.guava.api.RangeAssert;
+import org.assertj.guava.api.RangeMapAssert;
+import org.assertj.guava.api.RangeSetAssert;
+import org.assertj.guava.api.TableAssert;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.base.Optional;

diff --git a/...rtj/guava/api/MultimapAssertBaseTest.java → ...ava/tests/api/MultimapAssertBaseTest.java b/...rtj/guava/api/MultimapAssertBaseTest.java → ...ava/tests/api/MultimapAssertBaseTest.java
@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static com.google.common.collect.Lists.newArrayList;
 
@@ -35,4 +35,4 @@ public void setUp() {
     actual.putAll("Spurs", newArrayList("Tony Parker", "Tim Duncan", "Manu Ginobili"));
   }
 
-}
+}
diff --git a/...imapAssert_containsAllEntriesOf_Test.java → ...imapAssert_containsAllEntriesOf_Test.java b/...imapAssert_containsAllEntriesOf_Test.java → ...imapAssert_containsAllEntriesOf_Test.java
@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.assertj.core.api.Assertions.catchThrowable;
@@ -20,8 +20,8 @@
 import static org.assertj.core.util.FailureMessages.actualIsNull;
 import static org.assertj.core.util.Lists.list;
 import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
 
+import org.assertj.guava.tests.testkit.AssertionErrors;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.HashMultimap;
@@ -76,7 +76,7 @@ void should_fail_if_actual_is_null() {
     // GIVEN
     actual = null;
     // WHEN
-    AssertionError error = expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
+    AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
     // THEN
     then(error).hasMessage(actualIsNull());
   }
@@ -100,7 +100,7 @@ void should_fail_if_actual_does_not_contain_all_given_multimap_entries() {
     other.putAll("Spurs", newArrayList("Tony Parker", "Tim Duncan", "Manu Ginobili"));
     other.putAll("Warriors", newArrayList("Stephen Curry", "Klay Thompson"));
     // WHEN
-    AssertionError error = expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
+    AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).containsAllEntriesOf(other));
     // THEN
     then(error).hasMessage(shouldContain(actual, other,
                                          list(entry("Warriors", "Stephen Curry"), entry("Warriors", "Klay Thompson"))).create());

diff --git a/...api/MultimapAssert_containsKeys_Test.java → ...api/MultimapAssert_containsKeys_Test.java b/...api/MultimapAssert_containsKeys_Test.java → ...api/MultimapAssert_containsKeys_Test.java
@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...i/MultimapAssert_containsValues_Test.java → ...i/MultimapAssert_containsValues_Test.java b/...i/MultimapAssert_containsValues_Test.java → ...i/MultimapAssert_containsValues_Test.java
@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...ava/api/MultimapAssert_contains_Test.java → ...sts/api/MultimapAssert_contains_Test.java b/...ava/api/MultimapAssert_contains_Test.java → ...sts/api/MultimapAssert_contains_Test.java
@@ -10,7 +10,7 @@
  *
  * Copyright 2012-2024 the original author or authors.
  */
-package org.assertj.guava.api;
+package org.assertj.guava.tests.api;
 
 import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.catchThrowable;
@@ -20,9 +20,9 @@
 import static org.assertj.core.util.Arrays.array;
 import static org.assertj.core.util.FailureMessages.actualIsNull;
 import static org.assertj.guava.api.Assertions.assertThat;
-import static org.assertj.guava.testkit.AssertionErrors.expectAssertionError;
 
 import org.assertj.core.data.MapEntry;
+import org.assertj.guava.tests.testkit.AssertionErrors;
 import org.junit.jupiter.api.Test;
 
 class MultimapAssert_contains_Test extends MultimapAssertBaseTest {
@@ -38,7 +38,7 @@ void should_fail_if_actual_is_null() {
     // GIVEN
     actual = null;
     // WHEN
-    AssertionError error = expectAssertionError(() -> assertThat(actual).contains(entry("Lakers", "Kobe Bryant")));
+    AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).contains(entry("Lakers", "Kobe Bryant")));
     // THEN
     then(error).hasMessage(actualIsNull());
   }
@@ -68,7 +68,7 @@ void should_fail_if_actual_does_not_contain_all_given_entries() {
     // GIVEN
     MapEntry<String, String>[] entries = array(entry("Lakers", "Kobe Bryant"), entry("Spurs", "Derrick Rose"));
     // WHEN
-    AssertionError error = expectAssertionError(() -> assertThat(actual).contains(entries));
+    AssertionError error = AssertionErrors.expectAssertionError(() -> assertThat(actual).contains(entries));
     // THEN
     then(error).hasMessage(shouldContain(actual, entries, singleton(entry("Spurs", "Derrick Rose"))).create());
   }