This is an automated email from the ASF dual-hosted git repository.
jadams pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new f6e4ebe Catch error when delimiter expression fails
f6e4ebe is described below
commit f6e4ebe5e5257bff1ad7d18f0ea67a976131f785
Author: Josh Adams <[email protected]>
AuthorDate: Thu Apr 25 11:11:29 2019 -0400
Catch error when delimiter expression fails
We weren't handling a potential failure when an expression representing
a delimiter failed and it was resulting in a very unhelpful Assert
failure regarding delimiter stack lengths. Now such expression failures
will generate an SDE instead.
DAFFODIL-2083, DAFFODIL-2112
---
.../org/apache/daffodil/dpath/Conversions.scala | 4 +-
.../org/apache/daffodil/dpath/DPathRuntime.scala | 8 --
.../processors/parsers/ElementKindParsers.scala | 38 ++++---
.../daffodil/section15/choice_groups/choice.tdml | 4 +-
.../apache/daffodil/usertests/nameDOB_test.tdml | 123 +++++++++++++++++++++
.../usertests/TestUserSubmittedTests.scala | 4 +
6 files changed, 151 insertions(+), 30 deletions(-)
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/dpath/Conversions.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/dpath/Conversions.scala
index cc9cf77..4cc3506 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/dpath/Conversions.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/dpath/Conversions.scala
@@ -73,8 +73,8 @@ object Conversion {
case (x: AnyDateTime.Kind, String) => List(DateTimeToString)
case (HexBinary, String) => List(HexBinaryToString)
- case (String, NonEmptyString) => List(StringToNonEmptyString)
- case (x, NonEmptyString) => conversionOps(st, String, context) :+
StringToNonEmptyString
+ case (String, NonEmptyString) => Nil
+ case (x, NonEmptyString) => conversionOps(st, String, context)
case (x, ArrayIndex) => conversionOps(st, Long, context) ++
List(LongToArrayIndex)
case (Integer, Boolean) => IntegerToDecimal +: conversionOps(Decimal,
tt, context)
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/dpath/DPathRuntime.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/dpath/DPathRuntime.scala
index f250705..4b4752e 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/dpath/DPathRuntime.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/dpath/DPathRuntime.scala
@@ -302,11 +302,3 @@ abstract class Converter extends RecipeOp {
trait ToString extends Converter {
override def computeValue(a: AnyRef, dstate: DState): AnyRef = a.toString
}
-
-case object StringToNonEmptyString extends RecipeOp {
- override def run(dstate: DState) {
- val current = dstate.currentValue.asInstanceOf[String]
- if (current.length == 0)
- throw new IllegalArgumentException("String value may not be empty.")
- }
-}
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/ElementKindParsers.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/ElementKindParsers.scala
index 3ef460a..04b49db 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/ElementKindParsers.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/parsers/ElementKindParsers.scala
@@ -57,26 +57,28 @@ class DelimiterStackParser(
val newLocalIndex = start.mpstate.delimiters.length
start.mpstate.delimitersLocalIndexStack.push(newLocalIndex)
- // evaluate and add delimiters to the stack
- var i: Int = 0
- while (i < delimiters.length) {
- start.mpstate.delimiters ++= delimiters(i).evaluate(start)
- i += 1
- }
-
- // set the index of the newly added delimiters
- val newDelimLen = start.mpstate.delimiters.length
- i = newLocalIndex
- while (i < newDelimLen) {
- start.mpstate.delimiters(i).indexInDelimiterStack = i
- i += 1
- }
+ try {
+ // evaluate and add delimiters to the stack
+ var i: Int = 0
+ while (i < delimiters.length) {
+ start.mpstate.delimiters ++= delimiters(i).evaluate(start)
+ i += 1
+ }
- // parse
- bodyParser.parse1(start)
+ // set the index of the newly added delimiters
+ val newDelimLen = start.mpstate.delimiters.length
+ i = newLocalIndex
+ while (i < newDelimLen) {
+ start.mpstate.delimiters(i).indexInDelimiterStack = i
+ i += 1
+ }
- // pop delimiters
-
start.mpstate.delimiters.reduceToSize(start.mpstate.delimitersLocalIndexStack.pop)
+ // parse
+ bodyParser.parse1(start)
+ } finally {
+ // pop delimiters
+
start.mpstate.delimiters.reduceToSize(start.mpstate.delimitersLocalIndexStack.pop)
+ }
}
}
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/choice.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/choice.tdml
index 3717c32..ad32985 100644
---
a/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/choice.tdml
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/choice.tdml
@@ -1812,8 +1812,8 @@ it sure is/
description="simple case of direct dispatch - DFDL-15-001R. Dispatch key
returns empty string">
<tdml:document><![CDATA[;default]]></tdml:document>
<tdml:errors>
- <tdml:error>Parse Error</tdml:error>
- <tdml:error>String value may not be empty</tdml:error>
+ <tdml:error>Schema Definition Error</tdml:error>
+ <tdml:error>Non-empty string required</tdml:error>
</tdml:errors>
</tdml:parserTestCase>
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/usertests/nameDOB_test.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/usertests/nameDOB_test.tdml
new file mode 100644
index 0000000..0c47576
--- /dev/null
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/usertests/nameDOB_test.tdml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<testSuite suiteName="NameDOB"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:fn="http://www.w3.org/2005/xpath-functions";
+ xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/";
+ xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData";
+ xmlns:ex="http://example.com";
+ defaultRoundTrip="onePass">
+
+ <tdml:defineSchema name="test2" elementFormDefault="unqualified">
+ <xs:include
schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+
+ <dfdl:defineEscapeScheme name="eb1">
+ <dfdl:escapeScheme
+ escapeKind="escapeBlock"
+ escapeBlockStart="""
+ escapeBlockEnd='"'
+ escapeEscapeCharacter='\'
+ generateEscapeBlock="whenNeeded"
+ extraEscapedCharacters=""
+ />
+ </dfdl:defineEscapeScheme>
+ <dfdl:format ref="tns:GeneralFormat" escapeSchemeRef="tns:eb1"
+ separator="" initiator=""
+ terminator="" leadingSkip='0' textTrimKind="none" initiatedContent="no"
+ alignment="implicit" alignmentUnits="bits" trailingSkip="0"
ignoreCase="no"
+ separatorPosition="infix" occursCountKind="implicit"
+ emptyValueDelimiterPolicy="both" representation="text"
textNumberRep="standard"
+ lengthKind="delimited" encoding="ASCII" />
+
+ <xs:element name="file2"
dfdl:initiator="sep,last,middle,first,DOB%NL;%WSP*;">
+ <xs:complexType>
+ <xs:sequence dfdl:separator="%NL;" dfdl:separatorPosition="postfix">
+ <xs:element name="record" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence dfdl:separator="| // %HT; ,">
+ <xs:element name="sep" type="xs:string"/>
+ <xs:sequence dfdl:separator='{ ./sep }'>
+ <xs:element name="lastName" type="xs:string" />
+ <xs:element name="middleName" type="xs:string" />
+ <xs:element name="firstName" type="xs:string" />
+ <xs:element name="DOB" type="xs:date"
+ dfdl:calendarPattern="MM/dd/yyyy"
+ dfdl:calendarPatternKind="explicit"/>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ </tdml:defineSchema>
+ <tdml:parserTestCase name="nameDOB_test2_pass" root="file2"
+ model="test2"
+ roundTrip="twoPass">
+ <tdml:document><![CDATA[sep,last,middle,first,DOB
+#,"smith, jr."#robert#brandon#03/24/1988
+$,johnson$john$henry$01/23/1986
+[SEP],jones[SEP]arya[SEP]cat[SEP]02/19/1986
+]]></tdml:document>
+ <tdml:infoset>
+ <tdml:dfdlInfoset>
+ <ex:file2>
+ <record>
+ <sep>#</sep>
+ <lastName>smith, jr.</lastName>
+ <middleName>robert</middleName>
+ <firstName>brandon</firstName>
+ <DOB>1988-03-24</DOB>
+ </record>
+ <record>
+ <sep>$</sep>
+ <lastName>johnson</lastName>
+ <middleName>john</middleName>
+ <firstName>henry</firstName>
+ <DOB>1986-01-23</DOB>
+ </record>
+ <record>
+ <sep>[SEP]</sep>
+ <lastName>jones</lastName>
+ <middleName>arya</middleName>
+ <firstName>cat</firstName>
+ <DOB>1986-02-19</DOB>
+ </record>
+ </ex:file2>
+ </tdml:dfdlInfoset>
+ </tdml:infoset>
+ </tdml:parserTestCase>
+
+ <tdml:parserTestCase name="nameDOB_test2_fail" root="file2"
+ model="test2"
+ roundTrip="onePass">
+ <tdml:document><![CDATA[sep,last,middle,first,DOB
+,|"smith, jr.",robert,brandon,03/24/1988
+|,johnson|john|henry|01/23/1986
+[SEP],jones[SEP]arya[SEP]cat[SEP]02/19/1986
+]]></tdml:document>
+ <tdml:errors>
+ <tdml:error>Schema Definition Error</tdml:error>
+ <tdml:error>Non-empty string required</tdml:error>
+ </tdml:errors>
+ </tdml:parserTestCase>
+
+
+</testSuite>
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/usertests/TestUserSubmittedTests.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/usertests/TestUserSubmittedTests.scala
index 4b1ba0f..73534a1 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/usertests/TestUserSubmittedTests.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/usertests/TestUserSubmittedTests.scala
@@ -24,6 +24,7 @@ import org.junit.AfterClass
object TestUserSubmittedTests {
val testDir = "/org/apache/daffodil/usertests/"
val runner = Runner(testDir, "UserSubmittedTests.tdml")
+ val runner2 = Runner(testDir, "nameDOB_test.tdml")
@AfterClass def shutDown {
runner.reset
@@ -39,6 +40,9 @@ class TestUserSubmittedTests {
runner.runOneTest("test_prefix_separator_as_variable")
}
+ @Test def test_nameDOB_test2_pass() {
runner2.runOneTest("nameDOB_test2_pass") }
+ @Test def test_nameDOB_test2_fail() {
runner2.runOneTest("nameDOB_test2_fail") }
+
/*//DFDL-1118
@Test def test_dfdl_782() = {
val tr = new CustomTraceRunner
