[dns] consolidate tests

tests/aws/models/dns/zone_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('AWS::DNS | zone model', ['aws']) do
-
-  zone_tests(AWS[:dns], {}, false)
-
-end

tests/aws/models/dns/zones_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('AWS::DNS | zones collection', ['aws']) do
-
-  zones_tests(AWS[:dns], {}, false)
-
-end

tests/dns/helper.rb

@@ -0,0 +1,14 @@
+dns_providers = {
+  AWS       => {
+    :mocked => false
+  },
+  Linode    => {
+    :mocked => false
+  },
+  Slicehost => {
+    :mocked => false
+  },
+  Zerigo    => {
+    :mocked => false
+  }
+}

tests/dns/models/record_tests.rb

@@ -0,0 +1,17 @@
+for provider, config in dns_providers
+
+  params = {
+    :ip => '1.2.3.4',
+    :name => 'www.fogrecordtests.com',
+    :type => 'A'
+  }.merge!(config[:record_params] || {})
+
+  if !Fog.mocking? || provider[:mocked]
+    @zone = provider[:dns].zones.create(:domain => 'fogrecordtests.com')
+
+    model_tests(@zone.records, params, config[:mocked])
+
+    @zone.destroy
+  end
+
+end

tests/dns/models/records_tests.rb

@@ -0,0 +1,17 @@
+for provider, config in dns_providers
+
+  params = {
+    :ip => '1.2.3.4',
+    :name => 'www.fogrecordstests.com',
+    :type => 'A'
+  }.merge!(config[:records_params] || {})
+
+  if !Fog.mocking? || provider[:mocked]
+    @zone = provider[:dns].zones.create(:domain => 'fogrecordstests.com')
+
+    collection_tests(@zone.records, params, config[:mocked])
+
+    @zone.destroy
+  end
+
+end

tests/dns/models/zone_tests.rb

@@ -0,0 +1,9 @@
+for provider, config in dns_providers
+
+  params = {
+    :domain => 'fogzonetests.com'
+  }.merge!(config[:zone_params] || {})
+
+  model_tests(provider[:dns].zones, params, config[:mocked])
+
+end

tests/dns/models/zones_tests.rb

@@ -0,0 +1,9 @@
+for provider, config in dns_providers
+
+  params = {
+    :domain => 'fogzonestests.com'
+  }.merge!(config[:zones_params] || {})
+
+  collection_tests(provider[:dns].zones, params, config[:mocked])
+
+end

tests/helper.rb

@@ -14,11 +14,6 @@ require 'helpers/compute/flavors_tests'
 require 'helpers/compute/server_tests'
 require 'helpers/compute/servers_tests'
 
-require 'helpers/dns/record_tests'
-require 'helpers/dns/records_tests'
-require 'helpers/dns/zone_tests'
-require 'helpers/dns/zones_tests'
-
 require 'helpers/storage/directory_tests'
 require 'helpers/storage/directories_tests'
 require 'helpers/storage/file_tests'

tests/helpers/dns/record_tests.rb

@@ -1,13 +0,0 @@
-def record_tests(connection, params = {}, mocks_implemented = true)
-
-  params = {:ip => '1.2.3.4', :name => 'www.fogrecordtests.com', :type => 'A'}.merge!(params)
-
-  if !Fog.mocking? || mocks_implemented
-    @zone = connection.zones.create(:domain => 'fogrecordtests.com')
-
-    model_tests(@zone.records, params, mocks_implemented)
-
-    @zone.destroy
-  end
-
-end

tests/helpers/dns/records_tests.rb

@@ -1,13 +0,0 @@
-def records_tests(connection, params = {}, mocks_implemented = true)
-
-  params = {:ip => '1.2.3.4', :name => 'www.fogrecordstests.com', :type => 'A'}.merge!(params)
-
-  if !Fog.mocking? || mocks_implemented
-    @zone = connection.zones.create(:domain => 'fogrecordstests.com')
-
-    collection_tests(@zone.records, params, mocks_implemented)
-
-    @zone.destroy
-  end
-
-end

tests/helpers/dns/zone_tests.rb

@@ -1,7 +0,0 @@
-def zone_tests(connection, params = {}, mocks_implemented = true)
-
-  params = {:domain => 'fogzonetests.com'}.merge!(params)
-
-  model_tests(connection.zones, params, mocks_implemented)
-
-end

tests/helpers/dns/zones_tests.rb

@@ -1,7 +0,0 @@
-def zones_tests(connection, params = {}, mocks_implemented = true)
-
-  params = {:domain => 'fogzonestests.com'}.merge!(params)
-
-  collection_tests(connection.zones, params, mocks_implemented)
-
-end

tests/linode/models/dns/record_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Linode::DNS | record model', ['linode']) do
-
-  record_tests(Linode[:dns], {}, false)
-
-end

tests/linode/models/dns/records_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Linode::DNS | records collection', ['linode']) do
-
-  records_tests(Linode[:dns], {}, false)
-
-end

tests/linode/models/dns/zone_tests.rb

@@ -1,11 +0,0 @@
-Shindo.tests('Linode::DNS | zone model', ['linode']) do
-
-  zone_tests(Linode[:dns], {}, false) do
-
-    if !Fog.mocking? || mocks_implemented
-      @instance.responds_to(:nameservers)
-    end
-
-  end
-
-end

tests/linode/models/dns/zones_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Linode::DNS | zones collection', ['linode']) do
-
-  zones_tests(Linode[:dns], {}, false)
-
-end

tests/slicehost/models/dns/record_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Slicehost::DNS | record model', ['slicehost']) do
-
-  record_tests(Slicehost[:dns], {}, false)
-
-end

tests/slicehost/models/dns/records_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Slicehost::DNS | records collection', ['slicehost']) do
-
-  records_tests(Slicehost[:dns], {}, false)
-
-end

tests/slicehost/models/dns/zone_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Slicehost::DNS | zone model', ['slicehost']) do
-
-  zone_tests(Slicehost[:dns], {}, false)
-
-end

tests/slicehost/models/dns/zones_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Slicehost::DNS | zones collection', ['slicehost']) do
-
-  zones_tests(Slicehost[:dns], {}, false)
-
-end

tests/zerigo/models/dns/record_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Zerigo::DNS | record model', ['zerigo']) do
-
-  record_tests(Zerigo[:dns], {}, false)
-
-end

tests/zerigo/models/dns/records_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Zerigo::DNS | records collection', ['zerigo']) do
-
-  records_tests(Zerigo[:dns], {}, false)
-
-end

tests/zerigo/models/dns/zone_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Zerigo::DNS | zone model', ['zerigo']) do
-
-  zone_tests(Zerigo[:dns], {}, false)
-
-end

tests/zerigo/models/dns/zones_tests.rb

@@ -1,5 +0,0 @@
-Shindo.tests('Zerigo::DNS | zones collection', ['zerigo']) do
-
-  zones_tests(Zerigo[:dns], {}, false)
-
-end