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 2019/01/11 03:01:13 UTC
[03/10] james-project git commit: JAMES-2636 refactoring some mapping
tests
JAMES-2636 refactoring some mapping tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/00dcbd8f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/00dcbd8f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/00dcbd8f
Branch: refs/heads/master
Commit: 00dcbd8f9f15f20b725b90b8a2340f3f3bc8ae8d
Parents: 106a284
Author: Rene Cordier <rc...@linagora.com>
Authored: Fri Jan 4 18:03:11 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Fri Jan 11 09:48:33 2019 +0700
----------------------------------------------------------------------
.../org/apache/james/rrt/lib/MappingTest.java | 8 +++----
.../lib/AbstractRecipientRewriteTableTest.java | 22 ++++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/00dcbd8f/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java b/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
index 8eecd53..5c71bd5 100644
--- a/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
+++ b/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
@@ -38,19 +38,19 @@ public class MappingTest {
@Test
void hasPrefixShouldReturnTrueWhenDomain() {
- boolean hasPrefix = Mapping.Type.hasPrefix(Type.Domain.asPrefix() + "myRegex");
+ boolean hasPrefix = Mapping.Type.hasPrefix(Type.Domain.asPrefix() + "myDomain");
assertThat(hasPrefix).isTrue();
}
@Test
void hasPrefixShouldReturnTrueWhenError() {
- boolean hasPrefix = Mapping.Type.hasPrefix(Type.Error.asPrefix() + "myRegex");
+ boolean hasPrefix = Mapping.Type.hasPrefix(Type.Error.asPrefix() + "myError");
assertThat(hasPrefix).isTrue();
}
@Test
void hasPrefixShouldReturnTrueWhenForward() {
- boolean hasPrefix = Mapping.Type.hasPrefix(Type.Forward.asPrefix() + "myRegex");
+ boolean hasPrefix = Mapping.Type.hasPrefix(Type.Forward.asPrefix() + "myForward");
assertThat(hasPrefix).isTrue();
}
@@ -62,7 +62,7 @@ public class MappingTest {
@Test
void hasPrefixShouldReturnFalseWhenAddress() {
- boolean hasPrefix = Mapping.Type.hasPrefix(Type.Address.asPrefix() + "myRegex");
+ boolean hasPrefix = Mapping.Type.hasPrefix(Type.Address.asPrefix() + "myAddress");
assertThat(hasPrefix).isFalse();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/00dcbd8f/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
index b9bfe0a..2974975 100644
--- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTableTest.java
@@ -87,12 +87,12 @@ public abstract class AbstractRecipientRewriteTableTest {
String regex2 = "(.+)@test";
String invalidRegex = ".*):";
- assertThat(virtualUserTable.getResolvedMappings(USER, domain)).describedAs("No mapping")
+ assertThat(virtualUserTable.getStoredMappings(source)).describedAs("No mapping")
.isEqualTo(MappingsImpl.empty());
virtualUserTable.addMapping(source, Mapping.regex(regex));
virtualUserTable.addMapping(source, Mapping.regex(regex2));
- assertThat(virtualUserTable.getResolvedMappings(USER, domain)).describedAs("Two mappings").hasSize(2);
+ assertThat(virtualUserTable.getStoredMappings(source)).describedAs("Two mappings").hasSize(2);
assertThat(virtualUserTable.getAllMappings()).describedAs("One mappingline").hasSize(1);
virtualUserTable.removeMapping(source, Mapping.regex(regex));
@@ -104,7 +104,7 @@ public abstract class AbstractRecipientRewriteTableTest {
virtualUserTable.removeMapping(source, Mapping.regex(regex2));
- assertThat(virtualUserTable.getResolvedMappings(USER, domain)).describedAs("No mapping")
+ assertThat(virtualUserTable.getStoredMappings(source)).describedAs("No mapping")
.isEqualTo(MappingsImpl.empty());
assertThat(virtualUserTable.getAllMappings()).describedAs("No mapping").isEmpty();
}
@@ -140,19 +140,19 @@ public abstract class AbstractRecipientRewriteTableTest {
MappingSource source = MappingSource.fromUser(USER, domain);
String address2 = "test@james";
- assertThat(virtualUserTable.getResolvedMappings(USER, domain)).describedAs("No mapping")
+ assertThat(virtualUserTable.getStoredMappings(source)).describedAs("No mapping")
.isEqualTo(MappingsImpl.empty());
virtualUserTable.addMapping(source, Mapping.address(ADDRESS));
virtualUserTable.addMapping(source, Mapping.address(address2));
- assertThat(virtualUserTable.getResolvedMappings(USER, domain)).describedAs("Two mappings").hasSize(2);
+ assertThat(virtualUserTable.getStoredMappings(source)).describedAs("Two mappings").hasSize(2);
assertThat(virtualUserTable.getAllMappings()).describedAs("One mappingline").hasSize(1);
virtualUserTable.removeMapping(source, Mapping.address(ADDRESS));
virtualUserTable.removeMapping(source, Mapping.address(address2));
- assertThat(virtualUserTable.getResolvedMappings(USER, domain)).describedAs("No mapping")
+ assertThat(virtualUserTable.getStoredMappings(source)).describedAs("No mapping")
.isEqualTo(MappingsImpl.empty());
assertThat(virtualUserTable.getAllMappings()).describedAs("No mapping").isEmpty();
}
@@ -279,7 +279,7 @@ public abstract class AbstractRecipientRewriteTableTest {
virtualUserTable.addMapping(source, Mapping.address(ADDRESS));
virtualUserTable.addMapping(source, Mapping.regex(ADDRESS));
- assertThat(virtualUserTable.getResolvedMappings(USER, domain)).hasSize(2);
+ assertThat(virtualUserTable.getStoredMappings(source)).hasSize(2);
}
@Test
@@ -291,7 +291,7 @@ public abstract class AbstractRecipientRewriteTableTest {
virtualUserTable.addMapping(source, Mapping.forward(ADDRESS));
virtualUserTable.addMapping(source, Mapping.forward(address2));
- assertThat(virtualUserTable.getResolvedMappings(USER, domain)).hasSize(2);
+ assertThat(virtualUserTable.getStoredMappings(source)).hasSize(2);
}
@Test
@@ -306,7 +306,7 @@ public abstract class AbstractRecipientRewriteTableTest {
virtualUserTable.removeMapping(source, Mapping.forward(ADDRESS));
virtualUserTable.removeMapping(source, Mapping.forward(address2));
- assertThat(virtualUserTable.getResolvedMappings(USER, domain))
+ assertThat(virtualUserTable.getStoredMappings(source))
.isEqualTo(MappingsImpl.empty());
}
@@ -319,7 +319,7 @@ public abstract class AbstractRecipientRewriteTableTest {
virtualUserTable.addMapping(source, Mapping.group(ADDRESS));
virtualUserTable.addMapping(source, Mapping.group(address2));
- assertThat(virtualUserTable.getResolvedMappings(USER, domain)).hasSize(2);
+ assertThat(virtualUserTable.getStoredMappings(source)).hasSize(2);
}
@Test
@@ -334,7 +334,7 @@ public abstract class AbstractRecipientRewriteTableTest {
virtualUserTable.removeMapping(source, Mapping.group(ADDRESS));
virtualUserTable.removeMapping(source, Mapping.group(address2));
- assertThat(virtualUserTable.getResolvedMappings(USER, domain))
+ assertThat(virtualUserTable.getStoredMappings(source))
.isEqualTo(MappingsImpl.empty());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org