DATAMONGO-1425 - Compare not like/not containing queries in tests using JSON.

Comparing query documents using equals performs an object equals check and not a BSON represented equality check. Since Pattern.equals performs only a object instance equality check (this==that) we cannot check for equality using equals as this check always returns false. We now compare nested patterns using the JSON representation.

Author: mp911de

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java

@@ -62,7 +62,7 @@
 
 /**
  * Unit test for {@link MongoQueryCreator}.
- * 
+ *
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
@@ -463,7 +463,7 @@ public void shouldCreateRegexWhenUsingNotContainsOnStringProperty() {
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "thew"), context);
 		Query query = creator.createQuery();
 
-		assertThat(query.getQueryObject(), is(query(where("username").not().regex(".*thew.*")).getQueryObject()));
+		assertThat(query.getQueryObject().toJson(), is(query(where("username").not().regex(".*thew.*")).getQueryObject().toJson()));
 	}
 
 	/**
@@ -680,8 +680,8 @@ public void notLikeShouldEscapeSourceWhenUsedWithLeadingAndTrailingWildcard() {
 
 		Query query = new MongoQueryCreator(tree, accessor, context).createQuery();
 
-		assertThat(query.getQueryObject(),
-				is(query(where("username").not().regex(".*\\Qfire.fight+\\E.*")).getQueryObject()));
+		assertThat(query.getQueryObject().toJson(),
+				is(query(where("username").not().regex(".*\\Qfire.fight+\\E.*")).getQueryObject().toJson()));
 	}
 
 	/**
@@ -695,8 +695,8 @@ public void notLikeShouldEscapeSourceWhenUsedWithLeadingWildcard() {
 
 		Query query = new MongoQueryCreator(tree, accessor, context).createQuery();
 
-		assertThat(query.getQueryObject(),
-				is(query(where("username").not().regex(".*\\Qsteel.heart+\\E")).getQueryObject()));
+		assertThat(query.getQueryObject().toJson(),
+				is(query(where("username").not().regex(".*\\Qsteel.heart+\\E")).getQueryObject().toJson()));
 	}
 
 	/**
@@ -709,7 +709,7 @@ public void notLikeShouldEscapeSourceWhenUsedWithTrailingWildcard() {
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "cala.mity+*"), context);
 		Query query = creator.createQuery();
 
-		assertThat(query.getQueryObject(), is(query(where("username").not().regex("\\Qcala.mity+\\E.*")).getQueryObject()));
+		assertThat(query.getQueryObject().toJson(), is(query(where("username").not().regex("\\Qcala.mity+\\E.*")).getQueryObject().toJson()));
 	}
 
 	/**
@@ -722,7 +722,7 @@ public void notLikeShouldBeTreatedCorrectlyWhenUsedWithWildcardOnly() {
 		ConvertingParameterAccessor accessor = getAccessor(converter, "*");
 
 		Query query = new MongoQueryCreator(tree, accessor, context).createQuery();
-		assertThat(query.getQueryObject(), is(query(where("username").not().regex(".*")).getQueryObject()));
+		assertThat(query.getQueryObject().toJson(), is(query(where("username").not().regex(".*")).getQueryObject().toJson()));
 	}
 
 	interface PersonRepository extends Repository<Person, Long> {