test/helper.rb in johnson-1.2.0 vs test/helper.rb in johnson-2.0.0.pre0

@@ -24,10 +24,11 @@
 
     undef :default_test if method_defined? :default_test
 
     def setup
       @runtime = Johnson::Runtime.new
+      raise "hell" if !@runtime
       #@runtime.delegate.gc_zeal = 2
       #@runtime.delegate.debugger = Johnson::SpiderMonkey::Debugger.new(TestLogger.new)
     end
     
     def assert_js(expression, options={})
@@ -50,14 +51,32 @@
     
     def setup
       @parser = Johnson::Parser
     end
   
-    def assert_sexp(expected, actual)
-      assert_equal(expected, actual.to_sexp)
+    def assert_includes enumerable, element
+      if !enumerable.include?( element )
+        flunk element.to_s + " not in [" + enumerable.map { |e| e.to_s }.join(" ") + "]"
+      end
+  end
+
+    def assert_sexp(*args)
+      if args.length == 2
+        assert_equal(args[0],args[1].to_sexp)
+      else
+        expected = args[0,args.length-1]
+        actual = args.last
+        assert_includes expected, actual.to_sexp
+      end
     end
 
-    def assert_ecma(expected, actual)
-      assert_equal(expected, actual.to_ecma)
+    def assert_ecma(*args)
+      if args.length == 2
+        assert_equal(args[0],args[1].to_ecma)
+      else
+        expected = args[0,args.length-1]
+        actual = args.last
+        assert_includes expected, actual.to_ecma
+      end
     end
   end
 end