test/generators/test_generator.rb in reality-generators-1.3.0 vs test/generators/test_generator.rb in reality-generators-1.5.0

@@ -57,15 +57,15 @@
     def entity_map
       @entity_map ||= {}
     end
 
     def facet_enabled?(facet)
-      facet == :jpa ? !!@jpa : false
+      facet == :jpa ? !!self.jpa : false
     end
 
     def jpa
-      @jpa
+      @jpa ||= nil
     end
 
     def enable_jpa!
       @jpa = JpaRepository.new(self)
     end
@@ -88,11 +88,11 @@
     TestTemplateSetContainer.target_manager.target(:entity, :repository)
     TestTemplateSetContainer.target_manager.target(:attribute, :entity)
     TestTemplateSetContainer.target_manager.target(:unit, :repository, :facet_key => :jpa)
 
     targets = {}
-    TestTemplateSetContainer.generator.send(:collect_generation_targets, TestTemplateSetContainer, :repository, repository, repository, targets)
+    TestTemplateSetContainer.generator.send(:collect_generation_targets, :repository, repository, repository, targets)
 
     assert_equal true, targets.include?(:repository)
     assert_equal true, targets.include?(:entity)
     assert_equal true, targets.include?(:attribute)
     assert_equal 3, targets.size
@@ -117,20 +117,20 @@
     assert_equal 'MyRepo.MyEntityB.MyAttr4', targets[:attribute][3][1].qualified_name
 
     repository.enable_jpa!
 
     targets = {}
-    TestTemplateSetContainer.generator.send(:collect_generation_targets, TestTemplateSetContainer, :repository, repository, repository, targets)
+    TestTemplateSetContainer.generator.send(:collect_generation_targets, :repository, repository, repository, targets)
 
     # No units have been defined so no extra targets
     assert_equal 3, targets.size
 
     repository.jpa.unit(:MyUnit1)
     repository.jpa.unit(:MyUnit2)
 
     targets = {}
-    TestTemplateSetContainer.generator.send(:collect_generation_targets, TestTemplateSetContainer, :repository, repository, repository, targets)
+    TestTemplateSetContainer.generator.send(:collect_generation_targets, :repository, repository, repository, targets)
 
     assert_equal true, targets.include?(:repository)
     assert_equal true, targets.include?(:entity)
     assert_equal true, targets.include?(:attribute)
     assert_equal true, targets.include?(:'jpa.unit')
@@ -187,16 +187,16 @@
     TestTemplateSetContainer.target_manager.target(:repository)
     TestTemplateSetContainer.target_manager.target(:entity, :repository)
     TestTemplateSetContainer.target_manager.target(:attribute, :entity)
     TestTemplateSetContainer.target_manager.target(:unit, :repository, :facet_key => :jpa)
 
-    template_set = TestTemplateSetContainer.template_set(:test) do |template_set|
-      RepositoryTemplate.new(template_set, [], :repository, 'repository.java', 'main/java/#{repository.name}.java')
+    template_set = TestTemplateSetContainer.template_set(:test) do |t|
+      RepositoryTemplate.new(t, [], :repository, 'repository.java', 'main/java/#{repository.name}.java')
 
-      EntityTemplate.new(template_set, [], :entity, 'entity.java', 'main/java/#{entity.qualified_name.gsub(".","/")}.java', [], :guard => 'entity.qualified_name == "MyRepo.MyEntityB"')
-      AttributeTemplate.new(template_set, [], :attribute, 'attribute.java', 'main/java/#{attribute.qualified_name.gsub(".","/")}.java')
-      UnitTemplate.new(template_set, [], :'jpa.unit', 'unit.java', 'main/java/units/#{unit.name.gsub(".","/")}.java', [], {})
+      EntityTemplate.new(t, [], :entity, 'entity.java', 'main/java/#{entity.qualified_name.gsub(".","/")}.java', [], :guard => 'entity.qualified_name == "MyRepo.MyEntityB"')
+      AttributeTemplate.new(t, [], :attribute, 'attribute.java', 'main/java/#{attribute.qualified_name.gsub(".","/")}.java')
+      UnitTemplate.new(t, [], :'jpa.unit', 'unit.java', 'main/java/units/#{unit.name.gsub(".","/")}.java', [], {})
     end
 
     target_directory = "#{temp_dir}/generated/erb_template"
 
     FileUtils.mkdir_p "#{target_directory}/some/dir/to/delete"
@@ -209,11 +209,11 @@
     File.utime(File.atime(repo_file), DateTime.new(2001, 2, 3).to_time, repo_file)
     original_mtime = File.mtime(repo_file)
 
     filter = Proc.new { |artifact_type, artifact| artifact_type != :attribute || %w(MyAttr1 MyAttr2).include?(artifact.name.to_s) }
     TestTemplateSetContainer.generator.
-      generate(TestTemplateSetContainer, :repository, repository, target_directory, template_set.templates, filter)
+      generate(:repository, repository, target_directory, template_set.templates, filter)
 
     assert_equal false, File.directory?("#{target_directory}/some")
     assert_equal false, File.exist?("#{target_directory}/main/java/Touched.java")
     assert_equal true, File.directory?("#{target_directory}/main/java")
     assert_equal true, File.exist?(repo_file)
@@ -267,11 +267,10 @@
 
       AttributeTemplate.new(template_set, [], :attribute, 'attribute4.java', 'main/java/#{attribute.qualified_name.gsub(".","/")}4.java')
     end
 
     template_set_keys = [:template_set_1, :template_set_4]
-    templates = TestTemplateSetContainer.generator.
-      load_templates_from_template_sets(TestTemplateSetContainer, template_set_keys)
+    templates = TestTemplateSetContainer.generator.load_templates_from_template_sets(template_set_keys)
 
     assert_equal 6, templates.size
     assert_equal %w(template_set_1:attribute.java template_set_1:entity.java template_set_1:repository1.java template_set_1:unit.java template_set_4:attribute4.java template_set_4:repository4.java),
                  templates.collect{|t| t.name}.sort