kwartz 3.0.0 → 3.1.0

data/test/test-converter.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 114 $
-### $Release: 3.0.0 $
+### $Rev: 123 $
+### $Release: 3.1.0 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 
@@ -12,15 +12,23 @@ class ConverterTest < Test::Unit::TestCase
 
   ## define test methods
   filename = __FILE__.sub(/\.rb$/, '.yaml')
-  load_yaml_testdata(filename)
+  #load_yaml_testdata(filename)
+  load_yaml_testdata_with_each_lang(filename, :langs=>%w[eruby php])
 
 
   def _test
-    parser = Kwartz::PresentationLogicParser.get_class('css').new
-    ruleset_list = parser.parse(@plogic)
-    #handler = Kwartz::Handler.new(ruleset_list)
-    handler = Kwartz::ErubyHandler.new(ruleset_list, :delspan=>true)
-    converter = Kwartz::TextConverter.new(handler, :delspan=>true)
+    #parser = Kwartz::PresentationLogicParser.get_class('css').new
+    #ruleset_list = parser.parse(@plogic)
+    ruleset_list = []
+    (@properties ||= {}).each do |key, val|
+      if key.is_a?(String)
+        key = key.intern
+        @properties.delete(key)
+        @properties[key] = val
+      end
+    end
+    handler = Kwartz::Handler.get_class(@lang).new(ruleset_list, @properties)
+    converter = Kwartz::TextConverter.new(handler, @properties)
     stmt_list = converter.convert(@pdata)
     sb = ''
     stmt_list.each do |stmt|

data/test/test-converter.yaml

@@ -1,76 +1,294 @@
----
-- name:    span1
-  pdata: |
+###
+- name:    delspan1
+  desc:    <span> and id="mark:foo"
+  properties:  { delspan : true }
+  pdata*:
+    eruby: |
+	<p>
+	  <span id="foo">FOO</span>
+	  <span id="mark:bar">BAR</span>
+	  <span kw:d="id: baz">BAZ</span>
+	  <span kw:d="mark:poo" class="foo">POO</span>
+	</p>
+
+    php: &delspan1_pdata |
 	<p>
 	  <span id="foo">FOO</span>
 	  <span id="mark:bar">BAR</span>
-	  <span title="id: baz">BAZ</span>
-	  <span id="mark:poo" class="foo">POO</span>
+	  <span kw:d="id(baz)">BAZ</span>
+	  <span kw:d="mark(poo)" class="foo">POO</span>
+	</p>
+
+    jstl: *delspan1_pdata
+    
+    eperl: *delspan1_pdata
+
+  expected*:
+    eruby: &delspan2_expected |
+	print("<p>\n")
+	print("  <span id=\"foo\">")
+	print("FOO")
+	print("</span>\n")
+	print()
+	print("BAR")
+	print()
+	print()
+	print("BAZ")
+	print()
+	print("  <span class=\"foo\">")
+	print("POO")
+	print("</span>\n")
+	print("</p>\n")
+
+    php: *delspan2_expected
+
+    jstl: *delspan2_expected
+
+    eperl: *delspan2_expected
+
+###
+- name:    delspan2
+  desc:    <span> and 'attr:' or 'append:'
+  properties:  { delspan : true }
+  pdata*:
+    eruby: |
+	<p>
+	  <span kw:d="attr: 'class' classname">ATTR</span>
+	  <span kw:d="append: ' checked'">APPEND</span>
+	  <span kw:d="append: ' checked'" class="foo">APPEND</span>
+	</p>
+
+    php: &delspan2_pdata |
+	<p>
+	  <span kw:d="attr('class', $classname)">ATTR</span>
+	  <span kw:d="append(' checked')">APPEND</span>
+	  <span kw:d="append(' checked')" class="foo">APPEND</span>
+	</p>
+
+    jstl: |
+	<p>
+	  <span kw:d="attr('class', classname)">ATTR</span>
+	  <span kw:d="append(' checked')">APPEND</span>
+	  <span kw:d="append(' checked')" class="foo">APPEND</span>
+	</p>
+
+    eperl: |
+	<p>
+	  <span kw:d="attr('class', $classname)">ATTR</span>
+	  <span kw:d="append(' checked')">APPEND</span>
+	  <span kw:d="append(' checked')" class="foo">APPEND</span>
+	</p>
+
+  expected*:
+    eruby: |
+	print("<p>\n")
+	print("  <span class=\"", <%=classname%>, "\">")
+	print("ATTR")
+	print("</span>\n")
+	print("  <span", <%=' checked'%>, ">")
+	print("APPEND")
+	print("</span>\n")
+	print("  <span class=\"foo\"", <%=' checked'%>, ">")
+	print("APPEND")
+	print("</span>\n")
+	print("</p>\n")
+
+    php: |
+	print("<p>\n")
+	print("  <span class=\"", <%=$classname%>, "\">")
+	print("ATTR")
+	print("</span>\n")
+	print("  <span", <%=' checked'%>, ">")
+	print("APPEND")
+	print("</span>\n")
+	print("  <span class=\"foo\"", <%=' checked'%>, ">")
+	print("APPEND")
+	print("</span>\n")
+	print("</p>\n")
+
+    jstl: |
+	print("<p>\n")
+	print("  <span class=\"", <%=classname%>, "\">")
+	print("ATTR")
+	print("</span>\n")
+	print("  <span", <%=' checked'%>, ">")
+	print("APPEND")
+	print("</span>\n")
+	print("  <span class=\"foo\"", <%=' checked'%>, ">")
+	print("APPEND")
+	print("</span>\n")
+	print("</p>\n")
+
+    eperl: |
+	print("<p>\n")
+	print("  <span class=\"", <%=$classname%>, "\">")
+	print("ATTR")
+	print("</span>\n")
+	print("  <span", <%=' checked'%>, ">")
+	print("APPEND")
+	print("</span>\n")
+	print("  <span class=\"foo\"", <%=' checked'%>, ">")
+	print("APPEND")
+	print("</span>\n")
+	print("</p>\n")
+
+###
+- name:    delspan3
+  desc:    <span> and 'value:'
+  properties:  { delspan : true }
+  pdata*:
+    eruby: |
+	<p>
+	  <span kw:d="value: expr">EXPR</span>
+	  <span kw:d="value: expr" class="foo">EXPR</span>
 	</p>
+
+    php: |
 	<p>
-	  <span title="attr: 'class' classname">ATTR</span>
-	  <span title="append: ' checked'">APPEND</span>
-	  <span title="append: ' checked'" class="foo">APPEND</span>
+	  <span kw:d="value($expr)">EXPR</span>
+	  <span kw:d="value($expr)" class="foo">EXPR</span>
 	</p>
+
+    jstl: |
 	<p>
-	  <span title="value: expr">EXPR</span>
-	  <span title="value: expr" class="foo">EXPR</span>
+	  <span kw:d="value(expr)">EXPR</span>
+	  <span kw:d="value(expr)" class="foo">EXPR</span>
 	</p>
+
+    eperl: |
 	<p>
-	  <span title="if x > 0">positive</span>
-	  <span title="elsif x < 0">negative</span>
-	  <span title="else">zero</span>
+	  <span kw:d="value($expr)">EXPR</span>
+	  <span kw:d="value($expr)" class="foo">EXPR</span>
+	</p>
+
+  expected*:
+    eruby: |
+	print("<p>\n")
+	print(<%=expr%>)
+	print("  <span class=\"foo\">", <%=expr%>, "</span>\n")
+	print("</p>\n")
+
+    php: |
+	print("<p>\n")
+	print(<%=$expr%>)
+	print("  <span class=\"foo\">", <%=$expr%>, "</span>\n")
+	print("</p>\n")
+
+    jstl: |
+	print("<p>\n")
+	print(<%=expr%>)
+	print("  <span class=\"foo\">", <%=expr%>, "</span>\n")
+	print("</p>\n")
+
+    eperl: |
+	print("<p>\n")
+	print(<%=$expr%>)
+	print("  <span class=\"foo\">", <%=$expr%>, "</span>\n")
+	print("</p>\n")
+
+###
+- name:    delspan4
+  desc:    <span> and 'if:', 'elsif:', 'else:'
+  properties:  { delspan : true }
+  pdata*:
+    eruby: |
+	<p>
+	  <span kw:d="if x > 0">positive</span>
+	  <span kw:d="elsif x < 0">negative</span>
+	  <span kw:d="else">zero</span>
+	</p>
+
+    php: |
+	<p>
+	  <span kw:d="if($x > 0)">positive</span>
+	  <span kw:d="elseif($x < 0)">negative</span>
+	  <span kw:d="else">zero</span>
+	</p>
+
+    jstl: |
+	<p>
+	  <span kw:d="if(x > 0)">positive</span>
+	  <span kw:d="elseif(x < 0)">negative</span>
+	  <span kw:d="else">zero</span>
+	</p>
+
+    eperl: |
+	<p>
+	  <span kw:d="if($x > 0)">positive</span>
+	  <span kw:d="elsif($x < 0)">negative</span>
+	  <span kw:d="else">zero</span>
 	</p>
 
   plogic: |
+  expected*:
+    eruby: |
+	print("<p>\n")
+	<%if x > 0 then%>
+	print()
+	print("positive")
+	print()
+	<%elsif x < 0 then%>
+	print()
+	print("negative")
+	print()
+	<%else%>
+	print()
+	print("zero")
+	print()
+	<%end%>
+	print("</p>\n")
+
+    php: |
+	print("<p>\n")
+	<%if ($x > 0) {%>
+	print()
+	print("positive")
+	print()
+	<%} elseif ($x < 0) {%>
+	print()
+	print("negative")
+	print()
+	<%} else {%>
+	print()
+	print("zero")
+	print()
+	<%}%>
+	print("</p>\n")
+
+    jstl: |
+	print("<p>\n")
+	<%<c:choose><c:when test="${x > 0}">%>
+	print()
+	print("positive")
+	print()
+	<%</c:when><c:when test="${x < 0}">%>
+	print()
+	print("negative")
+	print()
+	<%</c:when><c:otherwise>%>
+	print()
+	print("zero")
+	print()
+	<%</c:otherwise></c:choose>%>
+	print("</p>\n")
+
+    eperl: |
+	print("<p>\n")
+	<%if ($x > 0) {%>
+	print()
+	print("positive")
+	print()
+	<%} elsif ($x < 0) {%>
+	print()
+	print("negative")
+	print()
+	<%} else {%>
+	print()
+	print("zero")
+	print()
+	<%}%>
+	print("</p>\n")
 
-  expected: |
-	[ "<p>\n"]
-	[ "  <span id=\"foo\">"]
-	[ "FOO"]
-	[ "</span>\n"]
-	[ ]
-	[ "BAR"]
-	[ ]
-	[ ]
-	[ "BAZ"]
-	[ ]
-	[ "  <span class=\"foo\">"]
-	[ "POO"]
-	[ "</span>\n"]
-	[ "</p>\n"]
-	[ "<p>\n"]
-	[ "  <span class=\"", <%=classname%>, "\">"]
-	[ "ATTR"]
-	[ "</span>\n"]
-	[ "  <span", <%=' checked'%>, ">"]
-	[ "APPEND"]
-	[ "</span>\n"]
-	[ "  <span class=\"foo\"", <%=' checked'%>, ">"]
-	[ "APPEND"]
-	[ "</span>\n"]
-	[ "</p>\n"]
-	[ "<p>\n"]
-	[ <%=expr%>]
-	[ "  <span class=\"foo\">", <%=expr%>, "</span>\n"]
-	[ "</p>\n"]
-	[ "<p>\n"]
-	"if x > 0 then"
-	[ ]
-	[ "positive"]
-	[ ]
-	"elsif x < 0 then"
-	[ ]
-	[ "negative"]
-	[ ]
-	"else"
-	[ ]
-	[ "zero"]
-	[ ]
-	"end"
-	[ "</p>\n"]
-
-  output: |
 
 ###
 #- name:    span2
@@ -95,33 +313,46 @@
 #	}
 #
 #  expected: |
-#	[ "<p>\n"]
-#	[ ]
-#	[ <%=title1%>]
-#	[ ]
-#	[ "  <span class=\"", <%=name%>, "\">"]
-#	[ <%=title2%>]
-#	[ "</span>\n"]
-#	[ "  <span", <%=' checked="checked"'%>, ">"]
-#	[ <%=title3%>]
-#	[ "</span>\n"]
-#	[ "</p>\n"]
+#	print("<p>\n")
+#	print()
+#	print(<%=title1%>)
+#	print()
+#	print("  <span class=\"", <%=name%>, "\">")
+#	print(<%=title2%>)
+#	print("</span>\n")
+#	print("  <span", <%=' checked="checked"'%>, ">")
+#	print(<%=title3%>)
+#	print("</span>\n")
+#	print("</p>\n")
 # 
 #
 #  output: |
 #
 
 
-##
+###
 - name:    unmatched
   desc:    unmatched text to fetch pattern
   bug:     self found
-  pdata: |
+  pdata*:
+    eruby: &unmatched_pdata |
 	foo
 	bar
 	baz
-  plogic: |
-  expected: |
-        [ "foo\nbar\nbaz\n"]
+    php: *unmatched_pdata
+    jstl: *unmatched_pdata
+    eperl: *unmatched_pdata
+
+  plogic*:
+    eruby: |
+    php: |
+    jstl: |
+    eperl: |
 
+  expected*:
+    eruby: &unmatched_expected |
+        print("foo\nbar\nbaz\n")
+    php:  *unmatched_expected
+    jstl: *unmatched_expected
+    eperl: *unmatched_expected