Intermediate commit -- I am ready to start pushing the graph stuff into the types and transactions, which will break everything for a little while.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1894 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 4 insertions, 30 deletions

diff --git a/test/util/graph.rb b/test/util/graph.rb
index 0a331f0e9..1df294c77 100755
--- a/test/util/graph.rb
+++ b/test/util/graph.rb
@@ -6,32 +6,12 @@
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
+require 'puppettest/graph'
 require 'puppet/util/graph'
 
 class TestUtilGraph < Test::Unit::TestCase
 	include PuppetTest
-	
-	class Container
-	    include Puppet::Util::Graph
-	    include Enumerable
-	    attr_accessor :name
-	    def each
-	        @children.each do |c| yield c end
-        end
-        
-	    def initialize(name, ary)
-	        @name = name
-	        @children = ary
-        end
-        
-        def push(*ary)
-            ary.each { |c| @children.push(c)}
-        end
-        
-        def to_s
-            @name
-        end
-    end
+	include PuppetTest::Graph
     
 	def test_to_graph
 	    children = %w{a b c d}
@@ -54,13 +34,7 @@ class TestUtilGraph < Test::Unit::TestCase
     end
     
     def test_recursive_to_graph
-        one = Container.new("one", %w{a b})
-        
-        two = Container.new("two", ["c", "d"])
-        
-        middle = Container.new("middle", ["e", "f", two])
-        
-        top = Container.new("top", ["g", "h", middle, one])
+        one, two, middle, top = build_tree
         
         graph = nil
         assert_nothing_raised do
@@ -77,7 +51,7 @@ class TestUtilGraph < Test::Unit::TestCase
             end
         end
         
-        top.to_jpg(graph)
+        graph.to_jpg("graph")
         
         # Now make sure we correctly retrieve the leaves from each container
         {top => %w{a b c d e f g h},