rgen 0.7.0 → 0.8.3

data/test/metamodel_builder_test.rb

@@ -1,11 +1,11 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/array_extensions'
 require 'bigdecimal'
 
-class MetamodelBuilderTest < Test::Unit::TestCase
+class MetamodelBuilderTest < MiniTest::Test
   
   module TestMetamodel
     extend RGen::MetamodelBuilder::ModuleExtension
@@ -168,6 +168,14 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     end
     OppositeRefAssocA.one_to_one 'bClass', OppositeRefAssocB, 'aClass'
 
+    class ReservedNameClass < RGen::MetamodelBuilder::MMBase
+      has_attr 'class', String
+    end
+
+    class ManyReservedNameClass < RGen::MetamodelBuilder::MMBase
+      has_many_attr 'class', String
+    end
+
   end
    
   def mm
@@ -182,8 +190,8 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     sc.name = "TestName"
     assert_equal "TestName", sc.name
     sc.name = nil
-    assert_equal nil, sc.name
-    err = assert_raise StandardError do
+    assert_nil sc.name
+    err = assert_raises StandardError do
       sc.name = 5
     end
     assert_match /In (\w+::)+SimpleClass : Can not use a Fixnum where a String is expected/, err.message
@@ -212,12 +220,12 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     sc.allowed = false
     assert_equal false, sc.allowed
     sc.allowed = nil
-    assert_equal nil, sc.allowed
-    err = assert_raise StandardError do
+    assert_nil sc.allowed
+    err = assert_raises StandardError do
       sc.allowed = :someSymbol
     end
     assert_match /In (\w+::)+SimpleClass : Can not use a Symbol\(:someSymbol\) where a \[true,false\] is expected/, err.message
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       sc.allowed = "a string"
     end
     assert_match /In (\w+::)+SimpleClass : Can not use a String where a \[true,false\] is expected/, err.message
@@ -230,12 +238,12 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     sc.kind = :extended
     assert_equal :extended, sc.kind
     sc.kind = nil
-    assert_equal nil, sc.kind
-    err = assert_raise StandardError do
+    assert_nil sc.kind
+    err = assert_raises StandardError do
       sc.kind = :false
     end
     assert_match /In (\w+::)+SimpleClass : Can not use a Symbol\(:false\) where a \[:simple,:extended\] is expected/, err.message
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       sc.kind = "a string"
     end
     assert_match /In (\w+::)+SimpleClass : Can not use a String where a \[:simple,:extended\] is expected/, err.message
@@ -268,11 +276,11 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     sc = mm::SimpleClass.new
     sc.longWithDefault = 5
     assert_equal 5, sc.longWithDefault
-    sc.longWithDefault = 1234567890
-    assert_equal 1234567890, sc.longWithDefault
+    sc.longWithDefault = (2**(0.size * 8 -2) -1) + 1
+    assert_equal (2**(0.size * 8 -2) -1) + 1, sc.longWithDefault
     assert sc.longWithDefault.is_a?(Bignum)
     assert sc.longWithDefault.is_a?(Integer)
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       sc.longWithDefault = "a string"
     end
     assert_match /In (\w+::)+SimpleClass : Can not use a String where a Integer is expected/, err.message
@@ -285,7 +293,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     assert_respond_to o, :addLiterals
     assert_respond_to o, :removeLiterals
 
-    err = assert_raise(StandardError) do
+    err = assert_raises(StandardError) do
       o.addLiterals(1)
     end
     assert_match /In (\w+::)+ManyAttrClass : Can not use a Fixnum where a String is expected/, err.message
@@ -320,7 +328,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     o.literals = ["a", "b", "c"]
     assert_equal ["a", "b", "c"], o.literals
     # can only take enumerables
-    err = assert_raise(StandardError) do
+    err = assert_raises(StandardError) do
       o.literals = 1
     end
     assert_match /In (\w+::)+ManyAttrClass : Can not use a Fixnum where a Enumerable is expected/, err.message
@@ -359,7 +367,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     sc.classA = ca
     assert_equal ca, sc.classA
     sc.classA = nil
-    assert_equal nil, sc.classA
+    assert_nil sc.classA
     
     assert_respond_to sc, :classB
     assert_respond_to sc, :classB=
@@ -367,7 +375,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     sc.classB = cb
     assert_equal cb, sc.classB
     
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       sc.classB = ca
     end
     assert_match /In (\w+::)+HasOneTestClass : Can not use a (\w+::)+ClassA where a (\w+::)+ClassB is expected/, err.message
@@ -394,7 +402,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     assert_equal [ca1, ca2], o.classA
     o.removeClassA(ca2)
     assert_equal [ca1], o.classA
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       o.addClassA(mm::ClassB.new)
     end
     assert_match /In (\w+::)+HasManyTestClass : Can not use a (\w+::)+ClassB where a (\w+::)+ClassA is expected/, err.message
@@ -434,7 +442,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     
     # remove the OneClass from the ManyClass
     mc.oneClass = nil
-    assert_equal nil, mc.oneClass
+    assert_nil mc.oneClass
     assert !oc.manyClasses.include?(mc)
     
     # put the ManyClass into the OneClass
@@ -445,7 +453,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     # remove the ManyClass from the OneClass
     oc.removeManyClasses mc
     assert !oc.manyClasses.include?(mc)
-    assert_equal nil, mc.oneClass
+    assert_nil mc.oneClass
     
     assert_equal [], mm::OneClass.ecore.eReferences.select{|r| r.many == false}
     assert_equal ["manyClasses"], mm::OneClass.ecore.eReferences.select{|r| r.many == true}.name
@@ -478,7 +486,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     mc1.oneClass = oc
     assert_equal [mc1], oc.manyClasses
     assert_equal oc, mc1.oneClass
-    assert_equal nil, mc2.oneClass
+    assert_nil mc2.oneClass
     
     mc2.oneClass = oc
     assert_equal [mc1, mc2], oc.manyClasses
@@ -515,7 +523,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     
     # remove the OneClass from the ManyClass
     mc.oneClass = nil
-    assert_equal nil, mc.oneClass
+    assert_nil mc.oneClass
     assert !oc.manyClasses.include?(mc)
     
     # put the ManyClass into the OneClass
@@ -526,7 +534,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     # remove the ManyClass from the OneClass
     oc.removeManyClasses mc
     assert !oc.manyClasses.include?(mc)
-    assert_equal nil, mc.oneClass
+    assert_nil mc.oneClass
     
     assert_equal [], mm::OneClass2.ecore.eReferences.select{|r| r.many == false}
     assert_equal ["manyClasses"], mm::OneClass2.ecore.eReferences.select{|r| r.many == true}.name
@@ -552,8 +560,8 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     
     # remove the AClass from the BClass
     bc.aClass = nil
-    assert_equal nil, bc.aClass
-    assert_equal nil, ac.bClass
+    assert_nil bc.aClass
+    assert_nil ac.bClass
     
     # put the BClass into the AClass
     ac.bClass = bc
@@ -562,8 +570,8 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     
     # remove the BClass from the AClass
     ac.bClass = nil
-    assert_equal nil, ac.bClass
-    assert_equal nil, bc.aClass
+    assert_nil ac.bClass
+    assert_nil bc.aClass
     
     assert_equal ["bClass"], mm::AClassOO.ecore.eReferences.select{|r| r.many == false}.name
     assert_equal [], mm::AClassOO.ecore.eReferences.select{|r| r.many == true}
@@ -579,11 +587,11 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     a.bClass = b1
     assert_equal b1, a.bClass
     assert_equal a, b1.aClass
-    assert_equal nil, b2.aClass
+    assert_nil b2.aClass
   
     a.bClass = b2
     assert_equal b2, a.bClass
-    assert_equal nil, b1.aClass
+    assert_nil b1.aClass
     assert_equal a, b2.aClass
 	end	
   
@@ -603,7 +611,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     assert ac.bClasses.include?(bc)
     
     # put something else into the BClass
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       bc.addAClasses :notaaclass
     end
     assert_match /In (\w+::)+BClassMM : Can not use a Symbol\(:notaaclass\) where a (\w+::)+AClassMM is expected/, err.message
@@ -619,7 +627,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     assert bc.aClasses.include?(ac)
     
     # put something else into the AClass
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       ac.addBClasses :notabclass
     end
     assert_match /In (\w+::)+AClassMM : Can not use a Symbol\(:notabclass\) where a (\w+::)+BClassMM is expected/, err.message
@@ -705,7 +713,8 @@ class MetamodelBuilderTest < Test::Unit::TestCase
 
   def checkAnnotation(anno, source, hash)
     assert anno.is_a?(RGen::ECore::EAnnotation)
-    assert_equal source, anno.source
+    assert_equal source, anno.source unless source.nil?
+    assert_nil anno.source if source.nil?
     assert_equal hash.size, anno.details.size
     hash.each_pair do |k, v|
       detail = anno.details.find{|d| d.key == k}
@@ -887,7 +896,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
   end
 
   def test_abstract
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       mm::AbstractClass.new
     end
     assert_match /Class (\w+::)+AbstractClass is abstract/, err.message
@@ -939,35 +948,35 @@ class MetamodelBuilderTest < Test::Unit::TestCase
   end
 
   def test_bad_default_value_literal
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       BadDefaultValueLiteralContainer::Test1.call
     end
     assert_equal "Property integerWithDefault can not take value 1.1, expected an Integer", err.message
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       BadDefaultValueLiteralContainer::Test2.call
     end
     assert_equal "Property integerWithDefault can not take value x, expected an Integer", err.message
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       BadDefaultValueLiteralContainer::Test3.call
     end
     assert_equal "Property boolWithDefault can not take value 1, expected true or false", err.message
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       BadDefaultValueLiteralContainer::Test4.call
     end
     assert_equal "Property floatWithDefault can not take value 1, expected a Float", err.message
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       BadDefaultValueLiteralContainer::Test5.call
     end
     assert_equal "Property floatWithDefault can not take value true, expected a Float", err.message
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       BadDefaultValueLiteralContainer::Test6.call
     end
     assert_equal "Property enumWithDefault can not take value xxx, expected one of :simple, :extended", err.message
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       BadDefaultValueLiteralContainer::Test7.call
     end
     assert_equal "Property enumWithDefault can not take value 7, expected one of :simple, :extended", err.message
-    err = assert_raise StandardError do
+    err = assert_raises StandardError do
       BadDefaultValueLiteralContainer::Test8.call
     end
     assert_equal "Property longWithDefault can not take value 1.1, expected an Integer", err.message
@@ -1322,9 +1331,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
 
   def test_container_generic
     a = mm::ContainerClass.new
-    assert_nothing_raised do
-      a.oneChild = RGen::MetamodelBuilder::MMGeneric.new
-    end
+    a.oneChild = RGen::MetamodelBuilder::MMGeneric.new
   end
 
   def test_opposite_assoc_on_first_write
@@ -1479,4 +1486,24 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     assert_equal [], a1.manyChildUni
   end
 
+  def test_reserved_names
+    e = mm::ReservedNameClass.new
+    e.setGeneric("class", "X")
+    assert_equal "X", e.getGeneric(:class)
+    assert_equal "X", e.getGeneric("class")
+    assert_equal ["X"], e.getGenericAsArray(:class)
+    assert_equal ["X"], e.getGenericAsArray("class")
+    assert_equal "X", e.getClass
+  end
+
+  def test_reserved_names_many
+    e = mm::ManyReservedNameClass.new
+    e.addGeneric("class", "X")
+    e.addGeneric("class", "Y")
+    assert_equal ["X", "Y"], e.getGeneric(:class)
+    assert_equal ["X", "Y"], e.getGeneric("class")
+    assert_equal ["X", "Y"], e.getGenericAsArray(:class)
+    assert_equal ["X", "Y"], e.getGenericAsArray("class")
+    assert_equal ["X", "Y"], e.getClass
+  end
 end

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'
@@ -23,4 +23,5 @@ require 'metamodel_from_ecore_test'
 require 'util_test'
 require 'model_fragment_test'
 require 'qualified_name_provider_test'
+require 'ecore_to_ruby_test'
 

data/test/template_language_test/templates/indent_nonl_at_eof_test/test.tpl

@@ -0,0 +1,14 @@
+<% define 'Test', :for => Object do %>
+  <%iinc%>
+	<% expand 'Sub' %>
+  <%idec%>
+<% end %>
+
+<% define 'Sub', :for => Object do %>
+	Sub
+	<%# white space after the following end tag but no NL %>
+	<%# the bug was triggered when the @output of template loading %>
+	<%# was non empty and not terminated by a newline; %>
+	<%# without the space after end, the newline above this %>
+	<%# define block would be the last character %>
+<% end %>