rgen 0.3.0 → 0.4.0

data/test/metamodel_roundtrip_test.rb

@@ -0,0 +1,52 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'test/unit'
+require 'rgen/array_extensions'
+require 'rgen/model_comparator'
+require 'mmgen/metamodel_generator'
+require 'rgen/instantiator/ecore_xml_instantiator'
+
+class MetamodelGeneratorTest < Test::Unit::TestCase
+  
+  TEST_DIR = File.dirname(__FILE__)+"/metamodel_roundtrip_test"
+  
+  include MMGen::MetamodelGenerator
+  include RGen::ModelComparator
+  
+  module Regenerated
+    Inside = binding
+  end
+  
+  def test_generator
+    require TEST_DIR+"/TestModel.rb"
+    outfile = TEST_DIR+"/TestModel_Regenerated.rb"		
+    generateMetamodel(HouseMetamodel.ecore, outfile)
+    
+    File.open(outfile) do |f|
+      eval(f.read, Regenerated::Inside)
+    end
+    
+    assert modelEqual?(HouseMetamodel.ecore, Regenerated::HouseMetamodel.ecore, ["instanceClassName"])
+  end
+  
+  module UMLRegenerated
+    Inside = binding
+  end
+  
+  def test_generate_from_ecore
+    outfile = TEST_DIR+"/houseMetamodel_from_ecore.rb"
+
+    env = RGen::Environment.new
+    File.open(TEST_DIR+"/houseMetamodel.ecore") { |f|
+      ECoreXMLInstantiator.new(env).instantiate(f.read)
+    }
+    rootpackage = env.find(:class => RGen::ECore::EPackage).first
+    rootpackage.name = "HouseMetamodel"
+    generateMetamodel(rootpackage, outfile)
+    
+    File.open(outfile) do |f|
+      eval(f.read, UMLRegenerated::Inside, "test_eval", 0)
+    end
+  end
+  
+end

data/test/metamodel_roundtrip_test/TestModel.rb

@@ -0,0 +1,65 @@
+require 'rgen/metamodel_builder'
+
+module HouseMetamodel
+  extend RGen::MetamodelBuilder::ModuleExtension
+  include RGen::MetamodelBuilder::DataTypes
+  
+  # TODO: Datatypes
+  #   AggregationKind = Enum.new([ :none, :aggregate, :composite ])
+  
+  class MeetingPlace < RGen::MetamodelBuilder::MMBase
+    annotation :source => "testmodel", :details => { 'complexity' => '1', 'date_created' => '2006-07-12 08:40:46', 'date_modified' => '2006-07-12 08:44:02', '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' }
+  end
+  
+  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'
+  end
+  
+  class House < RGen::MetamodelBuilder::MMBase
+    annotation       'complexity' => '1', 'date_created' => '2005-09-16 19:52:18', 'date_modified' => '2006-02-28 08:29:19', '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', 'stereotype' => 'dummy', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+    has_attr 'size', Integer
+    has_attr 'module'
+    has_attr 'address', String, :changeable => false      do
+      annotation          'collection' => 'false', 'containment' => 'Not Specified', 'derived' => '0', 'duplicates' => '0', 'ea_guid' => '{A8DF581B-9AC6-4f75-AB48-8FAEDFC6E068}', 'lowerBound' => '1', 'ordered' => '0', 'position' => '0', 'styleex' => 'volatile=0;', 'type' => 'String', 'upperBound' => '1'
+    end
+    
+  end
+  
+  
+  module Rooms
+    extend RGen::MetamodelBuilder::ModuleExtension
+    
+    
+    class Room < RGen::MetamodelBuilder::MMBase
+      annotation          'complexity' => '1', 'date_created' => '2005-09-16 19:52:28', 'date_modified' => '2006-06-22 21:15:25', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', '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'
+    end
+    
+    class Bathroom < Room
+      annotation          'complexity' => '1', 'date_created' => '2006-06-27 08:32:25', 'date_modified' => '2006-06-27 08:34:23', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', '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'
+    end
+    
+    class Kitchen < RGen::MetamodelBuilder::MMMultiple(HouseMetamodel::MeetingPlace, Room)
+      annotation          'complexity' => '1', 'date_created' => '2005-11-30 19:26:13', 'date_modified' => '2006-06-22 21:15:34', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', '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'
+    end
+    
+  end
+  
+  module DependingOnRooms
+    extend RGen::MetamodelBuilder::ModuleExtension
+    class RoomSub < Rooms::Room
+    end
+  end
+end
+
+HouseMetamodel::Person.has_many 'home', HouseMetamodel::House do
+  annotation    'containment' => 'Unspecified'
+end
+HouseMetamodel::House.has_one 'bathroom', HouseMetamodel::Rooms::Bathroom, :lowerBound => 1, :transient => true
+HouseMetamodel::House.one_to_one 'kitchen', HouseMetamodel::Rooms::Kitchen, 'house', :lowerBound => 1, :opposite_lowerBound => 1 do
+  annotation    'containment' => 'Unspecified'
+  opposite_annotation    'containment' => 'Unspecified'
+end
+HouseMetamodel::House.contains_many 'room', HouseMetamodel::Rooms::Room, 'house', :lowerBound => 1 do
+  # only an opposite annotation
+  opposite_annotation    'containment' => 'Unspecified'
+end

data/test/metamodel_roundtrip_test/TestModel_Regenerated.rb

@@ -0,0 +1,64 @@
+require 'rgen/metamodel_builder'
+
+module HouseMetamodel
+   extend RGen::MetamodelBuilder::ModuleExtension
+   include RGen::MetamodelBuilder::DataTypes
+
+
+   module Rooms
+      extend RGen::MetamodelBuilder::ModuleExtension
+      include RGen::MetamodelBuilder::DataTypes
+
+   end
+
+   module DependingOnRooms
+      extend RGen::MetamodelBuilder::ModuleExtension
+      include RGen::MetamodelBuilder::DataTypes
+
+   end
+end
+
+class HouseMetamodel::House < RGen::MetamodelBuilder::MMBase
+   annotation    'complexity' => '1', 'date_created' => '2005-09-16 19:52:18', 'date_modified' => '2006-02-28 08:29:19', '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', 'stereotype' => 'dummy', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+   has_attr 'size', Integer 
+   has_attr 'module', String 
+   has_attr 'address', String, :changeable => false do
+      annotation       'collection' => 'false', 'containment' => 'Not Specified', 'derived' => '0', 'duplicates' => '0', 'ea_guid' => '{A8DF581B-9AC6-4f75-AB48-8FAEDFC6E068}', 'lowerBound' => '1', 'ordered' => '0', 'position' => '0', 'styleex' => 'volatile=0;', 'type' => 'String', 'upperBound' => '1'
+   end
+end
+
+class HouseMetamodel::MeetingPlace < RGen::MetamodelBuilder::MMBase
+   annotation :source => "testmodel", :details => {'complexity' => '1', 'date_created' => '2006-07-12 08:40:46', 'date_modified' => '2006-07-12 08:44:02', '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'}
+end
+
+class HouseMetamodel::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'
+end
+
+class HouseMetamodel::Rooms::Room < RGen::MetamodelBuilder::MMBase
+   annotation    'complexity' => '1', 'date_created' => '2005-09-16 19:52:28', 'date_modified' => '2006-06-22 21:15:25', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', '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'
+end
+
+class HouseMetamodel::Rooms::Kitchen < RGen::MetamodelBuilder::MMMultiple(HouseMetamodel::MeetingPlace, HouseMetamodel::Rooms::Room)
+   annotation    'complexity' => '1', 'date_created' => '2005-11-30 19:26:13', 'date_modified' => '2006-06-22 21:15:34', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', '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'
+end
+
+class HouseMetamodel::Rooms::Bathroom < HouseMetamodel::Rooms::Room
+   annotation    'complexity' => '1', 'date_created' => '2006-06-27 08:32:25', 'date_modified' => '2006-06-27 08:34:23', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', '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'
+end
+
+class HouseMetamodel::DependingOnRooms::RoomSub < HouseMetamodel::Rooms::Room
+end
+
+
+HouseMetamodel::House.has_one 'bathroom', HouseMetamodel::Rooms::Bathroom, :transient => true, :lowerBound => 1 
+HouseMetamodel::House.one_to_one 'kitchen', HouseMetamodel::Rooms::Kitchen, 'house', :lowerBound => 1, :opposite_lowerBound => 1 do
+   annotation    'containment' => 'Unspecified'
+   opposite_annotation    'containment' => 'Unspecified'
+end
+HouseMetamodel::House.contains_many 'room', HouseMetamodel::Rooms::Room, 'house', :lowerBound => 1 do
+   opposite_annotation    'containment' => 'Unspecified'
+end
+HouseMetamodel::Person.has_many 'home', HouseMetamodel::House do
+   annotation    'containment' => 'Unspecified'
+end

data/test/metamodel_roundtrip_test/houseMetamodel.ecore

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    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" name="HouseMetamodel">
+  <eClassifiers xsi:type="ecore:EClass" name="House">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" eType="#//String"
+        changeable="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="bathroom" lowerBound="1"
+        eType="#//Rooms/Bathroom"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="kitchen" lowerBound="1"
+        eType="#//Rooms/Kitchen" eOpposite="#//Rooms/Kitchen/house"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="room" upperBound="-1" eType="#//Rooms/Room"
+        containment="true" eOpposite="#//Rooms/Room/house"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="MeetingPlace"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Person">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="house" upperBound="-1"
+        eType="#//House"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="String" instanceClassName="java.lang.String"/>
+  <eSubpackages name="Rooms">
+    <eClassifiers xsi:type="ecore:EClass" name="Room">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="house" eType="#//House"
+          defaultValueLiteral="" eOpposite="#//House/room"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Bathroom" eSuperTypes="#//Rooms/Room"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Kitchen" eSuperTypes="#//Rooms/Room #//MeetingPlace">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="house" eType="#//House"
+          eOpposite="#//House/kitchen"/>
+    </eClassifiers>
+  </eSubpackages>
+</ecore:EPackage>

data/test/metamodel_roundtrip_test/houseMetamodel_from_ecore.rb

@@ -0,0 +1,39 @@
+require 'rgen/metamodel_builder'
+
+module HouseMetamodel
+   extend RGen::MetamodelBuilder::ModuleExtension
+   include RGen::MetamodelBuilder::DataTypes
+
+
+   class House < RGen::MetamodelBuilder::MMBase
+      has_attr 'address', String, :ordered => :true, :unique => :true, :changeable => false, :volatile => :false, :transient => :false, :unsettable => :false, :derived => :false 
+   end
+
+   class MeetingPlace < RGen::MetamodelBuilder::MMBase
+   end
+
+   class Person < RGen::MetamodelBuilder::MMBase
+   end
+
+
+   module Rooms
+      extend RGen::MetamodelBuilder::ModuleExtension
+      include RGen::MetamodelBuilder::DataTypes
+
+
+      class Room < RGen::MetamodelBuilder::MMBase
+      end
+
+      class Bathroom < Room
+      end
+
+      class Kitchen < RGen::MetamodelBuilder::MMMultiple(Room, HouseMetamodel::MeetingPlace)
+      end
+
+   end
+end
+
+HouseMetamodel::House.contains_one_uni 'bathroom', HouseMetamodel::Rooms::Bathroom, :ordered => true, :unique => true, :changeable => true, :volatile => false, :transient => false, :unsettable => false, :derived => false, :lowerBound => 1, :resolveProxies => true 
+HouseMetamodel::Rooms::Kitchen.contains_one 'house', HouseMetamodel::House, 'kitchen', :ordered => true, :unique => true, :changeable => true, :volatile => false, :transient => false, :unsettable => false, :derived => false, :resolveProxies => true, :opposite_ordered => true, :opposite_unique => true, :opposite_changeable => true, :opposite_volatile => false, :opposite_transient => false, :opposite_unsettable => false, :opposite_derived => false, :opposite_lowerBound => 1, :opposite_resolveProxies => true 
+HouseMetamodel::Rooms::Room.many_to_one 'house', HouseMetamodel::House, 'room', :ordered => true, :unique => true, :changeable => true, :volatile => false, :transient => false, :unsettable => false, :derived => false, :resolveProxies => true, :opposite_ordered => true, :opposite_unique => true, :opposite_changeable => true, :opposite_volatile => false, :opposite_transient => false, :opposite_unsettable => false, :opposite_derived => false, :opposite_resolveProxies => true 
+HouseMetamodel::Person.contains_many_uni 'house', HouseMetamodel::House, :ordered => true, :unique => true, :changeable => true, :volatile => false, :transient => false, :unsettable => false, :derived => false, :resolveProxies => true 

data/test/rgen_test.rb

@@ -3,12 +3,12 @@ $:.unshift File.dirname(__FILE__)
 require 'test/unit'
 
 require 'array_extensions_test'
+require 'ea_instantiator_test'
+require 'ecore_self_test'
 require 'environment_test'
 require 'metamodel_builder_test'
+require 'metamodel_roundtrip_test'
 require 'output_handler_test'
 require 'template_language_test'
-require 'xmi_class_instantiator_test'
-require 'xmi_object_instantiator_test'
-require 'metamodel_generator_test'
 require 'transformer_test'
 require 'xml_instantiator_test'

data/test/template_language_test.rb

@@ -2,45 +2,71 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
 require 'test/unit'
 require 'rgen/template_language'
+require 'rgen/metamodel_builder'
 
 class TemplateContainerTest < Test::Unit::TestCase
-
-	TEMPLATES_DIR = File.dirname(__FILE__)+"/template_language_test/templates"
-	OUTPUT_DIR = File.dirname(__FILE__)+"/template_language_test"
-	
-	module MyMM
-	
-	class Chapter
-		attr_reader :title
-		def initialize(title)
-			@title = title
-		end
-	end
-
-	class Document
-		attr_reader :title, :author, :chapters
-		def initialize(title, author)
-			@title, @author = title, author
-			@chapters = []
-		end
-	end
-	
-	end
-	
-	TEST_MODEL = MyMM::Document.new("SomeDocument","MyName")
-	TEST_MODEL.chapters << MyMM::Chapter.new("Intro")
-	TEST_MODEL.chapters << MyMM::Chapter.new("MainPart")
-	TEST_MODEL.chapters << MyMM::Chapter.new("Summary")
-	
-	def test_with_model
-		tc = RGen::TemplateLanguage::DirectoryTemplateContainer.new(MyMM, OUTPUT_DIR)
-		tc.load(TEMPLATES_DIR)
-		File.delete(OUTPUT_DIR+"/testout.txt") if File.exists? OUTPUT_DIR+"/testout.txt"
-		tc.expand('root::Root', :for => TEST_MODEL, :indent => 1)
-		result = expected = ""
-		File.open(OUTPUT_DIR+"/testout.txt") {|f| result = f.read}
-		File.open(OUTPUT_DIR+"/expected_result.txt") {|f| expected = f.read}
-		assert_equal expected, result
-	end
-	
+  
+  TEMPLATES_DIR = File.dirname(__FILE__)+"/template_language_test/templates"
+  OUTPUT_DIR = File.dirname(__FILE__)+"/template_language_test"
+  
+  module MyMM
+    
+    class Chapter
+      attr_reader :title
+      def initialize(title)
+        @title = title
+      end
+    end
+    
+    class Document
+      attr_reader :title, :authors, :chapters
+      attr_accessor :sampleArray
+      def initialize(title)
+        @title = title
+        @chapters = []
+        @authors = []
+      end
+    end
+    
+    class Author
+      attr_reader :name, :email
+      def initialize(name, email)
+        @name, @email = name, email
+      end      
+    end
+    
+  end
+  
+  module CCodeMM
+    class CArray < RGen::MetamodelBuilder::MMBase
+      has_attr 'name'
+      has_attr 'size', Integer
+      has_attr 'type'
+    end
+    class PrimitiveInitValue < RGen::MetamodelBuilder::MMBase
+      has_attr 'value', Integer
+    end
+    CArray.has_many 'initvalue', PrimitiveInitValue
+  end
+  
+  TEST_MODEL = MyMM::Document.new("SomeDocument")
+  TEST_MODEL.authors << MyMM::Author.new("Martin", "martin@somewhe.re")
+  TEST_MODEL.authors << MyMM::Author.new("Otherguy", "other@somewhereel.se")
+  TEST_MODEL.chapters << MyMM::Chapter.new("Intro")
+  TEST_MODEL.chapters << MyMM::Chapter.new("MainPart")
+  TEST_MODEL.chapters << MyMM::Chapter.new("Summary")
+  TEST_MODEL.sampleArray = CCodeMM::CArray.new(:name => "myArray", :type => "int", :size => 5,
+    :initvalue => (1..5).collect { |v| CCodeMM::PrimitiveInitValue.new(:value => v) })
+  
+  def test_with_model
+    tc = RGen::TemplateLanguage::DirectoryTemplateContainer.new([MyMM, CCodeMM], OUTPUT_DIR)
+    tc.load(TEMPLATES_DIR)
+    File.delete(OUTPUT_DIR+"/testout.txt") if File.exists? OUTPUT_DIR+"/testout.txt"
+    tc.expand('root::Root', :for => TEST_MODEL, :indent => 1)
+    result = expected = ""
+    File.open(OUTPUT_DIR+"/testout.txt") {|f| result = f.read}
+    File.open(OUTPUT_DIR+"/expected_result.txt") {|f| expected = f.read}
+    assert_equal expected, result
+  end
+  
 end

data/test/template_language_test/expected_result.txt

@@ -1,10 +1,31 @@
    Document: SomeDocument
+
+      by       Martin, EMail: martin(at)somewhe.re and       Otherguy, EMail: other(at)somewhereel.se
+
    Index:
       1 Intro in SomeDocument
       2 MainPart in SomeDocument
       3 Summary in SomeDocument
-   by MyName
+
    ----------------
-   *** Intro ***
-   *** MainPart ***
+
+   Chapters in one line:
+   *** Intro ***, *** MainPart ***, *** Summary ***
+
+   Chapters each in one line:
+   *** Intro ***,
+   *** MainPart ***,
    *** Summary ***
+
+   Here are some code examples:
+   Text from Root
+   Text from Root
+   int myArray[5] = {
+      1,
+      2,
+      3,
+      4,
+      5
+   };
+   Text from Root
+   Text from Root

data/test/template_language_test/templates/code/array.tpl

@@ -0,0 +1,11 @@
+<% define 'ArrayDefinition', :for => CArray do %>
+  <%= getType %> <%= name %>[<%= size %>] = {<%iinc%>
+    <% expand 'InitValue', :foreach => initvalue, :separator => ",\n" %><%nl%><%idec%>
+  };
+  <% expand '../root::TextFromRoot' %>
+  <% expand '/root::TextFromRoot' %>
+<% end %>
+
+<% define 'InitValue', :for => PrimitiveInitValue do %>
+  <%= value %><%nows%>
+<% end %>

data/test/template_language_test/templates/content/author.tpl

@@ -0,0 +1,7 @@
+<% define 'Author', :for => Author do %>
+	<% expand 'SubAuthor' %>
+<% end %>
+
+<% define 'SubAuthor', :for => Author do %>
+	<%= name %>, EMail: <%= email.sub('@','(at)') %><%nows%>
+<% end %>

data/test/template_language_test/templates/content/chapter.tpl

@@ -1,5 +1,5 @@
 <% define 'Root', :for => Chapter do %>
- *** <%= title %> ***
+ *** <%= title %> ***<%nows%>
  
 
 <% end %>