You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2022/11/23 17:31:03 UTC
[juneau] branch master updated: Move ThirdPartyProxyTest to unit tests.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 0be87d167 Move ThirdPartyProxyTest to unit tests.
0be87d167 is described below
commit 0be87d167406ef437aa5b50dca14a2b35b32aa54
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Wed Nov 23 12:30:32 2022 -0500
Move ThirdPartyProxyTest to unit tests.
---
.../src/test/java/org/apache/juneau/rest/test/Root.java | 2 --
.../src/test/java/org/apache/juneau/rest/test/_TestSuite.java | 4 +---
.../org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java | 0
.../java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java | 2 --
4 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
index 17fe69c96..5f1716666 100644
--- a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
+++ b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
@@ -20,7 +20,6 @@ import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.beans.*;
import org.apache.juneau.rest.servlet.*;
-import org.apache.juneau.rest.test.client.*;
@Rest(
path="/*",
@@ -28,7 +27,6 @@ import org.apache.juneau.rest.test.client.*;
DebugResource.class,
ConfigResource.class,
LargePojosResource.class,
- ThirdPartyProxyResource.class,
ShutdownResource.class,
}
)
diff --git a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/_TestSuite.java b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
index cbc924718..a58d74bc8 100644
--- a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
+++ b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.test;
-import org.apache.juneau.rest.test.client.*;
import org.junit.*;
import org.junit.runner.*;
import org.junit.runners.*;
@@ -25,8 +24,7 @@ import org.junit.runners.Suite.*;
*/
@RunWith(Suite.class)
@SuiteClasses({
- ConfigTest.class,
- ThirdPartyProxyTest.class,
+ ConfigTest.class
})
public class _TestSuite {
diff --git a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
similarity index 100%
rename from juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
rename to juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
diff --git a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
similarity index 96%
rename from juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
rename to juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
index c4b1761e7..cb83d9606 100644
--- a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
@@ -36,7 +36,6 @@ import org.apache.juneau.json.*;
import org.apache.juneau.msgpack.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.mock.*;
-import org.apache.juneau.rest.test.*;
import org.apache.juneau.rest.test.client.ThirdPartyProxyTest.ThirdPartyProxy.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.testutils.pojos.*;
@@ -85,7 +84,6 @@ public class ThirdPartyProxyTest {
if (System.currentTimeMillis() - time.get() > 10000) {
try {
System.err.println("Failed at iteration " + iteration.get()); // NOT DEBUG
- TestMicroservice.jettyDump(null, null);
System.exit(2);
} catch (Exception e) {
e.printStackTrace();