From 5e555309f434496e287bd05f4bffeb81e95a0672 Mon Sep 17 00:00:00 2001 From: Christopher Phillips Date: Tue, 19 Dec 2023 11:50:09 -0500 Subject: [PATCH] test: rename unversioned java to versioned folders Signed-off-by: Christopher Phillips --- syft/pkg/cataloger/binary/cataloger_test.go | 2 +- .../positive/{ibm => ibm-java-1.8.0}/java | Bin .../positive/{oracle => oracle-java-19.0.1}/java | Bin .../{oracle-macos => oracle-macos-java-19.0.1}/java | Bin 4 files changed, 1 insertion(+), 1 deletion(-) rename syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/{ibm => ibm-java-1.8.0}/java (100%) rename syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/{oracle => oracle-java-19.0.1}/java (100%) rename syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/{oracle-macos => oracle-macos-java-19.0.1}/java (100%) diff --git a/syft/pkg/cataloger/binary/cataloger_test.go b/syft/pkg/cataloger/binary/cataloger_test.go index e5abd7742..7fde32a5e 100644 --- a/syft/pkg/cataloger/binary/cataloger_test.go +++ b/syft/pkg/cataloger/binary/cataloger_test.go @@ -582,7 +582,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) { }, { name: "positive-java-oracle-macos", - fixtureDir: "test-fixtures/classifiers/positive/oracle-macos-19.0.1", + fixtureDir: "test-fixtures/classifiers/positive/oracle-macos--java-19.0.1", expected: pkg.Package{ Name: "java", Version: "19.0.1+10-21", diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/ibm/java b/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/ibm-java-1.8.0/java similarity index 100% rename from syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/ibm/java rename to syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/ibm-java-1.8.0/java diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/oracle/java b/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/oracle-java-19.0.1/java similarity index 100% rename from syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/oracle/java rename to syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/oracle-java-19.0.1/java diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/oracle-macos/java b/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/oracle-macos-java-19.0.1/java similarity index 100% rename from syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/oracle-macos/java rename to syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/oracle-macos-java-19.0.1/java