Andrew Grant 4 mesi fa
parent
commit
cf53c185eb

+ 5 - 1
src/main/java/scot/carricksoftware/grantswriter/writer/LatexWriter.java

@@ -9,7 +9,11 @@ public interface LatexWriter {
     @SuppressWarnings("unused")
     boolean open(String fileName);
 
+    void close();
+
     boolean isOpen();
 
-    void close();
+    void print(String string);
+
+    void println(String string);
 }

+ 16 - 6
src/main/java/scot/carricksoftware/grantswriter/writer/LatexWriterImpl.java

@@ -13,7 +13,6 @@ public class LatexWriterImpl implements LatexWriter {
 
     private boolean isOpen = false;
 
-
     @Override
     public boolean open(String fileName) {
         try {
@@ -25,19 +24,30 @@ public class LatexWriterImpl implements LatexWriter {
         }
     }
 
-    @Override
-    public boolean isOpen() {
-        return isOpen;
-    }
-
     @Override
     public void close() {
         if (isOpen) {
             latexFile.close();
             isOpen = false;
         }
+    }
 
+    @Override
+    public boolean isOpen() {
+        return isOpen;
     }
 
+    @Override
+    public void print(String string) {
+        latexFile.println(string);
+    }
 
+    @Override
+    public void println(String string) {
+        try {
+            latexFile.println(string);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

+ 6 - 17
src/test/java/scot/carricksoftware/grantswriter/writer/LatexWriterTest.java

@@ -14,6 +14,7 @@ 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 LatexWriterTest {
@@ -38,25 +39,13 @@ class LatexWriterTest {
     }
 
     @Test
-    void isOpenIsFirstClosedTest() {
-        assertFalse(writer.isOpen());
+    void printlnWhenClosedThrowsAnErrorTest() {
+        assertThrows(Exception.class, () -> writer.println(GetRandomString()));
     }
 
     @Test
-    void isOpenIsTrueAfterAFileIsOpenTest() {
-        writer.open(System.getProperty("user.home") + File.separator + "test.tex");
-        assertTrue(writer.isOpen());
+    void printWhenClosedThrowsAnErrorTest() {
+        assertThrows(Exception.class, () -> writer.print(GetRandomString()));
     }
+}
 
-    @Test
-    void isOpenIsFalseAfterAFileIsClosedTest() {
-        writer.open(System.getProperty("user.home") + File.separator + "test.tex");
-        assertTrue(writer.isOpen());
-        writer.close();
-        assertFalse(writer.isOpen());
-    }
-
-
-
-
-}