Get scan working on the same as redis-cli 6.2.1

Author: PeterAdams-A

Sources/RediStack/Commands/RedisCommand.swift

@@ -96,8 +96,8 @@ extension RedisCommand {
         var args: [RESPValue] = [.init(bulk: pos)]
 
         if let k = key { args.insert(.init(from: k), at: 0) }
-        if let m = match { args.append(.init(bulk: "match \(m)")) }
-        if let c = count { args.append(.init(bulk: "count \(c)")) }
+        if let m = match { args.append(contentsOf: [.init(bulk: "match"), .init(bulk: "\(m)")]) }
+        if let c = count { args.append(contentsOf: [.init(bulk: "count"), .init(bulk: "\(c)")]) }
 
         return .init(keyword: keyword, arguments: args) {
             let response = try $0.map(to: [RESPValue].self)

Tests/RediStackIntegrationTests/Commands/KeyCommandsTests.swift

@@ -125,29 +125,29 @@ final class KeyCommandsTests: RediStackIntegrationTestCase {
 
     // TODO: #23 -- Rework Scan Unit Test
     // This is extremely flakey, and causes non-deterministic failures because of the assert on key counts
-//    func test_scan() throws {
-//        var dataset: [RedisKey] = .init(repeating: "", count: 10)
-//        for index in 1...15 {
-//            let key = RedisKey("key\(index)\(index % 2 == 0 ? "_even" : "_odd")")
-//            dataset.append(key)
-//            _ = try connection.set(key, to: "\(index)").wait()
-//        }
-//
-//        var (cursor, keys) = try connection.scan(count: 5).wait()
-//        XCTAssertGreaterThanOrEqual(cursor, 0)
-//        XCTAssertGreaterThanOrEqual(keys.count, 5)
-//
-//        (_, keys) = try connection.scan(startingFrom: cursor, count: 8).wait()
-//        XCTAssertGreaterThanOrEqual(keys.count, 8)
-//
-//        (cursor, keys) = try connection.scan(matching: "*_odd").wait()
-//        XCTAssertGreaterThanOrEqual(cursor, 0)
-//        XCTAssertGreaterThanOrEqual(keys.count, 1)
-//        XCTAssertLessThanOrEqual(keys.count, 7)
-//
-//        (cursor, keys) = try connection.scan(matching: "*_even*").wait()
-//        XCTAssertGreaterThanOrEqual(cursor, 0)
-//        XCTAssertGreaterThanOrEqual(keys.count, 1)
-//        XCTAssertLessThanOrEqual(keys.count, 7)
-//    }
+    func test_scan() throws {
+        var dataset: [RedisKey] = .init(repeating: "", count: 10)
+        for index in 1...15 {
+            let key = RedisKey("key\(index)\(index % 2 == 0 ? "_even" : "_odd")")
+            dataset.append(key)
+            _ = try connection.set(key, to: "\(index)").wait()
+        }
+
+        var (cursor, keys) = try connection.scanKeys(count: 5).wait()
+        XCTAssertGreaterThanOrEqual(cursor, 0)
+        XCTAssertGreaterThanOrEqual(keys.count, 5)
+
+        (_, keys) = try connection.scanKeys(startingFrom: cursor, count: 8).wait()
+        XCTAssertGreaterThanOrEqual(keys.count, 8)
+
+        (cursor, keys) = try connection.scanKeys(matching: "*_odd").wait()
+        XCTAssertGreaterThanOrEqual(cursor, 0)
+        XCTAssertGreaterThanOrEqual(keys.count, 1)
+        XCTAssertLessThanOrEqual(keys.count, 7)
+
+        (cursor, keys) = try connection.scanKeys(matching: "*_even*").wait()
+        XCTAssertGreaterThanOrEqual(cursor, 0)
+        XCTAssertGreaterThanOrEqual(keys.count, 1)
+        XCTAssertLessThanOrEqual(keys.count, 7)
+    }
 }