More examples and improvements

Author: joel-costigliola

assertions-examples/.classpath

@@ -2,13 +2,15 @@
 <classpath>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src/test/generated-assertions"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
@@ -23,6 +25,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/assertj--core-3.x"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

assertions-examples/pom.xml

@@ -21,7 +21,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <neo4j.version>3.0.0</neo4j.version>
-    <assertj-core.version>3.10.1-SNAPSHOT</assertj-core.version>
+    <assertj-core.version>3.11.0-SNAPSHOT</assertj-core.version>
   </properties>
 
   <dependencies>
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-joda-time</artifactId>
-      <version>2.0.0</version>
+      <version>2.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.17.0</version>
+      <version>2.18.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>

assertions-examples/src/test/java/org/assertj/examples/rpg/Item.java renamed to assertions-examples/src/main/java/org/assertj/examples/rpg/Item.java

@@ -348,6 +348,28 @@ public static org.assertj.examples.data.service.TeamManagerAssert assertThat(org
     return new org.assertj.examples.data.service.TeamManagerAssert(actual);
   }
 
+  /**
+   * Creates a new instance of <code>{@link org.assertj.examples.rpg.ItemAssert}</code>.
+   *
+   * @param actual the actual value.
+   * @return the created assertion object.
+   */
+  @org.assertj.core.util.CheckReturnValue
+  public static org.assertj.examples.rpg.ItemAssert assertThat(org.assertj.examples.rpg.Item actual) {
+    return new org.assertj.examples.rpg.ItemAssert(actual);
+  }
+
+  /**
+   * Creates a new instance of <code>{@link org.assertj.examples.rpg.WandAssert}</code>.
+   *
+   * @param actual the actual value.
+   * @return the created assertion object.
+   */
+  @org.assertj.core.util.CheckReturnValue
+  public static org.assertj.examples.rpg.WandAssert assertThat(org.assertj.examples.rpg.Wand actual) {
+    return new org.assertj.examples.rpg.WandAssert(actual);
+  }
+
   /**
    * Creates a new <code>{@link Assertions}</code>.
    */

assertions-examples/src/test/java/org/assertj/examples/rpg/Wand.java renamed to assertions-examples/src/main/java/org/assertj/examples/rpg/Wand.java

@@ -347,6 +347,28 @@ public static org.assertj.examples.data.service.TeamManagerAssert then(org.asser
     return new org.assertj.examples.data.service.TeamManagerAssert(actual);
   }
 
+  /**
+   * Creates a new instance of <code>{@link org.assertj.examples.rpg.ItemAssert}</code>.
+   *
+   * @param actual the actual value.
+   * @return the created assertion object.
+   */
+  @org.assertj.core.util.CheckReturnValue
+  public static org.assertj.examples.rpg.ItemAssert then(org.assertj.examples.rpg.Item actual) {
+    return new org.assertj.examples.rpg.ItemAssert(actual);
+  }
+
+  /**
+   * Creates a new instance of <code>{@link org.assertj.examples.rpg.WandAssert}</code>.
+   *
+   * @param actual the actual value.
+   * @return the created assertion object.
+   */
+  @org.assertj.core.util.CheckReturnValue
+  public static org.assertj.examples.rpg.WandAssert then(org.assertj.examples.rpg.Wand actual) {
+    return new org.assertj.examples.rpg.WandAssert(actual);
+  }
+
   /**
    * Creates a new <code>{@link BddAssertions}</code>.
    */

assertions-examples/src/test/generated-assertions/org/assertj/Assertions.java

@@ -362,4 +362,26 @@ public org.assertj.examples.data.service.TeamManagerAssert assertThat(org.assert
     return proxy(org.assertj.examples.data.service.TeamManagerAssert.class, org.assertj.examples.data.service.TeamManager.class, actual);
   }
 
+  /**
+   * Creates a new "soft" instance of <code>{@link org.assertj.examples.rpg.ItemAssert}</code>.
+   *
+   * @param actual the actual value.
+   * @return the created "soft" assertion object.
+   */
+  @org.assertj.core.util.CheckReturnValue
+  public org.assertj.examples.rpg.ItemAssert assertThat(org.assertj.examples.rpg.Item actual) {
+    return proxy(org.assertj.examples.rpg.ItemAssert.class, org.assertj.examples.rpg.Item.class, actual);
+  }
+
+  /**
+   * Creates a new "soft" instance of <code>{@link org.assertj.examples.rpg.WandAssert}</code>.
+   *
+   * @param actual the actual value.
+   * @return the created "soft" assertion object.
+   */
+  @org.assertj.core.util.CheckReturnValue
+  public org.assertj.examples.rpg.WandAssert assertThat(org.assertj.examples.rpg.Wand actual) {
+    return proxy(org.assertj.examples.rpg.WandAssert.class, org.assertj.examples.rpg.Wand.class, actual);
+  }
+
 }

assertions-examples/src/test/generated-assertions/org/assertj/BddAssertions.java

@@ -347,4 +347,26 @@ public org.assertj.examples.data.service.TeamManagerAssert assertThat(org.assert
     return proxy(org.assertj.examples.data.service.TeamManagerAssert.class, org.assertj.examples.data.service.TeamManager.class, actual);
   }
 
+  /**
+   * Creates a new "soft" instance of <code>{@link org.assertj.examples.rpg.ItemAssert}</code>.
+   *
+   * @param actual the actual value.
+   * @return the created "soft" assertion object.
+   */
+  @org.assertj.core.util.CheckReturnValue
+  public org.assertj.examples.rpg.ItemAssert assertThat(org.assertj.examples.rpg.Item actual) {
+    return proxy(org.assertj.examples.rpg.ItemAssert.class, org.assertj.examples.rpg.Item.class, actual);
+  }
+
+  /**
+   * Creates a new "soft" instance of <code>{@link org.assertj.examples.rpg.WandAssert}</code>.
+   *
+   * @param actual the actual value.
+   * @return the created "soft" assertion object.
+   */
+  @org.assertj.core.util.CheckReturnValue
+  public org.assertj.examples.rpg.WandAssert assertThat(org.assertj.examples.rpg.Wand actual) {
+    return proxy(org.assertj.examples.rpg.WandAssert.class, org.assertj.examples.rpg.Wand.class, actual);
+  }
+
 }

assertions-examples/src/test/generated-assertions/org/assertj/JUnitSoftAssertions.java

@@ -19,16 +19,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
 import org.assertj.examples.data.BasketBallPlayer;
 import org.assertj.examples.data.Mansion;
 import org.assertj.examples.data.service.GameService;
 import org.assertj.examples.data.service.TeamManager;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * BDD Style Assertions examples
@@ -51,7 +50,7 @@ public void given_when_then_with_mockito() {
 
     given(teamManager.getPlayers()).willReturn(asList(rose, james, durant));
 
-    //when
+    // when
     boolean result = sut.play();
 
     then(result).isTrue();
@@ -60,10 +59,10 @@ public void given_when_then_with_mockito() {
   @Test
   public void bdd_host_dinner_party_where_nobody_dies() {
 
-    //given
+    // given
     Mansion mansion = new Mansion();
 
-    //when
+    // when
     mansion.hostPotentiallyMurderousDinnerParty();
 
     then(mansion.guests()).isEqualTo(6);
@@ -75,13 +74,12 @@ public void bdd_host_dinner_party_where_nobody_dies() {
     then(mansion.professor()).isEqualTo("bloodied and disheveled");
   }
 
-
   @Test
   public void bdd_assertions_examples() {
-    //given
-    List<BasketBallPlayer> bulls = new ArrayList<BasketBallPlayer>();
+    // given
+    List<BasketBallPlayer> bulls = new ArrayList<>();
 
-    //when
+    // when
     bulls.add(rose);
     bulls.add(noah);
 
@@ -90,14 +88,14 @@ public void bdd_assertions_examples() {
 
   @Test
   public void bdd_soft_assertions_examples() {
-	//given
-	List<BasketBallPlayer> bulls = new ArrayList<BasketBallPlayer>();
-	
-	//when
-	bulls.add(rose);
-	bulls.add(noah);
-	
-	then(bulls).contains(rose, noah).doesNotContain(james);
+    // given
+    List<BasketBallPlayer> bulls = new ArrayList<>();
+
+    // when
+    bulls.add(rose);
+    bulls.add(noah);
+
+    then(bulls).contains(rose, noah).doesNotContain(james);
   }
-  
+
 }

assertions-examples/src/test/generated-assertions/org/assertj/SoftAssertions.java

@@ -12,12 +12,11 @@
  */
 package org.assertj.examples;
 
-import org.junit.Test;
-
+import org.assertj.SoftAssertions;
 import org.assertj.core.api.SoftAssertionError;
 import org.assertj.examples.data.Name;
-import org.assertj.SoftAssertions;
 import org.assertj.examples.exception.NameException;
+import org.junit.Test;
 
 public class GeneratedSoftAssertionsExamples extends AbstractAssertionsExamples {
 

assertions-examples/src/test/java/org/assertj/examples/BDDAssertionsExamples.java

@@ -0,0 +1,33 @@
+/**
+ * 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-2016 the original author or authors.
+ */
+package org.assertj.examples;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import org.junit.Test;
+
+public class InputStreamAssertionsExamples extends AbstractAssertionsExamples {
+
+  @Test
+  public void input_stream_content_can_be_compared_to_string() {
+    // GIVEN
+    String text = "Real stupidity beats artificial intelligence every time";
+    InputStream inputStream = new ByteArrayInputStream(text.getBytes());
+    // THEN
+    assertThat(inputStream).hasContent(text);
+  }
+
+}