Commits

Anonymous committed 4ab3d0b

1. Modified the body-dir test to actually do what it is supposed to do.

Comments (0)

Files changed (4)

 
 * Document the charset and language tags.
 
-* Implement a header tag for all the themes.
+* Deal with the address:email tag of the alon theme
 
 Long Term:
 ----------

installer/tests/Makefile

 all: check
 
-BASH_TESTS = html-correctness stop-on-error lang-settings 
+BASH_TESTS = html-correctness stop-on-error lang-settings body-dir
 
 BASH_TESTS_TARGETS = $(addprefix test-,$(BASH_TESTS))
 

installer/tests/body-dir/test1.bash

 local theme
 theme="$1"
 shift
-echo "Test No. $t : Theme=$theme"
+local dir
+dir="$1"
+shift
+echo "Test No. $t : Theme=$theme dir=$dir"
 
 test_dir=testhtml$t
 quadp setup $test_dir --dest-dir=`pwd`/${test_dir}-output
 sed -i "s/-DTHEME=[-a-zA-Z_]\+/-DTHEME=${theme}/" $test_dir/.wmlrc
 
 cat > $test_dir/src/index.html.wml <<EOF
+<set-var body_dir="$dir" />
 #include 'template.wml'
 
 <p>
     echo "File does not validate!" 1>&2 
     exit 
 fi
+
+body_str="<body>"
+if test "$dir" == "rtl" ; then
+    body_str="<body dir=\"rtl\">"
+fi
+
+if ! grep -F "$body_str" $output_file > /dev/null ; then
+    echo "File does not contain the correct body!" 1>&2
+    exit
+fi
+
 }
 
 for theme in $(cd ../../installation/share/quad-pres/wml/themes/ && ls) ; do
-    perform_test "$theme"
+    for dir in ltr rtl ; do        
+        perform_test "$theme" "$dir"
+    done
 done
 

installer/wml/quadpres_main.wml

 
 <default-var "lang" "en-US" />
 <default-var "charset" "iso-8859-1" />
-<default-var "main_dir" "ltr" />
+<default-var "body_dir" "ltr" />
 
 <define-tag qp:html:header>
 <?xml version="1.0" encoding="<get-var charset />"?>
 </define-tag>
 
 <define-tag qp:html:bodystart>
-<ifeq "<get-var "base_dir" />" "rtl" 
+<ifeq "<get-var "body_dir" />" "rtl" 
     "<body dir="rtl">"
     "<body>"
     />
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.