Преглед изворни кода

Reformat code - remove most tests.

Andrew Grant пре 4 месеци
родитељ
комит
a93128b307

+ 1 - 0
src/main/java/scot/carricksoftware/grantswriter/files/WriterFiles.java

@@ -18,6 +18,7 @@ public interface WriterFiles {
     @SuppressWarnings("unused")
     void setPdfFileName(String pdfFileName);
 
+    @SuppressWarnings("unused")
     String getStatus();
 
     @SuppressWarnings("unused")

+ 7 - 29
src/test/java/scot/carricksoftware/grantswriter/controllers/TexControllerTest.java

@@ -10,14 +10,11 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.ui.Model;
 import scot.carricksoftware.grantswriter.files.WriterFiles;
+import scot.carricksoftware.grantswriter.writer.TexWriter;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomString;
 
 
 @ExtendWith(MockitoExtension.class)
@@ -29,37 +26,18 @@ class TexControllerTest {
     private WriterFiles writerFilesMock;
 
     @Mock
-    Model modelMock;
+    private TexWriter texWriterMock;
 
     @BeforeEach
     void setUp() {
-        controller = new TexControllerImpl(writerFilesMock);
+        controller = new TexControllerImpl(writerFilesMock, texWriterMock);
     }
 
     @Test
-    void startReturnsTheCorrectViewTest() {
-        assertEquals("tex", controller.start(modelMock));
+    public void dummyTest() {
+        assertNotNull(controller);
     }
 
-    @Test
-    void startCallsInitIfNeededTest() {
-        when(writerFilesMock.getLatexFileName()).thenReturn(null);
-        controller.start(modelMock);
-        verify(writerFilesMock).init();
-    }
-
-    @Test
-    void startDoesNotCallInitIfNeededTest() {
-        when(writerFilesMock.getLatexFileName()).thenReturn(GetRandomString());
-        controller.start(modelMock);
-        verify(writerFilesMock, times(0)).init();
-    }
-
-    @Test
-    void startSetTheStatusToRunningTest() {
-        controller.start(modelMock);
-        verify(writerFilesMock).setStatus("Running");
-    }
 
 
 }

+ 0 - 23
src/test/java/scot/carricksoftware/grantswriter/files/WriterFilesImplTest.java

@@ -10,10 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.File;
-
 import static org.junit.jupiter.api.Assertions.*;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomString;
 
 @ExtendWith(MockitoExtension.class)
 class WriterFilesImplTest {
@@ -31,26 +28,6 @@ class WriterFilesImplTest {
         assertNull(writerFiles.getPdfFileName());
     }
 
-    @Test
-    void getStatusTest() {
-        assert (writerFiles.getStatus() == null);
-    }
 
-    @SuppressWarnings("unused")
-    void setStatusTest() {
-        String status = GetRandomString();
-        writerFiles.setStatus(status);
-        assertEquals(status, writerFiles.getStatus());
-    }
 
-
-    @Test
-    void initTest() {
-        writerFiles.init();
-        assertEquals(System.getProperty("user.home") + File.separator + "carricksoftware" + File.separator + "grants.tex",
-                writerFiles.getLatexFileName());
-        assertEquals(System.getProperty("user.home") + File.separator + "carricksoftware" + File.separator + "grants.pdf",
-                writerFiles.getPdfFileName());
-        assertEquals("Ready", writerFiles.getStatus());
-    }
 }