From a782fd2cf79f4fd9bd35dfcaafd47d7737c59e5b Mon Sep 17 00:00:00 2001
From: Christopher Phillips <christopher.phillips@anchore.com>
Date: Tue, 19 Dec 2023 11:39:03 -0500
Subject: [PATCH] test: update memcached to new generator pattern

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
---
 syft/pkg/cataloger/binary/cataloger_test.go    | 10 +++++-----
 .../positive/memcached-1.6.18/memcached        | 13 -------------
 .../memcached                                  | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 18 deletions(-)
 delete mode 100644 syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/memcached-1.6.18/memcached
 create mode 100644 syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/memcached-1.6.18/memcached-1.6.18-176467412e0722ae1b2c1159555d33574653ebfa87e8591d88c1e6e416ab3019-19-100/memcached

diff --git a/syft/pkg/cataloger/binary/cataloger_test.go b/syft/pkg/cataloger/binary/cataloger_test.go
index b4e686603..e5abd7742 100644
--- a/syft/pkg/cataloger/binary/cataloger_test.go
+++ b/syft/pkg/cataloger/binary/cataloger_test.go
@@ -133,14 +133,14 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
 			},
 		},
 		{
-			name:       "positive-memcached-1.6.14",
-			fixtureDir: "test-fixtures/classifiers/positive/memcached-1.6.14",
+			name:       "positive-memcached-1.6.18",
+			fixtureDir: "test-fixtures/classifiers/positive/memcached-1.6.18",
 			expected: pkg.Package{
 				Name:      "memcached",
-				Version:   "1.6.14",
+				Version:   "1.6.18",
 				Type:      "binary",
-				PURL:      "pkg:generic/memcached@1.6.14",
-				Locations: locations("memcached"),
+				PURL:      "pkg:generic/memcached@1.6.18",
+				Locations: locations("memcached-1.6.18-176467412e0722ae1b2c1159555d33574653ebfa87e8591d88c1e6e416ab3019-19-100/memcached"),
 				Metadata:  metadata("memcached-binary"),
 			},
 		},
diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/memcached-1.6.18/memcached b/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/memcached-1.6.18/memcached
deleted file mode 100644
index 263043342..000000000
--- a/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/memcached-1.6.18/memcached
+++ /dev/null
@@ -1,13 +0,0 @@
-secs_since_last_cmd
-listen
-memcached 1.6.18
-udp-port
-memcached 1.6.18
-Failed to allocate memory
-%s,%s
---
-bget
-flush_all
-VERSION 1.6.18
-quit
-BADCLASS invalid class id
diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/memcached-1.6.18/memcached-1.6.18-176467412e0722ae1b2c1159555d33574653ebfa87e8591d88c1e6e416ab3019-19-100/memcached b/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/memcached-1.6.18/memcached-1.6.18-176467412e0722ae1b2c1159555d33574653ebfa87e8591d88c1e6e416ab3019-19-100/memcached
new file mode 100644
index 000000000..896e0369c
--- /dev/null
+++ b/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/memcached-1.6.18/memcached-1.6.18-176467412e0722ae1b2c1159555d33574653ebfa87e8591d88c1e6e416ab3019-19-100/memcached
@@ -0,0 +1,18 @@
+### generated by script get-fixture-snippet.sh at Tue Dec 19 11:36:59 EST 2023 ###
+# filename:       memcached
+# sha256:         176467412e0722ae1b2c1159555d33574653ebfa87e8591d88c1e6e416ab3019
+# file info:      ASCII text, with CRLF, LF line terminators
+# base64(search): MS42LjE4
+# start offset:   19
+# length:         100
+### start of binary snippet ###
+
+listen
+memcached 1.6.18
+udp-port
+memcached 1.6.18
+Failed to allocate memory
+%s,%s
+--
+bget
+f
\ No newline at end of file