You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/08/01 11:50:34 UTC
[isis] branch v2 updated: ISIS-2156 minor: renaming/moving test
classes and cleanup
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new a5e9e15 ISIS-2156 minor: renaming/moving test classes and cleanup
a5e9e15 is described below
commit a5e9e153ff4e9d54a2acef441d49c75237ed8265
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Aug 1 13:50:26 2019 +0200
ISIS-2156 minor: renaming/moving test classes and cleanup
---
.../RestServerService.java => RestService.java} | 16 ++++++++--
...ServerServiceTest.java => RestServiceTest.java} | 35 +++++++---------------
2 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/server/RestServerService.java b/examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/RestService.java
similarity index 84%
rename from examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/server/RestServerService.java
rename to examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/RestService.java
index c508fe0..01a3bcc 100644
--- a/examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/server/RestServerService.java
+++ b/examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/RestService.java
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testdomain.rest.server;
+package org.apache.isis.testdomain.rest;
import javax.inject.Inject;
+import javax.ws.rs.client.Invocation.Builder;
import org.apache.isis.applib.client.RestfulClient;
import org.apache.isis.applib.client.RestfulClientConfig;
+import org.apache.isis.applib.client.SuppressionType;
import org.apache.isis.commons.internal.resources._Resources;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
@@ -30,7 +32,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service @Log4j2
-public class RestServerService {
+public class RestService {
public int getPort() {
if(port==null) {
@@ -59,7 +61,13 @@ public class RestServerService {
RestfulClient client = RestfulClient.ofConfig(clientConfig);
return client;
- }
+ }
+
+ public Builder newRecommendedBookOfTheWeekRequest(RestfulClient client) {
+ return client.request(
+ "services/testdomain.InventoryRepository/actions/recommendedBookOfTheWeek/invoke",
+ SuppressionType.ALL);
+ }
// -- HELPER
@@ -73,4 +81,6 @@ public class RestServerService {
@Inject Environment environment;
+
+
}
diff --git a/examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/server/RestServerServiceTest.java b/examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
similarity index 69%
rename from examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/server/RestServerServiceTest.java
rename to examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
index 10b46d4..0ade52b 100644
--- a/examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/server/RestServerServiceTest.java
+++ b/examples/smoketest/src/test/java/org/apache/isis/testdomain/rest/RestServiceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.testdomain.rest.server;
+package org.apache.isis.testdomain.rest;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -24,13 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import javax.inject.Inject;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.Response;
-import org.apache.isis.applib.client.ResponseDigest;
-import org.apache.isis.applib.client.RestfulClient;
-import org.apache.isis.applib.client.SuppressionType;
import org.apache.isis.testdomain.jdo.Book;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
import org.apache.isis.viewer.restfulobjects.IsisBootWebRestfulObjects;
@@ -42,7 +36,7 @@ import org.springframework.context.annotation.Import;
import lombok.val;
@SpringBootTest(
- classes = {RestServerService.class},
+ classes = {RestService.class},
properties = {
"logging.config=log4j2-test.xml",
},
@@ -51,41 +45,32 @@ import lombok.val;
JdoTestDomainModule.class,
IsisBootWebRestfulObjects.class
})
-class RestServerServiceTest {
+class RestServiceTest {
@LocalServerPort int port;
- @Inject RestServerService restServerService;
+ @Inject RestService restServerService;
@Test
- void test() throws InterruptedException {
-
- //Thread.sleep(10000000000L);
+ void bookOfTheWeek_viaRestService() {
assertNotNull(restServerService.getPort());
assertTrue(restServerService.getPort()>0);
- RestfulClient client = restServerService.newClient();
-
- Builder request = client.request(
- "services/testdomain.InventoryRepository/actions/recommendedBookOfTheWeek/invoke",
- SuppressionType.ALL);
+ val restfulClient = restServerService.newClient();
+ val request = restServerService.newRecommendedBookOfTheWeekRequest(restfulClient);
- Entity<String> args = client.arguments()
+ val args = restfulClient.arguments()
.build();
- Response response = request.post(args);
-
- ResponseDigest<Book> digest = client.digest(response, Book.class);
+ val response = request.post(args);
+ val digest = restfulClient.digest(response, Book.class);
if(digest.isSuccess()) {
val bookOfTheWeek = digest.get();
- System.out.println("result: "+ bookOfTheWeek);
-
assertNotNull(bookOfTheWeek);
assertEquals("Book of the week", bookOfTheWeek.getName());
-
} else {