Fix test: layer.tostring() instead of plaintext

Author: PrinsINT

server/src/test/kotlin/org/ivdnt/galahad/data/documents/DocumentMetadataTest.kt

@@ -36,9 +36,8 @@ class DocumentMetadataTest {
     @Test
     fun `Properties for an annotated file`() {
         val path = "all-formats/input/input.tei.xml"
-        val file = TestUtil.get(path)
         val doc = TestUtil.getDoc(path)
-        val plaintext = doc.plaintext
+        val plaintext = TestUtil.getLayer(doc).toString()
         val meta = doc.metadata
         assertEquals("input.tei.xml", meta.name)
         assertEquals(DocumentFormat.TeiP5, meta.format)

server/src/test/kotlin/org/ivdnt/galahad/formats/tei/TEIExportTest.kt

@@ -73,13 +73,13 @@ internal class TEIExportTest {
     fun punctuationExportTest() {
 
         val teiFile = TeiFile(TestUtil.get("tei/oneparagraph/mocktei.xml"))
-        DocTest.builder(corpus).expecting("Dit is wat oefentekst.").got(teiFile.plaintext)
+        DocTest.builder(corpus).expecting("Dit is wat oefentekst.").got(teiFile.layer.toString())
             .ignoreTrailingWhiteSpaces().result()
 
         val tagset = Tagset.readOrThrow("TDN-Core")
 
         val layer = LayerBuilder().loadLayerFromTSV(
-            "tei/export/mock-TDN-with-punctuation.tsv", teiFile.plaintext
+            "tei/export/mock-TDN-with-punctuation.tsv", teiFile.layer.toString()
         ).build()
 
         DocTest.builder(corpus).expectingFile("tei/export/mock-TDN-with-punctuation-result.xml")
@@ -92,7 +92,7 @@ internal class TEIExportTest {
     fun mergePuncutationTest() {
 
         val tagset = Tagset.readOrThrow("TDN-Core")
-        val plaintext = TeiFile(TestUtil.get("tei/dummies/punctutation-mixed-tags.xml")).plaintext
+        val plaintext = TeiFile(TestUtil.get("tei/dummies/punctutation-mixed-tags.xml")).layer.toString()
         val layer = LayerBuilder().loadLayerFromTSV("tei/dummies/punctuation-mixed-tags-sample-layer.tsv", plaintext)
             .build()
 

server/src/test/kotlin/org/ivdnt/galahad/formats/tei/TeiReaderTest.kt

@@ -11,19 +11,19 @@ internal class TeiReaderTest {
         @Test
         fun `Multiple text elements`() {
             val teiFile = TeiFile(TestUtil.get("formats/tei/dummies/multipletextelements.xml"))
-            assertEquals("text1\ntext2 text3", teiFile.plaintext.trim())
+            assertEquals("text1\ntext2 text3", teiFile.layer.toString())
         }
 
         @Test
         fun `Simple word tags in one paragraph`() {
             val teiFile = TeiFile(TestUtil.get("formats/tei/dummies/withwtags.xml"))
-            assertEquals("word1 word2", teiFile.plaintext.trim())
+            assertEquals("word1 word2", teiFile.layer.toString())
         }
 
         @Test
         fun `Simple word tags in two paragraph`() {
             val teiFile = TeiFile(TestUtil.get("formats/tei/dummies/wandp.xml"))
-            assertEquals("word1 word2\n\nword3 word4", teiFile.plaintext.trim())
+            assertEquals("word1 word2\n\nword3 word4", teiFile.layer.toString())
         }
 
         @Test
@@ -42,7 +42,7 @@ internal class TeiReaderTest {
         @Test
         fun `Import TEI with w-tags without spaces in between`() {
             val file = TeiFile(TestUtil.get("formats/tei/nospaces/input.tei.xml"))
-            assertEquals("a a a", file.plaintext.trim())
+            assertEquals("a a a", file.layer.toString())
 
         }
     }

server/src/test/kotlin/org/ivdnt/galahad/formats/tsv/TSVBodyTest.kt

@@ -27,7 +27,7 @@ internal class TSVBodyTest {
         val tsvFile = TsvFile(File("src/test/resources/tsv/body/extra-columns.tsv"))
         assertTSVFile(tsvFile)
         val expected = "scholen loop " // Note the space.
-        assertEquals(expected, tsvFile.plaintext)
+        assertEquals(expected, tsvFile.layer.toString())
     }
 
     @Test

server/src/test/kotlin/org/ivdnt/galahad/formats/tsv/TSVPlaintextTest.kt

@@ -12,6 +12,6 @@ internal class TSVPlaintextTest {
         assertEquals(1812, tsvFile.layer.terms.count())
         // Assert plaintext.
         val plainText = File("src/test/resources/tsv/plaintext/peerle.txt").readText()
-        assertEquals(plainText, tsvFile.plaintext)
+        assertEquals(plainText, tsvFile.layer.toString())
     }
 }

server/src/test/kotlin/org/ivdnt/galahad/jobs/JobTest.kt

@@ -26,7 +26,6 @@ class JobTest {
         // verify
         assertEquals(TestConfig.TAGGER_NAME, job.name)
         assertFalse(job.isActive)
-        assertEquals(0, job.assay.readOrThrow<Map<String, FlatMetricType>>().size)
         assertEquals(0, job.progress.total)
         // verify from state cache
         assertEquals(LayerPreview.EMPTY, job.metadata.preview)

server/src/test/kotlin/org/ivdnt/galahad/util/TestUtil.kt

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.databind.cfg.DatatypeFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
+import org.ivdnt.galahad.annotations.Layer
+import org.ivdnt.galahad.annotations.SOURCE_LAYER_NAME
 import org.ivdnt.galahad.app.User
 import org.ivdnt.galahad.corpora.Corpora
 import org.ivdnt.galahad.corpora.Corpus
@@ -30,6 +32,9 @@ object TestUtil {
         return corpus.documents.readOrNull(file.name) ?: corpus.documents.createOrThrow(file)
     }
 
+    fun getLayer(doc: Document, job: String = SOURCE_LAYER_NAME): Layer =
+        corpus.jobs.readOrThrow(job).getLayer(doc.name)
+
     val mapper: ObjectMapper = JsonMapper.builder()
         .configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true)
         .configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true)
@@ -61,7 +66,7 @@ object TestUtil {
     fun assertPlainText(folder: String, file: InternalFile) {
         // Plain text
         val plaintext = get("$folder/plaintext.txt").readText()
-        assertEquals(plaintext, file.plaintext)
+        assertEquals(plaintext, file.layer.toString())
     }
 
     fun assertPlaintextAndSourcelayer(folder: String, file: InternalFile) {