Tests

- update csaf_2.1/ test files based on oasis-tcs#679
tschmidtb51 · Jan 24, 2024 · 2285db8 · 2285db8
1 parent 0d2a4c1
commit 2285db8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/csaf_2.1/test/aggregator_schema/run_tests.sh b/csaf_2.1/test/aggregator_schema/run_tests.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 
+STRICT_BUILD=csaf_2.0/build
 ORIG_SCHEMA=csaf_2.0/json_schema/aggregator_json_schema.json
-AGGREGATOR_STRICT_SCHEMA=aggregator_strict_schema.json
-CSAF_STRICT_SCHEMA=csaf_strict_schema.json
+AGGREGATOR_STRICT_SCHEMA=${STRICT_BUILD}/aggregator_strict_schema.json
+CSAF_STRICT_SCHEMA=${STRICT_BUILD}/csaf_strict_schema.json
 CVSS_20_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v2.0_strict.json
 CVSS_30_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v3.0_strict.json
 CVSS_31_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v3.1_strict.json
-PROVIDER_STRICT_SCHEMA=provider_strict_schema.json
+PROVIDER_STRICT_SCHEMA=${STRICT_BUILD}/provider_strict_schema.json
 VALIDATOR=csaf_2.0/test/validator.py
 STRICT_GENERATOR=csaf_2.0/test/generate_strict_schema.py
 TESTPATH=csaf_2.0/examples/aggregator/*.json
@@ -33,12 +34,13 @@ test_all() {
   do
     validate $i
   done
-} 
+}
 
 SCHEMA=${ORIG_SCHEMA}
 test_all
- 
+
 printf "%s" "Generating strict schema ... "
+mkdir -p ${STRICT_BUILD}
 python3 "${STRICT_GENERATOR}" "${ORIG_SCHEMA}" > "${AGGREGATOR_STRICT_SCHEMA}"
 printf "%s\n" "done"
 

diff --git a/csaf_2.1/test/csaf_schema/run_tests.sh b/csaf_2.1/test/csaf_schema/run_tests.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
+STRICT_BUILD=csaf_2.0/build
 ORIG_SCHEMA=csaf_2.0/json_schema/csaf_json_schema.json 
-STRICT_SCHEMA=csaf_strict_schema.json
+CSAF_STRICT_SCHEMA=${STRICT_BUILD}/csaf_strict_schema.json
 CVSS_20_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v2.0_strict.json
 CVSS_30_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v3.0_strict.json
 CVSS_31_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v3.1_strict.json
@@ -37,10 +38,11 @@ test_all
 
 
 printf "%s" "Generating strict schema ... "
-python3 "${STRICT_GENERATOR}" "${ORIG_SCHEMA}" > "${STRICT_SCHEMA}"
+mkdir -p ${STRICT_BUILD}
+python3 "${STRICT_GENERATOR}" "${ORIG_SCHEMA}" > "${CSAF_STRICT_SCHEMA}"
 printf "%s\n" "done"
 
-SCHEMA=${STRICT_SCHEMA}
+SCHEMA=${CSAF_STRICT_SCHEMA}
 test_all
 
 exit ${FAIL}
diff --git a/csaf_2.1/test/provider_schema/run_tests.sh b/csaf_2.1/test/provider_schema/run_tests.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 
+STRICT_BUILD=csaf_2.0/build
 ORIG_SCHEMA=csaf_2.0/json_schema/provider_json_schema.json
-CSAF_STRICT_SCHEMA=csaf_strict_schema.json
+CSAF_STRICT_SCHEMA=${STRICT_BUILD}/csaf_strict_schema.json
 CVSS_20_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v2.0_strict.json
 CVSS_30_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v3.0_strict.json
 CVSS_31_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v3.1_strict.json
-PROVIDER_STRICT_SCHEMA=provider_strict_schema.json
+PROVIDER_STRICT_SCHEMA=${STRICT_BUILD}/provider_strict_schema.json
 VALIDATOR=csaf_2.0/test/validator.py
 STRICT_GENERATOR=csaf_2.0/test/generate_strict_schema.py
 TESTPATH=csaf_2.0/examples/provider-metadata/*.json
@@ -38,6 +39,7 @@ SCHEMA=${ORIG_SCHEMA}
 test_all
 
 printf "%s" "Generating strict schema ... "
+mkdir -p ${STRICT_BUILD}
 python3 "${STRICT_GENERATOR}" "${ORIG_SCHEMA}" > "${PROVIDER_STRICT_SCHEMA}"
 printf "%s\n" "done"
 

diff --git a/csaf_2.1/test/validator/run_tests.sh b/csaf_2.1/test/validator/run_tests.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
+STRICT_BUILD=csaf_2.0/build
 ORIG_SCHEMA=csaf_2.0/json_schema/csaf_json_schema.json 
-STRICT_SCHEMA=csaf_strict_schema.json
+CSAF_STRICT_SCHEMA=${STRICT_BUILD}/csaf_strict_schema.json
 CVSS_20_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v2.0_strict.json
 CVSS_30_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v3.0_strict.json
 CVSS_31_STRICT_SCHEMA=csaf_2.0/referenced_schema/first/cvss-v3.1_strict.json
@@ -46,10 +47,11 @@ test_all
 
 
 printf "%s" "Generating strict schema ... "
-python3 "${STRICT_GENERATOR}" "${ORIG_SCHEMA}" > "${STRICT_SCHEMA}"
+mkdir -p ${STRICT_BUILD}
+python3 "${STRICT_GENERATOR}" "${ORIG_SCHEMA}" > "${CSAF_STRICT_SCHEMA}"
 printf "%s\n" "done"
 
-SCHEMA=${STRICT_SCHEMA}
+SCHEMA=${CSAF_STRICT_SCHEMA}
 test_all_strict
 
 exit ${FAIL}