Fix unit tests

Author: hichamboushaba

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/products/DuplicateProductTest.kt

@@ -1,6 +1,6 @@
 package com.woocommerce.android.ui.products
 
-import com.woocommerce.android.model.Product
+import com.woocommerce.android.model.ProductAggregate
 import com.woocommerce.android.model.ProductVariation
 import com.woocommerce.android.ui.products.details.ProductDetailRepository
 import com.woocommerce.android.ui.products.variations.VariationRepository
@@ -41,35 +41,35 @@ class DuplicateProductTest : BaseUnitTest() {
     @Test
     fun `should duplicate a product and set expected properties`() = testBlocking {
         // given
-        val productToDuplicate = ProductTestUtils.generateProduct().copy(sku = "not an empty value")
+        val productToDuplicate = ProductAggregate(ProductTestUtils.generateProduct().copy(sku = "not an empty value"))
         productDetailRepository.stub {
-            onBlocking { addProduct(any()) } doReturn Pair(true, 123)
+            onBlocking { addProduct(any<ProductAggregate>()) } doReturn Pair(true, 123)
         }
 
         // when
         sut.invoke(productToDuplicate)
 
         // then
-        val duplicationRequestCapture = argumentCaptor<Product>()
+        val duplicationRequestCapture = argumentCaptor<ProductAggregate>()
         verify(productDetailRepository).addProduct(duplicationRequestCapture.capture())
 
         assertThat(duplicationRequestCapture.firstValue)
             .matches {
-                it.remoteId == 0L && it.name == "copied name" && it.sku == "" && it.status == ProductStatus.DRAFT
+                it.remoteId == 0L && it.product.name == "copied name" && it.product.sku == "" && it.product.status == ProductStatus.DRAFT
             }
             .usingRecursiveComparison()
-            .ignoringFields("remoteId", "name", "sku", "status")
+            .ignoringFields("product.remoteId", "product.name", "product.sku", "product.status")
             .isEqualTo(productToDuplicate)
     }
 
     @Test
     fun `should duplicate a variable product and keep all properties of variations except sku and remoteProductId`() =
         testBlocking {
             // given
-            val productToDuplicate = ProductTestUtils.generateProduct().copy(numVariations = 15)
+            val productToDuplicate = ProductAggregate(ProductTestUtils.generateProduct().copy(numVariations = 15))
             val duplicatedProductId = 456L
             productDetailRepository.stub {
-                onBlocking { addProduct(any()) } doReturn Pair(true, duplicatedProductId)
+                onBlocking { addProduct(any<ProductAggregate>()) } doReturn Pair(true, duplicatedProductId)
             }
 
             val variationsOfProductToDuplicate =

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/products/details/ProductDetailViewModel_AddFlowTest.kt

@@ -224,7 +224,7 @@ class ProductDetailViewModel_AddFlowTest : BaseUnitTest() {
     fun `Display success message on add product success`() = testBlocking {
         // given
         doReturn(ProductAggregate(product)).whenever(productRepository).getProductAggregate(any())
-        doReturn(Pair(true, 1L)).whenever(productRepository).addProduct(any())
+        doReturn(Pair(true, 1L)).whenever(productRepository).addProduct(any<ProductAggregate>())
 
         var successSnackbarShown = false
         viewModel.event.observeForever {
@@ -256,7 +256,7 @@ class ProductDetailViewModel_AddFlowTest : BaseUnitTest() {
     @Test
     fun `Display error message on add product failed`() = testBlocking {
         // given
-        doReturn(Pair(false, 0L)).whenever(productRepository).addProduct(any())
+        doReturn(Pair(false, 0L)).whenever(productRepository).addProduct(any<ProductAggregate>())
 
         var successSnackbarShown = false
         viewModel.event.observeForever {
@@ -310,7 +310,7 @@ class ProductDetailViewModel_AddFlowTest : BaseUnitTest() {
         testBlocking {
             // given
             doReturn(ProductAggregate(product)).whenever(productRepository).getProductAggregate(any())
-            doReturn(Pair(true, 1L)).whenever(productRepository).addProduct(any())
+            doReturn(Pair(true, 1L)).whenever(productRepository).addProduct(any<ProductAggregate>())
 
             var successSnackbarShown = false
             viewModel.event.observeForever {
@@ -399,7 +399,7 @@ class ProductDetailViewModel_AddFlowTest : BaseUnitTest() {
 
     @Test
     fun `when a new product is saved, then assign the new id to ongoing image uploads`() = testBlocking {
-        doReturn(Pair(true, PRODUCT_REMOTE_ID)).whenever(productRepository).addProduct(any())
+        doReturn(Pair(true, PRODUCT_REMOTE_ID)).whenever(productRepository).addProduct(any<ProductAggregate>())
         doReturn(product).whenever(productRepository).getProductAggregate(any())
         savedState = ProductDetailFragmentArgs(
             mode = ProductDetailFragment.Mode.AddNewProduct
@@ -454,7 +454,7 @@ class ProductDetailViewModel_AddFlowTest : BaseUnitTest() {
     @Test
     fun `given a product is under creation, when clicking on save product, then assign uploads to the new id`() =
         testBlocking {
-            doReturn(Pair(true, PRODUCT_REMOTE_ID)).whenever(productRepository).addProduct(any())
+            doReturn(Pair(true, PRODUCT_REMOTE_ID)).whenever(productRepository).addProduct(any<ProductAggregate>())
             doReturn(product).whenever(productRepository).getProductAggregate(any())
             viewModel.productDetailViewStateData.observeForever { _, _ -> }
 
@@ -494,7 +494,7 @@ class ProductDetailViewModel_AddFlowTest : BaseUnitTest() {
 
     @Test
     fun `given product status is draft, when save is clicked, then save product with correct status`() = testBlocking {
-        whenever(productRepository.addProduct(any())).thenAnswer { it.arguments.first() as Product }
+        whenever(productRepository.addProduct(any<ProductAggregate>())).thenAnswer { it.arguments.first() as Product }
         var viewState: ProductDetailViewModel.ProductDetailViewState? = null
         viewModel.productDetailViewStateData.observeForever { _, new -> viewState = new }