Prechádzať zdrojové kódy

WriterParts Integration

Andrew Grant 4 mesiacov pred
rodič
commit
f8366ff7e2

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

@@ -10,6 +10,7 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grantswriter.writer.latex.LatexDocumentEnd;
 import scot.carricksoftware.grantswriter.writer.latex.LatexDocumentStart;
+import scot.carricksoftware.grantswriter.writer.latex.parts.WriteParts;
 
 @Component
 public class TexWriterImpl implements TexWriter {
@@ -20,12 +21,14 @@ public class TexWriterImpl implements TexWriter {
 
     private final LatexDocumentStart docStart;
     private final LatexDocumentEnd docEnd;
+    private final WriteParts writeParts;
 
 
-    public TexWriterImpl(FileWriter fileWriter, LatexDocumentStart docStart, LatexDocumentEnd docEnd) {
+    public TexWriterImpl(FileWriter fileWriter, LatexDocumentStart docStart, LatexDocumentEnd docEnd, WriteParts writeParts) {
         this.fileWriter = fileWriter;
         this.docStart = docStart;
         this.docEnd = docEnd;
+        this.writeParts = writeParts;
     }
 
     @Override
@@ -33,6 +36,7 @@ public class TexWriterImpl implements TexWriter {
         logger.info("TexWriter::write");
         fileWriter.init(filename);
         docStart.write();
+        writeParts.write();
         docEnd.write();
         fileWriter.close();
     }

+ 2 - 0
src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/WritePartsImpl.java

@@ -7,7 +7,9 @@ package scot.carricksoftware.grantswriter.writer.latex.parts;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
 
+@Component
 public class WritePartsImpl implements WriteParts {
 
     private static final Logger logger = LogManager.getLogger(WritePartsImpl.class);

+ 7 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/TexWriterTest.java

@@ -13,6 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grantswriter.writer.latex.LatexDocumentEnd;
 import scot.carricksoftware.grantswriter.writer.latex.LatexDocumentStart;
+import scot.carricksoftware.grantswriter.writer.latex.parts.WriteParts;
 
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.inOrder;
@@ -32,18 +33,22 @@ class TexWriterTest {
     @Mock
     private LatexDocumentEnd docEndMock;
 
+    @Mock
+    private WriteParts writePartsMock;
+
     @BeforeEach
     void setUp() {
-        texWriter = new TexWriterImpl(fileWriterMock, docStartMock, docEndMock);
+        texWriter = new TexWriterImpl(fileWriterMock, docStartMock, docEndMock, writePartsMock);
     }
 
     @Test
     void writeTest() throws Exception {
-        InOrder inorder = inOrder(fileWriterMock, docStartMock, docEndMock,fileWriterMock);
+        InOrder inorder = inOrder(fileWriterMock, docStartMock, docEndMock,writePartsMock,fileWriterMock);
         texWriter.write(GetRandomString());
 
         inorder.verify(fileWriterMock).init(anyString());
         inorder.verify(docStartMock).write();
+        inorder.verify(writePartsMock).write();
         inorder.verify(docEndMock).write();
         inorder.verify(fileWriterMock).close();
     }