@@ -3,15 +3,15 @@ require File.expand_path(File.join(File.dirname(__FILE__), "/../helper")) module Johnson class BrowserTest < Johnson::TestCase def setup - @context = Johnson::Context.new - @context.evaluate('Johnson.require("johnson/browser");') + @runtime = Johnson::Runtime.new + @runtime.evaluate('Johnson.require("johnson/browser");') end def test_set_location_returns_location filename = "file://#{File.expand_path(__FILE__)}" - @context.evaluate("window.location = '#{filename}'") + @runtime.evaluate("window.location = '#{filename}'") uri = URI.parse(filename) - assert_equal(uri.to_s, @context.evaluate('window.location').to_s) + assert_equal(uri.to_s, @runtime.evaluate('window.location').to_s) end end end test/johnson/browser_test.rb @@ -4,32 +4,32 @@ module Johnson module Conversions class ArrayTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_array_index_get - @context[:list] = [1, 2, 3, 4] - assert_equal(1, @context.evaluate("list[0]")) + @runtime[:list] = [1, 2, 3, 4] + assert_equal(1, @runtime.evaluate("list[0]")) end def test_array_index_set - @context[:list] = [] - @context.evaluate("list[0] = 42") - assert_equal(42, @context[:list][0]) + @runtime[:list] = [] + @runtime.evaluate("list[0] = 42") + assert_equal(42, @runtime[:list][0]) end def test_array_works_with_for_in list = [1, 2, 3, 4] - @context['alert'] = lambda { |x| p x } - @context['list'] = list - @context.evaluate(" + @runtime['alert'] = lambda { |x| p x } + @runtime['list'] = list + @runtime.evaluate(" var new_list = []; for(x in list) { new_list.push(x + 1); } ") - assert_equal(list.map { |x| x + 1}, @context['new_list'].to_a) + assert_equal(list.map { |x| x + 1}, @runtime['new_list'].to_a) end end end test/johnson/conversions/array_test.rb @@ -4,17 +4,17 @@ module Johnson module Conversions class BooleanTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_truthiness - @context[:v] = true - assert_same(true, @context.evaluate("v === true")) + @runtime[:v] = true + assert_same(true, @runtime.evaluate("v === true")) end def test_dirty_lies - @context[:v] = false - assert_same(false, @context.evaluate("v === true")) + @runtime[:v] = false + assert_same(false, @runtime.evaluate("v === true")) end end end test/johnson/conversions/boolean_test.rb @@ -4,22 +4,22 @@ module Johnson module Conversions class CallableTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_proc_works_in_jsland - @context[:squared] = Proc.new { |x| x * x } + @runtime[:squared] = Proc.new { |x| x * x } assert_js_equal(4, "squared(2)") end def test_procs_roundtrip - @context[:k] = k = lambda { |x| x } - assert_same(k, @context.evaluate("k")) + @runtime[:k] = k = lambda { |x| x } + assert_same(k, @runtime.evaluate("k")) end def test_proc_js_function_proxy_gets_reused - @context[:k] = k = lambda { |x| x } - @context[:kk] = k + @runtime[:k] = k = lambda { |x| x } + @runtime[:kk] = k assert_js("k === kk") end @@ -30,7 +30,7 @@ module Johnson end def test_anything_with_a_call_method_can_be_called_as_a_method - @context[:c] = CallableThing.new + @runtime[:c] = CallableThing.new assert_js_equal("foo", "c()") end end test/johnson/conversions/callable_test.rb @@ -4,14 +4,14 @@ module Johnson module Conversions class FileTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_read_file File.open(__FILE__, 'rb') { |f| - @context[:foo] = f - assert_equal(f, @context.evaluate("foo")) - assert_equal(File.read(__FILE__), @context.evaluate("foo.read()")) + @runtime[:foo] = f + assert_equal(f, @runtime.evaluate("foo")) + assert_equal(File.read(__FILE__), @runtime.evaluate("foo.read()")) } end end test/johnson/conversions/file_test.rb @@ -4,20 +4,20 @@ module Johnson module Conversions class NilTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_ruby_nil_is_js_null - @context[:v] = nil - assert_equal(true, @context.evaluate("v == null")) + @runtime[:v] = nil + assert_equal(true, @runtime.evaluate("v == null")) end def test_js_null_is_ruby_nil - assert_nil(@context.evaluate("null")) + assert_nil(@runtime.evaluate("null")) end def test_js_undefined_is_ruby_nil - assert_nil(@context.evaluate("undefined")) + assert_nil(@runtime.evaluate("undefined")) end end end test/johnson/conversions/nil_test.rb @@ -4,34 +4,34 @@ module Johnson module Conversions class NumberTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_ruby_fixnum_in_js - @context[:v] = 42 + @runtime[:v] = 42 assert_js("v == 42") assert_js_equal(42, "v") - assert_equal(42, @context[:v]) + assert_equal(42, @runtime[:v]) end def test_js_fixnum_in_ruby - fix = @context.evaluate("42") + fix = @runtime.evaluate("42") assert_equal(42, fix) assert_kind_of(Fixnum, fix) end def test_ruby_float_in_js - @context[:pi] = pi = 3.141592654 + @runtime[:pi] = pi = 3.141592654 assert_js_equal(pi, "pi") - assert_in_delta(pi, @context.evaluate("pi"), 2 ** -20) + assert_in_delta(pi, @runtime.evaluate("pi"), 2 ** -20) end def test_ruby_bignum_in_js - @context[:big] = big = 2 ** 200 + @runtime[:big] = big = 2 ** 200 assert_js_equal(big, "big") - assert_kind_of(Float, @context.evaluate("big")) + assert_kind_of(Float, @runtime.evaluate("big")) end end end test/johnson/conversions/number_test.rb @@ -4,24 +4,24 @@ module Johnson module Conversions class RegexpTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_regex_converts - @context[:x] = /aaron/ - @context[:y] = /john/i - assert @context.evaluate('"aaron".match(x)') - assert !@context.evaluate('"Aaron".match(x)') - assert @context.evaluate('"john".match(y)') - assert @context.evaluate('"John".match(y)') + @runtime[:x] = /aaron/ + @runtime[:y] = /john/i + assert @runtime.evaluate('"aaron".match(x)') + assert !@runtime.evaluate('"Aaron".match(x)') + assert @runtime.evaluate('"john".match(y)') + assert @runtime.evaluate('"John".match(y)') end def test_regex_roundtrips - @context[:x] = /aaron/ - assert_equal(/aaron/, @context.evaluate('x')) + @runtime[:x] = /aaron/ + assert_equal(/aaron/, @runtime.evaluate('x')) - @context[:x] = /aaron/m - assert_equal(/aaron/m, @context.evaluate('x')) + @runtime[:x] = /aaron/m + assert_equal(/aaron/m, @runtime.evaluate('x')) end end end test/johnson/conversions/regexp_test.rb @@ -4,26 +4,26 @@ module Johnson module Conversions class StringTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_ruby_string_in_js - @context[:v] = "foo" + @runtime[:v] = "foo" assert_js("'foo' == v") end def test_js_string_in_ruby - assert_equal("foo", @context.evaluate("'foo'")) + assert_equal("foo", @runtime.evaluate("'foo'")) end def test_roundtrip - @context[:v] = v = "hola" - assert_equal(v, @context.evaluate("v")) + @runtime[:v] = v = "hola" + assert_equal(v, @runtime.evaluate("v")) end def test_strings_are_copies - @context[:v] = v = "hola" - assert_not_same(v, @context.evaluate("v")) + @runtime[:v] = v = "hola" + assert_not_same(v, @runtime.evaluate("v")) end end end test/johnson/conversions/string_test.rb @@ -4,15 +4,15 @@ module Johnson module Conversions class StructTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_use_struct f = Struct.new(:phil_collins).new f.phil_collins = 'awesome' - @context[:foo] = f - assert_equal(f, @context.evaluate('foo')) - assert_equal('awesome', @context.evaluate('foo.phil_collins')) + @runtime[:foo] = f + assert_equal(f, @runtime.evaluate('foo')) + assert_equal('awesome', @runtime.evaluate('foo.phil_collins')) end end end test/johnson/conversions/struct_test.rb @@ -4,19 +4,19 @@ module Johnson module Conversions class SymbolTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_symbols_are_interned - @context[:v] = :symbol - @context[:x] = :symbol + @runtime[:v] = :symbol + @runtime[:x] = :symbol - assert(@context.evaluate("v !== null && v === x")) + assert(@runtime.evaluate("v !== null && v === x")) end def test_ruby_symbol_roundtrips - @context[:v] = :foo - assert_equal(:foo, @context.evaluate("v")) + @runtime[:v] = :foo + assert_equal(:foo, @runtime.evaluate("v")) end end end test/johnson/conversions/symbol_test.rb @@ -12,6 +12,17 @@ module Johnson @runtime['thread'] = thread assert_js_equal(false, "thread.send('alive?')") end + + def test_new_js_thread + @runtime.evaluate('function testing() { Ruby.sleep(10); }') + @runtime.evaluate('new Ruby.Thread(function() { testing(); })') + end + + def test_js_thread_read_file + @runtime['filename'] = File.expand_path(__FILE__) + @runtime.evaluate('function testing() { Ruby.File.read(filename); }') + @runtime.evaluate('new Ruby.Thread(function() { testing(); })') + end end end end test/johnson/conversions/thread_test.rb todo/threading_test.rb 4507bf52e909971dd1184256e0cfba3429ac3d3a Aaron Patterson aaron.patterson@gmail.com http://github.com/jbarnette/johnson/commit/5bcd3531d7a01d190bc99130ae1dd44964b800eb 5bcd3531d7a01d190bc99130ae1dd44964b800eb 2008-05-30T16:59:45-07:00 2008-05-30T16:59:45-07:00 THEY ALL FUCKING WORK 2724315216ef6dcc00fe49f4f4f086a8584e46a9 Aaron Patterson aaron.patterson@gmail.com