Merge pull request #477 from Ecwid/ECWID-157318-b

fixed tests before ECWID-157318 Negative promo targets - filter categories for exclusion list - apiclient

Author: renat-ayzyatullen

src/main/kotlin/com/ecwid/apiclient/v3/dto/category/request/CategoriesSearchRequest.kt

@@ -20,6 +20,7 @@ data class CategoriesSearchRequest(
 	val responseFields: ResponseFields = ResponseFields.All,
 ) : ApiRequest, PagingRequest<CategoriesSearchRequest> {
 
+
 	override fun toRequestInfo() = RequestInfo.createGetRequest(
 		pathSegments = listOf(
 			"categories"

src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt

@@ -423,7 +423,7 @@ class CartsTest : BaseEntityTest() {
 
 		apiClient.createOrder(orderCreateRequest)
 
-		return processDelay(500L, 10) {
+		return processDelay(1500L, 10) {
 			val cartsSearchResult2 = apiClient.searchCartsAsSequence(cartsSearchRequest)
 			val newCartList = cartsSearchResult2 - cartsSearchResult1
 			if (newCartList.count() == 1) newCartList[0].cartId else null

src/test/kotlin/com/ecwid/apiclient/v3/entity/OrdersTest.kt

@@ -226,7 +226,7 @@ class OrdersTest : BaseEntityTest() {
 		assertTrue(orderCreateResult.id > 0)
 
 		// Waiting till order became available for searching
-		processDelay(1000, 10) {
+		processDelay(1500, 10) {
 			val ordersSearchRequest = OrdersSearchRequest(keywords = orderCreateRequest.newOrder.orderComments)
 			val ordersSearchResult = apiClient.searchOrders(ordersSearchRequest)
 			if (ordersSearchResult.total > 0) ordersSearchResult else null
@@ -337,7 +337,7 @@ class OrdersTest : BaseEntityTest() {
 
 		// Waiting till order became available for searching and trying to request only one page
 		val ordersSearchRequest = OrdersSearchRequest(offset = 2, limit = 2)
-		val ordersSearchResult = processDelay(1000, 10) {
+		val ordersSearchResult = processDelay(1500, 10) {
 			val result = apiClient.searchOrders(ordersSearchRequest)
 			if (result.count == 1 && result.total == 3) result else null
 		}
@@ -356,7 +356,7 @@ class OrdersTest : BaseEntityTest() {
 		val orderCreateResult = apiClient.createOrder(orderCreateRequest)
 		assertTrue(orderCreateResult.id > 0)
 
-		processDelay(1000, 10) {
+		processDelay(1500, 10) {
 			val result = apiClient.searchOrders(OrdersSearchRequest())
 			if (result.count == 1) result else null
 		}

src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt

@@ -109,7 +109,7 @@ fun generateTestOrder(): UpdatedOrder {
 			shippingRate = randomPrice(),
 			estimatedTransitTime = "Estimates " + randomAlphanumeric(8),
 			isPickup = true,
-			pickupInstruction = "Instruction " + randomAlphanumeric(64),
+			pickupInstruction = null, // can not be set now without matching owner.newShippingSettings entry ECWID-153335
 			fulfillmentType = FulfillmentType.PICKUP
 		),
 		taxesOnShipping = listOf(),