test: Re-serialize a couple of test assets

Use the `RewriteTestAssetsCommand` of the `helper-cli` to re-serialize the test assets, to re-align with how the serialization currently is set up. The changes do: 1. A re-ordering, see also preceeding commits, but not limited to these. 2. Drop quotes from the map keys of `ScannerRun.scanners`. Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · May 17, 2024 · 889f474 · 889f474
1 parent 4bd380b
commit 889f474
Show file tree

Hide file tree

Showing 7 changed files with 1,277 additions and 1,277 deletions.
diff --git a/cli/src/funTest/assets/semver4j-ort-result.yml b/cli/src/funTest/assets/semver4j-ort-result.yml
@@ -201,15 +201,6 @@ scanner:
         revision: "r4.12"
         path: ""
       resolved_revision: "64155f8a9babcfcf4263cf4d08253a1556e75481"
-  scanners:
-    "Maven:com.vdurmont:semver4j:3.1.0":
-    - "ScanCode"
-    "Maven:junit:junit:4.12":
-    - "ScanCode"
-    "Maven:org.hamcrest:hamcrest-core:1.3":
-    - "ScanCode"
-    "Maven:org.mockito:mockito-all:1.10.19":
-    - "ScanCode"
   scan_results:
   - provenance:
       vcs_info:
@@ -325,6 +316,15 @@ scanner:
           path: "LICENSE.md"
           start_line: 3
           end_line: 3
+  scanners:
+    Maven:com.vdurmont:semver4j:3.1.0:
+    - "ScanCode"
+    Maven:junit:junit:4.12:
+    - "ScanCode"
+    Maven:org.hamcrest:hamcrest-core:1.3:
+    - "ScanCode"
+    Maven:org.mockito:mockito-all:1.10.19:
+    - "ScanCode"
   files:
   - provenance:
       vcs_info:

diff --git a/...ector/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml b/...ector/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml
diff --git a/...radle/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml b/...radle/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml
diff --git a/plugins/reporters/evaluated-model/src/funTest/assets/reporter-test-input.yml b/plugins/reporters/evaluated-model/src/funTest/assets/reporter-test-input.yml
@@ -104,13 +104,13 @@ analyzer:
       - name: "compile"
         dependencies:
         - id: "Maven:org.apache.commons:commons-text:1.1"
+          dependencies:
+          - id: "Maven:org.apache.commons:commons-lang3:3.5"
           issues:
           - timestamp: "2024-04-25T07:44:20.725613974Z"
             source: "Gradle"
             message: "Example analyzer warning in included package."
             severity: "WARNING"
-          dependencies:
-          - id: "Maven:org.apache.commons:commons-lang3:3.5"
         - id: "Maven:org.example.test:component:1.11"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -119,15 +119,15 @@ analyzer:
       - name: "testCompile"
         dependencies:
         - id: "Ant:junit:junit:4.12"
+          dependencies:
+          - id: "Maven:com.foobar:foobar:1.0"
+          - id: "Maven:com.h2database:h2:1.4.200"
+          - id: "Maven:org.hamcrest:hamcrest-core:1.3"
           issues:
           - timestamp: "2024-04-25T07:44:20.725613974Z"
             source: "Gradle"
             message: "Example analyzer warning in excluded package."
             severity: "WARNING"
-          dependencies:
-          - id: "Maven:com.foobar:foobar:1.0"
-          - id: "Maven:com.h2database:h2:1.4.200"
-          - id: "Maven:org.hamcrest:hamcrest-core:1.3"
         - id: "Maven:org.example.test:component:1.11"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -676,23 +676,23 @@ scanner:
       start_time: "1970-01-01T00:00:00Z"
       end_time: "1970-01-01T00:00:00Z"
   scanners:
-    "Gradle:org.ossreviewtoolkit:nested-fake-project:1.0.0":
+    Ant:junit:junit:4.12:
+    - "Dummy"
+    Gradle:org.ossreviewtoolkit:nested-fake-project:1.0.0:
     - "FakeScanner"
-    "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0":
+    Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0:
     - "FakeScanner"
-    "Ant:junit:junit:4.12":
-    - "Dummy"
-    "Maven:com.foobar:foobar:1.0":
+    Maven:com.foobar:foobar:1.0:
     - "Dummy"
-    "Maven:com.h2database:h2:1.4.200":
+    Maven:com.h2database:h2:1.4.200:
     - "Dummy"
-    "Maven:org.apache.commons:commons-lang3:3.5":
+    Maven:org.apache.commons:commons-lang3:3.5:
     - "Dummy"
-    "Maven:org.apache.commons:commons-text:1.1":
+    Maven:org.apache.commons:commons-text:1.1:
     - "Dummy"
-    "Maven:org.example.test:example-component:1.11":
+    Maven:org.example.test:example-component:1.11:
     - "Dummy"
-    "Maven:org.hamcrest:hamcrest-core:1.3":
+    Maven:org.hamcrest:hamcrest-core:1.3:
     - "Dummy"
   files:
   - provenance:

diff --git a/plugins/reporters/opossum/src/funTest/assets/reporter-test-input.yml b/plugins/reporters/opossum/src/funTest/assets/reporter-test-input.yml
@@ -104,13 +104,13 @@ analyzer:
       - name: "compile"
         dependencies:
         - id: "Maven:org.apache.commons:commons-text:1.1"
+          dependencies:
+          - id: "Maven:org.apache.commons:commons-lang3:3.5"
           issues:
           - timestamp: "2024-04-25T07:44:20.725613974Z"
             source: "Gradle"
             message: "Example analyzer warning in included package."
             severity: "WARNING"
-          dependencies:
-          - id: "Maven:org.apache.commons:commons-lang3:3.5"
         - id: "Maven:org.example.test:component:1.11"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -119,15 +119,15 @@ analyzer:
       - name: "testCompile"
         dependencies:
         - id: "Ant:junit:junit:4.12"
+          dependencies:
+          - id: "Maven:com.foobar:foobar:1.0"
+          - id: "Maven:com.h2database:h2:1.4.200"
+          - id: "Maven:org.hamcrest:hamcrest-core:1.3"
           issues:
           - timestamp: "2024-04-25T07:44:20.725613974Z"
             source: "Gradle"
             message: "Example analyzer warning in excluded package."
             severity: "WARNING"
-          dependencies:
-          - id: "Maven:com.foobar:foobar:1.0"
-          - id: "Maven:com.h2database:h2:1.4.200"
-          - id: "Maven:org.hamcrest:hamcrest-core:1.3"
         - id: "Maven:org.example.test:component:1.11"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -676,23 +676,23 @@ scanner:
       start_time: "1970-01-01T00:00:00Z"
       end_time: "1970-01-01T00:00:00Z"
   scanners:
-    "Gradle:org.ossreviewtoolkit:nested-fake-project:1.0.0":
+    Ant:junit:junit:4.12:
+    - "Dummy"
+    Gradle:org.ossreviewtoolkit:nested-fake-project:1.0.0:
     - "FakeScanner"
-    "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0":
+    Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0:
     - "FakeScanner"
-    "Ant:junit:junit:4.12":
-    - "Dummy"
-    "Maven:com.foobar:foobar:1.0":
+    Maven:com.foobar:foobar:1.0:
     - "Dummy"
-    "Maven:com.h2database:h2:1.4.200":
+    Maven:com.h2database:h2:1.4.200:
     - "Dummy"
-    "Maven:org.apache.commons:commons-lang3:3.5":
+    Maven:org.apache.commons:commons-lang3:3.5:
     - "Dummy"
-    "Maven:org.apache.commons:commons-text:1.1":
+    Maven:org.apache.commons:commons-text:1.1:
     - "Dummy"
-    "Maven:org.example.test:example-component:1.11":
+    Maven:org.example.test:example-component:1.11:
     - "Dummy"
-    "Maven:org.hamcrest:hamcrest-core:1.3":
+    Maven:org.hamcrest:hamcrest-core:1.3:
     - "Dummy"
   files:
   - provenance:

diff --git a/plugins/reporters/static-html/src/funTest/assets/reporter-test-input.yml b/plugins/reporters/static-html/src/funTest/assets/reporter-test-input.yml
@@ -104,13 +104,13 @@ analyzer:
       - name: "compile"
         dependencies:
         - id: "Maven:org.apache.commons:commons-text:1.1"
+          dependencies:
+          - id: "Maven:org.apache.commons:commons-lang3:3.5"
           issues:
           - timestamp: "2024-04-25T07:44:20.725613974Z"
             source: "Gradle"
             message: "Example analyzer warning in included package."
             severity: "WARNING"
-          dependencies:
-          - id: "Maven:org.apache.commons:commons-lang3:3.5"
         - id: "Maven:org.example.test:component:1.11"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -119,15 +119,15 @@ analyzer:
       - name: "testCompile"
         dependencies:
         - id: "Ant:junit:junit:4.12"
+          dependencies:
+          - id: "Maven:com.foobar:foobar:1.0"
+          - id: "Maven:com.h2database:h2:1.4.200"
+          - id: "Maven:org.hamcrest:hamcrest-core:1.3"
           issues:
           - timestamp: "2024-04-25T07:44:20.725613974Z"
             source: "Gradle"
             message: "Example analyzer warning in excluded package."
             severity: "WARNING"
-          dependencies:
-          - id: "Maven:com.foobar:foobar:1.0"
-          - id: "Maven:com.h2database:h2:1.4.200"
-          - id: "Maven:org.hamcrest:hamcrest-core:1.3"
         - id: "Maven:org.example.test:component:1.11"
           dependencies:
           - id: "Maven:org.apache.commons:commons-text:1.1"
@@ -676,23 +676,23 @@ scanner:
       start_time: "1970-01-01T00:00:00Z"
       end_time: "1970-01-01T00:00:00Z"
   scanners:
-    "Gradle:org.ossreviewtoolkit:nested-fake-project:1.0.0":
+    Ant:junit:junit:4.12:
+    - "Dummy"
+    Gradle:org.ossreviewtoolkit:nested-fake-project:1.0.0:
     - "FakeScanner"
-    "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0":
+    Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0:
     - "FakeScanner"
-    "Ant:junit:junit:4.12":
-    - "Dummy"
-    "Maven:com.foobar:foobar:1.0":
+    Maven:com.foobar:foobar:1.0:
     - "Dummy"
-    "Maven:com.h2database:h2:1.4.200":
+    Maven:com.h2database:h2:1.4.200:
     - "Dummy"
-    "Maven:org.apache.commons:commons-lang3:3.5":
+    Maven:org.apache.commons:commons-lang3:3.5:
     - "Dummy"
-    "Maven:org.apache.commons:commons-text:1.1":
+    Maven:org.apache.commons:commons-text:1.1:
     - "Dummy"
-    "Maven:org.example.test:example-component:1.11":
+    Maven:org.example.test:example-component:1.11:
     - "Dummy"
-    "Maven:org.hamcrest:hamcrest-core:1.3":
+    Maven:org.hamcrest:hamcrest-core:1.3:
     - "Dummy"
   files:
   - provenance:

diff --git a/plugins/reporters/web-app/src/funTest/assets/scan-result-for-synthetic-gradle-lib.yml b/plugins/reporters/web-app/src/funTest/assets/scan-result-for-synthetic-gradle-lib.yml
@@ -369,24 +369,24 @@ scanner:
           start_line: -1
           end_line: -1
   scanners:
-    "Gradle:org.ossreviewtoolkit:nested-fake-project:1.0.0":
-      - "FakeScanner"
-    "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0":
-      - "FakeScanner"
-    "Ant:junit:junit:4.12":
-      - "Dummy"
-    "Maven:com.foobar:foobar:1.0":
-      - "Dummy"
-    "Maven:com.h2database:h2:1.4.200":
-      - "Dummy"
-    "Maven:org.apache.commons:commons-lang3:3.5":
-      - "Dummy"
-    "Maven:org.apache.commons:commons-text:1.1":
-      - "Dummy"
-    "Maven:org.example.test:example-component:1.11":
-      - "Dummy"
-    "Maven:org.hamcrest:hamcrest-core:1.3":
-      - "Dummy"
+    Ant:junit:junit:4.12:
+    - "Dummy"
+    Gradle:org.ossreviewtoolkit:nested-fake-project:1.0.0:
+    - "FakeScanner"
+    Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0:
+    - "FakeScanner"
+    Maven:com.foobar:foobar:1.0:
+    - "Dummy"
+    Maven:com.h2database:h2:1.4.200:
+    - "Dummy"
+    Maven:org.apache.commons:commons-lang3:3.5:
+    - "Dummy"
+    Maven:org.apache.commons:commons-text:1.1:
+    - "Dummy"
+    Maven:org.example.test:example-component:1.11:
+    - "Dummy"
+    Maven:org.hamcrest:hamcrest-core:1.3:
+    - "Dummy"
   files:
   - provenance:
       source_artifact: