specs/constraints/constraints.rb in gecoder-0.8.3 vs specs/constraints/constraints.rb in gecoder-0.9.0

@@ -1,83 +1,26 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Gecode::Constraints::Expression do
-  it 'should raise error if it doesn\'t get all parameters for initialization' do
-    lambda do 
-      Gecode::Constraints::Expression.new(Gecode::Model.new, :negate => false) 
-    end.should raise_error(ArgumentError)
-  end
-end
-
-describe Gecode::Constraints::IntEnum::Expression do
-  it 'should raise error unless lhs is an int enum' do
-    lambda do
-      Gecode::Constraints::IntEnum::Expression.new(Gecode::Model.new, 
-        :lhs => 'foo', :negate => false)
-    end.should raise_error(TypeError)
-  end
-end
-
-describe Gecode::Constraints::BoolEnum::Expression do
-  it 'should raise error unless lhs is a bool enum' do
-    lambda do
-      Gecode::Constraints::BoolEnum::Expression.new(Gecode::Model.new, 
-        :lhs => 'foo', :negate => false)
-    end.should raise_error(TypeError)
-  end
-end
-
-describe Gecode::Constraints::SetEnum::Expression do
-  it 'should raise error unless lhs is a set enum' do
-    lambda do
-      Gecode::Constraints::SetEnum::Expression.new(Gecode::Model.new, 
-        :lhs => 'foo', :negate => false)
-    end.should raise_error(TypeError)
-  end
-end
-
-describe Gecode::Constraints::Int::CompositeStub, ' (not subclassed)' do
+describe Gecode::Constraint, ' (not subclassed)' do
   before do
-    @con = Gecode::Constraints::Int::CompositeStub.new(Gecode::Model.new, {})
+    @con = Gecode::Constraint.new(Gecode::Model.new, {})
   end
 
-  it 'should raise error when calling #constrain_equal' do
-    lambda do 
-      @con.instance_eval{ constrain_equal(nil, {}, false) }
-    end.should raise_error(NoMethodError)
-  end
-end
-
-describe Gecode::Constraints::Constraint, ' (not subclassed)' do
-  before do
-    @con = Gecode::Constraints::Constraint.new(Gecode::Model.new, {})
-  end
-
   it 'should raise error when calling #post because it\'s not overridden' do
-    lambda{ @con.post }.should raise_error(NoMethodError)
+    lambda{ @con.post }.should raise_error(NotImplementedError)
   end
 end
 
-describe Gecode::Constraints::Util do
+describe Gecode::Util do
   it 'should raise error when giving incorrect set to #constant_set_to_params' do
     lambda do 
-      Gecode::Constraints::Util.constant_set_to_params('hello')
+      Gecode::Util.constant_set_to_params('hello')
     end.should raise_error(TypeError)
   end
   
   it 'should raise error when giving incorrect set to #constant_set_to_int_set' do
     lambda do 
-      Gecode::Constraints::Util.constant_set_to_int_set('hello')
+      Gecode::Util.constant_set_to_int_set('hello')
     end.should raise_error(TypeError)
   end
 end
 
-describe Gecode::Constraints::CompositeExpression do
-  it 'should raise error if a method doesn\'t exist' do
-    expression = Gecode::Constraints::CompositeExpression.new(
-      Gecode::Constraints::Int::Expression, Gecode::FreeIntVar, 
-      lambda{ }, Gecode::Model.new, {:lhs => nil, :negate => false}){}
-    lambda do
-      expression.this_method_does_not_exist
-    end.should raise_error(NoMethodError)
-  end
-end
\ No newline at end of file