Organize to standard Daffodil test layout + minor updates

.gitignore

@@ -0,0 +1 @@
+target

README.md

@@ -51,7 +51,7 @@ The current logical structure of the XML schema of TextGrid files is pictured be
           <intervalNum>1</intervalNum>
           <xMin>0</xMin>
           <xMax>2</xMax>
-          <text />
+          <text xsi:nil="true" />
         </interval>
       </intervals>
     </item>
@@ -63,17 +63,21 @@ The example data originates from the [Phonetic Corpus of Estonian Spontaneous Sp
 
 ## Creating XML from Praat TextGrid files
 
-The DFDL schema has been developed and tested using the open source tool [Daffodil](https://opensource.ncsa.illinois.edu/confluence/display/DFDL).
+The DFDL schema has been developed and tested using the open source tool [Apache Daffodil](https://daffodil.apache.org).
 
 Parsing the example TextGrid file.
 ```shell
-$ ../bin/daffodil parse --schema ./PraatTextGrid.dfdl.xsd ./examples/ekskfk_miski_1.TextGrid
+$ daffodil parse -TsuppressSchemaDefinitionWarnings=encodingErrorPolicyError \
+    --schema src/main/resources/com/github/keeleleek/praattextgrid/PraatTextGrid.dfdl.xsd \
+    src/test/resources/examples/ekskfk_miski_1.TextGrid
 ```
 
 ## Creating Praat TextGrid files from XML
 
 Un-parsing the parsed example XML infoset back to TextGrid text file.
 
 ```shell
-$ ../bin/daffodil unparse --schema ./PraatTextGrid.dfdl.xsd ./examples/ekskfk_miski_1.tdml
+$ daffodil unparse -TsuppressSchemaDefinitionWarnings=encodingErrorPolicyError \
+    --schema src/main/resources/com/github/keeleleek/praattextgrid/PraatTextGrid.dfdl.xsd \
+    src/test/resources/examples/ekskfk_miski_1.TextGrid.xml
 ```

build.sbt

@@ -0,0 +1,17 @@
+name := "dfdl-praat-textgrid"
+
+organization := "com.github.keeleleek"
+
+version := "0.0.1-SNAPSHOT"
+
+scalaVersion := "2.12.11"
+
+libraryDependencies ++= Seq(
+  "org.apache.daffodil" %% "daffodil-tdml-processor" % "2.6.0" % "test",
+  "com.novocode" % "junit-interface" % "0.11" % "test",
+  "junit" % "junit" % "4.12" % "test",
+)
+
+testOptions += Tests.Argument(TestFrameworks.JUnit, "-v")
+
+crossPaths := false

project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.3.9

PraatTextGrid.dfdl.xsd → src/main/resources/com/github/keeleleek/praattextgrid/PraatTextGrid.dfdl.xsd

@@ -4,10 +4,9 @@
   xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
   xmlns:ex="http://example.com"
   targetNamespace="http://example.com"
-  elementFormDefault="qualified"
-  attributeFormDefault="unqualified">
+  elementFormDefault="qualified">
 
-<xs:include schemaLocation="lib/built-in-formats.xsd" />
+<xs:include schemaLocation="built-in-formats.xsd" />
 
 <xs:annotation>
   <xs:appinfo source="http://www.ogf.org/dfdl/">

lib/built-in-formats.xsd → src/main/resources/com/github/keeleleek/praattextgrid/built-in-formats.xsd

@@ -30,7 +30,7 @@
 					utf16Width="fixed" textStandardDecimalSeparator="."
 					textStandardGroupingSeparator="," textStandardExponentRep="E"
 					textStandardZeroRep="0" textStandardInfinityRep="Inf"
-					textStandardNaNRep="NaN" textNumberPattern="#,##0.###;-#,##0.###"
+					textStandardNaNRep="NaN" textNumberPattern="#,##0.###############;-#,##0.###############"
 					textNumberRounding="explicit" textNumberRoundingMode="roundUnnecessary"
 					textNumberRoundingIncrement="0" decimalSigned="yes"/>
 			</dfdl:defineFormat>

examples/ekskfk_miski_1.tdml → src/test/resources/examples/ekskfk_miski_1.TextGrid.xml

@@ -1,4 +1,4 @@
-<ex:praat xmlns:ex="http://example.com">
+<ex:praat xmlns:ex="http://example.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <ex:fileType>ooTextFile</ex:fileType>
   <ex:objectClass>TextGrid</ex:objectClass>
   <ex:xMin>0.0</ex:xMin>
@@ -82,7 +82,7 @@
           <ex:intervalNum>2</ex:intervalNum>
           <ex:xMin>0.061199346418562</ex:xMin>
           <ex:xMax>0.40788261011471</ex:xMax>
-          <ex:text />
+          <ex:text xsi:nil="true" />
         </ex:interval>
         <ex:interval>
           <ex:intervalNum>3</ex:intervalNum>
@@ -260,7 +260,7 @@
           <ex:intervalNum>2</ex:intervalNum>
           <ex:xMin>0.061199346418562</ex:xMin>
           <ex:xMax>0.40788261011471</ex:xMax>
-          <ex:text />
+          <ex:text xsi:nil="true" />
         </ex:interval>
         <ex:interval>
           <ex:intervalNum>3</ex:intervalNum>
@@ -438,7 +438,7 @@
           <ex:intervalNum>2</ex:intervalNum>
           <ex:xMin>0.061199346418562</ex:xMin>
           <ex:xMax>0.40788261011471</ex:xMax>
-          <ex:text />
+          <ex:text xsi:nil="true" />
         </ex:interval>
         <ex:interval>
           <ex:intervalNum>3</ex:intervalNum>
@@ -526,7 +526,7 @@
           <ex:intervalNum>2</ex:intervalNum>
           <ex:xMin>0.061199346418562</ex:xMin>
           <ex:xMax>0.40788261011471</ex:xMax>
-          <ex:text />
+          <ex:text xsi:nil="true" />
         </ex:interval>
         <ex:interval>
           <ex:intervalNum>3</ex:intervalNum>
@@ -578,7 +578,7 @@
           <ex:intervalNum>2</ex:intervalNum>
           <ex:xMin>0.061199346418562</ex:xMin>
           <ex:xMax>0.40788261011471</ex:xMax>
-          <ex:text />
+          <ex:text xsi:nil="true" />
         </ex:interval>
         <ex:interval>
           <ex:intervalNum>3</ex:intervalNum>
@@ -658,7 +658,7 @@
           <ex:intervalNum>1</ex:intervalNum>
           <ex:xMin>0.0</ex:xMin>
           <ex:xMax>2.0</ex:xMax>
-          <ex:text />
+          <ex:text xsi:nil="true" />
         </ex:interval>
       </ex:intervals>
     </ex:item>
@@ -674,7 +674,7 @@
           <ex:intervalNum>1</ex:intervalNum>
           <ex:xMin>0.0</ex:xMin>
           <ex:xMax>0.061199346418562</ex:xMax>
-          <ex:text />
+          <ex:text xsi:nil="true" />
         </ex:interval>
         <ex:interval>
           <ex:intervalNum>2</ex:intervalNum>
@@ -686,7 +686,7 @@
           <ex:intervalNum>3</ex:intervalNum>
           <ex:xMin>0.40788261011471</ex:xMin>
           <ex:xMax>2.0</ex:xMax>
-          <ex:text />
+          <ex:text xsi:nil="true" />
         </ex:interval>
       </ex:intervals>
     </ex:item>
@@ -702,9 +702,9 @@
           <ex:intervalNum>1</ex:intervalNum>
           <ex:xMin>0.0</ex:xMin>
           <ex:xMax>2.0</ex:xMax>
-          <ex:text />
+          <ex:text xsi:nil="true" />
         </ex:interval>
       </ex:intervals>
     </ex:item>
   </ex:items>
-</ex:praat>
+</ex:praat>

src/test/resources/textgrid.tdml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<tdml:testSuite
+  xmlns="http://example.com"
+  xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"
+  xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
+  xmlns:ex="http://example.com"
+  xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  defaultRoundTrip="onePass"
+  defaultConfig="cfg_no_warn">
+
+  <tdml:defineConfig name="cfg_no_warn">
+    <daf:tunables>
+      <daf:suppressSchemaDefinitionWarnings>
+        encodingErrorPolicyError
+      </daf:suppressSchemaDefinitionWarnings>
+    </daf:tunables>
+  </tdml:defineConfig>
+
+  <tdml:parserTestCase name="ekskfk_miski_1" model="com/github/keeleleek/praattextgrid/PraatTextGrid.dfdl.xsd">
+    <tdml:document>
+      <tdml:documentPart type="file">examples/ekskfk_miski_1.TextGrid</tdml:documentPart>
+    </tdml:document>
+    <tdml:infoset>
+      <tdml:dfdlInfoset type="file">examples/ekskfk_miski_1.TextGrid.xml</tdml:dfdlInfoset>
+    </tdml:infoset>
+  </tdml:parserTestCase>
+
+</tdml:testSuite>

src/test/scala/TestPraatTextGrid.scala

@@ -0,0 +1,20 @@
+package com.gitub.keeleleek.praattextgrid
+
+import org.apache.daffodil.tdml.Runner
+import org.junit.Test
+import org.junit.AfterClass
+
+object TestPraatTextGrid {
+  lazy val runner = new Runner("/", "textgrid.tdml")
+
+  @AfterClass def shutDown {
+    runner.reset
+  }
+}
+
+class TestPraatTextGrid {
+  import TestPraatTextGrid._
+
+  @Test def test_ekskfk_miski_1() { runner.runOneTest("ekskfk_miski_1") }
+
+}