tests

jkowalleck · jkowalleck · commit 22c6e753c9f8 · 2025-02-08T14:02:52.000+01:00
Signed-off-by: Jan Kowalleck &lt;jan.kowalleck@gmail.com&gt;
diff --git a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-explicit.xml
@@ -7,10 +7,10 @@
     in validators and tools digesting XML.
     -->
     <components>
-        <component type="library" isExtraneous="false">
+        <component type="library" isExternal="false">
             <name>InvalidVersions</name>
             <versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
-            <description>versionRange may only exist on extraneous components, set `isExtraneous` explicit</description>
+            <description>versionRange may only exist on extraneous components, set `isExternal` explicit</description>
         </component>
     </components>
 </bom>
diff --git a/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml b/tools/src/test/resources/1.7/informal-invalid-component-versionRange-non-extraneous-implicit.xml
@@ -8,10 +8,10 @@
     -->
     <components>
         <component type="library">
-            <!-- @isExtraneous defaults to `false` -->
+            <!-- @isExternal defaults to `false` -->
             <name>InvalidVersions</name>
             <versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
-            <description>versionRange may only exist on extraneous components, set `isExtraneous` implicit by default value</description>
+            <description>versionRange may only exist on extraneous components, set `isExternal` implicit by default value</description>
         </component>
     </components>
 </bom>
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.json b/tools/src/test/resources/1.7/invalid-component-version-and-range.json
@@ -11,7 +11,7 @@
       "description": "may have `version` or `versionRange`, not both. This one does - it is invalid",
       "version": "9.0.14",
       "versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1",
-      "isExtraneous": true
+      "isExternal": true
     }
   ]
 }
diff --git a/tools/src/test/resources/1.7/invalid-component-version-and-range.xml b/tools/src/test/resources/1.7/invalid-component-version-and-range.xml
@@ -3,7 +3,7 @@
      serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
 >
     <components>
-        <component type="library" isExtraneous="true">
+        <component type="library" isExternal="true">
             <name>InvalidVersions</name>
             <version>9.0.14</version>
             <versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-explicit.json
@@ -8,8 +8,8 @@
     {
       "type": "library",
       "name": "InvalidVersions",
-      "description": "versionRange may only exist on extraneous components; set `.isExtraneous` explicit",
-      "isExtraneous": false,
+      "description": "versionRange may only exist on extraneous components; set `.isExternal` explicit",
+      "isExternal": false,
       "versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
     }
   ]
diff --git a/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json b/tools/src/test/resources/1.7/invalid-component-versionRange-non-extraneous-implicit.json
@@ -8,7 +8,7 @@
     {
       "type": "library",
       "name": "InvalidVersions",
-      "description": "versionRange may only exist on extraneous components; set `.isExtraneous` implicit by default value",
+      "description": "versionRange may only exist on extraneous components; set `.isExternal` implicit by default value",
       "versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
     }
   ]
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.json
@@ -9,7 +9,7 @@
       "type": "library",
       "name": "Foo",
       "description": "extraneous without any version constraints",
-      "isExtraneous": true
+      "isExternal": true
     }
   ]
 }
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml b/tools/src/test/resources/1.7/valid-component-extraneous-no-version-information.xml
@@ -3,9 +3,9 @@
      serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
 >
     <components>
-        <component type="library" isExtraneous="true">
+        <component type="library" isExternal="true">
             <name>Foo</name>
             <description>extraneous without any version constraints</description>
         </component>
     </components>
-</bom>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.json
@@ -9,7 +9,7 @@
       "type": "library",
       "name": "Foo",
       "description": "extraneous with version constraint",
-      "isExtraneous": true,
+      "isExternal": true,
       "version": "9.1.24"
     }
   ]
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.textproto
@@ -8,6 +8,6 @@ components {
   type: CLASSIFICATION_LIBRARY
   name: "Foo"
   description: "extraneous with version constraint",
-  isExtraneous: true
+  isExternal: true
   version: "9.1.24"
 }
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml b/tools/src/test/resources/1.7/valid-component-extraneous-with-version.xml
@@ -3,10 +3,10 @@
      serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
 >
     <components>
-        <component type="library" isExtraneous="true">
+        <component type="library" isExternal="true">
             <name>Foo</name>
             <version>9.1.24</version>
             <description>extraneous with version constraint</description>
         </component>
     </components>
-</bom>
+</bom>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.json
@@ -9,7 +9,7 @@
       "type": "library",
       "name": "Foo",
       "description": "extraneous with version range constraints",
-      "isExtraneous": true,
+      "isExternal": true,
       "versionRange": "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
     }
   ]
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.textproto
@@ -8,6 +8,6 @@ components {
   type: CLASSIFICATION_LIBRARY
   name: "Foo"
   description: "extraneous with version range constraints"
-  isExtraneous: true
+  isExternal: true
   versionRange: "vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1"
 }
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml b/tools/src/test/resources/1.7/valid-component-extraneous-with-versionRange.xml
@@ -3,7 +3,7 @@
      serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
 >
     <components>
-        <component type="library" isExtraneous="true">
+        <component type="library" isExternal="true">
             <name>Foo</name>
             <versionRange><![CDATA[vers:pypi/0.0.0|0.0.1|0.0.2|0.0.3|1.0|2.0pre1]]></versionRange>
             <description>extraneous with version range constraints</description>
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.json
@@ -9,7 +9,7 @@
       "type": "library",
       "name": "Foo",
       "description": "extraneous without version constraint",
-      "isExtraneous": true
+      "isExternal": true
     }
   ]
 }
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.textproto
@@ -8,5 +8,5 @@ components {
   type: CLASSIFICATION_LIBRARY
   name: "Foo"
   description: "extraneous without version constraint",
-  isExtraneous: true
+  isExternal: true
 }
diff --git a/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml b/tools/src/test/resources/1.7/valid-component-extraneous-without-version.xml
@@ -3,7 +3,7 @@
      serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"
 >
     <components>
-        <component type="library" isExtraneous="true">
+        <component type="library" isExternal="true">
             <name>Foo</name>
             <description>extraneous without version constraint</description>
         </component>

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	"description": "may have `version` or `versionRange`, not both. This one does - it is invalid",
`12`	`12`	`"version": "9.0.14",`
`13`	`13`	`"versionRange": "vers:pypi/0.0.0\|0.0.1\|0.0.2\|0.0.3\|1.0\|2.0pre1",`
`14`		`- "isExtraneous": true`
	`14`	`+ "isExternal": true`
`15`	`15`	`}`
`16`	`16`	`]`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1"`
`4`	`4`	`>`
`5`	`5`	`<components>`
`6`		`- <component type="library" isExtraneous="true">`
	`6`	`+ <component type="library" isExternal="true">`
`7`	`7`	`<name>InvalidVersions</name>`
`8`	`8`	`<version>9.0.14</version>`
`9`	`9`	`<versionRange><![CDATA[vers:pypi/0.0.0\|0.0.1\|0.0.2\|0.0.3\|1.0\|2.0pre1]]></versionRange>`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`	`{`
`9`	`9`	`"type": "library",`
`10`	`10`	`"name": "InvalidVersions",`
`11`		- "description": "versionRange may only exist on extraneous components; set `.isExtraneous` explicit",
`12`		`- "isExtraneous": false,`
	`11`	+ "description": "versionRange may only exist on extraneous components; set `.isExternal` explicit",
	`12`	`+ "isExternal": false,`
`13`	`13`	`"versionRange": "vers:pypi/0.0.0\|0.0.1\|0.0.2\|0.0.3\|1.0\|2.0pre1"`
`14`	`14`	`}`
`15`	`15`	`]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`{`
`9`	`9`	`"type": "library",`
`10`	`10`	`"name": "InvalidVersions",`
`11`		- "description": "versionRange may only exist on extraneous components; set `.isExtraneous` implicit by default value",
	`11`	+ "description": "versionRange may only exist on extraneous components; set `.isExternal` implicit by default value",
`12`	`12`	`"versionRange": "vers:pypi/0.0.0\|0.0.1\|0.0.2\|0.0.3\|1.0\|2.0pre1"`
`13`	`13`	`}`
`14`	`14`	`]`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"type": "library",`
`10`	`10`	`"name": "Foo",`
`11`	`11`	`"description": "extraneous without any version constraints",`
`12`		`- "isExtraneous": true`
	`12`	`+ "isExternal": true`
`13`	`13`	`}`
`14`	`14`	`]`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ components {`
`8`	`8`	`type: CLASSIFICATION_LIBRARY`
`9`	`9`	`name: "Foo"`
`10`	`10`	`description: "extraneous with version constraint",`
`11`		`- isExtraneous: true`
	`11`	`+ isExternal: true`
`12`	`12`	`version: "9.1.24"`
`13`	`13`	`}`