diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-08 17:36:59 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-08 17:36:59 +0200 |
| commit | 830e214805c68f5c447bca1b9db9b95c9866419c (patch) | |
| tree | b514590123a4d422656b94be9e06b5ef64f4f366 /org.eclipse.jgit.http.test | |
| parent | ea9231b39df100fa467282150ccef2994f1ef335 (diff) | |
| parent | b31d5360f0d1eaa9f6547079fe97988218fe5fe5 (diff) | |
| download | jgit-830e214805c68f5c447bca1b9db9b95c9866419c.tar.gz jgit-830e214805c68f5c447bca1b9db9b95c9866419c.zip | |
Merge branch 'stable-5.5'
* stable-5.5:
bazel: fix running http tests
Set parameter name in parameterized http tests
Format BUILD files with buildifier
Format BUILD files with buildifier
[error prone] Suppress NonAtomicVolatileUpdate in SimpleLruCache
Bazel: Format BUILD files with buildifier
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Bazel: Fix warning about deprecated lib.bzl
Format lib/BUILD with buildifier
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Bazel: Bump minimum supported version to 0.29.0
Bazel: Bump skylib library version to 0.8.0
Use bazelisk to switch between used bazel version
Bazel: Require minimum bazel version 0.17.1
Fix wrong placeholder index in error message packInaccessible
JGitText: Remove unused externalized strings
RepoText: Remove unused externalized string
CLI: Remove unused externalized strings
Change-Id: Idb0848dd33a76328b24908dc86db335cca742a1c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.http.test')
| -rw-r--r-- | org.eclipse.jgit.http.test/BUILD | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AllFactoriesHttpTestCase.java | 18 |
2 files changed, 15 insertions, 4 deletions
diff --git a/org.eclipse.jgit.http.test/BUILD b/org.eclipse.jgit.http.test/BUILD index dcffa066d0..09316adc6f 100644 --- a/org.eclipse.jgit.http.test/BUILD +++ b/org.eclipse.jgit.http.test/BUILD @@ -2,6 +2,7 @@ load( "@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests", ) +load("@rules_java//java:defs.bzl", "java_library") junit_tests( name = "http", diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AllFactoriesHttpTestCase.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AllFactoriesHttpTestCase.java index 266194f654..d292d79c48 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AllFactoriesHttpTestCase.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AllFactoriesHttpTestCase.java @@ -52,6 +52,7 @@ import org.eclipse.jgit.transport.http.JDKHttpConnectionFactory; import org.eclipse.jgit.transport.http.apache.HttpClientConnectionFactory; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -61,15 +62,24 @@ import org.junit.runners.Parameterized.Parameters; * factories provided in JGit: the JDK {@link JDKHttpConnectionFactory} and the * Apache HTTP {@link HttpClientConnectionFactory}. */ +@Ignore @RunWith(Parameterized.class) public abstract class AllFactoriesHttpTestCase extends HttpTestCase { - @Parameters + @Parameters(name = "{0}") public static Collection<Object[]> data() { // run all tests with both connection factories we have - return Arrays - .asList(new Object[][] { { new JDKHttpConnectionFactory() }, - { new HttpClientConnectionFactory() } }); + return Arrays.asList(new Object[][] { { new JDKHttpConnectionFactory() { + @Override + public String toString() { + return this.getClass().getSuperclass().getName(); + } + } }, { new HttpClientConnectionFactory() { + @Override + public String toString() { + return this.getClass().getSuperclass().getName(); + } + } } }); } protected AllFactoriesHttpTestCase(HttpConnectionFactory cf) { |