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 8fda15e Tests.
8fda15e is described below
commit 8fda15ecf55c9bba5a0ec98f6f3fcacd03f0a63c
Author: JamesBognar <[email protected]>
AuthorDate: Sun May 13 15:02:57 2018 -0400
Tests.
---
.../apache/juneau/rest/test/MessagesResource.java | 64 ----------------------
.../java/org/apache/juneau/rest/test/Root.java | 2 -
.../org/apache/juneau/rest/test/_TestSuite.java | 1 -
.../RestMethodInheritTest.java} | 6 +-
.../rest/annotation/RestResourceMessagesTest.java | 61 ++++++++++++++++-----
.../RestResourceMessagesTest1.properties | 0
.../RestResourceMessagesTest2.properties | 0
7 files changed, 49 insertions(+), 85 deletions(-)
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java
b/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java
deleted file mode 100644
index 81d4684..0000000
---
a/juneau-microservice/juneau-microservice-test/src/main/java/org/apache/juneau/rest/test/MessagesResource.java
+++ /dev/null
@@ -1,64 +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.apache.juneau.http.HttpMethodName.*;
-
-import java.util.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.rest.*;
-import org.apache.juneau.rest.annotation.*;
-import org.apache.juneau.serializer.*;
-import org.apache.juneau.transform.*;
-
-/**
- * JUnit automated testcase resource.
- * Validates that resource bundles can be defined on both parent and child
classes.
- */
-@RestResource(
- path="/testMessages",
- messages="MessagesResource",
- pojoSwaps={
- MessagesResource.ResourceBundleSwap.class
- }
-)
-public class MessagesResource extends BasicRestServlet {
- private static final long serialVersionUID = 1L;
-
-
//====================================================================================================
- // Return contents of resource bundle.
-
//====================================================================================================
- @RestMethod(name=GET, path="/test")
- public Object test(ResourceBundle nls) {
- return nls;
- }
-
-
- @SuppressWarnings("serial")
- @RestResource(
- path="/testMessages2",
- messages="Messages2Resource"
- )
- public static class Messages2Resource extends MessagesResource {}
-
- public static class ResourceBundleSwap extends MapSwap<ResourceBundle> {
- @Override /* Transform */
- public ObjectMap swap(BeanSession session, ResourceBundle o)
throws SerializeException {
- ObjectMap m = new ObjectMap();
- for (String k : o.keySet())
- m.put(k, o.getString(k));
- return m;
- }
- }
-}
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 903295d..2755109 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
@@ -35,8 +35,6 @@ import org.apache.juneau.rest.test.client.*;
HtmlDocLinksResource.class,
InterfaceProxyResource.class,
LargePojosResource.class,
- MessagesResource.Messages2Resource.class,
- MessagesResource.class,
NlsResource.class,
NlsPropertyResource.class,
OnPostCallResource.class,
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 3cd3a25..8cd9329 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
@@ -34,7 +34,6 @@ import org.junit.runners.Suite.*;
InterfaceProxyTest.class,
JacocoDummyTest.class,
LargePojosTest.class,
- MessagesTest.class,
NlsPropertyTest.class,
NlsTest.class,
OnPostCallTest.class,
diff --git
a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/InheritanceTest.java
b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestMethodInheritTest.java
similarity index 96%
rename from
juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/InheritanceTest.java
rename to
juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestMethodInheritTest.java
index 87ec43c..2a0d79e 100644
---
a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/InheritanceTest.java
+++
b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestMethodInheritTest.java
@@ -10,7 +10,7 @@
// * "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;
+package org.apache.juneau.rest.annotation;
import static org.apache.juneau.http.HttpMethodName.*;
@@ -20,7 +20,7 @@ import org.apache.juneau.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
-import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.transform.*;
@@ -32,7 +32,7 @@ import org.junit.runners.*;
*/
@SuppressWarnings({"javadoc"})
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class InheritanceTest {
+public class RestMethodInheritTest {
//=================================================================================================================
// Setup classes
diff --git
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/MessagesTest.java
b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestResourceMessagesTest.java
similarity index 53%
rename from
juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/MessagesTest.java
rename to
juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestResourceMessagesTest.java
index 80c1ea8..9e17202 100644
---
a/juneau-microservice/juneau-microservice-test/src/test/java/org/apache/juneau/rest/test/MessagesTest.java
+++
b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/annotation/RestResourceMessagesTest.java
@@ -10,35 +10,66 @@
// * "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.rest.testutils.TestUtils.*;
+import static org.apache.juneau.http.HttpMethodName.*;
import java.util.*;
-import org.apache.juneau.rest.client.*;
+import org.apache.juneau.*;
+import org.apache.juneau.rest.mock.*;
import org.junit.*;
+import org.junit.runners.*;
/**
- * Validates that resource bundles can be defined on both parent and child
classes.
+ * Tests that validate the behavior of @RestMethod(messages).
*/
-public class MessagesTest extends RestTestcase {
+@SuppressWarnings({"javadoc"})
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class RestResourceMessagesTest {
//====================================================================================================
- // Return contents of resource bundle.
+ // Setup
+
//====================================================================================================
+
+ static ObjectMap convertToMap(ResourceBundle rb) {
+ ObjectMap m = new ObjectMap();
+ for (String k : rb.keySet())
+ m.put(k, rb.getString(k));
+ return m;
+ }
+
+
//====================================================================================================
+ // Basic tests
//====================================================================================================
- @SuppressWarnings("rawtypes")
- @Test
- public void test() throws Exception {
- RestClient client = TestMicroservice.DEFAULT_CLIENT;
- // Parent resource should just pick up values from its bundle.
- TreeMap r =
client.doGet("/testMessages/test").getResponse(TreeMap.class);
- assertObjectEquals("{key1:'value1a',key2:'value2a'}", r);
+ @RestResource(messages="RestResourceMessagesTest1")
+ public static class A {
+ @RestMethod(name=GET)
+ public ObjectMap test(ResourceBundle rb) {
+ return convertToMap(rb);
+ }
+ }
+ static MockRest a = MockRest.create(A.class);
+ @Test
+ public void a01() throws Exception {
+ // Parent resource should just pick up values from its bundle.
+ a.request("GET",
"/").execute().assertBody("{key1:'value1a',key2:'value2a'}");
+ }
+
+
//====================================================================================================
+ // Overridden on subclass.
+
//====================================================================================================
+
+ @RestResource(messages="RestResourceMessagesTest2")
+ public static class B extends A {}
+ static MockRest b = MockRest.create(B.class);
+
+ @Test
+ public void b01() throws Exception {
// Child resource should pick up values from both parent and
child,
// ordered child before parent.
- r =
client.doGet("/testMessages2/test").getResponse(TreeMap.class);
-
assertObjectEquals("{key1:'value1a',key2:'value2b',key3:'value3b'}", r);
+ b.request("GET",
"/").execute().assertBody("{key1:'value1a',key2:'value2b',key3:'value3b'}");
}
}
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/resources/org/apache/juneau/rest/test/MessagesResource.properties
b/juneau-rest/juneau-rest-server/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest1.properties
similarity index 100%
rename from
juneau-microservice/juneau-microservice-test/src/main/resources/org/apache/juneau/rest/test/MessagesResource.properties
rename to
juneau-rest/juneau-rest-server/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest1.properties
diff --git
a/juneau-microservice/juneau-microservice-test/src/main/resources/org/apache/juneau/rest/test/Messages2Resource.properties
b/juneau-rest/juneau-rest-server/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest2.properties
similarity index 100%
rename from
juneau-microservice/juneau-microservice-test/src/main/resources/org/apache/juneau/rest/test/Messages2Resource.properties
rename to
juneau-rest/juneau-rest-server/src/test/resources/org/apache/juneau/rest/annotation/RestResourceMessagesTest2.properties
--
To stop receiving notification emails like this one, please contact
[email protected].
