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 712fd0f Tests.
712fd0f is described below
commit 712fd0ff4b468e9e36bb68117ed072265d47d9e1
Author: JamesBognar <[email protected]>
AuthorDate: Sun May 13 19:16:59 2018 -0400
Tests.
---
.../java/org/apache/juneau/rest/test/Root.java | 1 -
.../juneau/rest/test/TransformsParentResource.java | 26 ------
.../apache/juneau/rest/test/TransformsTest.java | 63 -------------
.../org/apache/juneau/rest/test/_TestSuite.java | 1 -
.../rest/annotation/RestResourcePathTest.java | 4 +-
.../rest/annotation/RestResourcePojoSwapsTest.java | 102 ++++++++++++---------
6 files changed, 61 insertions(+), 136 deletions(-)
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
index 45c5e99..35e6222 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
+++
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/Root.java
@@ -29,7 +29,6 @@ import org.apache.juneau.rest.test.client.*;
CallbackStringsResource.class,
ClientFuturesResource.class,
ConfigResource.class,
- TransformsResource.class,
FormDataResource.class,
HtmlDocResource.class,
HtmlDocLinksResource.class,
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsParentResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsParentResource.java
deleted file mode 100644
index 8a97ad5..0000000
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsParentResource.java
+++ /dev/null
@@ -1,26 +0,0 @@
-//
***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
-// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
-// * with the License. You may obtain a copy of the License at
*
-// *
*
-// * http://www.apache.org/licenses/LICENSE-2.0
*
-// *
*
-// * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
-// * specific language governing permissions and limitations under the
License. *
-//
***************************************************************************************************************************
-package org.apache.juneau.rest.test;
-
-import org.apache.juneau.rest.*;
-import org.apache.juneau.rest.annotation.*;
-
-/**
- * JUnit automated testcase resource.
- */
-@RestResource(
- pojoSwaps={TransformsResource.SwapA1.class}
-)
-public class TransformsParentResource extends BasicRestServlet {
- private static final long serialVersionUID = 1L;
-}
diff --git
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/TransformsTest.java
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/TransformsTest.java
deleted file mode 100644
index 3d405c4..0000000
---
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/TransformsTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-//
***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
-// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
-// * with the License. You may obtain a copy of the License at
*
-// *
*
-// * http://www.apache.org/licenses/LICENSE-2.0
*
-// *
*
-// * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
-// * specific language governing permissions and limitations under the
License. *
-//
***************************************************************************************************************************
-package org.apache.juneau.rest.test;
-
-import static org.junit.Assert.*;
-
-import org.apache.juneau.rest.client.*;
-import org.junit.*;
-
-public class TransformsTest extends RestTestcase {
-
- private static String URL = "/testTransforms";
-
-
//====================================================================================================
- // test1 - Test class transform overrides parent class transform
- // Should return "A2-1".
-
//====================================================================================================
- @Test
- public void testClassTransformOverridesParentClassTransform() throws
Exception {
- RestClient client = TestMicroservice.DEFAULT_CLIENT;
- String r;
- String url = URL +
"/testClassTransformOverridesParentClassTransform";
-
- r = client.doGet(url).getResponse(String.class);
- assertEquals("A2-0", r);
-
- r = client.doPut(url, "A2-1").getResponse(String.class);
- assertEquals("A2-1", r);
-
- r = client.doPut(url + "/A2-2", "").getResponse(String.class);
- assertEquals("A2-2", r);
- }
-
-
//====================================================================================================
- // Test method transform overrides class transform
- // Should return "A3-1".
-
//====================================================================================================
- @Test
- public void testMethodTransformOverridesClassTransform() throws
Exception {
- RestClient client = TestMicroservice.DEFAULT_CLIENT;
- String r;
- String url = URL +
"/testMethodTransformOverridesClassTransform";
-
- r = client.doGet(url).getResponse(String.class);
- assertEquals("A3-0", r);
-
- r = client.doPut(url, "A3-1").getResponse(String.class);
- assertEquals("A3-1", r);
-
- r = client.doPut(url + "/A3-2", "").getResponse(String.class);
- assertEquals("A3-2", r);
- }
-}
diff --git
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
index d99f943..b409348 100644
---
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
+++
b/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/_TestSuite.java
@@ -40,7 +40,6 @@ import org.junit.runners.Suite.*;
RestClientTest.class,
SerializersTest.class,
ThirdPartyProxyTest.class,
- TransformsTest.class,
})
public class _TestSuite {
diff --git
a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
index 0cfb838..f715edf 100644
---
a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
+++
b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
@@ -26,9 +26,9 @@ import org.junit.runners.*;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class RestResourcePathTest {
-
//====================================================================================================
+
//=================================================================================================================
// Nested children.
-
//====================================================================================================
+
//=================================================================================================================
@RestResource(path="/p0", children={A01.class})
public static class A {
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsResource.java
b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestResourcePojoSwapsTest.java
similarity index 55%
rename from
juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsResource.java
rename to
juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestResourcePojoSwapsTest.java
index ae0f3f1..9790891 100644
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/TransformsResource.java
+++
b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestResourcePojoSwapsTest.java
@@ -10,60 +10,29 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-package org.apache.juneau.rest.test;
+package org.apache.juneau.rest.annotation;
import static org.apache.juneau.http.HttpMethodName.*;
import org.apache.juneau.*;
+import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.mock.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.transform.*;
+import org.junit.*;
+import org.junit.runners.*;
/**
- * JUnit automated testcase resource.
+ * Tests that validate the behavior of @RestResource(pojoSwaps).
*/
-@RestResource(
- path="/testTransforms",
- pojoSwaps={TransformsResource.SwapA2.class}
-)
-public class TransformsResource extends TransformsParentResource {
- private static final long serialVersionUID = 1L;
-
-
//====================================================================================================
- // Test class transform overrides parent class transform
- // Should return "A2-1".
-
//====================================================================================================
- @RestMethod(name=GET,
path="/testClassTransformOverridesParentClassTransform")
- public A test1a() {
- return new A();
- }
- @RestMethod(name=PUT,
path="/testClassTransformOverridesParentClassTransform")
- public A test1b(@Body A a) {
- return a;
- }
- @RestMethod(name=PUT,
path="/testClassTransformOverridesParentClassTransform/{a}")
- public A test1c(@Path("a") A a) {
- return a;
- }
-
-
//====================================================================================================
- // Test method transform overrides class transform
- // Should return "A3-1".
-
//====================================================================================================
- @RestMethod(name=GET,
path="/testMethodTransformOverridesClassTransform", pojoSwaps={SwapA3.class})
- public A test2a() {
- return new A();
- }
- @RestMethod(name=PUT,
path="/testMethodTransformOverridesClassTransform", pojoSwaps={SwapA3.class})
- public A test2b(@Body A a) {
- return a;
- }
- @RestMethod(name=PUT,
path="/testMethodTransformOverridesClassTransform/{a}",
pojoSwaps={SwapA3.class})
- public A test2c(@Path("a") A a) {
- return a;
- }
+@SuppressWarnings({"javadoc"})
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class RestResourcePojoSwapsTest {
+
//=================================================================================================================
+ // Basic tests
+
//=================================================================================================================
public static class A {
public int f1;
@@ -113,4 +82,51 @@ public class TransformsResource extends
TransformsParentResource {
return a;
}
}
+
+ @RestResource(pojoSwaps={SwapA1.class},
serializers=JsonSerializer.Simple.class, parsers=JsonParser.class)
+ public static class A01_Parent {}
+
+ @RestResource(pojoSwaps={SwapA2.class})
+ public static class A01 extends A01_Parent {
+
+ @RestMethod(name=GET,
path="/classTransformOverridesParentClassTransform")
+ public A a01a() {
+ return new A(); // Should return "A2-1".
+ }
+ @RestMethod(name=PUT,
path="/classTransformOverridesParentClassTransform")
+ public A a01b(@Body A a) {
+ return a; // Should return "A2-1".
+ }
+ @RestMethod(name=PUT,
path="/classTransformOverridesParentClassTransform/{a}")
+ public A a01c(@Path("a") A a) {
+ return a; // Should return "A2-1".
+ }
+ @RestMethod(name=GET,
path="/methodTransformOverridesClassTransform", pojoSwaps={SwapA3.class})
+ public A a02a() {
+ return new A(); // Should return "A3-1".
+ }
+ @RestMethod(name=PUT,
path="/methodTransformOverridesClassTransform", pojoSwaps={SwapA3.class})
+ public A a02b(@Body A a) {
+ return a; // Should return "A3-1".
+ }
+ @RestMethod(name=PUT,
path="/methodTransformOverridesClassTransform/{a}", pojoSwaps={SwapA3.class})
+ public A a02c(@Path("a") A a) {
+ return a; // Should return "A3-1".
+ }
+ }
+ static MockRest a = MockRest.create(A01.class);
+
+ @Test
+ public void a01_classTransformOverridesParentClassTransform() throws
Exception {
+ a.request("GET",
"/classTransformOverridesParentClassTransform").json().execute().assertBody("'A2-0'");
+ a.request("PUT",
"/classTransformOverridesParentClassTransform").json().body("'A2-1'").execute().assertBody("'A2-1'");
+ a.request("PUT",
"/classTransformOverridesParentClassTransform/A2-2").json().execute().assertBody("'A2-2'");
+ }
+
+ @Test
+ public void a02_methodTransformOverridesClassTransform() throws
Exception {
+ a.request("GET",
"/methodTransformOverridesClassTransform").json().execute().assertBody("'A3-0'");
+ a.request("PUT",
"/methodTransformOverridesClassTransform").json().body("'A3-1'").execute().assertBody("'A3-1'");
+ a.request("PUT",
"/methodTransformOverridesClassTransform/A3-2").json().execute().assertBody("'A3-2'");
+ }
}
--
To stop receiving notification emails like this one, please contact
[email protected].
