Adds blackbox tests on the buffering ruleset (no bug detected so far).

enspirit · Jan 25, 2010 · a110ec3 · a110ec3
1 parent eb3522e
commit a110ec3
Show file tree

Hide file tree

Showing 39 changed files with 64 additions and 8 deletions.
diff --git a/lib/wlang.rb b/lib/wlang.rb
@@ -129,6 +129,11 @@ def self.load_data(uri, extension=nil)
     loader.call(uri) 
   end
 
+  # Maps a file extension to a dialect qualified name
+  def self.file_extension_map(extension, dialect_qname) 
+    WLang::FILE_EXTENSIONS[extension] = dialect_qname
+  end
+
   # Infers a dialect from a file extension
   def self.infer_dialect(uri)
     WLang::FILE_EXTENSIONS[File.extname(uri)]

diff --git a/lib/wlang/basic_object.rb b/lib/wlang/basic_object.rb
@@ -6,8 +6,8 @@ module WLang
   class BasicObject
 
     # Methods that we keep
-    KEPT_METHODS = ["__send__", "__id__", "instance_eval", "initialize", "object_id", "nil?",
-                    :__send__, :__id__, :instance_eval, :initialize, :object_id, :nil?]
+    KEPT_METHODS = ["__send__", "__id__", "instance_eval", "initialize", "object_id", "nil?", "singleton_method_added",
+                    :__send__, :__id__, :instance_eval, :initialize, :object_id, :nil?, :singleton_method_added]
 
     # Removes all methods that are not needed to the class
     (instance_methods + private_instance_methods).each do |m|

diff --git a/lib/wlang/hosted_language.rb b/lib/wlang/hosted_language.rb
@@ -19,13 +19,20 @@ def method_missing(name, *args, &block)
         if @parser_state.scope.has_key?(name.to_s)
           @parser_state.scope[name.to_s]
         else
-          Kernel.raise ::WLang::UndefinedVariableError.new(nil, nil, nil, name)
+          variable_missing(name)
         end
       else
         super(name, *args, &block)
       end
     end
 
+    # Called when a variable cannot be found. By default, it raises an
+    # UndefinedVariableError. This method is intended to be overriden 
+    # for handling such a situation more friendly.
+    def variable_missing(name)
+      Kernel.raise ::WLang::UndefinedVariableError.new(nil, nil, nil, name)
+    end
+
     #
     # Evaluates a given expression in the context of a given
     # parser state.

diff --git a/lib/wlang/rulesets/buffering_ruleset.rb b/lib/wlang/rulesets/buffering_ruleset.rb
@@ -85,7 +85,7 @@ def self.input_inclusion(parser, offset)
         parser.syntax_error(offset) if decoded.nil?
 
         # Look for share and context
-        shared  = decoded[:share].nil? ? :root : decoded[:share]
+        shared  = decoded[:share].nil? ? :none : decoded[:share]
         context = U.context_from_using_and_with(decoded)
 
         # Resolve the file by delegation to the parser

diff --git a/test/blackbox/buffering/data_1.rb b/test/blackbox/buffering/data_1.rb
@@ -0,0 +1 @@
+"blambeau"
diff --git a/test/blackbox/buffering/data_assignment_1.exp b/test/blackbox/buffering/data_assignment_1.exp
@@ -0,0 +1 @@
+blambeau
diff --git a/test/blackbox/buffering/data_assignment_1.tpl b/test/blackbox/buffering/data_assignment_1.tpl
@@ -0,0 +1 @@
+<<={data_1.rb as x}{+{x}}
diff --git a/test/blackbox/buffering/data_assignment_2.exp b/test/blackbox/buffering/data_assignment_2.exp
@@ -0,0 +1 @@
+blambeau wlang
diff --git a/test/blackbox/buffering/data_assignment_2.tpl b/test/blackbox/buffering/data_assignment_2.tpl
@@ -0,0 +1 @@
+<<={data_1.rb as who}{+{who}} +{who}
diff --git a/test/blackbox/buffering/data_assignment_3.exp b/test/blackbox/buffering/data_assignment_3.exp
@@ -0,0 +1 @@
+blambeau wlang
diff --git a/test/blackbox/buffering/data_assignment_3.tpl b/test/blackbox/buffering/data_assignment_3.tpl
@@ -0,0 +1 @@
+<<={+{data_file_1} as who}{+{who}} +{who}
diff --git a/test/blackbox/buffering/data_assignment_4.exp b/test/blackbox/buffering/data_assignment_4.exp
@@ -0,0 +1 @@
+blambeau wlang
diff --git a/test/blackbox/buffering/data_assignment_4.tpl b/test/blackbox/buffering/data_assignment_4.tpl
@@ -0,0 +1 @@
+<<={../+{data_file_1} as who}{+{who}} +{who}
diff --git a/test/blackbox/buffering/input_1.exp b/test/blackbox/buffering/input_1.exp
@@ -0,0 +1 @@
+text_1
diff --git a/test/blackbox/buffering/input_1.tpl b/test/blackbox/buffering/input_1.tpl
@@ -0,0 +1 @@
+<<{text_1.txt}
diff --git a/test/blackbox/buffering/input_2.exp b/test/blackbox/buffering/input_2.exp
@@ -0,0 +1 @@
+wlang
diff --git a/test/blackbox/buffering/input_2.tpl b/test/blackbox/buffering/input_2.tpl
@@ -0,0 +1 @@
+<<{+{who}.txt}
diff --git a/test/blackbox/buffering/input_3.exp b/test/blackbox/buffering/input_3.exp
@@ -0,0 +1 @@
+text_1
diff --git a/test/blackbox/buffering/input_3.tpl b/test/blackbox/buffering/input_3.tpl
@@ -0,0 +1 @@
+<<{+{input_file}}
diff --git a/test/blackbox/buffering/input_inclusion.exp b/test/blackbox/buffering/input_inclusion.exp
@@ -0,0 +1 @@
+wlang
diff --git a/test/blackbox/buffering/input_inclusion.tpl b/test/blackbox/buffering/input_inclusion.tpl
@@ -0,0 +1 @@
++{who}
diff --git a/test/blackbox/buffering/input_inclusion_1.exp b/test/blackbox/buffering/input_inclusion_1.exp
diff --git a/test/blackbox/buffering/input_inclusion_1.tpl b/test/blackbox/buffering/input_inclusion_1.tpl
@@ -0,0 +1 @@
+<<+{input_inclusion.tpl share none}
diff --git a/test/blackbox/buffering/input_inclusion_2.exp b/test/blackbox/buffering/input_inclusion_2.exp
@@ -0,0 +1 @@
+wlang
diff --git a/test/blackbox/buffering/input_inclusion_2.tpl b/test/blackbox/buffering/input_inclusion_2.tpl
@@ -0,0 +1 @@
+<<+{input_inclusion.tpl share root}
diff --git a/test/blackbox/buffering/input_inclusion_3.exp b/test/blackbox/buffering/input_inclusion_3.exp
@@ -0,0 +1 @@
+wlang
diff --git a/test/blackbox/buffering/input_inclusion_3.tpl b/test/blackbox/buffering/input_inclusion_3.tpl
@@ -0,0 +1 @@
+<<+{input_inclusion.tpl share all}
diff --git a/test/blackbox/buffering/input_inclusion_4.exp b/test/blackbox/buffering/input_inclusion_4.exp
diff --git a/test/blackbox/buffering/input_inclusion_4.tpl b/test/blackbox/buffering/input_inclusion_4.tpl
@@ -0,0 +1 @@
+<<+{input_inclusion_1.tpl with who: 'blambeau'}
diff --git a/test/blackbox/buffering/input_inclusion_5.exp b/test/blackbox/buffering/input_inclusion_5.exp
@@ -0,0 +1 @@
+blambeau
diff --git a/test/blackbox/buffering/input_inclusion_5.tpl b/test/blackbox/buffering/input_inclusion_5.tpl
@@ -0,0 +1 @@
+<<+{input_inclusion_2.tpl with who: 'blambeau'}
diff --git a/test/blackbox/buffering/input_inclusion_6.exp b/test/blackbox/buffering/input_inclusion_6.exp
@@ -0,0 +1 @@
+blambeau
diff --git a/test/blackbox/buffering/input_inclusion_6.tpl b/test/blackbox/buffering/input_inclusion_6.tpl
@@ -0,0 +1 @@
+<<+{input_inclusion_3.tpl with who: 'blambeau'}
diff --git a/test/blackbox/buffering/input_inclusion_7.exp b/test/blackbox/buffering/input_inclusion_7.exp
diff --git a/test/blackbox/buffering/input_inclusion_7.tpl b/test/blackbox/buffering/input_inclusion_7.tpl
@@ -0,0 +1 @@
+<<+{input_inclusion.tpl}
diff --git a/test/blackbox/buffering/text_1.txt b/test/blackbox/buffering/text_1.txt
@@ -0,0 +1 @@
+text_1
diff --git a/test/blackbox/buffering/wlang.txt b/test/blackbox/buffering/wlang.txt
@@ -0,0 +1 @@
+wlang
diff --git a/test/blackbox/data_1.rb b/test/blackbox/data_1.rb
@@ -0,0 +1 @@
+"blambeau"
diff --git a/test/blackbox/test_all.rb b/test/blackbox/test_all.rb
@@ -18,22 +18,35 @@ def test_on_examples
           rules WLang::RuleSet::Basic
           rules WLang::RuleSet::Context
         }
+        dialect("buffering") {
+          ruby_require "wlang/rulesets/basic_ruleset"
+          ruby_require "wlang/rulesets/buffering_ruleset"
+          rules WLang::RuleSet::Basic
+          rules WLang::RuleSet::Buffering
+        }
+      end
+      hosted = ::WLang::HostedLanguage.new
+      def hosted.variable_missing(name)
+        ""
       end
+      WLang::file_extension_map('.tpl', 'blackbox/buffering')
 
       # Context used here
       context = {
-        'who'      => 'wlang',
-        'whowho'   => 'who'
+        'who'         => 'wlang',
+        'whowho'      => 'who',
+        'input_file'  => 'text_1.txt',
+        'data_file_1' => 'data_1.rb'
       }
 
       Dir["#{File.dirname(__FILE__)}/*"].each do |folder|
         dialect_name = File.basename(folder)
         Dir["#{folder}/*.tpl"].each do |template_file|
           begin
             basename = File.basename(template_file, ".tpl")
-            template = File.read(File.join(folder, "#{basename}.tpl"))
             expected = File.read(File.join(folder, "#{basename}.exp"))
-            assert_equal(expected, template.wlang(context.dup, "blackbox/#{dialect_name}"), "Blackbox test failed #{basename}")
+            template = WLang::file_template(template_file, "blackbox/#{dialect_name}")
+            assert_equal(expected, template.instantiate(context.dup, hosted), "Blackbox test failed #{basename}")
           rescue Exception => ex
             puts "Blackbox test failed: #{template_file}\n#{ex.message}"
             puts ex.backtrace.join("\n")