Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAMONGO-1455, DATAMONGO-1456 - Polishing.

Browse Source 
Use static imports for org.junit.Assert and org.hamcrest.core. Fix spelling.

Original pull request: #375.
This commit is contained in:
Christoph Strobl
2016-07-11 12:47:48 +02:00
committed by Mark Paluch
parent ac55f5e77f
commit 9361fc3c71
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextCriteria.java
View File

@@ -172,7 +172,7 @@ public class TextCriteria implements CriteriaDefinition {
/** /**
* Optionally enable or disable case sensitive search. * Optionally enable or disable case sensitive search.
* *
* @param caseSensitive boolean flag endable/disable. * @param caseSensitive boolean flag to enable/disable.
* @return never {@literal null}. * @return never {@literal null}.
* @since 1.10 * @since 1.10
*/ */
@@ -183,9 +183,9 @@ public class TextCriteria implements CriteriaDefinition {
} }
/** /**
* Optionallly enable or disable diacritic sensitive search against version 3 text indexes. * Optionally enable or disable diacritic sensitive search against version 3 text indexes.
* *
* @param diacriticSensitive boolean flag endable/disable. * @param diacriticSensitive boolean flag to enable/disable.
* @return never {@literal null}. * @return never {@literal null}.
* @since 1.10 * @since 1.10
*/ */

36
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextCriteriaUnitTests.java
View File

@@ -15,8 +15,9 @@
*/ */
package org.springframework.data.mongodb.core.query; package org.springframework.data.mongodb.core.query;
import org.hamcrest.core.IsEqual; import static org.hamcrest.core.IsEqual.*;
import org.junit.Assert; import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.data.mongodb.core.DBObjectTestUtils; import org.springframework.data.mongodb.core.DBObjectTestUtils;
@@ -39,7 +40,7 @@ public class TextCriteriaUnitTests {
public void shouldNotHaveLanguageField() { public void shouldNotHaveLanguageField() {
TextCriteria criteria = TextCriteria.forDefaultLanguage(); TextCriteria criteria = TextCriteria.forDefaultLanguage();
Assert.assertThat(criteria.getCriteriaObject(), IsEqual.equalTo(searchObject("{ }"))); assertThat(criteria.getCriteriaObject(), equalTo(searchObject("{ }")));
} }
/** /**
@@ -49,7 +50,7 @@ public class TextCriteriaUnitTests {
public void shouldNotHaveLanguageForNonDefaultLanguageField() { public void shouldNotHaveLanguageForNonDefaultLanguageField() {
TextCriteria criteria = TextCriteria.forLanguage("spanish"); TextCriteria criteria = TextCriteria.forLanguage("spanish");
Assert.assertThat(criteria.getCriteriaObject(), IsEqual.equalTo(searchObject("{ \"$language\" : \"spanish\" }"))); assertThat(criteria.getCriteriaObject(), equalTo(searchObject("{ \"$language\" : \"spanish\" }")));
} }
/** /**
@@ -59,7 +60,7 @@ public class TextCriteriaUnitTests {
public void shouldCreateSearchFieldForSingleTermCorrectly() { public void shouldCreateSearchFieldForSingleTermCorrectly() {
TextCriteria criteria = TextCriteria.forDefaultLanguage().matching("cake"); TextCriteria criteria = TextCriteria.forDefaultLanguage().matching("cake");
Assert.assertThat(criteria.getCriteriaObject(), IsEqual.equalTo(searchObject("{ \"$search\" : \"cake\" }"))); assertThat(criteria.getCriteriaObject(), equalTo(searchObject("{ \"$search\" : \"cake\" }")));
} }
/** /**
@@ -69,8 +70,7 @@ public class TextCriteriaUnitTests {
public void shouldCreateSearchFieldCorrectlyForMultipleTermsCorrectly() { public void shouldCreateSearchFieldCorrectlyForMultipleTermsCorrectly() {
TextCriteria criteria = TextCriteria.forDefaultLanguage().matchingAny("bake", "coffee", "cake"); TextCriteria criteria = TextCriteria.forDefaultLanguage().matchingAny("bake", "coffee", "cake");
Assert.assertThat(criteria.getCriteriaObject(), assertThat(criteria.getCriteriaObject(), equalTo(searchObject("{ \"$search\" : \"bake coffee cake\" }")));
IsEqual.equalTo(searchObject("{ \"$search\" : \"bake coffee cake\" }")));
} }
/** /**
@@ -80,8 +80,8 @@ public class TextCriteriaUnitTests {
public void shouldCreateSearchFieldForPhraseCorrectly() { public void shouldCreateSearchFieldForPhraseCorrectly() {
TextCriteria criteria = TextCriteria.forDefaultLanguage().matchingPhrase("coffee cake"); TextCriteria criteria = TextCriteria.forDefaultLanguage().matchingPhrase("coffee cake");
Assert.assertThat(DBObjectTestUtils.getAsDBObject(criteria.getCriteriaObject(), "$text"), assertThat(DBObjectTestUtils.getAsDBObject(criteria.getCriteriaObject(), "$text"),
IsEqual.<DBObject> equalTo(new BasicDBObject("$search", "\"coffee cake\""))); equalTo((DBObject) new BasicDBObject("$search", "\"coffee cake\"")));
} }
/** /**
@@ -91,7 +91,7 @@ public class TextCriteriaUnitTests {
public void shouldCreateNotFieldCorrectly() { public void shouldCreateNotFieldCorrectly() {
TextCriteria criteria = TextCriteria.forDefaultLanguage().notMatching("cake"); TextCriteria criteria = TextCriteria.forDefaultLanguage().notMatching("cake");
Assert.assertThat(criteria.getCriteriaObject(), IsEqual.equalTo(searchObject("{ \"$search\" : \"-cake\" }"))); assertThat(criteria.getCriteriaObject(), equalTo(searchObject("{ \"$search\" : \"-cake\" }")));
} }
/** /**
@@ -101,8 +101,7 @@ public class TextCriteriaUnitTests {
public void shouldCreateSearchFieldCorrectlyForNotMultipleTermsCorrectly() { public void shouldCreateSearchFieldCorrectlyForNotMultipleTermsCorrectly() {
TextCriteria criteria = TextCriteria.forDefaultLanguage().notMatchingAny("bake", "coffee", "cake"); TextCriteria criteria = TextCriteria.forDefaultLanguage().notMatchingAny("bake", "coffee", "cake");
Assert.assertThat(criteria.getCriteriaObject(), assertThat(criteria.getCriteriaObject(), equalTo(searchObject("{ \"$search\" : \"-bake -coffee -cake\" }")));
IsEqual.equalTo(searchObject("{ \"$search\" : \"-bake -coffee -cake\" }")));
} }
/** /**
@@ -112,8 +111,8 @@ public class TextCriteriaUnitTests {
public void shouldCreateSearchFieldForNotPhraseCorrectly() { public void shouldCreateSearchFieldForNotPhraseCorrectly() {
TextCriteria criteria = TextCriteria.forDefaultLanguage().notMatchingPhrase("coffee cake"); TextCriteria criteria = TextCriteria.forDefaultLanguage().notMatchingPhrase("coffee cake");
Assert.assertThat(DBObjectTestUtils.getAsDBObject(criteria.getCriteriaObject(), "$text"), assertThat(DBObjectTestUtils.getAsDBObject(criteria.getCriteriaObject(), "$text"),
IsEqual.<DBObject> equalTo(new BasicDBObject("$search", "-\"coffee cake\""))); equalTo((DBObject) new BasicDBObject("$search", "-\"coffee cake\"")));
} }
/** /**
@@ -123,8 +122,8 @@ public class TextCriteriaUnitTests {
public void caseSensitiveOperatorShouldBeSetCorrectly() { public void caseSensitiveOperatorShouldBeSetCorrectly() {
TextCriteria criteria = TextCriteria.forDefaultLanguage().matching("coffee").caseSensitive(true); TextCriteria criteria = TextCriteria.forDefaultLanguage().matching("coffee").caseSensitive(true);
Assert.assertThat(DBObjectTestUtils.getAsDBObject(criteria.getCriteriaObject(), "$text"), IsEqual assertThat(DBObjectTestUtils.getAsDBObject(criteria.getCriteriaObject(), "$text"),
.<DBObject> equalTo(new BasicDBObjectBuilder().add("$search", "coffee").add("$caseSensitive", true).get())); equalTo(new BasicDBObjectBuilder().add("$search", "coffee").add("$caseSensitive", true).get()));
} }
/** /**
@@ -134,9 +133,8 @@ public class TextCriteriaUnitTests {
public void diacriticSensitiveOperatorShouldBeSetCorrectly() { public void diacriticSensitiveOperatorShouldBeSetCorrectly() {
TextCriteria criteria = TextCriteria.forDefaultLanguage().matching("coffee").diacriticSensitive(true); TextCriteria criteria = TextCriteria.forDefaultLanguage().matching("coffee").diacriticSensitive(true);
Assert.assertThat(DBObjectTestUtils.getAsDBObject(criteria.getCriteriaObject(), "$text"), assertThat(DBObjectTestUtils.getAsDBObject(criteria.getCriteriaObject(), "$text"),
IsEqual.<DBObject> equalTo( equalTo((DBObject) new BasicDBObjectBuilder().add("$search", "coffee").add("$diacriticSensitive", true).get()));
new BasicDBObjectBuilder().add("$search", "coffee").add("$diacriticSensitive", true).get()));
} }
private DBObject searchObject(String json) { private DBObject searchObject(String json) {