From 0ca012891bf24046e323e9ba7969b10cfd5b5438 Mon Sep 17 00:00:00 2001
From: Clinton Wolfe <clintoncwolfe@gmail.com>
Date: Wed, 7 Feb 2018 12:09:08 -0500
Subject: [PATCH] Rely on unit test helper to load resources, not individual
 AWS tests

Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
---
 test/unit/helper.rb                                          | 3 +--
 test/unit/resources/aws_cloudtrail_trail_test.rb             | 1 -
 test/unit/resources/aws_cloudtrail_trails_test.rb            | 1 -
 test/unit/resources/aws_cloudwatch_alarm_test.rb             | 2 --
 test/unit/resources/aws_cloudwatch_log_metric_filter_test.rb | 2 --
 test/unit/resources/aws_ec2_instance_test.rb                 | 1 -
 test/unit/resources/aws_ec2_security_group_test.rb           | 2 --
 test/unit/resources/aws_ec2_security_groups_test.rb          | 2 --
 test/unit/resources/aws_iam_access_key_test.rb               | 2 --
 test/unit/resources/aws_iam_access_keys_test.rb              | 3 ---
 test/unit/resources/aws_iam_group_test.rb                    | 2 --
 test/unit/resources/aws_iam_groups_test.rb                   | 2 --
 test/unit/resources/aws_iam_password_policy_test.rb          | 1 -
 test/unit/resources/aws_iam_policies_test.rb                 | 1 -
 test/unit/resources/aws_iam_policy_test.rb                   | 1 -
 test/unit/resources/aws_iam_role_test.rb                     | 1 -
 test/unit/resources/aws_iam_root_user_test.rb                | 1 -
 test/unit/resources/aws_iam_user_test.rb                     | 1 -
 test/unit/resources/aws_iam_users_test.rb                    | 2 --
 test/unit/resources/aws_kms_keys_test.rb                     | 1 -
 test/unit/resources/aws_s3_bucket_test.rb                    | 1 -
 test/unit/resources/aws_sns_topic_test.rb                    | 1 -
 test/unit/resources/aws_vpc_test.rb                          | 1 -
 test/unit/resources/aws_vpcs_test.rb                         | 1 -
 24 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/test/unit/helper.rb b/test/unit/helper.rb
index 5aa8a7a20..2342fcc01 100644
--- a/test/unit/helper.rb
+++ b/test/unit/helper.rb
@@ -6,5 +6,4 @@ require 'minitest/pride'
 require 'json'
 require 'ostruct'
 
-require 'inspec/resource'
-require_relative '../../libraries/_aws'
+require_relative 'lib/resource_support/aws'
diff --git a/test/unit/resources/aws_cloudtrail_trail_test.rb b/test/unit/resources/aws_cloudtrail_trail_test.rb
index ea373279b..6ffe45074 100644
--- a/test/unit/resources/aws_cloudtrail_trail_test.rb
+++ b/test/unit/resources/aws_cloudtrail_trail_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_cloudtrail_trail'
 
 # MACTTSB = MockAwsCloudTrailTrailSingularBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_cloudtrail_trails_test.rb b/test/unit/resources/aws_cloudtrail_trails_test.rb
index e4fcc5df9..2c447a26e 100644
--- a/test/unit/resources/aws_cloudtrail_trails_test.rb
+++ b/test/unit/resources/aws_cloudtrail_trails_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_cloudtrail_trails'
 
 # MACTTPB = MockAwsCloudTrailTrailsPluralBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_cloudwatch_alarm_test.rb b/test/unit/resources/aws_cloudwatch_alarm_test.rb
index 947bb2836..f27f98bbc 100644
--- a/test/unit/resources/aws_cloudwatch_alarm_test.rb
+++ b/test/unit/resources/aws_cloudwatch_alarm_test.rb
@@ -1,6 +1,4 @@
-require 'ostruct'
 require 'helper'
-require 'aws_cloudwatch_alarm'
 
 # MCWAB = MockCloudwatchAlarmBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_cloudwatch_log_metric_filter_test.rb b/test/unit/resources/aws_cloudwatch_log_metric_filter_test.rb
index dbe5d2f71..fd3e78eb8 100644
--- a/test/unit/resources/aws_cloudwatch_log_metric_filter_test.rb
+++ b/test/unit/resources/aws_cloudwatch_log_metric_filter_test.rb
@@ -1,6 +1,4 @@
-require 'ostruct'
 require 'helper'
-require 'aws_cloudwatch_log_metric_filter'
 
 # CWLMF = CloudwatchLogMetricFilter
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_ec2_instance_test.rb b/test/unit/resources/aws_ec2_instance_test.rb
index 70b0ecfaf..5cc65069e 100644
--- a/test/unit/resources/aws_ec2_instance_test.rb
+++ b/test/unit/resources/aws_ec2_instance_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_ec2_instance'
 
 class TestEc2 < Minitest::Test
   Id = 'instance-id'.freeze
diff --git a/test/unit/resources/aws_ec2_security_group_test.rb b/test/unit/resources/aws_ec2_security_group_test.rb
index 2f9b01bad..61130c5b3 100644
--- a/test/unit/resources/aws_ec2_security_group_test.rb
+++ b/test/unit/resources/aws_ec2_security_group_test.rb
@@ -1,6 +1,4 @@
-require 'ostruct'
 require 'helper'
-require 'aws_ec2_security_group'
 
 # MESGSB = MockEc2SecurityGroupSingleBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_ec2_security_groups_test.rb b/test/unit/resources/aws_ec2_security_groups_test.rb
index c977aca6f..30b8728a3 100644
--- a/test/unit/resources/aws_ec2_security_groups_test.rb
+++ b/test/unit/resources/aws_ec2_security_groups_test.rb
@@ -1,6 +1,4 @@
-require 'ostruct'
 require 'helper'
-require 'aws_ec2_security_groups'
 
 # MESGB = MockEc2SecurityGroupBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_iam_access_key_test.rb b/test/unit/resources/aws_iam_access_key_test.rb
index b07f4c761..c05f42a11 100644
--- a/test/unit/resources/aws_iam_access_key_test.rb
+++ b/test/unit/resources/aws_iam_access_key_test.rb
@@ -1,7 +1,5 @@
 # author: Chris Redekop
-
 require 'helper'
-require 'aws_iam_access_key'
 
 class AwsIamAccessKeyTest < Minitest::Test
   Username = 'test'.freeze
diff --git a/test/unit/resources/aws_iam_access_keys_test.rb b/test/unit/resources/aws_iam_access_keys_test.rb
index f087f0ca8..a443aa21a 100644
--- a/test/unit/resources/aws_iam_access_keys_test.rb
+++ b/test/unit/resources/aws_iam_access_keys_test.rb
@@ -1,7 +1,4 @@
-
-require 'aws-sdk'
 require 'helper'
-require 'aws_iam_access_keys'
 
 #==========================================================#
 #                 Constructor Tests                        #
diff --git a/test/unit/resources/aws_iam_group_test.rb b/test/unit/resources/aws_iam_group_test.rb
index 424f339ef..a387c57be 100644
--- a/test/unit/resources/aws_iam_group_test.rb
+++ b/test/unit/resources/aws_iam_group_test.rb
@@ -1,6 +1,4 @@
 require 'helper'
-require 'aws_iam_group'
-require 'date'
 
 # MAIGSB = MockAwsIamGroupSingularBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_iam_groups_test.rb b/test/unit/resources/aws_iam_groups_test.rb
index f79d2c2cd..8ae47c58a 100644
--- a/test/unit/resources/aws_iam_groups_test.rb
+++ b/test/unit/resources/aws_iam_groups_test.rb
@@ -1,6 +1,4 @@
 require 'helper'
-require 'aws_iam_groups'
-require 'date'
 
 # MAIGPB = MockAwsIamGroupsPluralBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_iam_password_policy_test.rb b/test/unit/resources/aws_iam_password_policy_test.rb
index 37e9dec6e..35aedb7c9 100644
--- a/test/unit/resources/aws_iam_password_policy_test.rb
+++ b/test/unit/resources/aws_iam_password_policy_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_iam_password_policy'
 
 class AwsIamPasswordPolicyTest < Minitest::Test
   def setup
diff --git a/test/unit/resources/aws_iam_policies_test.rb b/test/unit/resources/aws_iam_policies_test.rb
index e4563f767..a4fef32fa 100644
--- a/test/unit/resources/aws_iam_policies_test.rb
+++ b/test/unit/resources/aws_iam_policies_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_iam_policies'
 
 # MAIPPB = MockAwsIamPoliciesPluralBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_iam_policy_test.rb b/test/unit/resources/aws_iam_policy_test.rb
index 164e19f03..7f90c1c50 100644
--- a/test/unit/resources/aws_iam_policy_test.rb
+++ b/test/unit/resources/aws_iam_policy_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_iam_policy'
 
 # MAIPSB = MockAwsIamPolicySingularBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_iam_role_test.rb b/test/unit/resources/aws_iam_role_test.rb
index 418328dc4..c5e64b56b 100644
--- a/test/unit/resources/aws_iam_role_test.rb
+++ b/test/unit/resources/aws_iam_role_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_iam_role'
 
 # MIRB = MockIamRoleBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_iam_root_user_test.rb b/test/unit/resources/aws_iam_root_user_test.rb
index a616e1549..6af024057 100644
--- a/test/unit/resources/aws_iam_root_user_test.rb
+++ b/test/unit/resources/aws_iam_root_user_test.rb
@@ -1,6 +1,5 @@
 # author: Miles Tjandrawidjaja
 require 'helper'
-require 'aws_iam_root_user'
 
 class AwsIamRootUserTest < Minitest::Test
   def setup
diff --git a/test/unit/resources/aws_iam_user_test.rb b/test/unit/resources/aws_iam_user_test.rb
index 3585b8824..93bd31956 100644
--- a/test/unit/resources/aws_iam_user_test.rb
+++ b/test/unit/resources/aws_iam_user_test.rb
@@ -1,6 +1,5 @@
 # author: Simon Varlow
 require 'helper'
-require 'aws_iam_user'
 
 # MAUIB = MockAwsIamUserBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_iam_users_test.rb b/test/unit/resources/aws_iam_users_test.rb
index c60e72dc6..9c5084be7 100644
--- a/test/unit/resources/aws_iam_users_test.rb
+++ b/test/unit/resources/aws_iam_users_test.rb
@@ -1,6 +1,4 @@
 require 'helper'
-require 'ostruct'
-require 'aws_iam_users'
 
 # Maiusb = Mock AwsIamUsers::Backend
 # Abbreviation not used outside of this file
diff --git a/test/unit/resources/aws_kms_keys_test.rb b/test/unit/resources/aws_kms_keys_test.rb
index 9f7217d83..12b1c4cbe 100644
--- a/test/unit/resources/aws_kms_keys_test.rb
+++ b/test/unit/resources/aws_kms_keys_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_kms_keys'
 
 # MAKKPB = MockAwsKmsKeysPluralBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_s3_bucket_test.rb b/test/unit/resources/aws_s3_bucket_test.rb
index b92cfd38a..8a7974c3f 100644
--- a/test/unit/resources/aws_s3_bucket_test.rb
+++ b/test/unit/resources/aws_s3_bucket_test.rb
@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'helper'
-require 'aws_s3_bucket'
 
 # MSBSB = MockS3BucketSingleBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_sns_topic_test.rb b/test/unit/resources/aws_sns_topic_test.rb
index 3bb2c455e..e11ae97ed 100644
--- a/test/unit/resources/aws_sns_topic_test.rb
+++ b/test/unit/resources/aws_sns_topic_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_sns_topic'
 
 # MSNB = MockSnsBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_vpc_test.rb b/test/unit/resources/aws_vpc_test.rb
index 8a067b054..2e2e399b7 100644
--- a/test/unit/resources/aws_vpc_test.rb
+++ b/test/unit/resources/aws_vpc_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_vpc'
 
 # MAVSB = MockAwsVpcSingularBackend
 # Abbreviation not used outside this file
diff --git a/test/unit/resources/aws_vpcs_test.rb b/test/unit/resources/aws_vpcs_test.rb
index bd3786f6e..bb5494fe3 100644
--- a/test/unit/resources/aws_vpcs_test.rb
+++ b/test/unit/resources/aws_vpcs_test.rb
@@ -1,5 +1,4 @@
 require 'helper'
-require 'aws_vpcs'
 
 # MAVPB = MockAwsVpcsPluralBackend
 # Abbreviation not used outside this file