spring-projects#297 - Fixed failing test due to repository methods now returning Optional.

schauder · odrotbohm · commit 80b70e6bd2f4 · 2017-10-06T15:26:40.000+02:00
Also migrated Tests to AssertJ. Fixed compilation failure due to changed API of CollectionOptions
diff --git a/mongodb/query-by-example/src/test/java/example/springdata/mongodb/querybyexample/UserRepositoryIntegrationTests.java b/mongodb/query-by-example/src/test/java/example/springdata/mongodb/querybyexample/UserRepositoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,26 +15,25 @@
  */
 package example.springdata.mongodb.querybyexample;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-import static org.springframework.data.domain.ExampleMatcher.*;
+import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.*;
-import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.startsWith;
+import static org.springframework.data.domain.ExampleMatcher.*;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleMatcher.StringMatcher;
+import org.springframework.data.domain.ExampleMatcher.*;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration test showing the usage of MongoDB Query-by-Example support through Spring Data repositories.
  *
  * @author Mark Paluch
  * @author Oliver Gierke
+ * @author Jens Schauder
  */
 @SuppressWarnings("unused")
 @RunWith(SpringRunner.class)
@@ -65,7 +64,7 @@ public void countBySimpleExample() {
 
 		Example<Person> example = Example.of(new Person(null, "White", null));
 
-		assertThat(repository.count(example), is(3L));
+		assertThat(repository.count(example)).isEqualTo(3L);
 	}
 
 	/**
@@ -77,7 +76,7 @@ public void ignorePropertiesAndMatchByAge() {
 		Example<Person> example = Example.of(flynn, matching(). //
 				withIgnorePaths("firstname", "lastname"));
 
-		assertThat(repository.findOne(example), is(flynn));
+		assertThat(repository.findOne(example)).contains(flynn);
 	}
 
 	/**
@@ -89,7 +88,7 @@ public void substringMatching() {
 		Example<Person> example = Example.of(new Person("er", null, null), matching().//
 				withStringMatcher(StringMatcher.ENDING));
 
-		assertThat(repository.findAll(example), hasItems(skyler, walter));
+		assertThat(repository.findAll(example)).containsExactlyInAnyOrder(skyler, walter);
 	}
 
 	/**
@@ -101,7 +100,7 @@ public void regexMatching() {
 		Example<Person> example = Example.of(new Person("(Skyl|Walt)er", null, null), matching().//
 				withMatcher("firstname", matcher -> matcher.regex()));
 
-		assertThat(repository.findAll(example), hasItems(skyler, walter));
+		assertThat(repository.findAll(example)).contains(skyler, walter);
 	}
 
 	/**
@@ -116,7 +115,7 @@ public void matchStartingStringsIgnoreCase() {
 						withMatcher("firstname", startsWith()).//
 						withMatcher("lastname", ignoreCase()));
 
-		assertThat(repository.findAll(example), hasItems(flynn, walter));
+		assertThat(repository.findAll(example)).containsExactlyInAnyOrder(flynn, walter);
 	}
 
 	/**
@@ -131,7 +130,7 @@ public void configuringMatchersUsingLambdas() {
 						withMatcher("firstname", matcher -> matcher.startsWith()).//
 						withMatcher("lastname", matcher -> matcher.ignoreCase()));
 
-		assertThat(repository.findAll(example), hasItems(flynn, walter));
+		assertThat(repository.findAll(example)).containsExactlyInAnyOrder(flynn, walter);
 	}
 
 	/**
@@ -143,6 +142,6 @@ public void valueTransformer() {
 		Example<Person> example = Example.of(new Person(null, "White", 99), matching(). //
 				withMatcher("age", matcher -> matcher.transform(value -> Integer.valueOf(50))));
 
-		assertThat(repository.findAll(example), hasItems(walter));
+		assertThat(repository.findAll(example)).containsExactlyInAnyOrder(walter);
 	}
 }
diff --git a/mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactivePersonRepositoryIntegrationTest.java b/mongodb/reactive/src/test/java/example/springdata/mongodb/people/ReactivePersonRepositoryIntegrationTest.java
@@ -50,7 +50,7 @@ public void setUp() {
 
 		operations.collectionExists(Person.class) //
 				.flatMap(exists -> exists ? operations.dropCollection(Person.class) : Mono.just(exists)) //
-				.flatMap(o -> operations.createCollection(Person.class, new CollectionOptions(1024 * 1024, 100, true))) //
+				.flatMap(o -> operations.createCollection(Person.class, CollectionOptions.empty().size(1024 * 1024).maxDocuments( 100).capped())) //
 				.then() //
 				.block();
 
diff --git a/mongodb/reactive/src/test/java/example/springdata/mongodb/people/RxJava1PersonRepositoryIntegrationTest.java b/mongodb/reactive/src/test/java/example/springdata/mongodb/people/RxJava1PersonRepositoryIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@
  * reactive flavors.
  *
  * @author Mark Paluch
+ * @author Jens Schauder
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -54,7 +55,7 @@ public void setUp() {
 
 		operations.collectionExists(Person.class) //
 				.flatMap(exists -> exists ? operations.dropCollection(Person.class) : Mono.just(exists)) //
-				.flatMap(o -> operations.createCollection(Person.class, new CollectionOptions(1024 * 1024, 100, true))) //
+				.flatMap(o -> operations.createCollection(Person.class, CollectionOptions.empty().size(1024 * 1024).maxDocuments(100).capped())) //
 				.then() //
 				.block();
 
