You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2015/06/22 10:12:55 UTC
svn commit: r1686801 - in /james/mailbox/trunk/cassandra: pom.xml
src/test/java/org/apache/james/mailbox/cassandra/mail/utils/SimpleMailboxACLJsonConverterTest.java
Author: btellier
Date: Mon Jun 22 08:12:55 2015
New Revision: 1686801
URL: http://svn.apache.org/r1686801
Log:
MAILBOX-219 JSON tests should not check array order - contributed by Antoine Duprat
Modified:
james/mailbox/trunk/cassandra/pom.xml
james/mailbox/trunk/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/SimpleMailboxACLJsonConverterTest.java
Modified: james/mailbox/trunk/cassandra/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/cassandra/pom.xml?rev=1686801&r1=1686800&r2=1686801&view=diff
==============================================================================
--- james/mailbox/trunk/cassandra/pom.xml (original)
+++ james/mailbox/trunk/cassandra/pom.xml Mon Jun 22 08:12:55 2015
@@ -47,6 +47,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.skyscreamer</groupId>
+ <artifactId>jsonassert</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -85,6 +90,18 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
+ <groupId>net.javacrumbs.json-unit</groupId>
+ <artifactId>json-unit</artifactId>
+ <version>1.5.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.javacrumbs.json-unit</groupId>
+ <artifactId>json-unit-fluent</artifactId>
+ <version>1.5.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
<version>${cassandra-unit.version}</version>
Modified: james/mailbox/trunk/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/SimpleMailboxACLJsonConverterTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/SimpleMailboxACLJsonConverterTest.java?rev=1686801&r1=1686800&r2=1686801&view=diff
==============================================================================
--- james/mailbox/trunk/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/SimpleMailboxACLJsonConverterTest.java (original)
+++ james/mailbox/trunk/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/SimpleMailboxACLJsonConverterTest.java Mon Jun 22 08:12:55 2015
@@ -19,15 +19,16 @@
package org.apache.james.mailbox.cassandra.mail.utils;
+import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER;
+import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
import static org.assertj.core.api.Assertions.assertThat;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.SimpleMailboxACL;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.Map;
-
public class SimpleMailboxACLJsonConverterTest {
public class ACLMapBuilder {
@@ -66,31 +67,37 @@ public class SimpleMailboxACLJsonConvert
@Test
public void emptyACLShouldBeWellSerialized() throws Exception {
- assertThat(SimpleMailboxACLJsonConverter.toJson(SimpleMailboxACL.EMPTY)).isEqualTo("{\"entries\":{}}");
+ assertThatJson(SimpleMailboxACLJsonConverter.toJson(SimpleMailboxACL.EMPTY))
+ .isEqualTo("{\"entries\":{}}")
+ .when(IGNORING_ARRAY_ORDER);
}
@Test
public void singleUserEntryACLShouldBeWellSerialized() throws Exception {
- assertThat(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleUserEntryToMap().buildAsACL()))
- .isEqualTo("{\"entries\":{\"-user\":2040}}");
+ assertThatJson(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleUserEntryToMap().buildAsACL()))
+ .isEqualTo("{\"entries\":{\"-user\":2040}}")
+ .when(IGNORING_ARRAY_ORDER);
}
@Test
public void singleGroupEntryACLShouldBeWellSerialized() throws Exception {
- assertThat(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleGroupEntryToMap().buildAsACL()))
- .isEqualTo("{\"entries\":{\"-$group\":2032}}");
+ assertThatJson(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleGroupEntryToMap().buildAsACL()))
+ .isEqualTo("{\"entries\":{\"-$group\":2032}}")
+ .when(IGNORING_ARRAY_ORDER);
}
@Test
public void singleSpecialEntryACLShouldBeWellSerialized() throws Exception {
- assertThat(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleSpecialEntryToMap().buildAsACL()))
- .isEqualTo("{\"entries\":{\"-special\":1968}}");
+ assertThatJson(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleSpecialEntryToMap().buildAsACL()))
+ .isEqualTo("{\"entries\":{\"-special\":1968}}")
+ .when(IGNORING_ARRAY_ORDER);
}
@Test
public void multipleEntriesACLShouldBeWellSerialized() throws Exception {
- assertThat(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleUserEntryToMap().addSingleGroupEntryToMap().buildAsACL()))
- .isEqualTo("{\"entries\":{\"-user\":2040,\"-$group\":2032}}");
+ assertThatJson(SimpleMailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleUserEntryToMap().addSingleGroupEntryToMap().buildAsACL()))
+ .isEqualTo("{\"entries\":{\"-user\":2040,\"-$group\":2032}}")
+ .when(IGNORING_ARRAY_ORDER);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org