test: fix test file

The tests are for regexp operator in expression context. They aren't in regexp operator context.
ranguba · Apr 11, 2015 · 5108b56 · 5108b56
1 parent fb89686
commit 5108b56
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 36 deletions.
diff --git a/test/test-expression.rb b/test/test-expression.rb
@@ -260,6 +260,43 @@ def test_name
     0:<push n_args:1, flags:0, modify:2, value:29>,
     1:<push n_args:1, flags:0, modify:0, value:92>,
     2:<plus n_args:2, flags:0, modify:0, value:(NULL)>
+  }>
+        INSPECTED
+      end
+    end
+
+    class RegexpTest < self
+      setup
+      def setup_expression
+        @expression = Groonga::Expression.new
+        @expression.append_constant("Alice")
+        @expression.append_constant(/\A[aA].*l/.source)
+      end
+
+      def test_constant
+        @expression.append_operation(Groonga::Operator::REGEXP, 2)
+        assert_equal(<<-INSPECTED.chomp, @expression.inspect)
+#<Groonga::Expression
+  vars:{
+  },
+  codes:{
+    0:<push n_args:1, flags:0, modify:2, value:"Alice">,
+    1:<push n_args:1, flags:0, modify:0, value:"\\\\A[aA].*l">,
+    2:<regexp n_args:2, flags:0, modify:0, value:(NULL)>
+  }>
+        INSPECTED
+      end
+
+      def test_name
+        @expression.append_operation("regexp", 2)
+        assert_equal(<<-INSPECTED.chomp, @expression.inspect)
+#<Groonga::Expression
+  vars:{
+  },
+  codes:{
+    0:<push n_args:1, flags:0, modify:2, value:"Alice">,
+    1:<push n_args:1, flags:0, modify:0, value:"\\\\A[aA].*l">,
+    2:<regexp n_args:2, flags:0, modify:0, value:(NULL)>
   }>
         INSPECTED
       end

diff --git a/test/test-operator.rb b/test/test-operator.rb
@@ -20,40 +20,4 @@ class OperatorTest < Test::Unit::TestCase
 
   setup :setup_database
 
-  class RegexpTest < self
-    setup
-    def setup_expression
-      @expression = Groonga::Expression.new
-      @expression.append_constant("Alice")
-      @expression.append_constant(/\A[aA].*l/.source)
-    end
-
-    def test_constant
-      @expression.append_operation(Groonga::Operator::REGEXP, 2)
-      assert_equal(<<-INSPECTED.chomp, @expression.inspect)
-#<Groonga::Expression
-  vars:{
-  },
-  codes:{
-    0:<push n_args:1, flags:0, modify:2, value:"Alice">,
-    1:<push n_args:1, flags:0, modify:0, value:"\\\\A[aA].*l">,
-    2:<regexp n_args:2, flags:0, modify:0, value:(NULL)>
-  }>
-      INSPECTED
-    end
-
-    def test_name
-      @expression.append_operation("regexp", 2)
-      assert_equal(<<-INSPECTED.chomp, @expression.inspect)
-#<Groonga::Expression
-  vars:{
-  },
-  codes:{
-    0:<push n_args:1, flags:0, modify:2, value:"Alice">,
-    1:<push n_args:1, flags:0, modify:0, value:"\\\\A[aA].*l">,
-    2:<regexp n_args:2, flags:0, modify:0, value:(NULL)>
-  }>
-      INSPECTED
-    end
-  end
 end