From b4e530b40f14c7575a27557d6ec366ad1a261ff5 Mon Sep 17 00:00:00 2001
From: Brian Cox <BrianRCox@gmail.com>
Date: Thu, 17 Aug 2017 00:17:28 -0700
Subject: [PATCH] Clean up create-policy acceptance test; add a dir for bad
 policy text files (expected to fail) & add the first one, which is just a
 zero-byte file.

---
 src/parser/testfiles.bad/empty.txt     |  0
 src/test-harness/tests/createpolicy.pm | 57 +++++++++++++++-----------
 2 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 src/parser/testfiles.bad/empty.txt

diff --git a/src/parser/testfiles.bad/empty.txt b/src/parser/testfiles.bad/empty.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/test-harness/tests/createpolicy.pm b/src/test-harness/tests/createpolicy.pm
index 6d40914..a67632d 100644
--- a/src/test-harness/tests/createpolicy.pm
+++ b/src/test-harness/tests/createpolicy.pm
@@ -11,6 +11,7 @@ BEGIN
 {
     $description = "policy creation test";
     $testpolicydir = "$twtools::twrootdir/../../parser/testfiles";
+    $badpolicydir = "$twtools::twrootdir/../../parser/testfiles.bad";
 }
 
 ######################################################################
@@ -54,6 +55,35 @@ POLICY_END
 }
 
 
+sub test_policy_dir
+{
+    my ($policydir, $expected) = @_;
+    my $twpassed = 1;
+
+    opendir my $dir, $policydir or return 0;
+    my @files = readdir $dir;
+    closedir $dir;
+
+    foreach my $current_file (@files) {
+
+        if ($current_file eq "." || $current_file eq ".." ) {
+            next;
+        }
+
+        twtools::logStatus "Trying policy text $policydir/$current_file\n";
+
+        twtools::CreatePolicy({policy-text => "$policydir/$current_file"});
+        if ( $? != $expected ) {
+            twtools::logStatus ("create-polfile with $policydir/$current_file failed, error = $?\n");
+            $twpassed = 0;
+        }
+    }
+
+    return $twpassed;
+}
+
+
+
 ######################################################################
 #
 # Run the test.
@@ -83,39 +113,16 @@ sub run
         $twpassed = 0;
     }
 
-    # Test with existing test case files in the src/policy/testfiles directory.
-    #
-    twtools::CreatePolicy({policy-text => "$testpolicydir/directives.txt"});
+    test_policy_dir( "$testpolicydir", 0 );
     if ( $? != 0 ) {
-        twtools::logStatus("create-polfile with directives.txt failed, error = $?\n");
         $twpassed = 0;
     }
 
-    twtools::CreatePolicy({policy-text => "$testpolicydir/pol.txt"});
+    test_policy_dir( "$badpolicydir", 1 );
     if ( $? != 0 ) {
-        twtools::logStatus("create-polfile with pol.txt failed, error = $?\n");
         $twpassed = 0;
     }
 
-    twtools::CreatePolicy({policy-text => "$testpolicydir/poleasy.txt"});
-    if ( $? != 0 ) {
-        twtools::logStatus("create-polfile with poleasy.txt failed, error = $?\n");
-        $twpassed = 0;
-    }
-
-    twtools::CreatePolicy({policy-text => "$testpolicydir/polhard.txt"});
-    if ( $? != 0 ) {
-        twtools::logStatus("create-polfile with polhard.txt failed, error = $?\n");
-        $twpassed = 0;
-    }
-
-    twtools::CreatePolicy({policy-text => "$testpolicydir/polruleattr.txt"});
-    if ( $? != 0 ) {
-        twtools::logStatus("create-polfile with polruleattr.txt failed, error = $?\n");
-        $twpassed = 0;
-    }
-
-
     #########################################################
     #
     # See if the tests all succeeded...