htmlgrid 1.0.7 → 1.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 493156bba6ea55bb67e136827debde748db5bbbe
+  data.tar.gz: 012b9c6ef18b01881c8529b9262d0599ef91d9d9
+SHA512:
+  metadata.gz: 0efcf47d58cf047af2e6589845117f9afaf4c03e22e5eea79079538361ccb6a79a7821a0897cc458d469bb2de546feb374431626882e34550de18408e4121289
+  data.tar.gz: 4e00e05f74fda7af302fa339f1ca9d0f448463c2af6b5a25b54468f7f2998714d1787cc3ef2cf61542c1de63dac0909b921aa3c1a2b3f50e287b3e3f39de8414

data/History.txt

@@ -1,6 +1,13 @@
+=== 1.0.8 / 10.05.2015
+
+* Removed C-interface
+* Removed obsolete tests for RUBY_VERSION < 1.9
+* Ported to Ruby 2.3.0. Updated minitest. Use newer version of sbsm.
+* Ruby 1.9.3 is no longer supported
+
 === 1.0.7 / 03.12.2013
 
-* Remove LEGACY_INTERFACE.
+* Remove LEGACY_INTERFACE. No. LEGACY_INTERFACE was readded before release 1.0.7
 * Make travis work just fine.
 
 === 1.0.6 / 06.04.2012

data/Manifest.txt

@@ -6,7 +6,7 @@ Gemfile.lock
 History.txt
 LICENCE.txt
 Manifest.txt
-README.txt
+README.textile
 Rakefile
 ext/htmlgrid/MANIFEST
 ext/htmlgrid/extconf.rb

data/lib/htmlgrid/component.rb

@@ -176,11 +176,7 @@ module HtmlGrid
 				esc << if(entity = @@symbol_entities[byte])
 					'&' << entity << ';'
 				else
-          if RUBY_VERSION >= '1.9'
-            byte
-          else
-            byte.chr
-          end
+          byte
 				end
 			}
 			esc
@@ -218,18 +214,14 @@ module HtmlGrid
 			@attributes.store('tabIndex', tab.to_s)
 		end
 		def to_html(context)
-      if RUBY_VERSION > "1.9"
-        _to_html(context, @value).to_s.force_encoding('utf-8')
-      else
-        _to_html(context, @value).to_s
-      end
+      _to_html(context, @value).to_s.force_encoding('utf-8')
     end
     @@nl2br_ptrn = /(\r\n)|(\n)|(\r)/
 		def _to_html(context, value=@value)
 			if(value.is_a?(Array))
 				value.collect { |item| _to_html(context, item) }.join(' ')
 			elsif(value.respond_to?(:to_html))
-				value.to_html(context).to_s
+				value.to_html(context).to_s.force_encoding('utf-8')
 			else
 				value.to_s.gsub(@@nl2br_ptrn, '<br>')
 			end

data/lib/htmlgrid/composite.rb

@@ -42,6 +42,7 @@ end
 module HtmlGrid
 	class AbstractComposite < Component
 		LABELS = false
+		LEGACY_INTERFACE = true
 		SYMBOL_MAP = {}
 		CSS_MAP = {}
 		CSS_ID_MAP = {}
@@ -61,6 +62,9 @@ module HtmlGrid
 			elsif(component.is_a? Symbol)
 				if(self.respond_to?(component, true))
 					args = [model]
+					if(self::class::LEGACY_INTERFACE)
+						args.push(@session)
+					end
 					self.send(component, *args)
 				elsif(klass = symbol_map[component])
 					klass.new(component, model, @session, self)
@@ -258,11 +262,7 @@ module HtmlGrid
 		end
 		def to_html(context)
 			@grid.set_attributes(@attributes)
-      if RUBY_VERSION > "1.9"
-        super << @grid.to_html(context).force_encoding('utf-8')
-      else
-        super << @grid.to_html(context)
-      end
+      super << @grid.to_html(context).force_encoding('utf-8')
 		end
 		private
 		def back(model=@model, session=@session)

data/lib/htmlgrid/divcomposite.rb

@@ -39,7 +39,7 @@ module HtmlGrid
         res << context.div(tag_attributes(idx)) {
           div.flatten.inject('') { |html, item|
             html << if(item.respond_to?(:to_html))
-                      item.to_html(context)
+                      item.to_html(context).force_encoding('utf-8')
                     else
                       item.to_s
                     end

data/lib/htmlgrid/dojotoolkit.rb

@@ -71,7 +71,7 @@ module HtmlGrid
           html << context.div(attrs)
         elsif(@dojo_tooltip.respond_to?(:to_html))
           @dojo_tooltip.attributes.update(attrs)
-          html << @dojo_tooltip.to_html(context)
+          html << @dojo_tooltip.to_html(context).force_encoding('utf-8')
         end
         unless(html.empty? || dojo_parse_widgets)
           html << context.script('type' => 'text/javascript') {
@@ -93,11 +93,7 @@ module HtmlGrid
       def dynamic_html_headers(context)
         headers = super
         encoding = self.class::DOJO_ENCODING
-        encoding ||= if RUBY_VERSION >= '1.9'
-                       Encoding.default_external
-                     else
-                       $KCODE == 'UTF8' ? 'UTF-8' : 'ISO-8859-1'
-                     end
+        encoding ||= Encoding.default_external
         dojo_path = @lookandfeel.resource_global(:dojo_js)
         dojo_path ||= '/resources/dojo/dojo/dojo.js'
         args = { 'type' => 'text/javascript'}

data/lib/htmlgrid/form.rb

@@ -30,11 +30,7 @@ require 'htmlgrid/submit'
 module HtmlGrid
 	module FormMethods
 		AUTOFILL = false
-    if RUBY_VERSION >= '1.9'
-      ACCEPT_CHARSET = Encoding.default_external || 'UTF-8'
-    else
-      ACCEPT_CHARSET = $KCODE == 'UTF8' ? 'UTF-8' : 'ISO-8859-1'
-    end
+    ACCEPT_CHARSET = 'UTF-8'
 		EVENT = nil
 		FORM_ACTION = nil
 		FORM_METHOD = 'POST'

data/lib/htmlgrid/grid.rb

@@ -24,8 +24,9 @@
 #
 # HtmlGrid::Grid -- htmlgrid -- 23.02.2012 -- mhatakeyama@ywesee.com
 # HtmlGrid::Grid -- htmlgrid -- 12.01.2010 -- hwyss@ywesee.com
+require 'htmlgrid/version'
 begin
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
   begin
     # for gem install
     ext_dir = File.expand_path('../../ext/htmlgrid', File.dirname(__FILE__))
@@ -97,9 +98,9 @@ rescue LoadError
 					end
 					def component_html(cgi)
 						html = ''
-						@components.each { |component| 
+						@components.each { |component|
 							if component.respond_to? :to_html
-								html << component.to_html(cgi).to_s
+								html << component.to_html(cgi).to_s.force_encoding('utf-8')
 							else
 								html << component.to_s
 							end
@@ -196,7 +197,7 @@ rescue LoadError
             add_field(arg, x, y)
           elsif arg.kind_of? Array
             arg.each do |item|
-              add_field(item, x, y) 
+              add_field(item, x ? x : '', y)
             end
           else
             if(col)
@@ -215,7 +216,7 @@ rescue LoadError
 				}
 			end
 			def add_background(x, y, w=1, h=1)
-				each_field(x, y, w, h) { |field| 
+				each_field(x, y, w, h) { |field|
 					field.add_background(x, w)
 				}
 			end
@@ -254,7 +255,7 @@ rescue LoadError
 				}
 			end
 			def each_field(x, y, w=1, h=1)
-				y.upto([y+h, @height].min - 1) { |yy| 
+				y.upto([y+h, @height].min - 1) { |yy|
 					@rows[yy].each_field(x,w) { |field|
 						yield(field)
 					}
@@ -287,12 +288,12 @@ rescue LoadError
         # TODO
         # At the moment, offset value is not used
         # But probably offset value is used in grid.c
-				initialize_grid(0, y+1)
+        initialize_grid(offset, y + 1)
 				@rows[y].set_attributes(attr)
 			end
 			def to_html(cgi)
 				cgi.table(@attributes) {
-					@rows.collect { |row| row.to_html(cgi) }.join
+					@rows.collect { |row| row.to_html(cgi).force_encoding('utf-8') }.join
 				}
 			end
 			def [](x, y)

data/lib/htmlgrid/link.rb

@@ -44,7 +44,7 @@ module HtmlGrid
 		def to_html(context)
 			context.a(@attributes) { 
 				if(@value.respond_to?(:to_html))
-					@value.to_html(context)
+					@value.to_html(context).force_encoding('utf-8')
 				else
 					super
 				end

data/lib/htmlgrid/richtext.rb

@@ -16,7 +16,7 @@ module HtmlGrid
 		def to_html(context)
 			@elements.collect { |element|
 				if(element.respond_to?(:to_html))
-					element.to_html(context) 
+					element.to_html(context).force_encoding('utf-8')
 				else
 					element.to_s
 				end

data/lib/htmlgrid/spancomposite.rb

@@ -33,7 +33,7 @@ module HtmlGrid
 			@grid.each_with_index { |span, idx| 
 				res << context.span(tag_attributes(idx)) {
 					if(span.respond_to?(:to_html))
-						span.to_html(context)
+						span.to_html(context).force_encoding('utf-8')
 					else
 						span	
 					end

data/lib/htmlgrid/template.rb

@@ -32,6 +32,7 @@ module HtmlGrid
 		FOOT = nil
 		HEAD = nil
 		META_TAGS = []
+		LEGACY_INTERFACE = true
 		CSS_FILES = []
 		JAVASCRIPTS = []
 		def css_link(context, path=@lookandfeel.resource(:css))

data/lib/htmlgrid/ulcomposite.rb

@@ -35,7 +35,7 @@ module HtmlGrid
 				@grid.each_with_index { |li, idx| 
 					inner_res << context.li(tag_attributes(idx)) {
 						if(li.respond_to?(:to_html))
-							li.to_html(context)
+							li.to_html(context).force_encoding('utf-8')
 						else
 							li	
 						end

data/lib/htmlgrid/version.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+module HtmlGrid
+  VERSION = '1.0.8'
+end

data/{ext/htmlgrid/extconf.rb → test/suite.rb}

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
-# Copyright (C) 2003 Hannes Wyss, ywesee - intellectual capital connected
+#	Copyright (C) 2003 ywesee - intellectual capital connected
+# Andreas Schrafl, Benjamin Fay, Hannes Wyss, Markus Huggler
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,17 +18,15 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# ywesee - intellectual capital connected
-# Winterthurerstrasse 52, CH-8006 Z�rich, Switzerland
-# hwyss@ywesee.com
+#	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
+#	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# extconf.rb -- htmlgrid -- 30.10.2003 -- hwyss@ywesee.com
+# suite.rb -- htmlgrid -- 20.11.2002 -- hwyss@ywesee.com 
 
-require 'mkmf'
+$: << File.expand_path(File.dirname(__FILE__))
 
-if RUBY_VERSION >= '1.9'
-  $CPPFLAGS += " -DRUBY_19"
-end
+require 'rebuild'
 
-dir_config('htmlgrid', '.')
-create_makefile('htmlgrid')
+Dir.foreach(File.dirname(__FILE__)) { |file|
+	require file if /^test_.*\.rb$/o.match(file)
+}

data/test/test_add_row.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+#encoding: utf-8
+$: << File.expand_path('../lib', File.dirname(__FILE__))
+$: << File.dirname(__FILE__)
+
+require 'minitest/autorun'
+require 'stub/cgi'
+require 'htmlgrid/composite'
+require 'htmlgrid/inputtext'
+require 'htmlgrid/form'
+
+class StubComposite < HtmlGrid::Composite
+  attr_writer :container
+  COMPONENTS = {
+    [0,0,1] =>  :foo,
+  }
+  LABELS = true
+  SYMBOL_MAP = {
+    :bar  =>  HtmlGrid::InputText,
+  }
+  attr_reader :model, :session
+  public :resolve_offset, :labels?
+  def init
+    @barcount=0
+    super
+  end
+  def foo(model)
+    1.upto(2).each { |idx| 
+                      @grid.add(baz(model), 0, idx, 0)
+    }
+    "Foo"
+  end
+  def baz(model)
+    @barcount += 1
+    "Baz#{@barcount}"
+  end
+end
+class StubCompositeModel
+end
+class StubComposite2Model
+end
+class StubCompositeLookandfeel
+  def attributes(key)
+    {}
+  end
+  def lookup(key)
+  end
+  def base_url
+    'http://www.oddb.org/de/gcc'
+  end
+end
+class StubCompositeSession
+  def lookandfeel
+    StubCompositeLookandfeel.new
+  end
+  def error(key)
+  end
+end
+class StubCompositeForm < HtmlGrid::Form
+  COMPONENTS = {
+    [0,0] =>  StubComposite
+  }
+  EVENT = :foo
+end
+
+class TestComposite < Minitest::Test
+  def setup
+    @composite = StubComposite.new([StubComposite2Model.new, StubCompositeModel.new], 
+                                   StubCompositeSession.new)
+  end
+  def test_to_html
+    expected = '<TABLE cellspacing="0"><TR><TD>Foo</TD></TR><TR><TD>Baz1</TD></TR><TR><TD>Baz2</TD></TR></TABLE>'
+    assert_equal(expected, @composite.to_html(CGI.new))
+  end
+end

data/test/test_component.rb

@@ -26,7 +26,7 @@
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 $: << File.expand_path("../ext", File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'htmlgrid/component'
 
 module HtmlGrid
@@ -35,7 +35,7 @@ module HtmlGrid
 	end
 end
 
-class TestComponent < Test::Unit::TestCase
+class TestComponent < Minitest::Test
 	class StubAttributeComponent < HtmlGrid::Component
 		HTML_ATTRIBUTES = { "key" => "val" }
 	end
@@ -55,23 +55,17 @@ class TestComponent < Test::Unit::TestCase
 		@component = HtmlGrid::Component.new(nil, nil)
 	end
 	def test_initialize1
-		assert_nothing_raised {
-			HtmlGrid::Component.new("foo", "bar")
-		}
+    HtmlGrid::Component.new("foo", "bar")
 		comp = HtmlGrid::Component.new("foo", "bar")
 		assert_equal("foo", comp.model)
 		assert_equal("bar", comp.session)
 		assert_equal(nil, comp.container)
 		assert_equal(false, comp.label?)
-		assert_nothing_raised {
-			comp.label = true
-		}
+    comp.label = true
 		assert_equal(true, comp.label?)
 	end
 	def test_initialize2
-		assert_nothing_raised {
-			HtmlGrid::Component.new("foo", "bar", "baz")
-		}
+    HtmlGrid::Component.new("foo", "bar", "baz")
 		comp = HtmlGrid::Component.new("foo", "bar", "baz")
 		assert_equal("foo", comp.model)
 		assert_equal("bar", comp.session)
@@ -83,17 +77,13 @@ class TestComponent < Test::Unit::TestCase
 		assert_respond_to(comp, :attributes)
 		assert_equal(expected, comp.attributes)
 		assert_equal(expected, StubAttributeComponent::HTML_ATTRIBUTES)
-		assert_nothing_raised {
-			comp.attributes.store("other", "val")
-		}
+    comp.attributes.store("other", "val")
 		expected2 = { "key" =>	"val", "other" => "val" }
 		assert_equal(expected2, comp.attributes)
 		assert_equal(expected, StubAttributeComponent::HTML_ATTRIBUTES)
 		assert_equal({}, @component.attributes)
 		assert_equal({}, HtmlGrid::Component::HTML_ATTRIBUTES)
-		assert_nothing_raised {
-			@component.attributes.store("third", "val")
-		}
+    @component.attributes.store("third", "val")
 		expected = {"third"=>"val"}
 		assert_equal(expected, @component.attributes)
 		assert_equal({}, HtmlGrid::Component::HTML_ATTRIBUTES)

data/test/test_composite.rb

@@ -26,11 +26,12 @@
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 $: << File.dirname(__FILE__)
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'stub/cgi'
 require 'htmlgrid/composite'
 require 'htmlgrid/inputtext'
 require 'htmlgrid/form'
+require 'htmlgrid/button'
 
 class StubComposite < HtmlGrid::Composite
 	attr_writer :container
@@ -51,13 +52,16 @@ class StubComposite < HtmlGrid::Composite
 		@barcount=0
 		super
 	end
-	def foo(model)
+	def foo(model, lookandfeel)
 		"Foo"
 	end
-	def baz(model)
+	def baz(model, lookandfeel)
 		@barcount += 1
 		"Baz#{@barcount}"
 	end
+  def back
+    super
+  end
 end
 class StubCompositeComponent < HtmlGrid::Component
 	def to_html(context)
@@ -84,6 +88,9 @@ end
 class StubCompositeModel
 end
 class StubCompositeLookandfeel
+  def event_url(one)
+    return 'event_url'
+  end
 	def attributes(key)
 		{}
 	end
@@ -127,42 +134,38 @@ class StubCompositeColspan4 < HtmlGrid::Composite
 	}	
 end
 
-class TestComposite < Test::Unit::TestCase
+class TestComposite < Minitest::Test
 	def setup
 		@composite = StubComposite.new(StubCompositeModel.new, StubCompositeSession.new)
 	end
 	def test_create_method
 		foo = nil
-		assert_nothing_raised {
-			foo = @composite.create(:foo, @composite.model)
-		}
+    foo = @composite.create(:foo, @composite.model)
 		assert_equal("Foo", foo)
 	end
 	def test_create_symbol
 		bar = nil
-		assert_nothing_raised {
-			bar = @composite.create(:bar, @composite.model)
-		}
+    bar = @composite.create(:bar, @composite.model)
 		assert_equal(HtmlGrid::InputText, bar.class)
 	end
 	def test_full_colspan1
 		composite = StubCompositeColspan1.new(StubCompositeModel.new, StubCompositeSession.new)
-		assert_nothing_raised { composite.full_colspan }
+    composite.full_colspan
 		assert_equal(nil, composite.full_colspan)
 	end
 	def test_full_colspan2
 		composite = StubCompositeColspan2.new(StubCompositeModel.new, StubCompositeSession.new)
-		assert_nothing_raised { composite.full_colspan }
+    composite.full_colspan
 		assert_equal(nil, composite.full_colspan)
 	end
 	def test_full_colspan3
 		composite = StubCompositeColspan3.new(StubCompositeModel.new, StubCompositeSession.new)
-		assert_nothing_raised { composite.full_colspan }
+    composite.full_colspan
 		assert_equal(2, composite.full_colspan)
 	end
 	def test_full_colspan4
 		composite = StubCompositeColspan4.new(StubCompositeModel.new, StubCompositeSession.new)
-		assert_nothing_raised { composite.full_colspan }
+    composite.full_colspan
 		assert_equal(3, composite.full_colspan)
 	end
 	def test_labels1
@@ -172,10 +175,10 @@ class TestComposite < Test::Unit::TestCase
 	def test_labels2
 		assert_equal(true, @composite.labels?)
 	end
-	def test_to_html
-		expected = '<TABLE cellspacing="0"><TR><TD>Baz1FooBaz2</TD></TR><TR><TD>Baz3Baz4</TD></TR></TABLE>'
-		assert_equal(expected, @composite.to_html(CGI.new))
-	end
+  def test_to_html
+    expected = '<TABLE cellspacing="0"><TR><TD>Baz1FooBaz2</TD></TR><TR><TD>Baz3Baz4</TD></TR></TABLE>'
+    assert_equal(expected, @composite.to_html(CGI.new))
+  end
 	def test_resolve_offset
 		matrix = [1,2,3,4]
 		assert_equal(matrix, @composite.resolve_offset(matrix))
@@ -184,7 +187,7 @@ class TestComposite < Test::Unit::TestCase
 		assert_equal(expected, @composite.resolve_offset(matrix, offset))
 	end
 	def test_event
-		assert_nothing_raised { @composite.event() }
+    @composite.event()
 		form = StubCompositeForm.new(@composite.model, @composite.session)
 		@composite.container = form
 		assert_equal(:foo, @composite.event())
@@ -197,5 +200,15 @@ class TestComposite < Test::Unit::TestCase
 		expected = '<TABLE cellspacing="0"><TR><TD><A class="standard">brafoo</A></TD></TR></TABLE>'
 		assert_equal(expected, composite.to_html(CGI.new))
 		composite = StubComposite4.new(StubCompositeModel.new, StubCompositeSession.new)
-	end
+  end
+  def test_to_back
+    if RUBY_VERSION.split(".").first.eql?('1')
+      expected = "<INPUT type=\"button\" name=\"back\" onClick=\"document.location.href='event_url';\">"
+    else
+      # It looks like Ruby 2.x escapes the ' which is not strictly necessary
+      expected = "<INPUT type=\"button\" name=\"back\" onClick=\"document.location.href=&#39;event_url&#39;;\">"
+    end
+    html = @composite.back().to_html(CGI.new)
+    assert_equal(expected, html)
+  end
 end

data/test/test_datevalue.rb

@@ -25,7 +25,7 @@
 
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'htmlgrid/datevalue'
 require 'stub/cgi'
 require 'date'
@@ -49,7 +49,7 @@ class StubDateProvider
 	end
 end
 
-class TestDateValue < Test::Unit::TestCase
+class TestDateValue < Minitest::Test
 	def setup
 		@component = HtmlGrid::DateValue.new(:date, StubDateProvider.new,
 			StubDateSession.new)

data/test/test_form.rb

@@ -26,7 +26,7 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'htmlgrid/form'
 require 'stub/cgi'
 
@@ -76,7 +76,7 @@ class StubFormMultiPart < HtmlGrid::Form
 	TAG_METHOD = :multipart_form
 end
 
-class TestForm < Test::Unit::TestCase
+class TestForm < Minitest::Test
 	def setup
 		@model = StubFormModel.new
 		@lookandfeel = StubFormLookandfeel.new
@@ -88,24 +88,25 @@ class TestForm < Test::Unit::TestCase
 	def test_multipart
 		form = StubFormMultiPart.new(@model, @lookandfeel)
 		result = form.to_html(CGI.new)
-		expected = '<FORM NAME="stdform" METHOD="POST" ACTION="http://test.oddb.org/de/gcc" ACCEPT-CHARSET="UTF-8" ENCTYPE="multipart/form-data">'
-		assert_equal(0, result.index(expected), "expected\n#{result}\nto start with\n#{expected}")
+    expected = '<FORM NAME="stdform" METHOD="POST" ACTION="http://test.oddb.org/de/gcc" ACCEPT-CHARSET="UTF-8" ENCTYPE="multipart/form-data">'
+    assert_equal(0, result.index(expected), "expected\n#{result}\nto start with\n#{expected}")
 	end
 	def test_to_html
 		result = @form.to_html(CGI.new)
-		expected = [
-			'<INPUT TYPE="hidden" NAME="flavor" VALUE="gcc">',
-			'<INPUT TYPE="hidden" NAME="language" VALUE="de">',
-			'<INPUT NAME="event" ID="event" VALUE="foo" TYPE="hidden">',
-			'<INPUT TYPE="hidden" NAME="state_id" VALUE="1">',
-		]
-		expected.each { |line|
-			assert(result.index(line), "\nmissing #{line}\n     in #{result}")
+    expected = [
+      '<INPUT TYPE="hidden" NAME="flavor" VALUE="gcc">',
+      '<INPUT TYPE="hidden" NAME="language" VALUE="de">',
+      '<INPUT NAME="event" ID="event" VALUE="foo" TYPE="hidden">',
+      '<INPUT TYPE="hidden" NAME="state_id" VALUE="1">',
+    ]
+		expected.each_with_index { |line, idx|
+			assert(result.index(line), "#{idx}: missing #{line}\n     in #{result}")
 		}
 	end
 	def test_submit
-		expected = '<INPUT value="Submit-Value" type="submit" name="foo">'    
-		assert_equal(expected, @form.submit(@model, @lookandfeel).to_html(CGI.new))
+    html = @form.submit(@model, @lookandfeel).to_html(CGI.new)
+    expected = '<INPUT value="Submit-Value" type="submit" name="foo">'
+		assert_equal(expected, html)
 	end
 	def test_onsubmit
 		@form.onsubmit = 'submitted'
@@ -115,7 +116,7 @@ class TestForm < Test::Unit::TestCase
 	end
 	def test_onsubmit_init
 		form = nil
-		assert_nothing_raised { form = StubForm2.new(@model, @lookandfeel) }
+		form = StubForm2.new(@model, @lookandfeel)
 		expected = 'onSubmit="submitted"'	
 		result = /<FORM[^>]+>/.match(form.to_html(CGI.new))[0]
 		assert(result.index(expected), "missing:\n#{expected}\nin:\n#{result}")