Skip to content

Commit 9afa6aa

Browse files
committed
Fix tests
1 parent 408d925 commit 9afa6aa

26 files changed

Lines changed: 82 additions & 79 deletions

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ apply from: "$rootDir/gradle-scripts/set-library-version.gradle"
3030

3131
ext {
3232
mockitoVersion = '5.14.2'
33-
slf4jTestVersion = '1.2.0'
33+
slf4jTestVersion = '2.9.0'
3434
assertjVersion = '3.26.3'
3535
pmdVersion = '7.7.0'
3636
jacocoVersion = '0.8.12'
@@ -70,7 +70,7 @@ dependencies {
7070
implementation "ch.qos.logback:logback-classic:${logbackVersion}"
7171
implementation "ch.qos.logback:logback-core:${logbackVersion}"
7272
implementation "net.logstash.logback:logstash-logback-encoder:${logstashLogbackEncoderVersion}"
73-
testImplementation "uk.org.lidalia:slf4j-test:${slf4jTestVersion}"
73+
testImplementation "com.github.valfirst:slf4j-test:${slf4jTestVersion}"
7474
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
7575
testImplementation "org.junit.jupiter:junit-jupiter-api:${jupiterApiVersion}"
7676
testImplementation "org.junit.jupiter:junit-jupiter-params:${jupiterApiVersion}"

src/integration-test/java/com/commercetools/project/sync/CategorySyncWithReferenceResolutionIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
import com.commercetools.api.models.type.TypeDraftBuilder;
2424
import com.commercetools.api.models.type.TypeTextInputHint;
2525
import com.commercetools.project.sync.category.CategorySyncer;
26+
import com.github.valfirst.slf4jtest.TestLogger;
27+
import com.github.valfirst.slf4jtest.TestLoggerFactory;
2628
import org.junit.jupiter.api.AfterAll;
2729
import org.junit.jupiter.api.BeforeEach;
2830
import org.junit.jupiter.api.Test;
2931
import uk.org.lidalia.slf4jext.Level;
30-
import uk.org.lidalia.slf4jtest.TestLogger;
31-
import uk.org.lidalia.slf4jtest.TestLoggerFactory;
3232

3333
public class CategorySyncWithReferenceResolutionIT {
3434

src/integration-test/java/com/commercetools/project/sync/CliRunnerIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@
9090
import com.fasterxml.jackson.databind.ObjectMapper;
9191
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
9292
import com.fasterxml.jackson.databind.node.ObjectNode;
93+
import com.github.valfirst.slf4jtest.TestLogger;
94+
import com.github.valfirst.slf4jtest.TestLoggerFactory;
9395
import io.vrap.rmf.base.client.ApiHttpResponse;
9496
import io.vrap.rmf.base.client.utils.json.JsonUtils;
9597
import java.time.ZonedDateTime;
@@ -102,8 +104,6 @@
102104
import org.junit.jupiter.api.BeforeEach;
103105
import org.junit.jupiter.api.Test;
104106
import uk.org.lidalia.slf4jext.Level;
105-
import uk.org.lidalia.slf4jtest.TestLogger;
106-
import uk.org.lidalia.slf4jtest.TestLoggerFactory;
107107

108108
// This will suppress MoreThanOneLogger warnings in this class
109109
@SuppressWarnings("PMD.MoreThanOneLogger")

src/integration-test/java/com/commercetools/project/sync/InventorySyncMultiChannelIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.commercetools.api.models.type.TypeDraftBuilder;
2727
import com.commercetools.project.sync.inventoryentry.InventoryEntrySyncer;
2828
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
29+
import com.github.valfirst.slf4jtest.TestLogger;
30+
import com.github.valfirst.slf4jtest.TestLoggerFactory;
2931
import io.vrap.rmf.base.client.ApiHttpResponse;
3032
import java.util.concurrent.CompletableFuture;
3133
import java.util.stream.IntStream;
@@ -34,8 +36,6 @@
3436
import org.junit.jupiter.api.Disabled;
3537
import org.junit.jupiter.api.Test;
3638
import uk.org.lidalia.slf4jext.Level;
37-
import uk.org.lidalia.slf4jtest.TestLogger;
38-
import uk.org.lidalia.slf4jtest.TestLoggerFactory;
3939

4040
@Disabled(
4141
"Disabled for normal builds, "

src/integration-test/java/com/commercetools/project/sync/ProductSyncWithDiscountedPriceIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
import com.commercetools.api.models.product_type.ProductType;
2929
import com.commercetools.api.models.product_type.ProductTypeDraft;
3030
import com.commercetools.api.models.product_type.ProductTypeDraftBuilder;
31+
import com.github.valfirst.slf4jtest.TestLogger;
32+
import com.github.valfirst.slf4jtest.TestLoggerFactory;
3133
import java.time.ZonedDateTime;
3234
import javax.annotation.Nonnull;
3335
import javax.annotation.Nullable;
3436
import org.junit.jupiter.api.AfterAll;
3537
import org.junit.jupiter.api.BeforeEach;
3638
import org.junit.jupiter.api.Test;
3739
import uk.org.lidalia.slf4jext.Level;
38-
import uk.org.lidalia.slf4jtest.TestLogger;
39-
import uk.org.lidalia.slf4jtest.TestLoggerFactory;
4040

4141
class ProductSyncWithDiscountedPriceIT {
4242
private static final TestLogger cliRunnerTestLogger =

src/integration-test/java/com/commercetools/project/sync/ProductSyncWithImagesSyncIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
import com.commercetools.api.models.product_type.ProductType;
1919
import com.commercetools.api.models.product_type.ProductTypeDraft;
2020
import com.commercetools.api.models.product_type.ProductTypeDraftBuilder;
21+
import com.github.valfirst.slf4jtest.TestLogger;
22+
import com.github.valfirst.slf4jtest.TestLoggerFactory;
2123
import javax.annotation.Nonnull;
2224
import org.junit.jupiter.api.AfterAll;
2325
import org.junit.jupiter.api.BeforeEach;
2426
import org.junit.jupiter.api.Test;
2527
import uk.org.lidalia.slf4jext.Level;
26-
import uk.org.lidalia.slf4jtest.TestLogger;
27-
import uk.org.lidalia.slf4jtest.TestLoggerFactory;
2828

2929
class ProductSyncWithImagesSyncIT {
3030
private static final TestLogger cliRunnerTestLogger =

src/integration-test/java/com/commercetools/project/sync/ProductSyncWithMasterVariantSwitchIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import com.commercetools.api.models.product_type.ProductType;
2020
import com.commercetools.api.models.product_type.ProductTypeDraft;
2121
import com.commercetools.api.models.product_type.ProductTypeDraftBuilder;
22+
import com.github.valfirst.slf4jtest.TestLogger;
23+
import com.github.valfirst.slf4jtest.TestLoggerFactory;
2224
import javax.annotation.Nonnull;
2325
import org.junit.jupiter.api.AfterAll;
2426
import org.junit.jupiter.api.BeforeEach;
2527
import org.junit.jupiter.api.Test;
2628
import uk.org.lidalia.slf4jext.Level;
27-
import uk.org.lidalia.slf4jtest.TestLogger;
28-
import uk.org.lidalia.slf4jtest.TestLoggerFactory;
2929

3030
class ProductSyncWithMasterVariantSwitchIT {
3131
private static final TestLogger cliRunnerTestLogger =

src/integration-test/java/com/commercetools/project/sync/ProductSyncWithNestedReferencesIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
import com.fasterxml.jackson.databind.node.ArrayNode;
7373
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
7474
import com.fasterxml.jackson.databind.node.ObjectNode;
75+
import com.github.valfirst.slf4jtest.TestLogger;
76+
import com.github.valfirst.slf4jtest.TestLoggerFactory;
7577
import java.util.ArrayList;
7678
import java.util.Collections;
7779
import java.util.List;
@@ -82,8 +84,6 @@
8284
import org.junit.jupiter.api.BeforeEach;
8385
import org.junit.jupiter.api.Test;
8486
import uk.org.lidalia.slf4jext.Level;
85-
import uk.org.lidalia.slf4jtest.TestLogger;
86-
import uk.org.lidalia.slf4jtest.TestLoggerFactory;
8787

8888
// This will suppress MoreThanOneLogger warnings in this class
8989
@SuppressWarnings("PMD.MoreThanOneLogger")

src/integration-test/java/com/commercetools/project/sync/ProductSyncWithReferenceResolutionIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
import com.commercetools.api.models.type.TypeDraftBuilder;
5454
import com.commercetools.api.models.type.TypeTextInputHint;
5555
import com.commercetools.project.sync.product.ProductSyncer;
56+
import com.github.valfirst.slf4jtest.TestLogger;
57+
import com.github.valfirst.slf4jtest.TestLoggerFactory;
5658
import io.vrap.rmf.base.client.ApiHttpResponse;
5759
import io.vrap.rmf.base.client.http.HttpStatusCode;
5860
import java.util.List;
@@ -61,8 +63,6 @@
6163
import org.junit.jupiter.api.BeforeEach;
6264
import org.junit.jupiter.api.Test;
6365
import uk.org.lidalia.slf4jext.Level;
64-
import uk.org.lidalia.slf4jtest.TestLogger;
65-
import uk.org.lidalia.slf4jtest.TestLoggerFactory;
6666

6767
// This will suppress MoreThanOneLogger warnings in this class
6868
@SuppressWarnings("PMD.MoreThanOneLogger")

src/integration-test/java/com/commercetools/project/sync/ProductSyncWithReferencesIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
import com.fasterxml.jackson.databind.node.ArrayNode;
5353
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
5454
import com.fasterxml.jackson.databind.node.ObjectNode;
55+
import com.github.valfirst.slf4jtest.TestLogger;
56+
import com.github.valfirst.slf4jtest.TestLoggerFactory;
5557
import io.vrap.rmf.base.client.ApiHttpResponse;
5658
import java.util.List;
5759
import java.util.Set;
@@ -65,8 +67,6 @@
6567
import org.junit.jupiter.api.BeforeEach;
6668
import org.junit.jupiter.api.Test;
6769
import uk.org.lidalia.slf4jext.Level;
68-
import uk.org.lidalia.slf4jtest.TestLogger;
69-
import uk.org.lidalia.slf4jtest.TestLoggerFactory;
7070

7171
// This will suppress MoreThanOneLogger warnings in this class
7272
@SuppressWarnings("PMD.MoreThanOneLogger")

0 commit comments

Comments
 (0)