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:32:25 -06:00
parent 749a20c0fd
commit 8c79d9975e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java
+1 -2
View File
@@ -2,7 +2,6 @@ package edu.msudenver.tsp.website.controller;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
@@ -12,7 +11,7 @@ import static org.junit.Assert.assertNotNull;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
public class TheoremEntryControllerTest { public class TheoremEntryControllerTest {
@Mock private TheoremEntryController theoremEntryController; private final TheoremEntryController theoremEntryController = new TheoremEntryController();
@Test @Test
public void testEnterTheoremPage() { public void testEnterTheoremPage() {