Merge pull request #57 from james-stocks/update_tests

Update tests to expect specific output

.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 /.bundle
 /vendor
+tests/*/last_output

lib/metadata_json_lint.rb

@@ -53,7 +53,11 @@ def parse(metadata)
     options = options().clone
     # Configuration from rake tasks
     yield options if block_given?
-    f = File.read(metadata)
+    begin
+      f = File.read(metadata)
+    rescue Exception => e
+      abort("Error: Unable to read metadata file: #{e.exception}")
+    end
 
     begin
       parsed = JSON.parse(f)

tests/bad_license/expected

@@ -0,0 +1 @@
+Warning: License identifier Unknown-1.0 is not in the SPDX list: http://spdx.org/licenses/

tests/broken/expected

@@ -0,0 +1 @@
+Error: Unable to parse metadata.json: 743: unexpected token at

tests/duplicate-dep/expected

@@ -0,0 +1 @@
+Error: duplicate dependencies on puppetlabs/stdlib

tests/long_summary/expected

@@ -0,0 +1 @@
+Error: summary exceeds 144 characters in metadata.json

tests/long_summary/metadata.json

@@ -2,11 +2,11 @@
   "name": "foo-bar",
   "version": "1.0.0",
   "author": "foo/bar",
-  "summary": "This is obviously a way way tooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo long"
+  "summary": "This is obviously a way way tooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo long",
   "license": "Apache-2.0",
-  "source": ""
-  "project_page": ""
-  "issues_url": ""
+  "source": "",
+  "project_page": "",
+  "issues_url": "",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",

tests/missing_version_requirement/expected

@@ -0,0 +1 @@
+Warning: Dependency puppetlabs/stdlib has an open ended dependency version requirement

tests/mixed_version_syntax/expected

@@ -0,0 +1 @@
+Invalid 'version_requirement' field in metadata.json: Unparsable version range: ">= 3.2.x"

tests/multiple_problems/expected

@@ -0,0 +1,3 @@
+Error: Required field 'license' not found in metadata.json.
+Error: Required field 'summary' not found in metadata.json.
+Error: Deprecated field 'types' found in metadata.json.

tests/no_files/expected

@@ -0,0 +1 @@
+Error: Unable to read metadata file: No such file or directory

tests/noname/expected

@@ -0,0 +1 @@
+Error: Required field 'name' not found in metadata.json.

tests/open_ended_dependency/expected

@@ -0,0 +1 @@
+Warning: Dependency puppetlabs/stdlib has an open ended dependency version requirement >= 3.2.0

tests/rake_global_options/expected

@@ -0,0 +1 @@
+Warning: License identifier invalid_license is not in the SPDX list: http://spdx.org/licenses/

tests/tags_no_array/expected

@@ -0,0 +1 @@
+Warning: Tags must be in an array. Currently it's a String.

tests/test.sh

@@ -31,12 +31,30 @@ test_bin() {
   local expect=$1; shift
   local RESULT=-1
   cd $name;
-  bundle exec metadata-json-lint $* metadata.json >/dev/null 2>&1
+  bundle exec metadata-json-lint $* metadata.json >last_output 2>&1
   RESULT=$?
   if [ $RESULT -ne $expect ]; then
-    fail "Failing Test '${name}' (bin)"
+    fail "Failing Test '${name}' (unexpected exit code '${RESULT}' instead of '${expect}') (bin)"
+    echo "    Note: you can examine '${name}/last_output' for any output"
   else
-    echo "Successful Test '${name}' (bin)"
+    # If the test is not expected to succeed then it should match an expected output
+    if [ $expect -eq $SUCCESS ]; then
+      echo "Successful Test '${name}' (bin)"
+    else
+      if [ -f expected ]; then
+        if grep --quiet "`cat expected`" last_output; then
+          echo "Successful Test '${name}' (bin)"
+        else
+          fail "Failing Test '${name}' (did not get expected output) (bin)"
+          echo "    Comparing '${name}/expected' with '${name}/last_output':"
+          echo "        Expected: '`cat expected`'"
+          echo "        Actual: '`cat last_output`'"
+        fi
+      else
+        fail "Failing Test '${name}' (expected output file ${name}/expected is missing) (bin)"
+        echo "    Actual output that needs tested ('${name}/last_output'): '`cat last_output`'"
+      fi
+    fi
   fi
   cd ..
 }
@@ -125,6 +143,8 @@ fi
 cd ..
 
 # Test changing the rake task using settings
+# The bin test will fail due to strict licensing
+# The rake test should pass due to licensing option being set in Rakefile
 test_bin "rake_global_options" $FAILURE
 test_rake "rake_global_options" $SUCCESS
 

tests/types/expected

@@ -0,0 +1 @@
+Error: Deprecated field 'types' found in metadata.json.