Skip to content

Milestone 1.0.27 #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 17, 2017
Merged

Milestone 1.0.27 #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c4c8c2
bugfixing integration tests
phasenraum2010 Aug 17, 2017
79b8102
Merge pull request #262 from phasenraum2010/master
phasenraum2010 Aug 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions src/test/java/org/woehlke/twitterwall/frontend/controller/ApplicationControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 22 additions & 0 deletions src/test/java/org/woehlke/twitterwall/frontend/controller/CountedEntitiesControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/woehlke/twitterwall/frontend/controller/UserListControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down