[Asunit-svn] SF.net SVN: asunit: [88] trunk/ruby/src

[<luk...@us...>]

Revision: 88
          http://svn.sourceforge.net/asunit/?rev=88&view=rev
Author:   lukebayes
Date:     2006-09-06 08:23:22 -0700 (Wed, 06 Sep 2006)

Log Message:
-----------
worked visual entities in the test case

Modified Paths:
--------------
    trunk/ruby/src/create_class.rb
    trunk/ruby/src/template_resolver.rb
    trunk/ruby/src/templates/Class.erb
    trunk/ruby/src/templates/TestCase.erb

Modified: trunk/ruby/src/create_class.rb
===================================================================
--- trunk/ruby/src/create_class.rb	2006-09-06 08:11:07 UTC (rev 87)
+++ trunk/ruby/src/create_class.rb	2006-09-06 15:23:22 UTC (rev 88)
@@ -15,7 +15,7 @@
 		
 		def run(args)
 			@resolver.superclass = args.superclass
-			@resolver.visual = args.display_object?
+			@resolver.display_object = args.display_object?
 			args.interfaces.each {|inf|
 				@resolver.add_interface(inf)
 			}

Modified: trunk/ruby/src/template_resolver.rb
===================================================================
--- trunk/ruby/src/template_resolver.rb	2006-09-06 08:11:07 UTC (rev 87)
+++ trunk/ruby/src/template_resolver.rb	2006-09-06 15:23:22 UTC (rev 88)
@@ -5,7 +5,7 @@
 module AsUnit
 	class TemplateResolver
 		attr_reader :template, :fullclass, :interfaces, :test_cases
-		attr_accessor :superclass, :visual
+		attr_accessor :superclass, :display_object
 		
 		def initialize(fullclass)
 			@fullclass = fullclass;
@@ -14,7 +14,7 @@
 			@package = nil
 			@parsed = nil
 			@superclass = nil
-			@visual = nil
+			@display_object = false
 			@interfaces = Array.new
 			@test_cases = Array.new
 		end
@@ -52,6 +52,10 @@
 			@test_cases.push(test_case)
 			@test_cases.sort!
 		end
+		
+		def display_object?
+			return @display_object
+		end
 
 		def superclass?
 			return !@superclass.nil?
@@ -66,10 +70,6 @@
 			@interfaces.sort!
 		end
 		
-		def visual?
-			return @visual.nil?
-		end
-		
 		def superclass_decl
 			if(superclass?)
 				return ' extends ' + superclass.split('.').pop
@@ -78,7 +78,7 @@
 			end
 		end
 		
-		def import_statements
+		def import_statements
 			imports = Array.new
 			if(superclass?)
 				imports.push(import_statement(superclass))
@@ -88,8 +88,11 @@
 					imports.push(import_statement(inf))
 				}
 			end
+			if(imports.length == 0)
+				return ''
+			end
 			imports.sort!
-			return imports.join("\n")
+			return "\n" + imports.join("\n") + "\n"
 		end
 		
 		def import_statement(target)

Modified: trunk/ruby/src/templates/Class.erb
===================================================================
--- trunk/ruby/src/templates/Class.erb	2006-09-06 08:11:07 UTC (rev 87)
+++ trunk/ruby/src/templates/Class.erb	2006-09-06 15:23:22 UTC (rev 88)
@@ -1,8 +1,6 @@
 
 package <%= package %>{
-
 <%= import_statements %>
-
 	public class <%= classname %><%= superclass_decl %><%= interfaces_decl %> {
 
 		public function <%= classname %>() {

Modified: trunk/ruby/src/templates/TestCase.erb
===================================================================
--- trunk/ruby/src/templates/TestCase.erb	2006-09-06 08:11:07 UTC (rev 87)
+++ trunk/ruby/src/templates/TestCase.erb	2006-09-06 15:23:22 UTC (rev 88)
@@ -10,17 +10,15 @@
 
 		protected override function setUp():void {
 		    super.setUp();
-		    instance = new <%= classname %>();
-		    <% if visual? %>
-		    addChild(instance);
-		    <% end %>
+		    instance = new <%= classname %>();<%
+		    if display_object? %>
+		    addChild(instance);<% end %>
 		}
 
 		protected override function tearDown():void {
-		    super.tearDown();
-		    <% if visual? %>
-		    removeChild(instance);
-		    <% end %>
+		    super.tearDown();<%
+		    if display_object? %>
+		    removeChild(instance);<% end %>
 		    instance = null;
 		}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.