JAMES-1595 Test mapping sorting in AbstractRecipientRewriteTable

git-svn-id: https://svn.apache.org/repos/asf/james/project/trunk@1711989 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 2, 2015 · 49f6c33 · 49f6c33
1 parent dcd0e58
commit 49f6c33
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/...ata-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java b/...ata-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
@@ -21,7 +21,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-import java.util.Arrays;
 import java.util.Map;
 
 import org.apache.james.lifecycle.api.LifecycleUtil;
@@ -301,7 +300,7 @@ public void sortMappingsShouldReturnNullWhenNull() {
 
     @Test
     public void sortMappingsShouldReturnEmptyWhenEmpty() {
-        assertThat(AbstractRecipientRewriteTable.sortMappings("")).isEqualTo("");
+        assertThat(AbstractRecipientRewriteTable.sortMappings("")).isEmpty();
     }
 
     @Test
@@ -312,19 +311,26 @@ public void sortMappingsShouldReturnSameStringWhenSingleDomainAlias() {
 
     @Test
     public void sortMappingsShouldReturnSameStringWhenTwoDomainAliases() {
-        String firstAliasMapping = RecipientRewriteTable.ALIASDOMAIN_PREFIX + "first";
-        String secondAliasMapping = RecipientRewriteTable.ALIASDOMAIN_PREFIX + "second";
-        String mappings = MappingsImpl.fromCollection(Arrays.asList(firstAliasMapping, secondAliasMapping)).serialize();
-        assertThat(AbstractRecipientRewriteTable.sortMappings(mappings)).isEqualTo(mappings);
+        MappingsImpl mappings = MappingsImpl.builder()
+                .add(RecipientRewriteTable.ALIASDOMAIN_PREFIX + "first")
+                .add(RecipientRewriteTable.ALIASDOMAIN_PREFIX + "second")
+                .build();
+        assertThat(AbstractRecipientRewriteTable.sortMappings(mappings.serialize())).isEqualTo(mappings.serialize());
     }
 
     @Test
     public void sortMappingsShouldPutDomainAliasFirstWhenVariousMappings() {
         String regexMapping = RecipientRewriteTable.REGEX_PREFIX + "first";
         String domainMapping = RecipientRewriteTable.ALIASDOMAIN_PREFIX + "second";
-        String inputMappings = MappingsImpl.fromCollection(Arrays.asList(regexMapping, domainMapping)).serialize();
-        String expectedMappings = MappingsImpl.fromCollection(Arrays.asList(domainMapping, regexMapping)).serialize();
-        assertThat(AbstractRecipientRewriteTable.sortMappings(inputMappings)).isEqualTo(expectedMappings);
+        MappingsImpl mappings = MappingsImpl.builder()
+                .add(regexMapping)
+                .add(domainMapping)
+                .build();
+        assertThat(AbstractRecipientRewriteTable.sortMappings(mappings.serialize()))
+                .isEqualTo(MappingsImpl.builder()
+                        .add(domainMapping)
+                        .add(regexMapping)
+                        .build().serialize());
     }