rgen 0.8.2 → 0.8.3

data/test/metamodel_from_ecore_test.rb

@@ -37,7 +37,7 @@ class MetamodelFromEcoreTest < MetamodelBuilderTest
     mod = RGen::ECore::ECoreToRuby.new.create_module(package)
     obj = mod::Class1.new
     # the error is raised only when the feature is lazily constructed
-    assert_raise StandardError do
+    assert_raises StandardError do
       obj.value
     end
   end

data/test/metamodel_order_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/ecore/ecore'
 require 'rgen/array_extensions'
 
-class MetamodelOrderTest < Test::Unit::TestCase
+class MetamodelOrderTest < MiniTest::Test
 	include RGen::ECore
 	
   module TestMM1

data/test/metamodel_roundtrip_test.rb

@@ -1,13 +1,13 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/array_extensions'
 require 'rgen/util/model_comparator'
 require 'mmgen/metamodel_generator'
 require 'rgen/instantiator/ecore_xml_instantiator'
 require 'rgen/serializer/xmi20_serializer'
 
-class MetamodelRoundtripTest < Test::Unit::TestCase
+class MetamodelRoundtripTest < MiniTest::Test
   
   TEST_DIR = File.dirname(__FILE__)+"/metamodel_roundtrip_test"
   

data/test/method_delegation_test.rb

@@ -1,9 +1,9 @@
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/util/method_delegation'
 
-class MethodDelegationTest < Test::Unit::TestCase
+class MethodDelegationTest < MiniTest::Test
   include RGen
   
   class TestDelegate
@@ -88,7 +88,7 @@ class MethodDelegationTest < Test::Unit::TestCase
     assert_equal "AnotherConst::A::B::C", AnotherConst::A::B::C.to_s
     
     Util::MethodDelegation.unregisterDelegate(ConstPathElement, surroundingModule, "const_missing")
-    assert_raise NameError do 
+    assert_raises NameError do 
       SomeArbitraryConst
     end
   end
@@ -123,7 +123,7 @@ class MethodDelegationTest < Test::Unit::TestCase
     
     delegate1.mode = :nothing
     # delegate1 just exits and thus returns nil
-    assert_equal nil, delegator.send(method)
+    assert_nil delegator.send(method)
     assert_equal 2, delegate1.callcount
     # delegate2 is not called
     assert_equal 0, delegate2.callcount
@@ -167,7 +167,7 @@ class MethodDelegationTest < Test::Unit::TestCase
   
   def checkCallOriginal(delegator, method, originalResult, newMethod)
     if newMethod
-      assert_raise NoMethodError do
+      assert_raises NoMethodError do
         result = delegator.send(method)
       end
     else

data/test/model_builder/builder_context_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.dirname(__FILE__)+"/../lib"
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/ecore/ecore'
 require 'rgen/model_builder/builder_context'
 
-class BuilderContextTest < Test::Unit::TestCase
+class BuilderContextTest < MiniTest::Test
   
   module BuilderExtension1
     module PackageA
@@ -50,7 +50,7 @@ class BuilderContextTest < Test::Unit::TestCase
     assert_equal 5, packBExt.inPackBExt
     assert_equal 7, packBExt.inBuilderContext
     
-    assert_raise RuntimeError do
+    assert_raises RuntimeError do
       # aboveRoot is not contained within root
       assert_nil factory.moduleForPackage(aboveRoot)
     end

data/test/model_builder/builder_test.rb

@@ -1,13 +1,13 @@
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/ecore/ecore'
 require 'rgen/ecore/ecore_builder_methods'
 require 'rgen/environment'
 require 'rgen/model_builder'
 require 'model_builder/statemachine_metamodel'
 
-class ModelBuilderTest < Test::Unit::TestCase
+class ModelBuilderTest < MiniTest::Test
       
   def test_statemachine
     result = RGen::ModelBuilder.build(StatemachineMetamodel) do 
@@ -193,47 +193,47 @@ class ModelBuilderTest < Test::Unit::TestCase
     
     # TestClass1
     class1 = p1.eClassifiers.find{|c| c.name == "TestClass1"}
-    assert_not_nil class1
+    assert class1 != nil
     assert class1.is_a?(RGen::ECore::EClass)
     
     # TestClass1.attr1
     attr1 = class1.eAllAttributes.find{|a| a.name == "attr1"}
-    assert_not_nil attr1
+    assert attr1 != nil
     assert_equal RGen::ECore::EString, attr1.eType
     
     # TestClass1.attr2
     attr2 = class1.eAllAttributes.find{|a| a.name == "attr2"}
-    assert_not_nil attr2
+    assert attr2 != nil
     assert_equal RGen::ECore::EInt, attr2.eType
     
     # TestClass2
     class2 = p1.eClassifiers.find{|c| c.name == "TestClass2"}
-    assert_not_nil class2
+    assert class2 != nil
     assert class2.is_a?(RGen::ECore::EClass)
 
     # TestClass2.ref1
     ref1 = class2.eAllReferences.find{|a| a.name == "ref1"}
-    assert_not_nil ref1
+    assert ref1 != nil
     assert_equal class1, ref1.eType
 
     # TestClass1.biRef1
     biRef1 = class1.eAllReferences.find{|r| r.name == "biRef1"}
-    assert_not_nil biRef1
+    assert biRef1 != nil
     assert_equal class2, biRef1.eType
     biRef1Opp = class2.eAllReferences.find {|r| r.name == "testClass1"}
-    assert_not_nil biRef1Opp
+    assert biRef1Opp != nil
     assert_equal class1, biRef1Opp.eType
     assert_equal biRef1Opp, biRef1.eOpposite
     assert_equal biRef1, biRef1Opp.eOpposite
     
     # TestClass1.testClass2
     tc2Ref = class1.eAllReferences.find{|r| r.name == "testClass2"}
-    assert_not_nil tc2Ref
+    assert tc2Ref != nil
     assert_equal class2, tc2Ref.eType
     assert  tc2Ref.containment
     assert_equal -1, tc2Ref.upperBound
     tc2RefOpp = class2.eAllReferences.find{|r| r.name == "tc1Parent"}
-    assert_not_nil tc2RefOpp
+    assert tc2RefOpp != nil
     assert_equal class1, tc2RefOpp.eType
     assert !tc2RefOpp.containment
     assert_equal 1, tc2RefOpp.upperBound

data/test/model_builder/reference_resolver_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.dirname(__FILE__)+"/../lib"
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/model_builder/reference_resolver'
 
-class ReferenceResolverTest < Test::Unit::TestCase
+class ReferenceResolverTest < MiniTest::Test
 
   class ClassA < RGen::MetamodelBuilder::MMBase
     has_attr "name"
@@ -122,7 +122,7 @@ class ReferenceResolverTest < Test::Unit::TestCase
       :reference => ClassC.ecore.eReferences.find{|r| r.name == "refCs"},
       :namespace => b1,
       :string => "b1.c5"))
-    assert_raise RGen::ModelBuilder::ReferenceResolver::ResolverException do
+    assert_raises RGen::ModelBuilder::ReferenceResolver::ResolverException do
       resolver.resolve(toplevelNamespace)
     end
   end

data/test/model_builder/serializer_test.rb

@@ -1,6 +1,6 @@
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/ecore/ecore'
 
 # The following would also influence other tests...
@@ -28,7 +28,7 @@ require 'rgen/instantiator/ecore_xml_instantiator'
 require 'rgen/model_builder'
 require 'model_builder/statemachine_metamodel'
 
-class ModelSerializerTest < Test::Unit::TestCase
+class ModelSerializerTest < MiniTest::Test
   def test_ecore_internal
     File.open(File.dirname(__FILE__)+"/ecore_internal.rb","w") do |f|
       serializer = RGen::ModelBuilder::ModelSerializer.new(f, RGen::ECore.ecore)

data/test/model_fragment_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/fragment/model_fragment'
 
-class ModelFragmentTest < Test::Unit::TestCase
+class ModelFragmentTest < MiniTest::Test
 
 module TestMetamodel
   extend RGen::MetamodelBuilder::ModuleExtension

data/test/output_handler_test.rb

@@ -1,9 +1,9 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/template_language/output_handler'
 
-class MetamodelBuilderTest < Test::Unit::TestCase
+class MetamodelBuilderTest < MiniTest::Test
 	def test_direct_nl
 		h = RGen::TemplateLanguage::OutputHandler.new
 		h.mode = :direct

data/test/qualified_name_provider_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/serializer/qualified_name_provider'
 
-class QualifiedNameProviderTest < Test::Unit::TestCase
+class QualifiedNameProviderTest < MiniTest::Test
 
   class AbstractTestNode < RGen::MetamodelBuilder::MMBase
     contains_many 'children', AbstractTestNode, "parent"

data/test/qualified_name_resolver_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/instantiator/qualified_name_resolver'
 
-class QualifiedNameResolverTest < Test::Unit::TestCase
+class QualifiedNameResolverTest < MiniTest::Test
 
   class TestNode < RGen::MetamodelBuilder::MMBase
     has_attr 'name', String
@@ -86,8 +86,8 @@ class QualifiedNameResolverTest < Test::Unit::TestCase
     assert_equal model[1].children[0].children[0], res.resolveIdentifier("/Root2/Sub21/Sub211")
     # duplicate name yields two result elements
     assert_equal [model[2], model[3]], res.resolveIdentifier("/Root3")
-    assert_equal nil, res.resolveIdentifier("/RootX")
-    assert_equal nil, res.resolveIdentifier("/Root1/SubX")
+    assert_nil res.resolveIdentifier("/RootX")
+    assert_nil res.resolveIdentifier("/Root1/SubX")
   end
 
   def test_oneChild

data/test/reference_resolver_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/instantiator/reference_resolver'
 
-class ReferenceResolverTest < Test::Unit::TestCase
+class ReferenceResolverTest < MiniTest::Test
 
   class TestNode < RGen::MetamodelBuilder::MMBase
     has_attr 'name', String
@@ -107,9 +107,9 @@ class ReferenceResolverTest < Test::Unit::TestCase
   def check_model(nodeA, nodeB, nodeC)
     assert_equal nodeB, nodeA.other
     assert_equal [], nodeA.others
-    assert_equal nil, nodeB.other
+    assert_nil nodeB.other
     assert_equal [nodeA, nodeC], nodeB.others
-    assert_equal nil, nodeC.other
+    assert_nil nodeC.other
     assert_equal [], nodeC.others
   end
 

data/test/rgen_test.rb

@@ -1,6 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
-require 'test/unit'
+require 'minitest/autorun'
 
 require 'array_extensions_test'
 require 'ea_instantiator_test'

data/test/template_language_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/template_language'
 require 'rgen/metamodel_builder'
 
-class TemplateContainerTest < Test::Unit::TestCase
+class TemplateContainerTest < MiniTest::Test
   
   TEMPLATES_DIR = File.dirname(__FILE__)+"/template_language_test/templates"
   OUTPUT_DIR = File.dirname(__FILE__)+"/template_language_test"
@@ -93,17 +93,15 @@ class TemplateContainerTest < Test::Unit::TestCase
   def test_null_context
     tc = RGen::TemplateLanguage::DirectoryTemplateContainer.new([MyMM, CCodeMM], OUTPUT_DIR)
     tc.load(TEMPLATES_DIR)
-    assert_raise StandardError do 
+    assert_raises StandardError do 
       # the template must raise an exception because it calls expand :for => nil
       tc.expand('null_context_test::NullContextTestBad', :for => :dummy)
     end
-    assert_raise StandardError do 
+    assert_raises StandardError do 
       # the template must raise an exception because it calls expand :foreach => nil
       tc.expand('null_context_test::NullContextTestBad2', :for => :dummy)
     end
-    assert_nothing_raised do
-      tc.expand('null_context_test::NullContextTestOk', :for => :dummy)
-    end
+    tc.expand('null_context_test::NullContextTestOk', :for => :dummy)
   end
   
   def test_no_indent
@@ -141,7 +139,7 @@ class TemplateContainerTest < Test::Unit::TestCase
     tc = RGen::TemplateLanguage::DirectoryTemplateContainer.new([MyMM, CCodeMM], OUTPUT_DIR)
     tc.load(TEMPLATES_DIR)
     assert_equal "Local1\r\n", tc.expand('define_local_test/test::Test', :for => :dummy)
-    assert_raise StandardError do
+    assert_raises StandardError do
       tc.expand('define_local_test/test::TestForbidden', :for => :dummy)
     end
   end

data/test/testmodel/class_model_checker.rb

@@ -11,7 +11,7 @@ module ClassModelChecker
 						
 		# check main package
 		mainPackage = envUML.find(:class => UML13::Package, :name => "HouseMetamodel").first
-		assert_not_nil mainPackage
+		assert mainPackage != nil
 		
 		# check Rooms package
 		subs = mainPackage.ownedElement.select{|e| e.is_a?(UML13::Package)}
@@ -26,10 +26,10 @@ module ClassModelChecker
 		personClass = classes.find{|c| c.name == "Person"}
 		meetingPlaceClass = classes.find{|c| c.name == "MeetingPlace"}
 		cookingPlaceInterface = mainPackage.ownedElement.find{|e| e.is_a?(UML13::Interface) && e.name == "CookingPlace"}
-		assert_not_nil houseClass
-		assert_not_nil personClass
-		assert_not_nil meetingPlaceClass
-        assert_not_nil cookingPlaceInterface
+		assert houseClass != nil
+		assert personClass != nil
+		assert meetingPlaceClass != nil
+        assert cookingPlaceInterface != nil
 
 		# check Rooms package classes
 		classes = roomsPackage.ownedElement.select{|e| e.is_a?(UML13::Class)}
@@ -37,20 +37,20 @@ module ClassModelChecker
 		roomClass = classes.find{|c| c.name == "Room"}
 		kitchenClass = classes.find{|c| c.name == "Kitchen"}
 		bathroomClass = classes.find{|c| c.name == "Bathroom"}
-		assert_not_nil roomClass
-		assert_not_nil kitchenClass
-		assert_not_nil bathroomClass
+		assert roomClass != nil
+		assert kitchenClass != nil
+		assert bathroomClass != nil
 		
 		# check Room inheritance
 		assert_equal 2, roomClass.specialization.child.size
-		assert_not_nil roomClass.specialization.child.find{|c| c.name == "Kitchen"}
-		assert_not_nil roomClass.specialization.child.find{|c| c.name == "Bathroom"}
+		assert nil != roomClass.specialization.child.find{|c| c.name == "Kitchen"}
+		assert nil != roomClass.specialization.child.find{|c| c.name == "Bathroom"}
 		assert_equal 2, kitchenClass.generalization.parent.size
 		assert_equal roomClass.object_id, kitchenClass.generalization.parent.find{|c| c.name == "Room"}.object_id
 		assert_equal meetingPlaceClass.object_id, kitchenClass.generalization.parent.find{|c| c.name == "MeetingPlace"}.object_id
 		assert_equal 1, bathroomClass.generalization.parent.size
 		assert_equal roomClass.object_id, bathroomClass.generalization.parent.first.object_id
-		assert_not_nil kitchenClass.clientDependency.find{|d| d.stereotype.name == "implements"}
+		assert nil != kitchenClass.clientDependency.find{|d| d.stereotype.name == "implements"}
         assert_equal cookingPlaceInterface.object_id, kitchenClass.clientDependency.supplier.find{|c| c.name == "CookingPlace"}.object_id
         assert_equal kitchenClass.object_id, cookingPlaceInterface.supplierDependency.client.find{|c| c.name == "Kitchen"}.object_id
 
@@ -72,8 +72,8 @@ module ClassModelChecker
 		assert_equal 2, houseClass.remoteNavigableEnd.size
 		bathEnd = houseClass.remoteNavigableEnd.find{|e| e.name == "bathroom"}
 		kitchenEnd = houseClass.remoteNavigableEnd.find{|e| e.name== "kitchen"}
-		assert_not_nil bathEnd
-		assert_not_nil kitchenEnd
+		assert bathEnd != nil
+		assert kitchenEnd != nil
 		assert_equal UML13::Association, bathEnd.association.class
 		assert_equal UML13::Association, kitchenEnd.association.class
 		assert_equal "1", kitchenEnd.multiplicity.range.first.lower
@@ -82,7 +82,7 @@ module ClassModelChecker
 		# check House IN associations
 		assert_equal 3, houseClass.localNavigableEnd.size
 		homeEnd = houseClass.localNavigableEnd.find{|e| e.name == "home"}
-		assert_not_nil homeEnd
+		assert homeEnd != nil
 		assert_equal UML13::Association, homeEnd.association.class
 		assert_equal "0", homeEnd.multiplicity.range.first.lower
 		assert_equal "*", homeEnd.multiplicity.range.first.upper
@@ -97,14 +97,14 @@ module ClassModelChecker
 		assert_nil mainPackage
 		
 		roomsPackage = envUML.find(:class => UML13::Package, :name => "Rooms").first
-		assert_not_nil roomsPackage
+		assert roomsPackage != nil
 		
 		roomClass = envUML.find(:class => UML13::Class, :name => "Room").first
-		assert_not_nil roomClass
+		assert roomClass != nil
 		
 		# House is created from an EAStub
 		houseClass = roomClass.remoteCompositeEnd.first.type
-		assert_not_nil houseClass
+		assert houseClass != nil
 		assert_equal "House", houseClass.name
         # House is not in a package since it's just a stub
 		assert houseClass.namespace.nil?

data/test/testmodel/ecore_model_checker.rb

@@ -12,7 +12,7 @@ module ECoreModelChecker
 						
 		# check main package
 		mainPackage = env.elements.select {|e| e.is_a? EPackage and e.name == "HouseMetamodel"}.first
-		assert_not_nil mainPackage
+		assert mainPackage != nil
 		
 		# check Rooms package
 		assert mainPackage.eSubpackages.is_a?(Array)
@@ -29,10 +29,10 @@ module ECoreModelChecker
 		personClass = mainPackage.eClassifiers.select{|c| c.name == "Person"}.first
 		meetingPlaceClass = mainPackage.eClassifiers.select{|c| c.name == "MeetingPlace"}.first
 		cookingPlaceInterface = mainPackage.eClassifiers.select{|c| c.name == "CookingPlace"}.first
-		assert_not_nil houseClass
-		assert_not_nil personClass
-		assert_not_nil meetingPlaceClass
-		assert_not_nil cookingPlaceInterface
+		assert houseClass != nil
+		assert personClass != nil
+		assert meetingPlaceClass != nil
+		assert cookingPlaceInterface != nil
 
 		# check Rooms package classes
 		assert roomsPackage.eClassifiers.is_a?(Array)
@@ -41,9 +41,9 @@ module ECoreModelChecker
 		roomClass = roomsPackage.eClassifiers.select{|c| c.name == "Room"}.first
 		kitchenClass = roomsPackage.eClassifiers.select{|c| c.name == "Kitchen"}.first
 		bathroomClass = roomsPackage.eClassifiers.select{|c| c.name == "Bathroom"}.first
-		assert_not_nil roomClass
-		assert_not_nil kitchenClass
-		assert_not_nil bathroomClass
+		assert roomClass != nil
+		assert kitchenClass != nil
+		assert bathroomClass != nil
 		
 		# check Room inheritance
 		assert kitchenClass.eSuperTypes.is_a?(Array)
@@ -63,7 +63,7 @@ module ECoreModelChecker
 		assert_equal "room", roomRef.name
 		assert_equal 1, roomRef.lowerBound
 		assert_equal(-1, roomRef.upperBound)
-		assert_not_nil roomRef.eOpposite
+		assert roomRef.eOpposite != nil
 		assert_equal houseClass.object_id, roomRef.eOpposite.eType.object_id
 		
 		partOfRefs = roomClass.eReferences.select{|r| r.eOpposite && r.eOpposite.containment}
@@ -78,10 +78,10 @@ module ECoreModelChecker
 		bathRef = houseClass.eReferences.find {|e| e.name == "bathroom"}
 		kitchenRef = houseClass.eReferences.find {|e| e.name == "kitchen"}
 		roomRef = houseClass.eReferences.find {|e| e.name == "room"}
-		assert_not_nil bathRef
+		assert bathRef != nil
 		assert_nil bathRef.eOpposite
-		assert_not_nil kitchenRef
-		assert_not_nil roomRef
+		assert kitchenRef != nil
+		assert roomRef != nil
 		assert_equal 1, kitchenRef.lowerBound
 		assert_equal 1, kitchenRef.upperBound
 		assert_equal 1, roomRef.lowerBound
@@ -91,7 +91,7 @@ module ECoreModelChecker
         houseInRefs = env.find(:class => EReference, :eType => houseClass)
 		assert_equal 3, houseInRefs.size
 		homeEnd = houseInRefs.find{|e| e.name == "home"}
-		assert_not_nil homeEnd
+		assert homeEnd != nil
 		assert_equal 0, homeEnd.lowerBound
 		assert_equal(-1, homeEnd.upperBound)
 		

data/test/testmodel/object_model_checker.rb

@@ -18,10 +18,10 @@ module ObjectModelChecker
 		
 		# check main package
 		mainPackage = envUML.find(:class => UML13::Package, :name => "HouseExampleModel").first
-		assert_not_nil mainPackage
+		assert mainPackage != nil
 		
 		eaRootCollaboration = mainPackage.ownedElement.find{|e| e.is_a?(UML13::Collaboration) && e.name == "Collaborations"}
-        assert_not_nil eaRootCollaboration
+        assert eaRootCollaboration != nil
 
 		# check main package objects
         objects = eaRootCollaboration.ownedElement.select{|e| e.is_a?(UML13::ClassifierRole)}
@@ -56,10 +56,10 @@ module ObjectModelChecker
 		assert someonesHouse.localCompositeEnd.otherEnd.is_a?(Array)
 		assert_equal 4, someonesHouse.localCompositeEnd.otherEnd.size
 		assert someonesHouse.localCompositeEnd.otherEnd.all?{|e| e.name == "room"}
-		assert_not_nil someonesHouse.localCompositeEnd.otherEnd.getType.find{|o| o == yellowRoom}
-		assert_not_nil someonesHouse.localCompositeEnd.otherEnd.getType.find{|o| o == greenRoom}
-		assert_not_nil someonesHouse.localCompositeEnd.otherEnd.getType.find{|o| o == hotRoom}
-		assert_not_nil someonesHouse.localCompositeEnd.otherEnd.getType.find{|o| o == wetRoom}
+		assert nil != someonesHouse.localCompositeEnd.otherEnd.getType.find{|o| o == yellowRoom}
+		assert nil != someonesHouse.localCompositeEnd.otherEnd.getType.find{|o| o == greenRoom}
+		assert nil != someonesHouse.localCompositeEnd.otherEnd.getType.find{|o| o == hotRoom}
+		assert nil != someonesHouse.localCompositeEnd.otherEnd.getType.find{|o| o == wetRoom}
 
 	end
 end

data/test/transformer_test.rb

@@ -1,14 +1,14 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 $:.unshift File.join(File.dirname(__FILE__),"..","test")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/transformer'
 require 'rgen/environment'
 require 'rgen/util/model_comparator'
 require 'metamodels/uml13_metamodel'
 require 'testmodel/class_model_checker'
 
-class TransformerTest < Test::Unit::TestCase
+class TransformerTest < MiniTest::Test
 
 	class ModelIn
 		attr_accessor :name
@@ -135,7 +135,7 @@ class TransformerTest < Test::Unit::TestCase
     assert_equal t1.trans(from).object_id, t2.trans(from).object_id
     assert_equal :dummy, t2.trans(from2)
     # and no transformer rule is evaluated at this point
-		assert_equal nil, t2.modelInTrans_count
+		assert_nil t2.modelInTrans_count
     # now transform a new object in second transformer
 		assert t2.trans(from3).is_a?(ModelOut)
 		assert_equal "Test3", t2.trans(from3).name

data/test/util/file_cache_map_test.rb

@@ -1,10 +1,10 @@
 $:.unshift(File.dirname(__FILE__)+"/../../lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'fileutils'
 require 'rgen/util/file_cache_map'
 
-class FileCacheMapTest < Test::Unit::TestCase
+class FileCacheMapTest < MiniTest::Test
 
   TestDir = File.dirname(__FILE__)+"/file_cache_map_test/testdir"
  

data/test/util/pattern_matcher_test.rb

@@ -1,12 +1,12 @@
 $:.unshift(File.dirname(__FILE__)+"/../../lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/environment'
 require 'rgen/metamodel_builder'
 require 'rgen/model_builder'
 require 'rgen/util/pattern_matcher'
 
-class PatternMatcherTest < Test::Unit::TestCase
+class PatternMatcherTest < MiniTest::Test
 
 module TestMM
   extend RGen::MetamodelBuilder::ModuleExtension
@@ -51,7 +51,7 @@ def test_simple
   env = modelA
 
   match = matcher.find_pattern(env, "simple")
-  assert_not_nil match
+  assert match != nil
   assert_equal "A", match.root.name
   assert_equal env.find(:class => TestMM::Node, :name => "A").first.object_id, match.root.object_id
   assert_equal 2, match.elements.size
@@ -75,21 +75,21 @@ def test_value_binding
   env = modelA
 
   match = matcher.find_pattern(env, "single_child")
-  assert_not_nil match
+  assert match != nil
   assert_equal "A", match.root.name
   assert_equal "AA", match.bound_values[1].name
 
   match = matcher.find_pattern(env, "single_child", "D")
-  assert_not_nil match
+  assert match != nil
   assert_equal "D", match.root.name
   assert_equal "DD", match.bound_values[0].name
 
   match = matcher.find_pattern(env, "double_child")
-  assert_not_nil match
+  assert match != nil
   assert_equal "C", match.root.name
 
   match = matcher.find_pattern(env, "child_pattern")
-  assert_not_nil match
+  assert match != nil
   assert_equal ["AA"], match.bound_values
 end