Merge pull request #263 from phasenraum2010/milestone-1.0.27

Milestone 1.0.27

Author: phasenraum2010

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

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

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();