Spec cleanup

Author: jsl

spec/micro_kanren/core_spec.rb

@@ -5,9 +5,8 @@
   include MicroKanren::MiniKanrenWrappers
   include MicroKanren::Lisp
 
-  def uvar(v)
-    MicroKanren::Var.new([v])
-  end
+  include MicroKanren::TestPrograms
+  include MicroKanren::TestSupport
 
   describe "#call_fresh" do
     it "second-set t1" do
@@ -32,13 +31,6 @@ def uvar(v)
       cdr(res).must_be_nil
     end
 
-    def a_and_b
-      a = -> (a) { eq(a, 7) }
-      b = -> (b) { disj(eq(b, 5), eq(b, 6)) }
-
-      conj(call_fresh(a), call_fresh(b))
-    end
-
     # https://github.com/jasonhemann/microKanren/blob/master/microKanren-test.scm#L13
     it "second-set t3" do
       res = car(a_and_b.call(empty_state))
@@ -50,12 +42,6 @@ def a_and_b
       lists_equal?(res, sexp).must_equal true
     end
 
-    def fives
-      -> (x) {
-        disj(eq(x, 5), -> (a_c) { -> { fives(x).call(a_c) } })
-      }
-    end
-
     it "who cares" do
       res = take(1, call_fresh(-> (q) { fives.call(q) }).call(empty_state))
 

spec/spec_helper.rb

@@ -3,3 +3,6 @@
 require "mocha"
 
 require "#{File.dirname(__FILE__)}/../lib/micro_kanren"
+
+require "#{File.dirname(__FILE__)}/test_programs"
+require "#{File.dirname(__FILE__)}/test_support"

spec/test_programs.rb

@@ -0,0 +1,16 @@
+module MicroKanren
+  module TestPrograms
+    def a_and_b
+      a = -> (a) { eq(a, 7) }
+      b = -> (b) { disj(eq(b, 5), eq(b, 6)) }
+
+      conj(call_fresh(a), call_fresh(b))
+    end
+
+    def fives
+      -> (x) {
+        disj(eq(x, 5), -> (a_c) { -> { fives(x).call(a_c) } })
+      }
+    end
+  end
+end

spec/test_support.rb

@@ -0,0 +1,9 @@
+module MicroKanren
+  module TestSupport
+
+    # Shorthand for declaring a new logic variable.
+    def uvar(v)
+      MicroKanren::Var.new([v])
+    end
+  end
+end