Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'PAN-16' and 'master' of https://github.com/atusa17/ptp into PAN-16

Browse Source 
# Conflicts:
#	services/build.gradle
This commit is contained in:
atusa17
2019-03-20 22:00:11 -06:00
parent 5479130178 b15ef858b0
commit 749a20c0fd
48 changed files with 1323 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java
+7 -28
View File
@@ -2,44 +2,23 @@ package edu.msudenver.tsp.website.controller;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.ui.Model;
import org.springframework.web.servlet.ModelAndView;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import java.util.Map;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@RunWith(MockitoJUnitRunner.class)
public class TheoremEntryControllerTest {
@InjectMocks
private TheoremEntryController theoremEntryController;
@Mock private TheoremEntryController theoremEntryController;
@Test
public void theoremPage(){
final ModelAndView modelAndView= theoremEntryController.enterTheoremPage();
public void testEnterTheoremPage() {
final ModelAndView modelAndView = theoremEntryController.enterTheoremPage();
assertNotNull(modelAndView);
assertEquals("Theorem",modelAndView.getViewName());
assertEquals("Theorem", modelAndView.getViewName());
}
@Test
public void saveTheorem(){
final ModelAndView modelAndView= theoremEntryController.enterTheoremPage();
assertNotNull(modelAndView);
assertEquals("Theorem",modelAndView.getViewName());
}
}