[PATCH 1/6] tests: split common helper out of test_setup.rb

[lu...@redhat.com]

From: David Lutterkort <lu...@redhat.com>

---
 tests/deltacloud/test_setup.rb |   53 +++---------------------------
 tests/helpers/common.rb        |   69 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 48 deletions(-)
 create mode 100644 tests/helpers/common.rb

diff --git a/tests/deltacloud/test_setup.rb b/tests/deltacloud/test_setup.rb
index 6beceb1..8380925 100644
--- a/tests/deltacloud/test_setup.rb
+++ b/tests/deltacloud/test_setup.rb
@@ -15,52 +15,11 @@
 # under the License.
 
 require 'rubygems'
-require 'minitest/autorun'
-require 'rest_client'
-require 'nokogiri'
-require 'json'
-require 'base64'
-require 'yaml'
-require 'singleton'
-#SETUP
-topdir = File.join(File.dirname(__FILE__), '..')
-$:.unshift topdir
-require 'deltacloud/common_tests_collections.rb'
-
-module RestClient::Response
-  def xml
-    @xml ||= Nokogiri::XML(body)
-  end
-
-  def json
-    @json ||= JSON.parse(body)
-  end
-end
-
-class String
-  def singularize
-    return self.gsub(/ies$/, 'y') if self =~ /ies$/
-    return self.gsub(/es$/, '') if self =~ /sses$/
-    self.gsub(/s$/, '')
-  end
-  def pluralize
-    return self + 'es' if self =~ /ess$/
-    return self[0, self.length-1] + "ies" if self =~ /ty$/
-    return self if self =~ /data$/
-    self + "s"
-  end
-end
+require 'require_relative'
+require_relative '../helpers/common.rb'
+require_relative 'common_tests_collections.rb'
 
-class Array
-  alias :original_method_missing :method_missing
-
-  def method_missing(name, *args)
-    if name == :choice
-      return self.sample(*args)
-    end
-    original_method_missing(name, *args)
-  end
-end
+require 'singleton'
 
 module Deltacloud
   module Test
@@ -70,9 +29,7 @@ module Deltacloud
       include Singleton
 
       def initialize
-        fname = ENV["CONFIG"] || File::join(File::dirname(__FILE__), "..",
-                                            "config.yaml")
-        @hash = YAML.load(File::open(fname))
+        @hash = Deltacloud::Test::yaml_config
       end
 
       def url
diff --git a/tests/helpers/common.rb b/tests/helpers/common.rb
new file mode 100644
index 0000000..5b3bcfb
--- /dev/null
+++ b/tests/helpers/common.rb
@@ -0,0 +1,69 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+require 'rubygems'
+require 'minitest/autorun'
+require 'rest_client'
+require 'nokogiri'
+require 'json'
+require 'base64'
+require 'yaml'
+
+module RestClient::Response
+  def xml
+    @xml ||= Nokogiri::XML(body)
+  end
+
+  def json
+    @json ||= JSON.parse(body)
+  end
+end
+
+class String
+  def singularize
+    return self.gsub(/ies$/, 'y') if self =~ /ies$/
+    return self.gsub(/es$/, '') if self =~ /sses$/
+    self.gsub(/s$/, '')
+  end
+  def pluralize
+    return self + 'es' if self =~ /ess$/
+    return self[0, self.length-1] + "ies" if self =~ /ty$/
+    return self if self =~ /data$/
+    self + "s"
+  end
+end
+
+class Array
+  alias :original_method_missing :method_missing
+
+  def method_missing(name, *args)
+    if name == :choice
+      return self.sample(*args)
+    end
+    original_method_missing(name, *args)
+  end
+end
+
+module Deltacloud
+  module Test
+
+    def self.yaml_config
+      fname = ENV["CONFIG"] || File::join(File::dirname(__FILE__), "..",
+                                          "config.yaml")
+      YAML.load(File::open(fname))
+    end
+  end
+end
-- 
1.7.7.6