test/test_parser.rb in p-lang-0.1.1 vs test/test_parser.rb in p-lang-0.2.0

@@ -1,26 +1,19 @@
 require 'helper'
 
 class TestParser < Test::Unit::TestCase
   
-  EXPRESSIONS = File.readlines(File.join(File.dirname(__FILE__), "test_parser_ok.txt"))
-  BUILT_EXPRESSIONS = File.readlines(File.join(File.dirname(__FILE__), "test_parser_build.txt"))
+  EXPRESSIONS = File.readlines(File.join(File.dirname(__FILE__), "test_parser"))
+  BUILD = File.readlines(File.join(File.dirname(__FILE__), "test_parser_build"))
   
-  context "The PLangParser" do
-    setup do
-      @parser = PLangParser.new
-    end
+  context "The Parser" do
     
     EXPRESSIONS.each_with_index do |expr, i|
+      parser = PLang::Parser::SyntaxAnalyser.new(EXPRESSIONS[i])
       should "parse the expression ##{i}" do
-        assert @parser.parse expr
+        assert_equal eval(parser.parse.inspect), eval(BUILD[i])
       end
     end
-
-    EXPRESSIONS.each_with_index do |expr, i|
-      should "build the expression ##{i}" do
-        assert_equal eval(BUILT_EXPRESSIONS[i]), @parser.parse(expr).build.collect(&:to_sexp)
-      end
-    end
+  
   end
   
 end