Test fixes

Author: joshheald

Modules/Tests/StorageTests/GRDB/PersistedProductBarcodeQueryTests.swift

@@ -63,68 +63,6 @@ struct PersistedProductBarcodeQueryTests {
         #expect(result == nil)
     }
 
-    @Test("posProductByGlobalUniqueID filters out downloadable products")
-    func test_global_unique_id_query_filters_downloadable() async throws {
-        // Given
-        let globalUniqueID = "UPC-DOWNLOADABLE"
-        let downloadableProduct = PersistedProduct(
-            id: 2,
-            siteID: siteID,
-            name: "Downloadable Product",
-            productTypeKey: "simple",
-            fullDescription: nil,
-            shortDescription: nil,
-            sku: nil,
-            globalUniqueID: globalUniqueID,
-            price: "5.00",
-            downloadable: true,
-            parentID: 0,
-            manageStock: false,
-            stockQuantity: nil,
-            stockStatusKey: "instock"
-        )
-        try await insertProduct(downloadableProduct)
-
-        // When
-        let result = try await grdbManager.databaseConnection.read { db in
-            try PersistedProduct.posProductByGlobalUniqueID(siteID: siteID, globalUniqueID: globalUniqueID).fetchOne(db)
-        }
-
-        // Then
-        #expect(result == nil)
-    }
-
-    @Test("posProductByGlobalUniqueID filters out unsupported product types")
-    func test_global_unique_id_query_filters_unsupported_types() async throws {
-        // Given
-        let globalUniqueID = "UPC-GROUPED"
-        let groupedProduct = PersistedProduct(
-            id: 3,
-            siteID: siteID,
-            name: "Grouped Product",
-            productTypeKey: "grouped",
-            fullDescription: nil,
-            shortDescription: nil,
-            sku: nil,
-            globalUniqueID: globalUniqueID,
-            price: "0.00",
-            downloadable: false,
-            parentID: 0,
-            manageStock: false,
-            stockQuantity: nil,
-            stockStatusKey: "instock"
-        )
-        try await insertProduct(groupedProduct)
-
-        // When
-        let result = try await grdbManager.databaseConnection.read { db in
-            try PersistedProduct.posProductByGlobalUniqueID(siteID: siteID, globalUniqueID: globalUniqueID).fetchOne(db)
-        }
-
-        // Then
-        #expect(result == nil)
-    }
-
     // MARK: - Site Isolation Tests
 
     @Test("Queries only return products from specified site")

Modules/Tests/StorageTests/GRDB/PersistedProductVariationBarcodeQueryTests.swift

@@ -80,54 +80,6 @@ struct PersistedProductVariationBarcodeQueryTests {
         #expect(result == nil)
     }
 
-    @Test("posVariationByGlobalUniqueID filters out downloadable variations")
-    func test_global_unique_id_query_filters_downloadable() async throws {
-        // Given
-        let globalUniqueID = "VAR-DOWNLOADABLE"
-
-        // Insert parent product first
-        let parentProduct = PersistedProduct(
-            id: 10,
-            siteID: siteID,
-            name: "Parent Product",
-            productTypeKey: "variable",
-            fullDescription: nil,
-            shortDescription: nil,
-            sku: nil,
-            globalUniqueID: nil,
-            price: "0.00",
-            downloadable: false,
-            parentID: 0,
-            manageStock: false,
-            stockQuantity: nil,
-            stockStatusKey: "instock"
-        )
-        try await insertProduct(parentProduct)
-
-        let downloadableVariation = PersistedProductVariation(
-            id: 101,
-            siteID: siteID,
-            productID: 10,
-            sku: nil,
-            globalUniqueID: globalUniqueID,
-            price: "5.00",
-            downloadable: true,
-            fullDescription: nil,
-            manageStock: false,
-            stockQuantity: nil,
-            stockStatusKey: "instock"
-        )
-        try await insertVariation(downloadableVariation)
-
-        // When
-        let result = try await grdbManager.databaseConnection.read { db in
-            try PersistedProductVariation.posVariationByGlobalUniqueID(siteID: siteID, globalUniqueID: globalUniqueID).fetchOne(db)
-        }
-
-        // Then
-        #expect(result == nil)
-    }
-
     // MARK: - Site Isolation Tests
 
     @Test("Queries only return variations from specified site")

Modules/Tests/YosemiteTests/PointOfSale/PointOfSaleLocalBarcodeScanServiceTests.swift

@@ -182,7 +182,9 @@ struct PointOfSaleLocalBarcodeScanServiceTests {
         try await insertProduct(groupedProduct)
 
         // When/Then - Should not find unsupported product type
-        await #expect(throws: PointOfSaleBarcodeScanError.notFound(scannedCode: barcode)) {
+        await #expect(throws: PointOfSaleBarcodeScanError.unsupportedProductType(scannedCode: barcode,
+                                                                                 productName: "Grouped Product",
+                                                                                 productType: .grouped)) {
             _ = try await sut.getItem(barcode: barcode)
         }
     }
@@ -210,17 +212,10 @@ struct PointOfSaleLocalBarcodeScanServiceTests {
         try await insertProduct(variableParentProduct)
 
         // When/Then - Should throw unsupportedProductType error
-        do {
+        await #expect(throws: PointOfSaleBarcodeScanError.unsupportedProductType(scannedCode: barcode,
+                                                                                 productName: "Variable Parent Product",
+                                                                                 productType: .variable)) {
             _ = try await sut.getItem(barcode: barcode)
-            Issue.record("Expected unsupportedProductType error but none was thrown")
-        } catch let error as PointOfSaleBarcodeScanError {
-            guard case .unsupportedProductType(let scannedCode, let productName, let productType) = error else {
-                Issue.record("Expected unsupportedProductType error, got \(error)")
-                return
-            }
-            #expect(scannedCode == barcode)
-            #expect(productName == "Variable Parent Product")
-            #expect(productType == .variable)
         }
     }