Latex section header etc

pom.xml

@@ -139,7 +139,6 @@
                 </executions>
             </plugin>
 
-
             <plugin>
                 <groupId>org.pitest</groupId>
                 <artifactId>pitest-maven</artifactId>

src/main/java/scot/carricksoftware/grantswriter/writer/latex/LatexPartHeaderImpl.java

@@ -6,30 +6,20 @@
 package scot.carricksoftware.grantswriter.writer.latex;
 
 import org.springframework.stereotype.Component;
-import scot.carricksoftware.grantswriter.constants.LatexConstants;
-import scot.carricksoftware.grantswriter.data.helpers.LatexDivision;
-import scot.carricksoftware.grantswriter.writer.FileWriter;
-
-import static scot.carricksoftware.grantswriter.constants.LatexLevels.LATEX_PART;
+import scot.carricksoftware.grantswriter.constants.LatexLevels;
 
 @Component
 public class LatexPartHeaderImpl implements LatexPartHeader {
 
+    private final LatexDivisionHeader latexDivisionHeader;
 
-    private final FileWriter fileWriter;
-
-    private final LatexDivision latexDivision;
+    public LatexPartHeaderImpl(LatexDivisionHeader latexDivisionHeader) {
 
-    public LatexPartHeaderImpl(FileWriter fileWriter, LatexDivision latexDivision) {
-        this.fileWriter = fileWriter;
-        this.latexDivision = latexDivision;
+        this.latexDivisionHeader = latexDivisionHeader;
     }
 
     @Override
     public void write(String title) {
-        String sb = latexDivision.header(LATEX_PART) +
-                title +
-                LatexConstants.TERM_END;
-        fileWriter.writeLine(sb);
+        latexDivisionHeader.write(LatexLevels.LATEX_PART, title);
     }
 }

src/main/java/scot/carricksoftware/grantswriter/writer/latex/LatexSectionHeaderImpl.java

@@ -21,6 +21,6 @@ public class LatexSectionHeaderImpl implements LatexSectionHeader {
 
     @Override
     public void write(String title) {
-        latexDivisionHeader.write(LatexLevels.LATEX_PART, title);
+        latexDivisionHeader.write(LatexLevels.LATEX_SECTION, title);
     }
 }

src/main/java/scot/carricksoftware/grantswriter/writer/latex/LatexSubSectionHeaderImpl.java

@@ -6,29 +6,21 @@
 package scot.carricksoftware.grantswriter.writer.latex;
 
 import org.springframework.stereotype.Component;
-import scot.carricksoftware.grantswriter.constants.LatexConstants;
-import scot.carricksoftware.grantswriter.data.helpers.LatexDivision;
-import scot.carricksoftware.grantswriter.writer.FileWriter;
+import scot.carricksoftware.grantswriter.constants.LatexLevels;
 
-import static scot.carricksoftware.grantswriter.constants.LatexLevels.LATEX_SUBSECTION;
 
 @Component
 public class LatexSubSectionHeaderImpl implements LatexSubSectionHeader {
 
-    private final FileWriter fileWriter;
+    private final LatexDivisionHeader latexDivisionHeader;
 
-    private final LatexDivision latexDivision;
-
-    public LatexSubSectionHeaderImpl(FileWriter fileWriter, LatexDivision latexDivision) {
-        this.fileWriter = fileWriter;
-        this.latexDivision = latexDivision;
+    public LatexSubSectionHeaderImpl(LatexDivisionHeader latexDivisionHeader) {
+        this.latexDivisionHeader = latexDivisionHeader;
     }
 
+
     @Override
     public void write(String title) {
-        String sb = latexDivision.header(LATEX_SUBSECTION) +
-                title +
-                LatexConstants.TERM_END;
-        fileWriter.writeLine(sb);
+        latexDivisionHeader.write(LatexLevels.LATEX_SUBSECTION, title);
     }
 }

src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexPartHeaderTest.java

@@ -10,12 +10,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import scot.carricksoftware.grantswriter.data.helpers.LatexDivision;
-import scot.carricksoftware.grantswriter.writer.FileWriter;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
 
 @ExtendWith(MockitoExtension.class)
@@ -24,22 +20,17 @@ class LatexPartHeaderTest {
     private LatexPartHeader header;
 
     @Mock
-    private FileWriter fileWriterMock;
-
-    @Mock
-    private LatexDivision latexDivisionMock;
+    private LatexDivisionHeader latexDivisionHeaderMock;
 
     @BeforeEach
     void setUp() {
-        header = new LatexPartHeaderImpl(fileWriterMock, latexDivisionMock);
+        header = new LatexPartHeaderImpl(latexDivisionHeaderMock);
     }
 
     @Test
     void writeTest() {
-        when(latexDivisionMock.header(any())).thenReturn("\\part{");
         String title = GetRandomString();
         header.write(title);
-        String requiredString = "\\part{" + title + "}";
-        verify(fileWriterMock).writeLine(requiredString);
+        verify(latexDivisionHeaderMock).write(-1, title);
     }
 }

src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexSectionHeaderTest.java

@@ -31,6 +31,6 @@ class LatexSectionHeaderTest {
     void writeTest() {
         String title = GetRandomString();
         header.write(title);
-        verify(latexDivisionHeaderMock).write(-1, title);
+        verify(latexDivisionHeaderMock).write(1, title);
     }
 }

src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexSubSectionHeaderTest.java

@@ -10,12 +10,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import scot.carricksoftware.grantswriter.data.helpers.LatexDivision;
-import scot.carricksoftware.grantswriter.writer.FileWriter;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
 
 @ExtendWith(MockitoExtension.class)
@@ -24,22 +20,17 @@ class LatexSubSectionHeaderTest {
     private LatexSubSectionHeader header;
 
     @Mock
-    private FileWriter fileWriterMock;
-
-    @Mock
-    private LatexDivision latexDivisionMock;
+    private LatexDivisionHeader latexDivisionHeaderMock;
 
     @BeforeEach
     void setUp() {
-        header = new LatexSubSectionHeaderImpl(fileWriterMock, latexDivisionMock);
+        header = new LatexSubSectionHeaderImpl(latexDivisionHeaderMock);
     }
 
     @Test
     void writeTest() {
-        when(latexDivisionMock.header(any())).thenReturn("\\subsection{");
         String title = GetRandomString();
         header.write(title);
-        String requiredString = "\\subsection{" + title + "}";
-        verify(fileWriterMock).writeLine(requiredString);
+        verify(latexDivisionHeaderMock).write(2, title);
     }
 }