From df3f1f9f03ce6521d6bc690fc97d5b3a7c440fed Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Wed, 23 Nov 2016 15:41:19 +0100 Subject: Improved overview on test table --- test/w3c/create-test-table.pl | 141 +++++++++++++++++++++++++++++------------- 1 file changed, 98 insertions(+), 43 deletions(-) diff --git a/test/w3c/create-test-table.pl b/test/w3c/create-test-table.pl index f936817..630e0a4 100755 --- a/test/w3c/create-test-table.pl +++ b/test/w3c/create-test-table.pl @@ -1,13 +1,42 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl use strict; use Data::Dumper; use XML::Simple; +use File::Basename; +use File::Find; +use Cwd 'abs_path'; -my $manifest = XMLin("./manifest.xml"); -# print Dumper($manifest->{'assert'}); +my $ctest = 'ctest'; # we assume it to be in the path -my $perSpecId; +my $possibleBuildDir = shift | "../../build/cli"; +chdir dirname(abs_path($0)) or die($!); +my $manifest = XMLin("manifest.xml"); + +if (-d $possibleBuildDir) { + chdir $possibleBuildDir or die($!); +} + +my %testClasses = ( +'w3c/ecma/' => 'ECMA', +'w3c/lua/' => 'Lua', +'w3c/namespace/' => 'NS', +'w3c/promela/' => 'Promela', +'w3c/c89/' => 'C89', +'w3c/gen/c/ecma/' => 'C (ECMA)', +'w3c/gen/c/lua/' => 'C (Lua)', +'w3c/binding/java/jexl/' => 'JEXL', +# 'w3c/spin/promela/' => 'Spin' +); + +my %specClass = ( +'3' => 'Core Constructs', +'4' => 'Executable Content', +'5' => 'Data Model and Manipulation', +'6' => 'External Communications', +'C' => 'Data Models', +'D' => 'Event I/O Processor' +); my %specName = ( 'C.1' => 'The Null Data Model', @@ -43,6 +72,8 @@ my %specName = ( my %specLink = ( ); +my $perSpecId; + TESTS: for my $testNr (keys $manifest->{'assert'}) { my @tests; my $thisTest = $manifest->{'assert'}->{$testNr}; @@ -71,23 +102,32 @@ TESTS: for my $testNr (keys $manifest->{'assert'}) { print << "EOF"; - - - - - - - - - - + + + + +EOF + +for my $testClass (values %testClasses) { + print << "EOF"; + +EOF + +} + +print << "EOF"; + + + EOF # print '| Test | | ECMA | Lua |' . "\n"; # print '|-----:|--|:------:|:---:|' . "\n"; +my $lastSpecClass = ""; for my $specid (sort { $a cmp $b } keys $perSpecId) { my $specName = $specName{$specid}; + my $specClass = $specClass{substr($specid, 0, 1)}; if ($specName =~ s/^<(.*)>$/ucfirst($1)/eg) { # $specName = join " ", map {ucfirst} split " ", $specName; $specName = 'The ' .$specName. ' Element'; @@ -96,19 +136,31 @@ for my $specid (sort { $a cmp $b } keys $perSpecId) { # print "|
| | | | |\n"; + if ($specClass ne $lastSpecClass) { + print << "EOF"; + + + +EOF + $lastSpecClass = $specClass; + } + my $link = "http://www.w3.org/TR/2015/REC-scxml-20150901/" . ${specLink{${specid}}}; print << "EOF"; - - - - + + + + EOF # print "| **[§${specid}](http://www.w3.org/TR/2015/REC-scxml-20150901/${specLink{${specid}}})** | **${specName}** |

| |\n"; for my $test (sort {$a<=>$b} keys $perSpecId->{$specid}) { + + print STDERR "\n${test} "; + my $content = $perSpecId->{$specid}->{$test}->{'content'}; $content =~ s/^\s+|\s+$//g ; # trim $content =~ s/[\n]//g; # remove special chars @@ -138,37 +190,37 @@ EOF my $output; - - my $pass = '`pass`'; - my $fail = '**`FAIL`**'; - - my $ecmaPass = $fail; - my $ecmaFile = "/Users/sradomski/Documents/TK/Code/uscxml2/test/w3c/ecma/test${test}.scxml"; - $output = `../../build/cli/bin/test-w3c $ecmaFile 2>&1 /dev/null`; - $ecmaPass = $pass if $? == 0; - - my $luaPass = $fail; - my $luaFile = "/Users/sradomski/Documents/TK/Code/uscxml2/test/w3c/lua/test${test}.scxml"; - $output = `../../build/cli/bin/test-w3c $luaFile 2>&1 /dev/null`; - $luaPass = $pass if $? == 0; - - my $nsPass = $fail; - my $nsFile = "/Users/sradomski/Documents/TK/Code/uscxml2/test/w3c/namespace/test${test}.scxml"; - $output = `../../build/cli/bin/test-w3c $nsFile 2>&1 /dev/null`; - $nsPass = $pass if $? == 0; + my $pass = 'pass'; + my $fail = 'FAIL'; $link = "https://github.com/tklab-tud/uscxml/tree/master/test/w3c/txml/test${test}.txml"; print << "EOF"; - + - - - - - +EOF + + for my $testClass (keys %testClasses) { + print STDERR "$testClasses{$testClass}"; + my $testPass = $fail; + my $testName = "${testClass}/test${test}.scxml"; + $output = `$ctest -L $testName 2>&1 /dev/null`; + if ($? == 0) { + $testPass = $pass; + print STDERR "+ " + } else { + print STDERR "! " + } + + print << "EOF"; + +EOF + + } + + print << "EOF"; EOF @@ -177,4 +229,7 @@ EOF } } -print '
Test (Req. / Man.)NameSpaceECMALuaPROMELAProlog
Test (Req. / Man.)${testClass}
${specClass}
**§${specid}** **${specName}** 
§${specid} ${specName} 
   **`${test}`**   ${test} ${required} ${manual}${nsPass}${ecmaPass}${luaPass}`N/A``N/A`${pass}
' + print << "EOF"; + + +EOF -- cgit v0.12 From 14ded59e327f635cc0bbcb634457aafc2f225ad3 Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Wed, 23 Nov 2016 16:48:32 +0100 Subject: Refined test matrix output --- test/w3c/TEST-MATRIX.md | 3531 +++++++++++++++++++++++------------------ test/w3c/create-test-table.pl | 39 +- 2 files changed, 2032 insertions(+), 1538 deletions(-) diff --git a/test/w3c/TEST-MATRIX.md b/test/w3c/TEST-MATRIX.md index 9fe3509..ec82f49 100644 --- a/test/w3c/TEST-MATRIX.md +++ b/test/w3c/TEST-MATRIX.md @@ -1,2454 +1,2943 @@ - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + - - - - - + + + + + + + + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - - - - - + + + + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + + + + + - - - - - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + -
Test (Req. / Man.)NameSpaceECMALuaPROMELAProlog
**§3.10** **The History Element** 
   **`387`**Test (Req. / Man.)NSLuaPromelaSpinC (Lua)ECMAC (ECMA)
Core Constructs
§3.10 The History Element 
   387 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`388`**   388 X `pass``pass``pass``N/A``N/A`passpassFAILpasspasspasspass
   **`579`**   579 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`580`**   580 X `pass``pass``pass``N/A``N/A`passpassFAILpasspasspasspass
§3.12 SCXML Events 
**§3.12** **SCXML Events** 
   **`396`**   396 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`399`**   399 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`401`**   401 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`402`**   402 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
§3.13 Selecting and Executing Transitions 
**§3.13** **Selecting and Executing Transitions** 
   **`403b`**   403b X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`403a`**   403c X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`403c`**   403a X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`404`**   404 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`405`**   405 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`406`**   406 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`407`**   407 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`409`**   409 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`411`**   411 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`412`**   412 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`413`**   413 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`415`**   415 X X**`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`passN/AN/AN/ApassN/Apass
   **`416`**   416 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`417`**   417 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`419`**   419 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`421`**   421 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`422`**   422 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`423`**   423 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`503`**   503 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`504`**   504 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`505`**   505 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`506`**   506 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`533`**   533 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
§3.2 The SCXML Element 
**§3.2** **The SCXML Element** 
   **`355`**   355 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`576`**   576 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
§3.3 The State Element 
**§3.3** **The State Element** 
   **`364`**   364 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
**§3.7** **The Final Element** 
   **`372`**§3.7 The Final Element 
   372 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`570`**   570 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
§3.8 The Onentry Element 
**§3.8** **The Onentry Element** 
   **`375`**   375 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`376`**   376 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
**§3.9** **The Onexit Element** 
   **`377`**§3.9 The Onexit Element 
   377 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`378`**   378 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
**§4.2** **The Raise Element** 
   **`144`**Executable Content
§4.2 The Raise Element 
   144 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
§4.3 The If Element 
**§4.3** **The If Element** 
   **`147`**   147 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`148`**   148 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`149`**   149 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
**§4.6** **The Foreach Element** 
   **`150`**§4.6 The Foreach Element 
   150 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`151`**   151 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`152`**   152 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`153`**   153 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`155`**   155 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`156`**   156 X `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpasspass
   **`525`**   525 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
§4.9 Evaluation of Executable Content 
**§4.9** **Evaluation of Executable Content** 
   **`158`**   158 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`159`**   159 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
Data Model and Manipulation
§5.10 System Variables 
**§5.10** **System Variables** 
   **`318`**   318 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`319`**   319 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`321`**   321 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`322`**   322 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`323`**   323 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`324`**   324 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`325`**   325 X `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpassFAIL
   **`326`**   326 X `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpassFAIL
   **`329`**   329 X `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpassFAIL
   **`330`**   330 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`331`**   331 X `pass``pass``pass``N/A``N/A`passpassFAILN/Apasspasspass
   **`332`**   332 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`333`**   333 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`335`**   335 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`336`**   336 X `pass``pass``pass``N/A``N/A`passpasspasspassFAILpassFAIL
   **`337`**   337 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`338`**   338 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`339`**   339 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`342`**   342 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`346`**   346 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
§5.3 The Data Element 
**§5.3** **The Data Element** 
   **`276`**   276 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`277`**   277 X `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpasspass
   **`279`**   279 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`280`**   280 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`550`**   550 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`551`**   551 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`552`**   552 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
§5.4 The Assign Element 
**§5.4** **The Assign Element** 
   **`286`**   286 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`287`**   287 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`288`**   288 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`487`**   487 X `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpasspass
§5.5 The Donedata Element 
**§5.5** **The Donedata Element** 
   **`294`**   294 X `pass``pass``pass``N/A``N/A`FAILpasspassN/ApassFAILpass
**§5.6** **The Content Element** 
   **`527`**§5.6 The Content Element 
   527 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`528`**   528 X `pass``pass``pass``N/A``N/A`passpasspassN/ApasspassFAIL
   **`529`**   529 X `pass``pass``pass``N/A``N/A`passpasspasspassFAILpasspass
§5.7 The Param Element 
**§5.7** **The Param Element** 
   **`298`**   298 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`343`**   343 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`488`**   488 X `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpasspass
**§5.8** **The Script Element** 
   **`301`**§5.8 The Script Element 
   301 X X**`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`passN/AN/AN/AFAILN/AN/A
   **`302`**   302 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`303`**   303 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`304`**   304 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
**§5.9** **Expressions** 
   **`307`**§5.9 Expressions 
   307 X X**`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`309`**   309 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`310`**   310 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`311`**   311 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`312`**   312 X `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpasspass
   **`313`**   313 X X`pass``pass``pass``N/A``N/A`passN/AN/AN/AFAILN/Apass
   **`314`**   314 X X`pass``pass``pass``N/A``N/A`passN/AN/AN/AFAILN/Apass
   **`344`**   344 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
**§6.2** **The Send Element** 
   **`172`**External Communications
§6.2 The Send Element 
   172 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`173`**   173 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`174`**   174 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`175`**   175 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`176`**   176 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`178`**   178 X X**`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`passN/AN/AN/ApassN/Apass
   **`179`**   179 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`183`**   183 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`185`**   185 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`186`**   186 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`187`**   187 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`194`**   194 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`198`**   198 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`199`**   199 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`200`**   200 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`201`**   201 `pass``pass``pass``N/A``N/A`passpasspasspassFAILpassN/A
   **`205`**   205 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`521`**   521 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`553`**   553 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
**§6.3** **The Cancel Element** 
   **`207`**§6.3 The Cancel Element 
   207 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`208`**   208 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`210`**   210 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
§6.4 The Invoke Element 
**§6.4** **The Invoke Element** 
   **`215`**   215 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`216`**   216 X `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpassN/A
   **`220`**   220 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`223`**   223 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`224`**   224 X `pass``pass``pass``N/A``N/A`passpassFAILN/Apasspasspass
   **`225`**   225 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`226`**   226 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`228`**   228 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`229`**   229 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`230`**   230 X X**`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`passN/AN/AN/ApassN/Apass
   **`232`**   232 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`233`**   233 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`234`**   234 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`235`**   235 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`236`**   236 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`237`**   237 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`239`**   239 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`240`**   240 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`241`**   241 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`242`**   242 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`243`**   243 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`244`**   244 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`245`**   245 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`247`**   247 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`250`**   250 X X**`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`passN/AN/AN/ApassN/Apass
   **`252`**   252 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`253`**   253 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`530`**   530 X `pass``pass`**`FAIL`**`N/A``N/A`passpasspassN/AFAILpassN/A
   **`554`**   554 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
Data Models
**§C.1** **The Null Data Model** 
   **`436`**§C.1 The Null Data Model 
   436 X **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
§C.2 The ECMAScript Data Model 
**§C.2** **The ECMAScript Data Model** 
   **`278`**   278 `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`444`**   444 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`445`**   445 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`446`**   446 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`448`**   448 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`449`**   449 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`451`**   451 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`452`**   452 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`453`**   453 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/ApassFAIL
   **`456`**   456 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`457`**   457 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`459`**   459 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`460`**   460 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`557`**   557 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/ApassN/A
   **`558`**   558 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`560`**   560 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
   **`561`**   561 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/ApassN/A
   **`562`**   562 `pass``pass`**`FAIL`**`N/A``N/A`FAILN/AN/AN/AN/AFAILFAIL
   **`569`**   569 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/ApassN/A
   **`578`**   578 `pass``pass`**`FAIL`**`N/A``N/A`passN/AN/AN/AN/Apasspass
**§C.3** **The XPath Data Model** 
   **`463`**§C.3 The XPath Data Model 
   463 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`464`**   464 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`465`**   465 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`466`**   466 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`467`**   467 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`468`**   468 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`469`**   469 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`470`**   470 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`473`**   473 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`474`**   474 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`475`**   475 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`476`**   476 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`477`**   477 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`478`**   478 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`479`**   479 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`480`**   480 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`481`**   481 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`482`**   482 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`483`**   483 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`537`**   537 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`539`**   539 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`540`**   540 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`542`**   542 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`543`**   543 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`544`**   544 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`545`**   545 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`546`**   546 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`547`**   547 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`555`**   555 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`568`**   568 **`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
Event I/O Processor
**§D.1** **SCXML Event I/O Processor** 
   **`189`**§D.1 SCXML Event I/O Processor 
   189 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`190`**   190 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`191`**   191 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`192`**   192 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`193`**   193 `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`347`**   347 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`348`**   348 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`349`**   349 X `pass``pass``pass``N/A``N/A`passpasspasspassFAILpassFAIL
   **`350`**   350 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`351`**   351 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`352`**   352 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`354`**   354 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`495`**   495 X `pass``pass``pass``N/A``N/A`passpasspasspasspasspasspass
   **`496`**   496 X `pass``pass``pass``N/A``N/A`passpasspassN/Apasspasspass
   **`500`**   500 X `pass``pass``pass``N/A``N/A`passpasspasspassFAILpassN/A
   **`501`**   501 X `pass``pass``pass``N/A``N/A`passpasspasspassFAILpassN/A
§D.2 Basic HTTP Event I/O Processor 
**§D.2** **Basic HTTP Event I/O Processor** 
   **`509`**   509 `pass``pass``pass``N/A``N/A`passpassFAILN/AFAILpassN/A
   **`510`**   510 `pass``pass``pass``N/A``N/A`passpasspasspassFAILpassN/A
   **`513`**   513 X**`FAIL`****`FAIL`****`FAIL`**`N/A``N/A`N/AN/AN/AN/AN/AN/AN/A
   **`518`**   518 `pass``pass``pass``N/A``N/A`passpassFAILN/AFAILpassN/A
   **`519`**   519 `pass``pass``pass``N/A``N/A`passpassFAILN/AFAILpassN/A
   **`520`**   520 `pass``pass``pass``N/A``N/A`passpassFAILN/AFAILpassN/A
   **`522`**   522 `pass``pass``pass``N/A``N/A`passpasspasspassFAILpassN/A
   **`531`**   531 `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpassN/A
   **`532`**   532 `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpassN/A
   **`534`**   534 `pass``pass``pass``N/A``N/A`passpassFAILN/AFAILpassN/A
   **`567`**   567 `pass``pass``pass``N/A``N/A`passpasspasspassFAILpassN/A
   **`577`**   577 `pass``pass``pass``N/A``N/A`passpasspassN/AFAILpassN/A
\ No newline at end of file + + diff --git a/test/w3c/create-test-table.pl b/test/w3c/create-test-table.pl index 630e0a4..feda8a0 100755 --- a/test/w3c/create-test-table.pl +++ b/test/w3c/create-test-table.pl @@ -18,15 +18,15 @@ if (-d $possibleBuildDir) { } my %testClasses = ( -'w3c/ecma/' => 'ECMA', -'w3c/lua/' => 'Lua', -'w3c/namespace/' => 'NS', -'w3c/promela/' => 'Promela', -'w3c/c89/' => 'C89', -'w3c/gen/c/ecma/' => 'C (ECMA)', -'w3c/gen/c/lua/' => 'C (Lua)', -'w3c/binding/java/jexl/' => 'JEXL', -# 'w3c/spin/promela/' => 'Spin' +'w3c/ecma' => 'ECMA', +'w3c/lua' => 'Lua', +'w3c/namespace' => 'NS', +'w3c/promela' => 'Promela', +# 'w3c/c89' => 'C89', +'w3c/gen/c/ecma' => 'C (ECMA)', +'w3c/gen/c/lua' => 'C (Lua)', +# 'w3c/binding/java/jexl' => 'JEXL', +'w3c/spin/promela' => 'Spin' ); my %specClass = ( @@ -123,7 +123,7 @@ EOF # print '| Test | | ECMA | Lua |' . "\n"; # print '|-----:|--|:------:|:---:|' . "\n"; - +my $nrCols = 0; my $lastSpecClass = ""; for my $specid (sort { $a cmp $b } keys $perSpecId) { my $specName = $specName{$specid}; @@ -136,10 +136,11 @@ for my $specid (sort { $a cmp $b } keys $perSpecId) { # print "|
| | | | |\n"; + $nrCols = 3 + (keys %testClasses); if ($specClass ne $lastSpecClass) { print << "EOF"; - ${specClass} + ${specClass} EOF $lastSpecClass = $specClass; @@ -147,10 +148,11 @@ EOF my $link = "http://www.w3.org/TR/2015/REC-scxml-20150901/" . ${specLink{${specid}}}; + $nrCols = 2 + (keys %testClasses); print << "EOF"; §${specid} -  ${specName}  +  ${specName}  EOF @@ -203,19 +205,22 @@ EOF EOF for my $testClass (keys %testClasses) { - print STDERR "$testClasses{$testClass}"; my $testPass = $fail; my $testName = "${testClass}/test${test}.scxml"; + print STDERR "$testClasses{$testClass}"; $output = `$ctest -L $testName 2>&1 /dev/null`; - if ($? == 0) { + if ($output =~ /No tests were found!!!/) { + $testPass = 'N/A'; + print STDERR "? "; + } elsif ($output =~ /Passed/) { $testPass = $pass; - print STDERR "+ " + print STDERR "+ "; } else { - print STDERR "! " + print STDERR "! "; } print << "EOF"; - ${pass} + ${testPass} EOF } -- cgit v0.12 From 7e0257c3f89bf3d3ed35053b89436bba691b60ce Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Wed, 23 Nov 2016 17:20:34 +0100 Subject: Passing all Lua tests again --- src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp index 4b7ed67..ed96622 100644 --- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp @@ -326,6 +326,7 @@ void LuaDataModel::setEvent(const Event& event) { Data LuaDataModel::evalAsData(const std::string& content) { Data data; + ErrorEvent originalError; std::string trimmedExpr = boost::trim_copy(content); @@ -337,21 +338,32 @@ Data LuaDataModel::evalAsData(const std::string& content) { lua_pop(_luaState, retVals); return data; } catch (ErrorEvent e) { + originalError = e; } + int retVals = 0; try { // evaluate again without the return() - int retVals = luaEval(_luaState, trimmedExpr); + retVals = luaEval(_luaState, trimmedExpr); + } catch (ErrorEvent e) { + throw originalError; // we will assume syntax error and throw + } + if (retVals == 0) + throw originalError; // we will assume syntax error and throw + + + try { if (retVals == 1) { data = getLuaAsData(_luaState, luabridge::LuaRef::fromStack(_luaState, -1)); } lua_pop(_luaState, retVals); return data; + + } catch (ErrorEvent e) { + throw e; // we will assume syntax error and throw + } - } catch (ErrorEvent e) { - throw e; // we will assume syntax error and throw - } return data; } @@ -583,4 +595,4 @@ std::string LuaDataModel::andExpressions(std::list exprs) { } -} \ No newline at end of file +} -- cgit v0.12 From fa50ad507898d1e119ddd9ed35fd9b3b0ccf2659 Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Wed, 23 Nov 2016 17:21:05 +0100 Subject: Fixed space normalization in content element --- src/uscxml/interpreter/BasicContentExecutor.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp index 9f58b46..6b12afd 100644 --- a/src/uscxml/interpreter/BasicContentExecutor.cpp +++ b/src/uscxml/interpreter/BasicContentExecutor.cpp @@ -630,12 +630,14 @@ Data BasicContentExecutor::elementAsData(XERCESC_NS::DOMElement* element) { for (auto textIter = textChildren.begin(); textIter != textChildren.end(); textIter++) { contentSS << X((*textIter)->getNodeValue()); } - try { +#if 0 + try { Data d = _callbacks->getAsData(contentSS.str()); if (!d.empty()) return d; } catch(...) {} - +#endif + // test294, test562 return Data(spaceNormalize(contentSS.str()), Data::VERBATIM); } } @@ -644,4 +646,4 @@ Data BasicContentExecutor::elementAsData(XERCESC_NS::DOMElement* element) { return Data(); } -} \ No newline at end of file +} -- cgit v0.12