test: rename "fixtures" to "testdata"

Author: G-Rath

.github/workflows/semantic.yml

@@ -52,7 +52,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-debian-versions
-          path: pkg/semantic/fixtures/debian-versions-generated.txt
+          path: pkg/semantic/testdata/debian-versions-generated.txt
 
       - uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
@@ -85,7 +85,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-redhat-versions
-          path: pkg/semantic/fixtures/redhat-versions-generated.txt
+          path: pkg/semantic/testdata/redhat-versions-generated.txt
 
       - uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
@@ -109,7 +109,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-packagist-versions
-          path: pkg/semantic/fixtures/packagist-versions-generated.txt
+          path: pkg/semantic/testdata/packagist-versions-generated.txt
 
   generate-pypi-versions:
     permissions:
@@ -129,7 +129,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-pypi-versions
-          path: pkg/semantic/fixtures/pypi-versions-generated.txt
+          path: pkg/semantic/testdata/pypi-versions-generated.txt
 
   generate-rubygems-versions:
     permissions:
@@ -149,7 +149,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-rubygems-versions
-          path: pkg/semantic/fixtures/rubygems-versions-generated.txt
+          path: pkg/semantic/testdata/rubygems-versions-generated.txt
 
   generate-maven-versions:
     permissions:
@@ -175,7 +175,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-maven-versions
-          path: pkg/semantic/fixtures/maven-versions-generated.txt
+          path: pkg/semantic/testdata/maven-versions-generated.txt
 
   generate-cran-versions:
     permissions:
@@ -193,7 +193,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-cran-versions
-          path: pkg/semantic/fixtures/cran-versions-generated.txt
+          path: pkg/semantic/testdata/cran-versions-generated.txt
 
   test-semantic:
     permissions:
@@ -220,7 +220,7 @@ jobs:
       - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           pattern: generated-*-versions
-          path: pkg/semantic/fixtures/
+          path: pkg/semantic/testdata/
           merge-multiple: true
       - run: git status
       - run: make test

.gitignore

@@ -34,9 +34,9 @@ pids
 vendor/
 
 # These files are generated during tests
-fixtures/locks-insecure-nested/.osv-detector.yml
-fixtures/locks-insecure-nested/nested/.osv-detector.yml
-fixtures/locks-insecure-many/.osv-detector.yml
-fixtures/existing-config-with-ignored-ignores.yml
-fixtures/existing-config-with-ignores.yml
-fixtures/existing-config.yml
+testdata/locks-insecure-nested/.osv-detector.yml
+testdata/locks-insecure-nested/nested/.osv-detector.yml
+testdata/locks-insecure-many/.osv-detector.yml
+testdata/existing-config-with-ignored-ignores.yml
+testdata/existing-config-with-ignores.yml
+testdata/existing-config.yml

.prettierignore

@@ -1,7 +1,7 @@
-**/fixtures/bun/*.json5
-**/fixtures/pnpm/*.yaml
-**/fixtures/**/invalid.json
-**/fixtures/configs-invalid/*.yaml
-**/fixtures/locks-e2e/
-internal/configer/fixtures/ext-yaml-invalid/*.yaml
-internal/configer/fixtures/ext-yml-invalid/*.yml
+**/testdata/bun/*.json5
+**/testdata/pnpm/*.yaml
+**/testdata/**/invalid.json
+**/testdata/configs-invalid/*.yaml
+**/testdata/locks-e2e/
+internal/configer/testdata/ext-yaml-invalid/*.yaml
+internal/configer/testdata/ext-yml-invalid/*.yml

Makefile

@@ -29,5 +29,5 @@ lint-with-go-fmt:
 format-with-prettier:
 	npx prettier --prose-wrap always --write .
 
-regenerate-e2e-fixtures: ${BINARY}
-	OSV_DETECTOR_CMD=./${BINARY} ./generators/generate-e2e-fixtures.js
+regenerate-e2e-testdata: ${BINARY}
+	OSV_DETECTOR_CMD=./${BINARY} ./generators/generate-e2e-testdata.js

generators/GenerateMavenVersions.java

@@ -15,7 +15,7 @@
 import java.util.zip.ZipFile;
 
 /**
- * Script for generating a list of maven version comparison fixtures based off
+ * Script for generating a list of maven version comparison testdata based off
  * every version mentioned in the OSV Maven database, sorted using the native
  * Maven implementation.
  * <p>
@@ -275,7 +275,7 @@ public static String getSelectFilter() {
   }
 
   public static void main(String[] args) throws IOException {
-    String outfile = "pkg/semantic/fixtures/maven-versions-generated.txt";
+    String outfile = "pkg/semantic/testdata/maven-versions-generated.txt";
     Map<String, List<String>> packages = fetchPackageVersions();
 
     writeToFile(outfile, generatePackageCompares(packages));

generators/generate-alpine-versions.py

@@ -262,7 +262,7 @@ def fetch_packages_versions():
   return extract_packages_with_versions(osvs)
 
 
-outfile = 'pkg/semantic/fixtures/alpine-versions-generated.txt'
+outfile = 'pkg/semantic/testdata/alpine-versions-generated.txt'
 
 packs = fetch_packages_versions()
 with open(outfile, 'w') as f:

generators/generate-cran-versions.R

@@ -170,7 +170,7 @@ fetch_packages_versions <- function() {
   return(extract_packages_with_versions(osvs))
 }
 
-outfile <- "pkg/semantic/fixtures/cran-versions-generated.txt"
+outfile <- "pkg/semantic/testdata/cran-versions-generated.txt"
 
 packs <- fetch_packages_versions()
 writeLines(generate_package_compares(packs), outfile, sep = "\n")

generators/generate-debian-versions.py

@@ -218,7 +218,7 @@ def fetch_packages_versions():
   return extract_packages_with_versions(osvs)
 
 
-outfile = 'pkg/semantic/fixtures/debian-versions-generated.txt'
+outfile = 'pkg/semantic/testdata/debian-versions-generated.txt'
 
 packs = fetch_packages_versions()
 with open(outfile, 'w') as f:

generators/generate-e2e-fixtures.js generators/generate-e2e-testdata.jsgenerators/generate-e2e-fixtures.js renamed to generators/generate-e2e-testdata.js

@@ -5,7 +5,7 @@ const path = require('path');
 const child_process = require('child_process');
 
 const root = path.join(__dirname, '..');
-const fixturesDir = 'fixtures/locks-e2e';
+const testdataDir = 'testdata/locks-e2e';
 
 const OSV_DETECTOR_CMD = process.env.OSV_DETECTOR_CMD ?? 'osv-detector';
 
@@ -55,7 +55,7 @@ const wildcardDatabaseStats = output => {
 const regenerateFixture = async fileName => {
   const [, parseAs] = /\d+-(.*)/u.exec(fileName) ?? [];
 
-  const p = path.join(fixturesDir, fileName);
+  const p = path.join(testdataDir, fileName);
   if (!parseAs) {
     console.error('could not determine parser for', p);
   }
@@ -65,14 +65,14 @@ const regenerateFixture = async fileName => {
   console.log('(re)generated', p, 'fixture', `(parsed as ${parseAs})`);
 
   await fs.writeFile(
-    path.join(root, fixturesDir, `${fileName}.out.txt`),
+    path.join(root, testdataDir, `${fileName}.out.txt`),
     wildcardDatabaseStats(output)
   );
 };
 
 (async () => {
   const files = (
-    await fs.readdir(path.join(root, fixturesDir), { withFileTypes: true })
+    await fs.readdir(path.join(root, testdataDir), { withFileTypes: true })
   ).filter(dirent => dirent.isFile() && !dirent.name.endsWith('.out.txt'));
 
   await Promise.all(files.map(file => regenerateFixture(file.name)));

generators/generate-packagist-versions.php

@@ -213,7 +213,7 @@ function compareVersions(array $lines, string $select = "all"): bool
   return $hasAnyFailed;
 }
 
-$outfile = "pkg/semantic/fixtures/packagist-versions-generated.txt";
+$outfile = "pkg/semantic/testdata/packagist-versions-generated.txt";
 
 /** @noinspection PhpUnhandledExceptionInspection */
 $packages = fetchPackageVersions();