drying up tests

qhoxie · Jun 10, 2008 · 9a1447e · 9a1447e
1 parent 94c0788
commit 9a1447e
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 64 deletions.
diff --git a/test.js b/test.js
diff --git a/test/helper.rb b/test/helper.rb
@@ -19,6 +19,10 @@ def debug(string)
     end
 
     undef :default_test
+
+    def setup
+      @runtime = Johnson::Runtime.new
+    end
 
     def assert_js(expression, options={})
       runtime = options[:runtime] || @runtime

diff --git a/test/johnson/browser_test.rb b/test/johnson/browser_test.rb
@@ -5,7 +5,7 @@
 module Johnson
   class BrowserTest < Johnson::TestCase
     def setup
-      @runtime = Johnson::Runtime.new
+      super
       @runtime.evaluate('Johnson.require("johnson/browser");')
     end
 

diff --git a/test/johnson/conversions/array_test.rb b/test/johnson/conversions/array_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class ArrayTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_array_index_get
         @runtime[:list] = [1, 2, 3, 4]
         assert_equal(1, @runtime.evaluate("list[0]"))

diff --git a/test/johnson/conversions/boolean_test.rb b/test/johnson/conversions/boolean_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class BooleanTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_truthiness
         @runtime[:v] = true
         assert_same(true, @runtime.evaluate("v === true"))

diff --git a/test/johnson/conversions/callable_test.rb b/test/johnson/conversions/callable_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class CallableTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_proc_works_in_jsland
         @runtime[:squared] = Proc.new { |x| x * x }
         assert_js_equal(4, "squared(2)")

diff --git a/test/johnson/conversions/file_test.rb b/test/johnson/conversions/file_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class FileTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_read_file
         File.open(__FILE__, 'rb') { |f|
           @runtime[:foo] = f

diff --git a/test/johnson/conversions/nil_test.rb b/test/johnson/conversions/nil_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class NilTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_ruby_nil_is_js_null
         @runtime[:v] = nil
         assert_equal(true, @runtime.evaluate("v == null"))

diff --git a/test/johnson/conversions/number_test.rb b/test/johnson/conversions/number_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class NumberTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_ruby_fixnum_in_js
         @runtime[:v] = 42
 

diff --git a/test/johnson/conversions/regexp_test.rb b/test/johnson/conversions/regexp_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class RegexpTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_regex_converts
         @runtime[:x] = /aaron/
         @runtime[:y] = /john/i

diff --git a/test/johnson/conversions/string_test.rb b/test/johnson/conversions/string_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class StringTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_ruby_string_in_js
         @runtime[:v] = "foo"
         assert_js("'foo' == v")

diff --git a/test/johnson/conversions/struct_test.rb b/test/johnson/conversions/struct_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class StructTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_use_struct
         f = Struct.new(:phil_collins).new
         f.phil_collins = 'awesome'

diff --git a/test/johnson/conversions/symbol_test.rb b/test/johnson/conversions/symbol_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class SymbolTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_symbols_are_interned
         @runtime[:v] = :symbol
         @runtime[:x] = :symbol

diff --git a/test/johnson/conversions/thread_test.rb b/test/johnson/conversions/thread_test.rb
@@ -3,10 +3,6 @@
 module Johnson
   module Conversions
     class ThreadTest < Johnson::TestCase
-      def setup
-        @runtime = Johnson::Runtime.new
-      end
-
       def test_manipulate_thread
         thread = Thread.new { }
         @runtime['thread'] = thread

diff --git a/test/johnson/extensions_test.rb b/test/johnson/extensions_test.rb
@@ -4,7 +4,7 @@ module Johnson
   module Extensions
     class DefinePropertyTest < Johnson::TestCase
       def setup
-        @runtime = Johnson::Runtime.new
+        super
         @runtime.evaluate("x = {}")
       end      
 

diff --git a/test/johnson/prelude_test.rb b/test/johnson/prelude_test.rb
@@ -2,10 +2,6 @@
 
 module Johnson
   class PreludeTest < Johnson::TestCase
-    def setup
-      @runtime = Johnson::Runtime.new
-    end
-
     def test_symbols_are_interned
       assert(@runtime.evaluate("Johnson.symbolize('foo') === Johnson.symbolize('foo')"))
     end

diff --git a/test/johnson/runtime_test.rb b/test/johnson/runtime_test.rb
@@ -2,10 +2,6 @@
 
 module Johnson
   class RuntimeTest < Johnson::TestCase
-    def setup
-      @runtime = Johnson::Runtime.new
-    end
-
     def test_default_delegate_is_spidermonkey
       assert_equal(Johnson::SpiderMonkey::Runtime, @runtime.delegate.class)
     end