rgen 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb797f971990b12a38d234053b5edd0be3bd3cab
-  data.tar.gz: 27b2698616fa3536d71800db0784485b3903d019
+  metadata.gz: d1c27a6cc15f063ebc9483cb56253ebd20721cd2
+  data.tar.gz: b30dfcf5b91d19a8d26b0cc66a5dec9d3c0471c9
 SHA512:
-  metadata.gz: 79f31649d8f3a8da15723545841ba91b0b6294478000508b8f5abbd35b84d8c3d52d0b0100b35dd6803621a7e11d450ce4f06253e81be60a8c19ec06b45f4ff7
-  data.tar.gz: 267ee0574d6ce33e41c19825b86e8fff027c061dde40497124968c654e43cb7822f085c6614ce97cd372e58e2ce4643d8efbc10eebe310da137d5cc8afeaa543
+  metadata.gz: 5b74eb0928f9e39911b25dddbff8c73b12a331d651d59fdb27672794c6f6477bcdf23b3e8ac17ca97c2b3138dc33a3788a48ae6100493a710ff06e5557093dc8
+  data.tar.gz: cfe2866c2692b7a408cd460205cdc105f2cf792262104adfb6a0f0aa55bf917c26193766abebf43ccfd2f218f74e78910f20b82fa17d585beaca5345301bf985

data/CHANGELOG

@@ -212,4 +212,9 @@
 
 =0.8.2
 
-* Added helper methods
+* Added helper methods
+
+=0.8.3
+
+* Performance improvement: getGeneric made a lot faster
+ 

data/Rakefile

@@ -1,39 +1,29 @@
 require 'rubygems/package_task'
 require 'rdoc/task'
+require 'bundler/setup'
+require 'rake/testtask'
 
-RGenGemSpec = Gem::Specification.new do |s|
-  s.name = %q{rgen}
-  s.version = "0.8.2"
-  s.date = Time.now.strftime("%Y-%m-%d")
-  s.summary = %q{Ruby Modelling and Generator Framework}
-  s.email = %q{martin dot thiede at gmx de}
-  s.homepage = %q{http://ruby-gen.org}
-  s.rubyforge_project = %q{rgen}
-  s.description = %q{RGen is a framework for Model Driven Software Development (MDSD) in Ruby. This means that it helps you build Metamodels, instantiate Models, modify and transform Models and finally generate arbitrary textual content from it.}
-  s.authors = ["Martin Thiede"]
-  gemfiles = Rake::FileList.new
-  gemfiles.include("{lib,test}/**/*")
-  gemfiles.include("README.rdoc", "CHANGELOG", "MIT-LICENSE", "Rakefile") 
-  gemfiles.exclude(/\b\.bak\b/)
-  s.files = gemfiles
-  s.rdoc_options = ["--main", "README.rdoc", "-x", "test", "-x", "metamodels", "-x", "ea_support/uml13*"]
-  s.extra_rdoc_files = ["README.rdoc", "CHANGELOG", "MIT-LICENSE"]
-end
+RGenGemSpec = eval(File.read('rgen.gemspec'))
 
 RDoc::Task.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc", "CHANGELOG", "MIT-LICENSE", "lib/**/*.rb")
-  rd.rdoc_files.exclude("lib/metamodels/*")
-  rd.rdoc_files.exclude("lib/ea_support/uml13*")
-  rd.rdoc_dir = "doc"
+  rd.main = 'README.rdoc'
+  rd.rdoc_files.include('README.rdoc', 'CHANGELOG', 'MIT-LICENSE', 'lib/**/*.rb')
+  rd.rdoc_files.exclude('lib/metamodels/*')
+  rd.rdoc_files.exclude('lib/ea_support/uml13*')
+  rd.rdoc_dir = 'doc'
 end
 
 RGenPackageTask = Gem::PackageTask.new(RGenGemSpec) do |p|
   p.need_zip = false
-end	
+end
+
+::Rake::TestTask.new(:test) do |t|
+  t.test_files = ['test/rgen_test.rb']
+  t.warning = false
+end
 
 task :prepare_package_rdoc => :rdoc do
-  RGenPackageTask.package_files.include("doc/**/*")
+  RGenPackageTask.package_files.include('doc/**/*')
 end
 
 task :release => [:prepare_package_rdoc, :package]

data/lib/rgen/fragment/fragmented_model.rb

@@ -111,6 +111,8 @@ class FragmentedModel
   # This is a Hash mapping identifiers to model elements accessible via the identifier. 
   #
   def index
+    # Invalidate the cache when any fragment's local index changes.
+    # Assumption: If the local index content changes, there is a new index object.
     fragments.each do |f|
       if !@fragment_index[f] || (@fragment_index[f].object_id != f.index.object_id)
         @fragment_index[f] = f.index

data/lib/rgen/fragment/model_fragment.rb

@@ -117,6 +117,9 @@ class ModelFragment
   end
   
   # Returns the index of the element contained in this fragment.
+  # 
+  # FragmentedModel's index caching depends on the fact that any change 
+  # of a fragment's index contents implies a new index object.
   #
   def index
     build_index unless @index

data/lib/rgen/metamodel_builder/builder_extensions.rb

@@ -319,6 +319,10 @@ module BuilderExtensions
         end
         <% if name != "class" %>
           alias <%= name %> get<%= firstToUpper(name) %>
+        <% else %>
+          def getGeneric(role)
+            send("get\#{firstToUpper(role.to_s)}")
+          end
         <% end %>
 
       CODE
@@ -380,10 +384,14 @@ module BuilderExtensions
       @@many_read_builder ||= ERB.new <<-CODE
       
         def get<%= firstToUpper(name) %>
-          ( @<%= name %> ? @<%= name %>.dup : [] )
+          ( defined?(@<%= name %>) ? @<%= name %>.dup : [] )
         end
         <% if name != "class" %>
           alias <%= name %> get<%= firstToUpper(name) %>
+        <% else %>
+          def getGeneric(role)
+            send("get\#{firstToUpper(role.to_s)}")
+          end
         <% end %>
               
       CODE
@@ -394,7 +402,7 @@ module BuilderExtensions
       @@many_write_builder ||= ERB.new <<-CODE
     
         def add<%= firstToUpper(name) %>(val, index=-1)
-          @<%= name %> = [] unless @<%= name %>
+          @<%= name %> = [] unless defined?(@<%= name %>)
           return if val.nil? || (val.is_a?(MMBase) || val.is_a?(MMGeneric)) && @<%= name %>.any? {|e| e.equal?(val)}
           <%= type_check_code("val", props) %>
           @<%= name %>.insert(index, val)
@@ -407,7 +415,7 @@ module BuilderExtensions
         end
         
         def remove<%= firstToUpper(name) %>(val)
-          @<%= name %> = [] unless @<%= name %>
+          @<%= name %> = [] unless defined?(@<%= name %>)
           @<%= name %>.each_with_index do |e,i|
             if e.equal?(val)
               @<%= name %>.delete_at(i)
@@ -428,7 +436,7 @@ module BuilderExtensions
           get<%= firstToUpper(name) %>.each {|e|
             remove<%= firstToUpper(name) %>(e)
           }
-          @<%= name %> = [] unless @<%= name %>
+          @<%= name %> = [] unless defined?(@<%= name %>)
           <% if props.reference? %>
           val.uniq {|elem| elem.object_id }.each {|elem|
             next if elem.nil?
@@ -451,7 +459,7 @@ module BuilderExtensions
         alias <%= name %>= set<%= firstToUpper(name) %>
         
         def _register<%= firstToUpper(name) %>(val)
-          @<%= name %> = [] unless @<%= name %>
+          @<%= name %> = [] unless defined?(@<%= name %>)
           @<%= name %>.push val
           <% if props.reference? && props.value(:containment) %>
             val._set_container(self, :<%= name %>)

data/lib/rgen/metamodel_builder/builder_runtime.rb

@@ -58,14 +58,17 @@ module BuilderRuntime
     end
   end
 
-	def getGeneric(role)
-		send("get#{firstToUpper(role.to_s)}")
-	end
+  alias getGeneric send
 
   def getGenericAsArray(role)
     result = getGeneric(role)
-    result = [result].compact unless result.is_a?(Array)
-    result
+    if result.nil?
+      []
+    elsif result.is_a?(Array)
+      result
+    else
+      [result]
+    end
   end
 
   def eIsSet(role)
@@ -100,6 +103,10 @@ module BuilderRuntime
 
   # if a block is given, calls the block on every contained element in depth first order. 
   # if the block returns :prune, recursion will stop at this point.
+  # 
+  # BEWARE of concurrent modification of contained elements while iterating!
+  # (adding/removing containers or contained elements)
+  # if you need to do such modifications, use the variant without a block instead.
   #
   # if no block is given builds and returns a list of all contained elements.
   #

data/test/array_extensions_test.rb

@@ -1,9 +1,9 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/array_extensions'
 
-class ArrayExtensionsTest < Test::Unit::TestCase
+class ArrayExtensionsTest < MiniTest::Test
 
   def test_element_methods
     c = Struct.new("SomeClass",:name,:age)
@@ -11,11 +11,11 @@ class ArrayExtensionsTest < Test::Unit::TestCase
     a << c.new('MyName',33)
     a << c.new('YourName',22)
     assert_equal ["MyName", "YourName"], a >> :name
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       a.name
     end
     assert_equal [33, 22], a>>:age
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       a.age
     end
     # unfortunately, any method can be called on an empty array
@@ -42,11 +42,11 @@ class ArrayExtensionsTest < Test::Unit::TestCase
     # put something into the array that is not an MMBase
     a << "not a MMBase"
     # the dot operator will tell that there is something not a MMBase
-    assert_raise StandardError do
+    assert_raises StandardError do
       a.age
     end
     # the >> operator will try to call the method anyway
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       a >> :age
     end
   end
@@ -56,7 +56,7 @@ class ArrayExtensionsTest < Test::Unit::TestCase
   end
 
   def test_to_str_on_empty_array
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       [].to_str
     end
   end

data/test/ea_instantiator_test.rb

@@ -1,6 +1,6 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/environment'
 require 'metamodels/uml13_metamodel'
 require 'ea_support/ea_support'
@@ -9,7 +9,7 @@ require 'testmodel/class_model_checker'
 require 'testmodel/object_model_checker'
 require 'testmodel/ecore_model_checker'
 
-class EAInstantiatorTest < Test::Unit::TestCase
+class EAInstantiatorTest < MiniTest::Test
 
     include Testmodel::ClassModelChecker
     include Testmodel::ObjectModelChecker

data/test/ea_serializer_test.rb

@@ -1,12 +1,12 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/environment'
 require 'metamodels/uml13_metamodel'
 require 'ea_support/ea_support'
 require 'rgen/serializer/xmi11_serializer'
 
-class EASerializerTest < Test::Unit::TestCase
+class EASerializerTest < MiniTest::Test
 
 	MODEL_DIR = File.join(File.dirname(__FILE__),"testmodel")
 	TEST_DIR = File.join(File.dirname(__FILE__),"ea_serializer_test")

data/test/ecore_self_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 ECoreSelfTest < Test::Unit::TestCase
+class ECoreSelfTest < MiniTest::Test
   include RGen::ECore
   
   def test_simple

data/test/ecore_to_ruby_test.rb

@@ -1,12 +1,12 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/environment'
 require 'rgen/ecore/ecore'
 require 'rgen/ecore/ecore_ext'
 require 'rgen/ecore/ecore_to_ruby'
 
-class ECoreToRubyTest < Test::Unit::TestCase
+class ECoreToRubyTest < MiniTest::Test
 
 module ContainerSimple
 end

data/test/environment_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/environment'
 require 'rgen/metamodel_builder'
 
-class EnvironmentTest < Test::Unit::TestCase
+class EnvironmentTest < MiniTest::Test
 
 	class Model
 		attr_accessor :name

data/test/json_test.rb

@@ -1,12 +1,12 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/environment'
 require 'rgen/metamodel_builder'
 require 'rgen/serializer/json_serializer'
 require 'rgen/instantiator/json_instantiator'
 
-class JsonTest < Test::Unit::TestCase
+class JsonTest < MiniTest::Test
 
   module TestMM
     extend RGen::MetamodelBuilder::ModuleExtension
@@ -61,7 +61,7 @@ class JsonTest < Test::Unit::TestCase
     inst.instantiate(%q({ "_class": "TestNode", "text": "some text", "childs": [ 
   { "_class": "TestNode", "text": "child" }] }))
     root = env.find(:class => TestMM::TestNode, :text => "some text").first
-    assert_not_nil root
+    assert root != nil
     assert_equal 1, root.childs.size
     assert_equal TestMM::TestNode, root.childs.first.class
     assert_equal "child", root.childs.first.text
@@ -149,7 +149,7 @@ class JsonTest < Test::Unit::TestCase
   def test_json_instantiator_subpackage_no_shortname_opt
     env = RGen::Environment.new
     inst = RGen::Instantiator::JsonInstantiator.new(env, TestMMSubpackage, :short_class_names => false)
-    assert_raise RuntimeError do
+    assert_raises RuntimeError do
       inst.instantiate(%q({ "_class": "Data2", "data2": "something" }))
     end
   end

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
@@ -272,7 +280,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     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