@@ -3,11 +3,11 @@ require File.expand_path(File.join(File.dirname(__FILE__), "/../helper")) module Johnson class PreludeTest < Johnson::TestCase def setup - @context = Johnson::Context.new + @runtime = Johnson::Runtime.new end def test_symbols_are_interned - assert(@context.evaluate("Johnson.symbolize('foo') === Johnson.symbolize('foo')")) + assert(@runtime.evaluate("Johnson.symbolize('foo') === Johnson.symbolize('foo')")) end def test_strings_had_a_to_symbol_method @@ -15,7 +15,7 @@ module Johnson end def test_string_to_symbol_is_not_enumerable - assert(!@context.evaluate(<<-END)) + assert(!@runtime.evaluate(<<-END)) var flag = false; for (x in "foo") { if (x == 'toSymbol') flag = true } flag @@ -23,18 +23,18 @@ module Johnson end def test_symbol_to_string - assert_equal("monkey", @context.evaluate("Johnson.symbolize('monkey').toString()")) + assert_equal("monkey", @runtime.evaluate("Johnson.symbolize('monkey').toString()")) end def test_symbol_inspect - assert_equal(":monkey", @context.evaluate("Johnson.symbolize('monkey').inspect()")) + assert_equal(":monkey", @runtime.evaluate("Johnson.symbolize('monkey').inspect()")) end def test_all_of_ruby_is_available - assert_raise(Johnson::Error) { @context.evaluate("Ruby.Set.new()") } + assert_raise(Johnson::Error) { @runtime.evaluate("Ruby.Set.new()") } - @context.evaluate("Ruby.require('set')") - assert_kind_of(Set, @context.evaluate("Ruby.Set.new()")) + @runtime.evaluate("Ruby.require('set')") + assert_kind_of(Set, @runtime.evaluate("Ruby.Set.new()")) end def test_require_an_existing_js_file_without_extension @@ -43,7 +43,7 @@ module Johnson def test_require_returns_false_the_second_time_around assert_js("Johnson.require('johnson/template')") - assert(!@context.evaluate("Johnson.require('johnson/template')")) + assert(!@runtime.evaluate("Johnson.require('johnson/template')")) end def test_missing_requires_throw_LoadError test/johnson/prelude_test.rb @@ -4,17 +4,17 @@ module Johnson module SpiderMonkey class ContextTest < Johnson::TestCase def setup - @context = Johnson::Context.new(Johnson::SpiderMonkey::Context) + @runtime = Johnson::Runtime.new(Johnson::SpiderMonkey::Runtime) end def test_wraps_global_unfuckedly - assert_same(@context.global, @context.evaluate("this")) + assert_same(@runtime.global, @runtime.evaluate("this")) end - def test_provides_basic_context_interface - assert(@context.respond_to?(:evaluate)) - assert(@context.respond_to?(:[])) - assert(@context.respond_to?(:[]=)) + def test_provides_basic_runtime_interface + assert(@runtime.respond_to?(:evaluate)) + assert(@runtime.respond_to?(:[])) + assert(@runtime.respond_to?(:[]=)) end end end test/johnson/spidermonkey/context_test.rb @@ -58,7 +58,7 @@ module Johnson end def setup - @context = Johnson::Context.new(Johnson::SpiderMonkey::Context) + @runtime = Johnson::Runtime.new(Johnson::SpiderMonkey::Runtime) end def test_find_constants @@ -66,14 +66,14 @@ module Johnson end def test_proxies_get_reused - @context["foo"] = @context["bar"] = Foo.new + @runtime["foo"] = @runtime["bar"] = Foo.new assert_js_equal(true, "foo === bar") end def test_attributes_get_added_to_ruby - foo = @context["foo"] = Foo.new + foo = @runtime["foo"] = Foo.new assert !foo.respond_to?(:johnson) - @context.evaluate("foo.johnson = 'explode';") + @runtime.evaluate("foo.johnson = 'explode';") assert foo.respond_to?(:johnson) assert_equal('explode', foo.johnson) assert_js_equal('explode', 'foo.johnson') @@ -81,9 +81,9 @@ module Johnson end def test_assign_function_as_attribute - foo = @context["foo"] = Foo.new + foo = @runtime["foo"] = Foo.new assert !foo.respond_to?(:johnson) - f = @context.evaluate("foo.johnson = function() { return 'explode'; }") + f = @runtime.evaluate("foo.johnson = function() { return 'explode'; }") assert foo.respond_to?(:johnson) assert_equal('explode', foo.johnson) assert_js_equal('explode', 'foo.johnson()') @@ -92,115 +92,115 @@ module Johnson end def test_assign_function_as_attribute_with_this - foo = @context["foo"] = Foo.new - @context.evaluate("foo.ex_squared = function(x) { return this.x2(x); }") + foo = @runtime["foo"] = Foo.new + @runtime.evaluate("foo.ex_squared = function(x) { return this.x2(x); }") assert_equal(4, foo.ex_squared(2)) - @context.evaluate("foo.ex_squared = 20;") + @runtime.evaluate("foo.ex_squared = 20;") assert_equal(20, foo.ex_squared) end def test_use_ruby_global_object - func = @context.evaluate("function(x) { return this.x2(x); }") + func = @runtime.evaluate("function(x) { return this.x2(x); }") foo = Foo.new assert_equal(4, func.call_using(foo, 2)) end def test_proxies_roundtrip - @context["foo"] = foo = Foo.new - assert_same(foo, @context.evaluate("foo")) + @runtime["foo"] = foo = Foo.new + assert_same(foo, @runtime.evaluate("foo")) end def test_proxies_classes - @context["Foo"] = Foo - assert_same(Foo, @context.evaluate("Foo")) + @runtime["Foo"] = Foo + assert_same(Foo, @runtime.evaluate("Foo")) end def test_proxies_modules - @context["AModule"] = AModule - assert_same(AModule, @context.evaluate("AModule")) + @runtime["AModule"] = AModule + assert_same(AModule, @runtime.evaluate("AModule")) end def test_proxies_hashes - @context["beatles"] = { "george" => "guitar" } - assert_equal("guitar", @context.evaluate("beatles['george']")) + @runtime["beatles"] = { "george" => "guitar" } + assert_equal("guitar", @runtime.evaluate("beatles['george']")) end def test_getter_calls_0_arity_method - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(10, "foo.bar") end def test_getter_calls_indexer - @context["foo"] = indexable = Indexable.new + @runtime["foo"] = indexable = Indexable.new indexable["bar"] = 10 assert_js_equal(10, "foo.bar") end def test_getter_returns_nil_for_unknown_properties - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(nil, "foo.quux") end def test_setter_calls_key= - @context["foo"] = foo = Foo.new + @runtime["foo"] = foo = Foo.new assert_js_equal(42, "foo.bar = 42") assert_equal(42, foo.bar) end def test_setter_calls_indexer - @context["foo"] = indexable = Indexable.new + @runtime["foo"] = indexable = Indexable.new assert_js_equal(42, "foo.monkey = 42") assert_equal(42, indexable["monkey"]) end def test_calls_attr_reader - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(10, "foo.bar") end def test_calls_1_arity_method - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(10, "foo.x2(5)") end def test_calls_n_arity_method - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(10, "foo.add(4, 2, 2, 1, 1)") end def test_calls_class_method - @context["Foo"] = Foo + @runtime["Foo"] = Foo assert_js_equal(Foo.bar, "Foo.bar()") end def test_accesses_consts - @context["Foo"] = Foo - assert_same(Foo::Inner, @context.evaluate("Foo.Inner")) + @runtime["Foo"] = Foo + assert_same(Foo::Inner, @runtime.evaluate("Foo.Inner")) end def test_can_create_new_instances_in_js - @context["AClass"] = AClass - foo = @context.evaluate("AClass.new()") + @runtime["AClass"] = AClass + foo = @runtime.evaluate("AClass.new()") assert_kind_of(AClass, foo) end def test_class_proxies_provide_a_ctor - @context["AClass"] = AClass - foo = @context.evaluate("new AClass()") + @runtime["AClass"] = AClass + foo = @runtime.evaluate("new AClass()") assert_kind_of(AClass, foo) - bar = @context.evaluate("new AClass(1, 2, 3)") + bar = @runtime.evaluate("new AClass(1, 2, 3)") assert_equal([1, 2, 3], bar.args) end def test_dwims_blocks - @context["foo"] = Foo.new + @runtime["foo"] = Foo.new assert_js_equal(4, "foo.xform(2, function(x) { return x * 2 })") end def test_dwims_blocks_for_0_arity_methods - @context[:arr] = [1, 2, 3] + @runtime[:arr] = [1, 2, 3] assert_js_equal([2, 4, 6], "arr.collect(function(x) { return x * 2 })") end @@ -221,15 +221,15 @@ module Johnson end def test_raises_string_to_ruby - assert_raise(Johnson::Error) { @context.evaluate("throw 'my string';") } + assert_raise(Johnson::Error) { @runtime.evaluate("throw 'my string';") } end def test_raises_object_to_ruby - assert_raise(Johnson::Error) { @context.evaluate("throw { bad: true };") } + assert_raise(Johnson::Error) { @runtime.evaluate("throw { bad: true };") } end def test_raises_exception_to_ruby - assert_raise(Johnson::Error) { @context.evaluate("undefinedValue();") } + assert_raise(Johnson::Error) { @runtime.evaluate("undefinedValue();") } end end end test/johnson/spidermonkey/js_land_proxy_test.rb dc2a8331070fe0cb318d359ee5d439859d957604 Aaron Patterson aaron.patterson@gmail.com http://github.com/jbarnette/johnson/commit/e6e9ac78c9aee246329f6bc90b19c58c49a2f538 e6e9ac78c9aee246329f6bc90b19c58c49a2f538 2008-05-30T16:50:00-07:00 2008-05-30T16:50:00-07:00 making more shit work 26c1852e99f90ad428f37959d652f8a48c7440fa Aaron Patterson aaron.patterson@gmail.com