From 7c4c8c2b3436af7d38ee165925519aa3c7d5a680 Mon Sep 17 00:00:00 2001
From: phasenraum2010 <thomas@woehlke.org>
Date: Thu, 17 Aug 2017 11:36:02 +0200
Subject: [PATCH] bugfixing integration tests

---
 .../controller/ApplicationControllerTest.java | 23 -------------------
 .../CountedEntitiesControllerTest.java        | 22 ++++++++++++++++++
 .../controller/UserListControllerTest.java    |  2 +-
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/test/java/org/woehlke/twitterwall/frontend/controller/ApplicationControllerTest.java b/src/test/java/org/woehlke/twitterwall/frontend/controller/ApplicationControllerTest.java
index 5525e20e..9ea9dda0 100644
--- a/src/test/java/org/woehlke/twitterwall/frontend/controller/ApplicationControllerTest.java
+++ b/src/test/java/org/woehlke/twitterwall/frontend/controller/ApplicationControllerTest.java
@@ -55,29 +55,6 @@ public void setupTestData() throws Exception {
         Assert.assertTrue(true);
     }
 
-    @WithMockUser
-    @Commit
-    @Test
-    public void domainCountTest() throws Exception {
-        String msg ="domainCountTest: ";
-
-        MvcResult result = this.mockMvc.perform(get("/application/domain/count"))
-                .andExpect(status().isOk())
-                .andExpect(view().name( "application/domain/count"))
-                .andExpect(model().attributeExists("countedEntities"))
-                .andExpect(model().attributeExists("page"))
-                .andReturn();
-
-        String content = result.getResponse().getContentAsString();
-
-        log.info(msg+"#######################################");
-        log.info(msg+"#######################################");
-        log.info(msg+content);
-        log.info(msg+"#######################################");
-        log.info(msg+"#######################################");
-        Assert.assertTrue(true);
-    }
-
     @WithMockUser
     @Commit
     @Test
diff --git a/src/test/java/org/woehlke/twitterwall/frontend/controller/CountedEntitiesControllerTest.java b/src/test/java/org/woehlke/twitterwall/frontend/controller/CountedEntitiesControllerTest.java
index de5e4e79..97fc9caf 100644
--- a/src/test/java/org/woehlke/twitterwall/frontend/controller/CountedEntitiesControllerTest.java
+++ b/src/test/java/org/woehlke/twitterwall/frontend/controller/CountedEntitiesControllerTest.java
@@ -57,6 +57,28 @@ public void setupTestData() throws Exception {
     private final static String URL_PATH = "/application/countedEntities";
     private final static String TEMPLATE_PATH = "application/countedEntities";
 
+    @WithMockUser
+    @Commit
+    @Test
+    public void domainCountTest() throws Exception {
+        String msg ="domainCountTest: ";
+
+        MvcResult result = this.mockMvc.perform(get("/application/countedEntities/domain/count"))
+            .andExpect(status().isOk())
+            .andExpect(view().name( "application/domain/count"))
+            .andExpect(model().attributeExists("countedEntities"))
+            .andExpect(model().attributeExists("page"))
+            .andReturn();
+
+        String content = result.getResponse().getContentAsString();
+
+        log.info(msg+"#######################################");
+        log.info(msg+"#######################################");
+        log.info(msg+content);
+        log.info(msg+"#######################################");
+        log.info(msg+"#######################################");
+        Assert.assertTrue(true);
+    }
 
     @WithMockUser
     @Commit
diff --git a/src/test/java/org/woehlke/twitterwall/frontend/controller/UserListControllerTest.java b/src/test/java/org/woehlke/twitterwall/frontend/controller/UserListControllerTest.java
index d502a0f9..d49c21fd 100644
--- a/src/test/java/org/woehlke/twitterwall/frontend/controller/UserListControllerTest.java
+++ b/src/test/java/org/woehlke/twitterwall/frontend/controller/UserListControllerTest.java
@@ -55,7 +55,7 @@ public void getAllTest() throws Exception {
         MvcResult result = this.mockMvc.perform(get("/userlist/all"))
             .andExpect(status().isOk())
             .andExpect(view().name("userlist/all"))
-            .andExpect(model().attributeExists("userlists"))
+            .andExpect(model().attributeExists("myPageContent"))
             .andExpect(model().attributeExists("page"))
             .andReturn();