test/misc_test.rb in openwferu-0.9.16 vs test/misc_test.rb in openwferu-0.9.17

@@ -8,10 +8,12 @@
 #
 
 require 'test/unit'
 
 require 'openwfe/utils'
+require 'openwfe/expressions/raw'
+#require 'openwfe/def'
 require 'openwfe/expressions/fe_define'
 require 'openwfe/expressions/expressionmap'
 
 #
 # testing misc things
@@ -58,11 +60,11 @@
     end
 
     def test_grep_0
 
         assert OpenWFE::grep("sputnik", "Rakefile").empty?
-        assert_equal OpenWFE::grep("Mettraux", "Rakefile").size, 5
+        assert_equal 2, OpenWFE::grep("Mettraux", "Rakefile").size
 
         OpenWFE::grep "Mettraux", "Rakefile" do |line|
             assert_match "Mettraux", line
         end
     end
@@ -70,17 +72,17 @@
     def test_expmap_get_classes
 
         em = OpenWFE::ExpressionMap.new
 
         assert_equal \
-            em.get_expression_classes(OpenWFE::Schedulable),
+            em.get_expression_classes(Rufus::Schedulable),
             [
                 OpenWFE::ParticipantExpression,
                 OpenWFE::SleepExpression,
                 OpenWFE::CronExpression,
                 OpenWFE::WhenExpression,
                 OpenWFE::WaitExpression,
-                OpenWFE::ReserveExpression,
+                #OpenWFE::ReserveExpression,
                 OpenWFE::ListenExpression,
                 OpenWFE::TimeoutExpression,
                 OpenWFE::Environment
             ]
     end