[sword-svn] r3467 - trunk/tests/testsuite
scribe at crosswire.org
scribe at crosswire.org
Sun May 21 10:53:58 MST 2017
Author: scribe
Date: 2017-05-21 10:53:58 -0700 (Sun, 21 May 2017)
New Revision: 3467
Modified:
trunk/tests/testsuite/osis_basic.good
trunk/tests/testsuite/osis_basic.sh
trunk/tests/testsuite/osis_mod2zmod.good
trunk/tests/testsuite/osis_mod2zmod.sh
trunk/tests/testsuite/osis_osis2modcipher.good
trunk/tests/testsuite/osis_osis2modcipher.sh
Log:
fixed up testsuite to pass all tests with new RTF and Plain output tests
Modified: trunk/tests/testsuite/osis_basic.good
===================================================================
--- trunk/tests/testsuite/osis_basic.good 2017-05-21 17:41:01 UTC (rev 3466)
+++ trunk/tests/testsuite/osis_basic.good 2017-05-21 17:53:58 UTC (rev 3467)
@@ -125,7 +125,7 @@
[ Genesis 1:2 ] Text of verse 2.
-mods.d modules Plain output
+-- Plain output
Acts 2:19: ‘* And I will grant wonders in the sky above *
* And signs on the earth below *,
* Blood, and fire, and vapor of smoke *.
@@ -134,10 +134,8 @@
* And the moon into blood *,
* Before the great and glorious day of the Lord shall come *.
-(OSISReference)
-mods.d modules RTF output
+-- RTF output
{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par
Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par
-(OSISReference)
-}
\ No newline at end of file
+}
Modified: trunk/tests/testsuite/osis_basic.sh
===================================================================
--- trunk/tests/testsuite/osis_basic.sh 2017-05-21 17:41:01 UTC (rev 3466)
+++ trunk/tests/testsuite/osis_basic.sh 2017-05-21 17:53:58 UTC (rev 3467)
@@ -28,8 +28,8 @@
../../../osistest OSISReference
echo
-echo ** Plain output
-../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-20
+echo "-- Plain output"
+../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-20 | grep -v OSISReference
echo
-echo ** RTF output
-../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-20
+echo "-- RTF output"
+../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-20 | grep -v OSISReference
Modified: trunk/tests/testsuite/osis_mod2zmod.good
===================================================================
--- trunk/tests/testsuite/osis_mod2zmod.good 2017-05-21 17:41:01 UTC (rev 3466)
+++ trunk/tests/testsuite/osis_mod2zmod.good 2017-05-21 17:53:58 UTC (rev 3467)
@@ -124,3 +124,18 @@
<br />
[ Genesis 1:2 ] Text of verse 2.
+
+-- Plain output
+Acts 2:19: ‘* And I will grant wonders in the sky above *
+* And signs on the earth below *,
+* Blood, and fire, and vapor of smoke *.
+
+Acts 2:20: ‘* The sun will be turned into darkness *
+* And the moon into blood *,
+* Before the great and glorious day of the Lord shall come *.
+
+
+-- RTF output
+{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par
+Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par
+}
Modified: trunk/tests/testsuite/osis_mod2zmod.sh
===================================================================
--- trunk/tests/testsuite/osis_mod2zmod.sh 2017-05-21 17:41:01 UTC (rev 3466)
+++ trunk/tests/testsuite/osis_mod2zmod.sh 2017-05-21 17:53:58 UTC (rev 3467)
@@ -36,6 +36,7 @@
CompressType=ZIP
SourceType=OSIS
Lang=en
+GlobalOptionFilter=OSISLemma
GlobalOptionFilter=OSISStrongs
GlobalOptionFilter=OSISMorph
GlobalOptionFilter=OSISFootnotes
@@ -50,3 +51,10 @@
cd tmp/osis_mod2zmod
../../../../utilities/mod2zmod OSISReference zmodules/ 4 2 0 abc123 > /dev/null 2>&1
../../../osistest zOSISReference
+
+echo
+echo "-- Plain output"
+../../../../utilities/diatheke/diatheke -b zOSISReference -f plain -k Acts 2:19-20 | grep -v zOSISReference
+echo
+echo "-- RTF output"
+../../../../utilities/diatheke/diatheke -b zOSISReference -f RTF -k Acts 2:19-20 | grep -v zOSISReference
Modified: trunk/tests/testsuite/osis_osis2modcipher.good
===================================================================
--- trunk/tests/testsuite/osis_osis2modcipher.good 2017-05-21 17:41:01 UTC (rev 3466)
+++ trunk/tests/testsuite/osis_osis2modcipher.good 2017-05-21 17:53:58 UTC (rev 3467)
@@ -124,3 +124,18 @@
<br />
[ Genesis 1:2 ] Text of verse 2.
+
+-- Plain output
+Acts 2:19: ‘* And I will grant wonders in the sky above *
+* And signs on the earth below *,
+* Blood, and fire, and vapor of smoke *.
+
+Acts 2:20: ‘* The sun will be turned into darkness *
+* And the moon into blood *,
+* Before the great and glorious day of the Lord shall come *.
+
+
+-- RTF output
+{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par
+Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par
+}
Modified: trunk/tests/testsuite/osis_osis2modcipher.sh
===================================================================
--- trunk/tests/testsuite/osis_osis2modcipher.sh 2017-05-21 17:41:01 UTC (rev 3466)
+++ trunk/tests/testsuite/osis_osis2modcipher.sh 2017-05-21 17:53:58 UTC (rev 3467)
@@ -28,3 +28,10 @@
cp osis_basic.good osis_osis2modcipher.good
cd tmp/osis_osis2modcipher
../../../osistest OSISReference
+
+echo
+echo "-- Plain output"
+../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-20 | grep -v OSISReference
+echo
+echo "-- RTF output"
+../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-20 | grep -v OSISReference
More information about the sword-cvs
mailing list