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 2018/08/04 01:20:30 UTC
[15/16] james-project git commit: JAMES-2495 Update pl.pragmatists to
1.1.1
JAMES-2495 Update pl.pragmatists to 1.1.1
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b413bba3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b413bba3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b413bba3
Branch: refs/heads/master
Commit: b413bba372855f99427f1902035168fe3a6b8a73
Parents: 38d5851
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Mon Jul 23 16:56:30 2018 +0200
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Sat Aug 4 08:17:48 2018 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
.../filesystem/api/AbstractFileSystemTest.java | 56 ++++++++++----------
2 files changed, 30 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b413bba3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1813085..d67761d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2539,7 +2539,7 @@
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
- <version>1.0.4</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/b413bba3/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
----------------------------------------------------------------------
diff --git a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
index cc9f420..34972dc 100644
--- a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
+++ b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.james.filesystem.api;
-import static junitparams.JUnitParamsRunner.$;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
@@ -113,13 +112,13 @@ public abstract class AbstractFileSystemTest {
public static class UrlsAsFileThrowingFileNotFoundExceptionProvider {
public static Object[] provides() {
- return $(
- $("bad://file"),
- $("classpath:" + FAKE_FILE),
- $("classpath:/" + FAKE_FILE),
- $("http://localhost:$PORT$/"),
- $("classpath:" + new File(ClassLoader.getSystemResource(EXISTING_CLASSPATH_FILE).getFile()).getAbsolutePath()),
- $("classpath:java/lang/String.class")
+ return toArray(
+ toArray("bad://file"),
+ toArray("classpath:" + FAKE_FILE),
+ toArray("classpath:/" + FAKE_FILE),
+ toArray("http://localhost:$PORT$/"),
+ toArray("classpath:" + new File(ClassLoader.getSystemResource(EXISTING_CLASSPATH_FILE).getFile()).getAbsolutePath()),
+ toArray("classpath:java/lang/String.class")
);
}
}
@@ -134,11 +133,11 @@ public abstract class AbstractFileSystemTest {
public static class NonExistingFilesProvider {
public static Object[] provides() {
- return $(
- $("file:///" + FAKE_FILE),
- $("file:///" + FAKE_DIRECTORY + FAKE_FILE),
- $("file://conf/" + FAKE_FILE),
- $("file://var/" + FAKE_FILE)
+ return toArray(
+ toArray("file:///" + FAKE_FILE),
+ toArray("file:///" + FAKE_DIRECTORY + FAKE_FILE),
+ toArray("file://conf/" + FAKE_FILE),
+ toArray("file://var/" + FAKE_FILE)
);
}
}
@@ -152,10 +151,10 @@ public abstract class AbstractFileSystemTest {
public static class NonAvailableStreamsProvider {
public static Object[] provide() {
- return $(
- $("http://localhost:$PORT$/" + FAKE_FILE),
- $("classpath:java/lang/" + FAKE_FILE + ".clas"),
- $("classpath:" + FAKE_FILE)
+ return toArray(
+ toArray("http://localhost:$PORT$/" + FAKE_FILE),
+ toArray("classpath:java/lang/" + FAKE_FILE + ".clas"),
+ toArray("classpath:" + FAKE_FILE)
);
}
}
@@ -170,13 +169,13 @@ public abstract class AbstractFileSystemTest {
public static class AvailableStreamsProvider {
public static Object[] provide() {
- return $(
- $("http://localhost:$PORT$/"),
- $("classpath:java/lang/String.class"),
- $("classpath:" + EXISTING_CLASSPATH_FILE),
- $("classpath:" + EXISTING_CLASSPATH_FILE_WITH_SPACES),
- $("classpath:/" + EXISTING_CLASSPATH_FILE),
- $("classpath:/" + EXISTING_CLASSPATH_FILE_WITH_SPACES)
+ return toArray(
+ toArray("http://localhost:$PORT$/"),
+ toArray("classpath:java/lang/String.class"),
+ toArray("classpath:" + EXISTING_CLASSPATH_FILE),
+ toArray("classpath:" + EXISTING_CLASSPATH_FILE_WITH_SPACES),
+ toArray("classpath:/" + EXISTING_CLASSPATH_FILE),
+ toArray("classpath:/" + EXISTING_CLASSPATH_FILE_WITH_SPACES)
);
}
}
@@ -196,9 +195,9 @@ public abstract class AbstractFileSystemTest {
public static class FileToCreateProvider {
public static Object[] provide() {
- return $(
- $("fileSystemTest", ".txt"),
- $("file System Test", ".txt")
+ return toArray(
+ toArray("fileSystemTest", ".txt"),
+ toArray("file System Test", ".txt")
);
}
}
@@ -269,4 +268,7 @@ public abstract class AbstractFileSystemTest {
assertThat(file).hasContent("varcontent");
}
+ private static Object[] toArray(Object... params) {
+ return params;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org