rgen 0.5.1 → 0.5.2

data/lib/rgen/serializer/xmi20_serializer.rb

@@ -7,7 +7,9 @@ module Serializer
 class XMI20Serializer < XMLSerializer
 
 	def serialize(rootElement)
+		@referenceStrings = {}
 		buildReferenceStrings(rootElement, "#/")
+    addBuiltinReferenceStrings
 		attrs = attributeHash(rootElement)
 		attrs['xmi:version'] = "2.0"
 		attrs['xmlns:xmi'] = "http://www.omg.org/XMI"
@@ -36,7 +38,7 @@ class XMI20Serializer < XMLSerializer
 			val = element.getGeneric(a.name)
 			result[a.name] = val unless val.nil? || val == ""
 		end
-		eAllReferences(element).select{|r| !r.containment && !r.derived}.each do |r|
+		eAllReferences(element).select{|r| !r.containment && !(r.eOpposite && r.eOpposite.containment) && !r.derived}.each do |r|
 			targetElements = element.getGeneric(r.name)
 			targetElements = [targetElements] unless targetElements.is_a?(Array)
 			val = targetElements.collect{|te| @referenceStrings[te]}.compact.join(' ')
@@ -46,15 +48,24 @@ class XMI20Serializer < XMLSerializer
 	end
 	
 	def buildReferenceStrings(element, string)
-		@referenceStrings ||= {}
 		@referenceStrings[element] = string
 		eachReferencedElement(element, containmentReferences(element)) do |r,te|
 			buildReferenceStrings(te, string+"/"+te.name) if te.respond_to?(:name)
 		end
 	end
 
+  def addBuiltinReferenceStrings
+    pre = "ecore:EDataType http://www.eclipse.org/emf/2002/Ecore"
+    @referenceStrings[RGen::ECore::EString] = pre+"#//EString"
+    @referenceStrings[RGen::ECore::EInt] = pre+"#//EInt"
+    @referenceStrings[RGen::ECore::EFloat] = pre+"#//EFloat"
+    @referenceStrings[RGen::ECore::EBoolean] = pre+"#//EBoolean"
+    @referenceStrings[RGen::ECore::EJavaObject] = pre+"#//EJavaObject"
+    @referenceStrings[RGen::ECore::EJavaClass] = pre+"#//EJavaClass"
+  end
+
 end
 
 end
 
-end
+end

data/test/json_test.rb

@@ -0,0 +1,91 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'test/unit'
+require 'rgen/environment'
+require 'rgen/metamodel_builder'
+require 'rgen/serializer/json_serializer'
+require 'rgen/instantiator/json_instantiator'
+
+class JsonTest < Test::Unit::TestCase
+
+  module TestMM
+    extend RGen::MetamodelBuilder::ModuleExtension
+    class TestNode < RGen::MetamodelBuilder::MMBase
+      has_attr 'text', String
+      has_attr 'integer', Integer
+      has_attr 'float', Float
+      contains_many 'childs', TestNode, 'parent'
+    end
+  end
+
+  class StringWriter < String
+    alias write concat
+  end
+
+  def test_json_serializer
+    testModel = TestMM::TestNode.new(:text => "some text", :childs => [
+      TestMM::TestNode.new(:text => "child")])
+
+    output = StringWriter.new
+    ser = RGen::Serializer::JsonSerializer.new(output)
+
+    assert_equal %q({ "_class": "TestNode", "text": "some text", "childs": [ 
+  { "_class": "TestNode", "text": "child" }] }), ser.serialize(testModel)
+  end
+
+  def test_json_instantiator
+    env = RGen::Environment.new
+    inst = RGen::Instantiator::JsonInstantiator.new(env, TestMM)
+    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_equal 1, root.childs.size
+    assert_equal TestMM::TestNode, root.childs.first.class
+    assert_equal "child", root.childs.first.text
+  end
+
+  def test_json_serializer_escapes
+    testModel = TestMM::TestNode.new(:text => %q(some " \ \" text))
+    output = StringWriter.new
+    ser = RGen::Serializer::JsonSerializer.new(output)
+
+    assert_equal %q({ "_class": "TestNode", "text": "some \" \\ \\\" text" }), ser.serialize(testModel) 
+  end
+   
+  def test_json_instantiator_escapes
+    env = RGen::Environment.new
+    inst = RGen::Instantiator::JsonInstantiator.new(env, TestMM)
+    inst.instantiate(%q({ "_class": "TestNode", "text": "some \" \\ \\\\\" text" }))
+    assert_equal %q(some " \ \" text), env.elements.first.text
+  end
+
+  def test_json_serializer_integer
+    testModel = TestMM::TestNode.new(:integer => 7)
+    output = StringWriter.new
+    ser = RGen::Serializer::JsonSerializer.new(output)
+    assert_equal %q({ "_class": "TestNode", "integer": 7 }), ser.serialize(testModel) 
+  end
+
+  def test_json_instantiator_integer
+    env = RGen::Environment.new
+    inst = RGen::Instantiator::JsonInstantiator.new(env, TestMM)
+    inst.instantiate(%q({ "_class": "TestNode", "integer": 7 }))
+    assert_equal 7, env.elements.first.integer
+  end
+
+  def test_json_serializer_float
+    testModel = TestMM::TestNode.new(:float => 1.23)
+    output = StringWriter.new
+    ser = RGen::Serializer::JsonSerializer.new(output)
+    assert_equal %q({ "_class": "TestNode", "float": 1.23 }), ser.serialize(testModel) 
+  end
+
+  def test_json_instantiator_float
+    env = RGen::Environment.new
+    inst = RGen::Instantiator::JsonInstantiator.new(env, TestMM)
+    inst.instantiate(%q({ "_class": "TestNode", "float": 1.23 }))
+    assert_equal 1.23, env.elements.first.float
+  end
+end
+	

data/test/metamodel_builder_test.rb

@@ -73,6 +73,76 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     assert_equal ["extended", "simple"], enum.eLiterals.name.sort
   end
   
+  class ManyAttrClass < RGen::MetamodelBuilder::MMBase
+    has_many_attr 'literals', String
+    has_many_attr 'bools', Boolean
+    has_many_attr 'integers', Integer
+    has_many_attr 'enums', RGen::MetamodelBuilder::DataTypes::Enum.new([:a, :b, :c])
+    has_many_attr 'limitTest', Integer, :upperBound => 2
+  end
+
+  def test_many_attr
+    o = ManyAttrClass.new
+
+    assert_respond_to o, :literals
+    assert_respond_to o, :addLiterals
+    assert_respond_to o, :removeLiterals
+
+    assert_raise(StandardError) do
+      o.addLiterals(1)
+    end
+
+    assert_equal [], o.literals
+    o.addLiterals("a")
+    assert_equal ["a"], o.literals
+    o.addLiterals("b")
+    assert_equal ["a", "b"], o.literals
+    # check for duplicates works by object identity, so there can be two strings "b"
+    o.addLiterals("b")
+    assert_equal ["a", "b", "b"], o.literals
+    # but the same string object "a" can only occur once
+    o.addLiterals(o.literals.first)
+    assert_equal ["a", "b", "b"], o.literals
+    # removing works by object identity, so providing a new string won't delete an existing one
+    o.removeLiterals("a")
+    assert_equal ["a", "b", "b"], o.literals
+    theA = o.literals.first
+    o.removeLiterals(theA)
+    assert_equal ["b", "b"], o.literals
+    # removing something which is not present has no effect
+    o.removeLiterals(theA)
+    assert_equal ["b", "b"], o.literals
+    o.removeLiterals(o.literals.first)
+    assert_equal ["b"], o.literals
+    o.removeLiterals(o.literals.first)
+    assert_equal [], o.literals
+  
+    # setting multiple elements at a time
+    o.literals = ["a", "b", "c"]
+    assert_equal ["a", "b", "c"], o.literals
+    # can only take arrays
+    assert_raise(StandardError) do
+      o.literals = "a"
+    end
+ 
+    o.bools = [true, false, true, false]
+    assert_equal [true, false], o.bools
+
+    o.integers = [1, 2, 2, 3, 3]
+    assert_equal [1, 2, 3], o.integers
+
+    o.enums = [:a, :a, :b, :c, :c]
+    assert_equal [:a, :b, :c], o.enums
+
+    lit = ManyAttrClass.ecore.eAttributes.find{|a| a.name == "literals"}
+    assert lit.is_a?(RGen::ECore::EAttribute)
+    assert lit.many
+
+    lim = ManyAttrClass.ecore.eAttributes.find{|a| a.name == "limitTest"}
+    assert lit.many
+    assert_equal 2, lim.upperBound
+  end
+
   class ClassA < RGen::MetamodelBuilder::MMBase
     # metamodel accessors must work independent of the ==() method
     module ClassModule
@@ -493,5 +563,129 @@ class MetamodelBuilderTest < Test::Unit::TestCase
 		somePackage = SomePackage.ecore
 		assert_equal somePackage.eSubpackages.first.object_id, subPackage.object_id
 	end
+
+  def test_proxy
+    p = RGen::MetamodelBuilder::MMProxy.new("test")
+    assert_equal "test", p.targetIdentifier
+    p.targetIdentifier = 123
+    assert_equal 123, p.targetIdentifier
+  end
+ 
+  def test_proxies_has_one
+    e = HasOneTestClass.new 
+    proxy = RGen::MetamodelBuilder::MMProxy.new
+    e.classA = proxy
+    assert_equal proxy, e.classA
+    a = ClassA.new 
+    # displace proxy
+    e.classA = a
+    assert_equal a, e.classA
+    # displace by proxy
+    e.classA = proxy
+    assert_equal proxy, e.classA
+  end
+
+  def test_proxies_has_many
+    e = HasManyTestClass.new
+    proxy = RGen::MetamodelBuilder::MMProxy.new
+    e.addClassA(proxy)
+    assert_equal [proxy], e.classA 
+    # again
+    e.addClassA(proxy)
+    assert_equal [proxy], e.classA 
+    proxy2 = RGen::MetamodelBuilder::MMProxy.new
+    e.addClassA(proxy2)
+    assert_equal [proxy, proxy2], e.classA 
+    e.removeClassA(proxy)
+    assert_equal [proxy2], e.classA
+    # again
+    e.removeClassA(proxy)
+    assert_equal [proxy2], e.classA 
+    e.removeClassA(proxy2)
+    assert_equal [], e.classA 
+  end
+
+  def test_proxies_one_to_one
+    ea = AClassOO.new
+    eb = BClassOO.new
+    proxy1 = RGen::MetamodelBuilder::MMProxy.new
+    proxy2 = RGen::MetamodelBuilder::MMProxy.new
+    ea.bClass = proxy1
+    eb.aClass = proxy2
+    assert_equal proxy1, ea.bClass
+    assert_equal proxy2, eb.aClass
+    # displace proxies
+    ea.bClass = eb
+    assert_equal eb, ea.bClass
+    assert_equal ea, eb.aClass
+    # displace by proxy
+    ea.bClass = proxy1
+    assert_equal proxy1, ea.bClass
+    assert_nil eb.aClass
+  end
+
+  def test_proxies_one_to_many
+    eo = OneClass.new
+    em = ManyClass.new
+    proxy1 = RGen::MetamodelBuilder::MMProxy.new
+    proxy2 = RGen::MetamodelBuilder::MMProxy.new
+    eo.addManyClasses(proxy1)
+    assert_equal [proxy1], eo.manyClasses
+    em.oneClass = proxy2
+    assert_equal proxy2, em.oneClass
+    # displace proxies at many side
+    # adding em will set em.oneClass to eo and displace the proxy from em.oneClass
+    eo.addManyClasses(em)
+    assert_equal [proxy1, em], eo.manyClasses
+    assert_equal eo, em.oneClass
+    eo.removeManyClasses(proxy1)
+    assert_equal [em], eo.manyClasses
+    assert_equal eo, em.oneClass
+    # displace by proxy
+    em.oneClass = proxy2
+    assert_equal [], eo.manyClasses
+    assert_equal proxy2, em.oneClass
+    # displace proxies at one side
+    em.oneClass = eo
+    assert_equal [em], eo.manyClasses
+    assert_equal eo, em.oneClass
+  end
+
+  def test_proxies_many_to_many
+    e1 = AClassMM.new
+    e2 = BClassMM.new
+    proxy1 = RGen::MetamodelBuilder::MMProxy.new
+    proxy2 = RGen::MetamodelBuilder::MMProxy.new
+    e1.addBClasses(proxy1)
+    e2.addAClasses(proxy2)
+    assert_equal [proxy1], e1.bClasses
+    assert_equal [proxy2], e2.aClasses
+    e1.addBClasses(e2)
+    assert_equal [proxy1, e2], e1.bClasses
+    assert_equal [proxy2, e1], e2.aClasses
+    e1.removeBClasses(proxy1) 
+    e2.removeAClasses(proxy2) 
+    assert_equal [e2], e1.bClasses
+    assert_equal [e1], e2.aClasses
+  end
   
+  def test_genericAccess
+    e1 = OneClass.new
+    e2 = ManyClass.new
+    e3 = OneClass.new
+    e4 = ManyClass.new
+    # use on "many" feature
+    e1.setOrAddGeneric("manyClasses", e2)
+    assert_equal [e2], e1.manyClasses
+    assert_equal [e2], e1.getGeneric("manyClasses")
+    assert_equal [e2], e1.getGenericAsArray("manyClasses")
+    # use on "one" feature
+    e2.setOrAddGeneric("oneClass", e3)
+    assert_equal e3, e2.oneClass
+    assert_equal e3, e2.getGeneric("oneClass")
+    assert_equal [e3], e2.getGenericAsArray("oneClass")
+    assert_nil e4.getGeneric("oneClass")
+    assert_equal [], e4.getGenericAsArray("oneClass")
+  end
+
 end

data/test/metamodel_roundtrip_test.rb

@@ -7,7 +7,7 @@ require 'mmgen/metamodel_generator'
 require 'rgen/instantiator/ecore_xml_instantiator'
 require 'rgen/serializer/xmi20_serializer'
 
-class MetamodelGeneratorTest < Test::Unit::TestCase
+class MetamodelRoundtripTest < Test::Unit::TestCase
   
   TEST_DIR = File.dirname(__FILE__)+"/metamodel_roundtrip_test"
   
@@ -57,5 +57,39 @@ class MetamodelGeneratorTest < Test::Unit::TestCase
 	  	ser.serialize(HouseMetamodel.ecore)
 	 	end
   end
-  
-end
+ 
+  BuiltinTypesTestEcore = TEST_DIR+"/using_builtin_types.ecore"
+
+  def test_ecore_serializer_builtin_types
+    mm = RGen::ECore::EPackage.new(:name => "P1", :eClassifiers => [
+      RGen::ECore::EClass.new(:name => "C1", :eStructuralFeatures => [
+        RGen::ECore::EAttribute.new(:name => "a1", :eType => RGen::ECore::EString), 
+        RGen::ECore::EAttribute.new(:name => "a2", :eType => RGen::ECore::EInt), 
+        RGen::ECore::EAttribute.new(:name => "a3", :eType => RGen::ECore::EFloat), 
+        RGen::ECore::EAttribute.new(:name => "a4", :eType => RGen::ECore::EBoolean) 
+      ])
+    ])
+    outfile = TEST_DIR+"/using_builtin_types_serialized.ecore"
+    File.open(outfile, "w") do |f|
+      ser = RGen::Serializer::XMI20Serializer.new(f)
+      ser.serialize(mm)
+    end
+    assert_equal(File.read(BuiltinTypesTestEcore), File.read(outfile))
+  end
+
+  def test_ecore_instantiator_builtin_types
+    env = RGen::Environment.new
+    File.open(BuiltinTypesTestEcore) { |f|
+      ECoreXMLInstantiator.new(env).instantiate(f.read)
+    }
+    a1 = env.find(:class => RGen::ECore::EAttribute, :name => "a1").first
+    assert_equal(RGen::ECore::EString, a1.eType)
+    a2 = env.find(:class => RGen::ECore::EAttribute, :name => "a2").first
+    assert_equal(RGen::ECore::EInt, a2.eType)
+    a3 = env.find(:class => RGen::ECore::EAttribute, :name => "a3").first
+    assert_equal(RGen::ECore::EFloat, a3.eType)
+    a4 = env.find(:class => RGen::ECore::EAttribute, :name => "a4").first
+    assert_equal(RGen::ECore::EBoolean, a4.eType)
+  end
+
+end

data/test/metamodel_roundtrip_test/TestModel.rb

@@ -15,6 +15,7 @@ module HouseMetamodel
   class Person < RGen::MetamodelBuilder::MMBase
     annotation       'complexity' => '1', 'date_created' => '2006-06-27 08:34:23', 'date_modified' => '2006-06-27 08:34:26', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
   	has_attr 'sex', SexEnum
+    has_many_attr 'nicknames', String
   end
   
   class House < RGen::MetamodelBuilder::MMBase
@@ -65,4 +66,4 @@ end
 HouseMetamodel::House.contains_many 'room', HouseMetamodel::Rooms::Room, 'house', :lowerBound => 1 do
   # only an opposite annotation
   opposite_annotation    'containment' => 'Unspecified'
-end
+end

data/test/metamodel_roundtrip_test/houseMetamodel.ecore

@@ -20,6 +20,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="house" upperBound="-1"
         eType="#//House"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="sex" eType="#//SexEnum"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nicknames" upperBound="-1" eType="#//String"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="String" instanceClassName="java.lang.String"/>
   <eClassifiers xsi:type="ecore:EEnum" name="SexEnum">

data/test/metamodel_roundtrip_test/houseMetamodel_from_ecore.rb

@@ -16,6 +16,7 @@ module HouseMetamodel
 
    class Person < RGen::MetamodelBuilder::MMBase
       has_attr 'sex', HouseMetamodel::SexEnum 
+      has_many_attr 'nicknames', String 
    end
 
 

data/test/metamodel_roundtrip_test/using_builtin_types.ecore

@@ -0,0 +1,8 @@
+<ecore:EPackage xmi:version="2.0" name="P1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
+  <eClassifiers name="C1" xsi:type="ecore:EClass">
+    <eStructuralFeatures name="a1" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" unique="true"/>
+    <eStructuralFeatures name="a2" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" unique="true"/>
+    <eStructuralFeatures name="a3" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat" unique="true"/>
+    <eStructuralFeatures name="a4" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" unique="true"/>
+  </eClassifiers>
+</ecore:EPackage>

data/test/metamodel_roundtrip_test/using_builtin_types_serialized.ecore

@@ -0,0 +1,8 @@
+<ecore:EPackage xmi:version="2.0" name="P1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
+  <eClassifiers name="C1" xsi:type="ecore:EClass">
+    <eStructuralFeatures name="a1" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" unique="true"/>
+    <eStructuralFeatures name="a2" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" unique="true"/>
+    <eStructuralFeatures name="a3" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat" unique="true"/>
+    <eStructuralFeatures name="a4" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" unique="true"/>
+  </eClassifiers>
+</ecore:EPackage>

data/test/qualified_name_resolver_test.rb

@@ -0,0 +1,102 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'test/unit'
+require 'rgen/metamodel_builder'
+require 'rgen/instantiator/qualified_name_resolver'
+
+class QualifiedNameResolverTest < Test::Unit::TestCase
+
+  class TestNode < RGen::MetamodelBuilder::MMBase
+    has_attr 'name', String
+    has_one 'nextSibling', TestNode
+    contains_many 'children', TestNode, "parent"
+  end
+
+  class TestNode2 < RGen::MetamodelBuilder::MMBase
+    has_attr 'cname', String
+    has_one 'nextSibling', TestNode2
+    contains_many 'children', TestNode2, "parent"
+  end
+
+  class TestNode3 < RGen::MetamodelBuilder::MMBase
+    has_attr 'name', String
+    contains_one 'child', TestNode3, "parent"
+  end
+
+  def testModel
+    [TestNode.new(:name => "Root1", :children => [
+      TestNode.new(:name => "Sub11"),
+      TestNode.new(:name => "Sub12", :children => [
+        TestNode.new(:name => "Sub121")])]),
+     TestNode.new(:name => "Root2", :children => [
+      TestNode.new(:name => "Sub21", :children => [
+        TestNode.new(:name => "Sub211")])]),
+     TestNode.new(:name => "Root3"),
+     TestNode.new(:name => "Root3")
+     ]
+  end
+
+  def testModel2
+    [TestNode2.new(:cname => "Root1", :children => [
+      TestNode2.new(:cname => "Sub11")])]
+  end
+
+  def testModel3
+    [TestNode3.new(:name => "Root1", :child =>
+      TestNode3.new(:name => "Sub11", :child =>
+        TestNode3.new(:name => "Sub111")))]
+  end
+
+  def test_customNameAttribute
+    model = testModel2
+    res = RGen::Instantiator::QualifiedNameResolver.new(model, :nameAttribute => "cname")
+    assert_equal model[0], res.resolveIdentifier("/Root1")
+    assert_equal model[0].children[0], res.resolveIdentifier("/Root1/Sub11")
+  end
+
+  def test_customSeparator
+    model = testModel
+    res = RGen::Instantiator::QualifiedNameResolver.new(model, :separator => "|")
+    assert_equal model[0], res.resolveIdentifier("|Root1")
+    assert_nil res.resolveIdentifier("/Root1")
+    assert_equal model[0].children[0], res.resolveIdentifier("|Root1|Sub11")
+  end
+
+  def test_noLeadingSeparator
+    model = testModel
+    res = RGen::Instantiator::QualifiedNameResolver.new(model, :leadingSeparator => false)
+    assert_equal model[0], res.resolveIdentifier("Root1")
+    assert_nil res.resolveIdentifier("/Root1")
+    assert_equal model[0].children[0], res.resolveIdentifier("Root1/Sub11")
+  end
+    
+	def test_resolve
+    model = testModel
+    res = RGen::Instantiator::QualifiedNameResolver.new(model)
+    assert_equal model[0], res.resolveIdentifier("/Root1")
+    # again
+    assert_equal model[0], res.resolveIdentifier("/Root1")
+    assert_equal model[0].children[0], res.resolveIdentifier("/Root1/Sub11")
+    # again
+    assert_equal model[0].children[0], res.resolveIdentifier("/Root1/Sub11")
+    assert_equal model[0].children[1], res.resolveIdentifier("/Root1/Sub12")
+    assert_equal model[0].children[1].children[0], res.resolveIdentifier("/Root1/Sub12/Sub121")
+    assert_equal model[1], res.resolveIdentifier("/Root2")
+    assert_equal model[1].children[0], res.resolveIdentifier("/Root2/Sub21")
+    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")
+  end
+
+  def test_oneChild
+    model = testModel3
+    res = RGen::Instantiator::QualifiedNameResolver.new(model)
+    assert_equal model[0], res.resolveIdentifier("/Root1")
+    assert_equal model[0].child, res.resolveIdentifier("/Root1/Sub11")
+    assert_equal model[0].child.child, res.resolveIdentifier("/Root1/Sub11/Sub111")
+  end
+
+end
+