✅ Update smoke tests with generic-representer

- Add test on expected_representation.json
- Remove smoke tests that expect errors (not supported anymore)

Author: homersimpsons

bin/run-tests.sh

@@ -17,38 +17,17 @@ exit_code=0
 for test_dir in tests/*; do
     test_dir_name=$(basename "${test_dir}")
     test_dir_path=$(realpath "${test_dir}")
-    representation_file_path="${test_dir_path}/representation.txt"
-    expected_representation_file_path="${test_dir_path}/expected_representation.txt"
-    mapping_file_path="${test_dir_path}/mapping.json"    
-    expected_mapping_file_path="${test_dir_path}/expected_mapping.json"
-    expected_error_file_path="${test_dir_path}/expected_representation.txt"
-    expect_error="${test_dir_path}/.expect-error"
 
     bin/run.sh "${test_dir_name}" "${test_dir_path}" "${test_dir_path}"
-    test_exit_code=$?
 
-    if [[ -f "${expect_error}" ]]; then
-        if [[ $test_exit_code -eq 0 ]]; then
-            echo 'Expected non-zero exit code'
-            exit_code=1
-        fi
-    else
-        echo "${test_dir_name}: comparing representation.txt to expected_representation.txt"
-        diff "${representation_file_path}" "${expected_representation_file_path}"
-
-        if [ $? -ne 0 ]; then
-            echo "FAILED"
-            exit_code=1
-        fi
-
-        echo "${test_dir_name}: comparing mapping.json to expected_mapping.json"
-        diff "${mapping_file_path}" "${expected_mapping_file_path}"
+    for file in representation.txt representation.json mapping.json; do
+        expected_file="expected_${file}"
+        echo "${test_dir_name}: comparing ${file} to ${expected_file}"
 
-        if [ $? -ne 0 ]; then
-            echo "FAILED"
+        if ! diff "${test_dir_path}/${file}" "${test_dir_path}/${expected_file}"; then
             exit_code=1
         fi
-    fi
+    done
 done
 
 exit ${exit_code}

bin/run.sh

@@ -33,4 +33,5 @@ mkdir -p "${output_dir}"
 
 echo "${slug}: creating representation..."
 
+# Create the representation for the solution
 /usr/local/bin/php /opt/representer/main.php "$@"

src/DirectoryRepresenter.php

@@ -62,7 +62,7 @@ public function represent(): Result
 
         return new Result(
             $filesRepresentation,
-            '{"version":2}',
+            '{"version": 2}',
             $mapping->toJson(),
         );
     }

tests/example-empty-file/expected_representation.json

@@ -0,0 +1 @@
+{"version": 2}

tests/example-leading-trailing-empty-lines/expected_representation.json

@@ -0,0 +1 @@
+{"version": 2}