From 5afdd574a8eac49caddf33d2ddf95cc0fe8fe744 Mon Sep 17 00:00:00 2001 From: Dan Luhring Date: Sat, 14 Nov 2020 14:55:41 -0500 Subject: [PATCH] Update existing archive test cases to correct names and versions Signed-off-by: Dan Luhring --- syft/cataloger/java/archive_filename_test.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/syft/cataloger/java/archive_filename_test.go b/syft/cataloger/java/archive_filename_test.go index 1cc9c9038..972e6fb6f 100644 --- a/syft/cataloger/java/archive_filename_test.go +++ b/syft/cataloger/java/archive_filename_test.go @@ -93,23 +93,18 @@ func TestExtractInfoFromJavaArchiveFilename(t *testing.T) { ty: pkg.JavaPkg, }, { - filename: "/hudson.war:WEB-INF/lib/jtidy-4aug2000r7-dev-hudson-1.jar", - // I don't see how we can reliably account for this case - //version: "4aug2000r7-dev-hudson-1", - version: "", + filename: "/hudson.war:WEB-INF/lib/jtidy-4aug2000r7-dev-hudson-1.jar", + version: "4aug2000r7-dev-hudson-1", extension: "jar", name: "jtidy", ty: pkg.JavaPkg, }, { - filename: "/hudson.war:WEB-INF/lib/trilead-ssh2-build212-hudson-5.jar", - // I don't see how we can reliably account for this case - //version: "build212-hudson-5", - version: "5", + filename: "/hudson.war:WEB-INF/lib/trilead-ssh2-build212-hudson-5.jar", + version: "build212-hudson-5", extension: "jar", - // name: "trilead-ssh2", - name: "trilead-ssh2-build212-hudson", - ty: pkg.JavaPkg, + name: "trilead-ssh2", + ty: pkg.JavaPkg, }, { filename: "/hudson.war:WEB-INF/lib/guava-r06.jar",