Skip to content

Commit 16a763a

Browse files
author
salander85
committed
Replace source utils usage in tests with mocks
1 parent cbc5043 commit 16a763a

File tree

5 files changed

+69
-72
lines changed

5 files changed

+69
-72
lines changed

‎src/integration-test/java/com/commercetools/sync/integration/externalsource/producttypes/ProductTypeSyncIT.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.commercetools.api.defaultconfig.ApiRootBuilder;
1919
import com.commercetools.api.models.product_type.AttributeConstraintEnum;
2020
import com.commercetools.api.models.product_type.AttributeDefinition;
21-
import com.commercetools.api.models.product_type.AttributeDefinitionBuilder;
2221
import com.commercetools.api.models.product_type.AttributeDefinitionDraft;
2322
import com.commercetools.api.models.product_type.AttributeDefinitionDraftBuilder;
2423
import com.commercetools.api.models.product_type.AttributeLocalizedEnumValueBuilder;
@@ -36,7 +35,6 @@
3635
import com.commercetools.sync.producttypes.ProductTypeSyncOptions;
3736
import com.commercetools.sync.producttypes.ProductTypeSyncOptionsBuilder;
3837
import com.commercetools.sync.producttypes.helpers.ProductTypeSyncStatistics;
39-
import com.commercetools.sync.producttypes.helpers.ResourceToDraftConverters;
4038
import io.vrap.rmf.base.client.ApiHttpMethod;
4139
import io.vrap.rmf.base.client.ApiHttpResponse;
4240
import io.vrap.rmf.base.client.error.BadGatewayException;
@@ -870,8 +868,8 @@ void sync_withProductTypeWithCategoryReference_ShouldAddNewAttributesToTheProduc
870868
final ProductTypeSyncOptions productTypeSyncOptions =
871869
ProductTypeSyncOptionsBuilder.of(CTP_TARGET_CLIENT).build();
872870

873-
final AttributeDefinition referenceTypeAttr =
874-
AttributeDefinitionBuilder.of()
871+
final AttributeDefinitionDraft referenceTypeAttr =
872+
AttributeDefinitionDraftBuilder.of()
875873
.name("referenceTypeAttr")
876874
.label(ofEnglish("referenceTypeAttr"))
877875
.type(
@@ -893,9 +891,7 @@ void sync_withProductTypeWithCategoryReference_ShouldAddNewAttributesToTheProduc
893891
.key(PRODUCT_TYPE_KEY_3)
894892
.name(PRODUCT_TYPE_NAME_3)
895893
.description(PRODUCT_TYPE_DESCRIPTION_3)
896-
.attributes(
897-
ResourceToDraftConverters.toAttributeDefinitionDraftBuilder(referenceTypeAttr)
898-
.build())
894+
.attributes(referenceTypeAttr)
899895
.build();
900896

901897
final ProductTypeSync productTypeSync = new ProductTypeSync(productTypeSyncOptions);
@@ -906,10 +902,7 @@ void sync_withProductTypeWithCategoryReference_ShouldAddNewAttributesToTheProduc
906902
.key(PRODUCT_TYPE_KEY_3)
907903
.name(PRODUCT_TYPE_NAME_3)
908904
.description(PRODUCT_TYPE_DESCRIPTION_3)
909-
.attributes(
910-
ATTRIBUTE_DEFINITION_DRAFT_1,
911-
ResourceToDraftConverters.toAttributeDefinitionDraftBuilder(referenceTypeAttr)
912-
.build())
905+
.attributes(ATTRIBUTE_DEFINITION_DRAFT_1, referenceTypeAttr)
913906
.build();
914907

915908
productTypeSync.sync(singletonList(updatedProductTypeDraft)).toCompletableFuture().join();

‎src/test/java/com/commercetools/sync/producttypes/utils/AttributeDefinitionUpdateActionUtilsTest.java‎

Lines changed: 30 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.commercetools.sync.producttypes.utils;
22

33
import static com.commercetools.api.models.common.LocalizedString.ofEnglish;
4+
import static com.commercetools.sync.producttypes.MockBuilderUtils.createMockAttributeDefinitionDraftBuilder;
45
import static java.util.Arrays.asList;
56
import static java.util.Collections.emptyList;
67
import static org.assertj.core.api.Assertions.assertThat;
@@ -30,7 +31,6 @@
3031
import com.commercetools.api.models.product_type.ProductTypeUpdateAction;
3132
import com.commercetools.api.models.product_type.TextInputHint;
3233
import com.commercetools.sync.producttypes.MockBuilderUtils;
33-
import com.commercetools.sync.producttypes.helpers.ResourceToDraftConverters;
3434
import java.util.List;
3535
import java.util.Optional;
3636
import org.junit.jupiter.api.Test;
@@ -51,7 +51,7 @@ class AttributeDefinitionUpdateActionUtilsTest {
5151
void buildChangeLabelAction_WithDifferentValues_ShouldReturnAction() {
5252
// Preparation
5353
final AttributeDefinitionDraft draft =
54-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder().label(ofEnglish("x")).build();
54+
createMockAttributeDefinitionDraftBuilder().label(ofEnglish("x")).build();
5555

5656
final AttributeDefinition attributeDefinition =
5757
MockBuilderUtils.createMockAttributeDefinitionBuilder().label(ofEnglish("y")).build();
@@ -73,8 +73,7 @@ void buildChangeLabelAction_WithDifferentValues_ShouldReturnAction() {
7373
@Test
7474
void buildChangeLabelAction_WithSameValues_ShouldReturnEmptyOptional() {
7575
// Preparation
76-
final AttributeDefinitionDraft draft =
77-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder().build();
76+
final AttributeDefinitionDraft draft = createMockAttributeDefinitionDraftBuilder().build();
7877

7978
final AttributeDefinition attributeDefinition =
8079
MockBuilderUtils.createMockAttributeDefinitionBuilder().build();
@@ -92,9 +91,7 @@ void buildChangeLabelAction_WithSameValues_ShouldReturnEmptyOptional() {
9291
void buildSetInputTipAction_WithDifferentValues_ShouldReturnAction() {
9392
// Preparation
9493
final AttributeDefinitionDraft draft =
95-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
96-
.inputTip(ofEnglish("foo"))
97-
.build();
94+
createMockAttributeDefinitionDraftBuilder().inputTip(ofEnglish("foo")).build();
9895

9996
final AttributeDefinition attributeDefinition =
10097
MockBuilderUtils.createMockAttributeDefinitionBuilder().inputTip(ofEnglish("bar")).build();
@@ -117,9 +114,7 @@ void buildSetInputTipAction_WithDifferentValues_ShouldReturnAction() {
117114
void buildSetInputTipAction_WithSameValues_ShouldReturnEmptyOptional() {
118115
// Preparation
119116
final AttributeDefinitionDraft draft =
120-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
121-
.inputTip(ofEnglish("foo"))
122-
.build();
117+
createMockAttributeDefinitionDraftBuilder().inputTip(ofEnglish("foo")).build();
123118

124119
final AttributeDefinition attributeDefinition =
125120
MockBuilderUtils.createMockAttributeDefinitionBuilder().inputTip(ofEnglish("foo")).build();
@@ -137,9 +132,7 @@ void buildSetInputTipAction_WithSameValues_ShouldReturnEmptyOptional() {
137132
void buildSetInputTipAction_WithSourceNullValues_ShouldReturnAction() {
138133
// Preparation
139134
final AttributeDefinitionDraft draft =
140-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
141-
.inputTip((LocalizedString) null)
142-
.build();
135+
createMockAttributeDefinitionDraftBuilder().inputTip((LocalizedString) null).build();
143136

144137
final AttributeDefinition attributeDefinition =
145138
MockBuilderUtils.createMockAttributeDefinitionBuilder().inputTip(ofEnglish("foo")).build();
@@ -162,9 +155,7 @@ void buildSetInputTipAction_WithSourceNullValues_ShouldReturnAction() {
162155
void buildSetInputTipAction_WithTargetNullValues_ShouldReturnAction() {
163156
// Preparation
164157
final AttributeDefinitionDraft draft =
165-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
166-
.inputTip(ofEnglish("foo"))
167-
.build();
158+
createMockAttributeDefinitionDraftBuilder().inputTip(ofEnglish("foo")).build();
168159

169160
final AttributeDefinition attributeDefinition =
170161
MockBuilderUtils.createMockAttributeDefinitionBuilder()
@@ -189,7 +180,7 @@ void buildSetInputTipAction_WithTargetNullValues_ShouldReturnAction() {
189180
void buildChangeIsSearchableAction_WithDifferentValues_ShouldReturnAction() {
190181
// Preparation
191182
final AttributeDefinitionDraft draft =
192-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder().isSearchable(true).build();
183+
createMockAttributeDefinitionDraftBuilder().isSearchable(true).build();
193184

194185
final AttributeDefinition attributeDefinition =
195186
MockBuilderUtils.createMockAttributeDefinitionBuilder().isSearchable(false).build();
@@ -211,7 +202,7 @@ void buildChangeIsSearchableAction_WithDifferentValues_ShouldReturnAction() {
211202
void buildChangeIsSearchableAction_WithSameValues_ShouldReturnEmptyOptional() {
212203
// Preparation
213204
final AttributeDefinitionDraft draft =
214-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder().isSearchable(true).build();
205+
createMockAttributeDefinitionDraftBuilder().isSearchable(true).build();
215206

216207
final AttributeDefinition attributeDefinition =
217208
MockBuilderUtils.createMockAttributeDefinitionBuilder().isSearchable(true).build();
@@ -228,7 +219,7 @@ void buildChangeIsSearchableAction_WithSameValues_ShouldReturnEmptyOptional() {
228219
void buildChangeIsSearchableAction_WithNullSourceAndNonDefaultTarget_ShouldBuildAction() {
229220
// Preparation
230221
final AttributeDefinitionDraft draft =
231-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder().isSearchable(null).build();
222+
createMockAttributeDefinitionDraftBuilder().isSearchable(null).build();
232223

233224
final AttributeDefinition attributeDefinition =
234225
MockBuilderUtils.createMockAttributeDefinitionBuilder().isSearchable(false).build();
@@ -250,7 +241,7 @@ void buildChangeIsSearchableAction_WithNullSourceAndNonDefaultTarget_ShouldBuild
250241
void buildChangeIsSearchableAction_WithNullSourceAndDefaultTarget_ShouldNotBuildAction() {
251242
// Preparation
252243
final AttributeDefinitionDraft draft =
253-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder().isSearchable(null).build();
244+
createMockAttributeDefinitionDraftBuilder().isSearchable(null).build();
254245

255246
final AttributeDefinition attributeDefinition =
256247
MockBuilderUtils.createMockAttributeDefinitionBuilder().isSearchable(true).build();
@@ -267,9 +258,7 @@ void buildChangeIsSearchableAction_WithNullSourceAndDefaultTarget_ShouldNotBuild
267258
void buildChangeInputHintAction_WithDifferentValues_ShouldReturnAction() {
268259
// Preparation
269260
final AttributeDefinitionDraft draft =
270-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
271-
.inputHint(TextInputHint.MULTI_LINE)
272-
.build();
261+
createMockAttributeDefinitionDraftBuilder().inputHint(TextInputHint.MULTI_LINE).build();
273262

274263
final AttributeDefinition attributeDefinition =
275264
MockBuilderUtils.createMockAttributeDefinitionBuilder()
@@ -293,9 +282,7 @@ void buildChangeInputHintAction_WithDifferentValues_ShouldReturnAction() {
293282
void buildChangeInputHintAction_WithSameValues_ShouldReturnEmptyOptional() {
294283
// Preparation
295284
final AttributeDefinitionDraft draft =
296-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
297-
.inputHint(TextInputHint.MULTI_LINE)
298-
.build();
285+
createMockAttributeDefinitionDraftBuilder().inputHint(TextInputHint.MULTI_LINE).build();
299286

300287
final AttributeDefinition attributeDefinition =
301288
MockBuilderUtils.createMockAttributeDefinitionBuilder()
@@ -314,7 +301,7 @@ void buildChangeInputHintAction_WithSameValues_ShouldReturnEmptyOptional() {
314301
void buildChangeInputHintAction_WithSourceNullValuesAndNonDefaultTargetValue_ShouldBuildAction() {
315302
// Preparation
316303
final AttributeDefinitionDraft draft =
317-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder().inputHint(null).build();
304+
createMockAttributeDefinitionDraftBuilder().inputHint(null).build();
318305

319306
final AttributeDefinition attributeDefinition =
320307
MockBuilderUtils.createMockAttributeDefinitionBuilder()
@@ -338,7 +325,7 @@ void buildChangeInputHintAction_WithSourceNullValuesAndNonDefaultTargetValue_Sho
338325
void buildChangeInputHintAction_WithSourceNullValuesAndDefaultTargetValue_ShouldNotBuildAction() {
339326
// Preparation
340327
final AttributeDefinitionDraft draft =
341-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder().inputHint(null).build();
328+
createMockAttributeDefinitionDraftBuilder().inputHint(null).build();
342329

343330
final AttributeDefinition attributeDefinition =
344331
MockBuilderUtils.createMockAttributeDefinitionBuilder()
@@ -358,7 +345,7 @@ void buildChangeAttributeConstraintAction_WithDifferentValues_ShouldBuildAction(
358345
throws UnsupportedOperationException {
359346
// Preparation
360347
final AttributeDefinitionDraft draft =
361-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
348+
createMockAttributeDefinitionDraftBuilder()
362349
.attributeConstraint(AttributeConstraintEnum.NONE)
363350
.build();
364351

@@ -385,7 +372,7 @@ void buildChangeAttributeConstraintAction_WithSameValues_ShouldReturnEmptyOption
385372
throws UnsupportedOperationException {
386373
// Preparation
387374
final AttributeDefinitionDraft draft =
388-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
375+
createMockAttributeDefinitionDraftBuilder()
389376
.attributeConstraint(AttributeConstraintEnum.COMBINATION_UNIQUE)
390377
.build();
391378

@@ -408,9 +395,7 @@ void buildChangeAttributeConstraintAction_WithSameValues_ShouldReturnEmptyOption
408395
throws UnsupportedOperationException {
409396
// Preparation
410397
final AttributeDefinitionDraft draft =
411-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
412-
.attributeConstraint(null)
413-
.build();
398+
createMockAttributeDefinitionDraftBuilder().attributeConstraint(null).build();
414399

415400
final AttributeDefinition attributeDefinition =
416401
MockBuilderUtils.createMockAttributeDefinitionBuilder()
@@ -440,7 +425,7 @@ void buildChangeAttributeConstraintAction_WithSameValues_ShouldReturnEmptyOption
440425
.build();
441426

442427
final AttributeDefinitionDraft draft =
443-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
428+
createMockAttributeDefinitionDraftBuilder()
444429
.attributeConstraint(AttributeConstraintEnum.COMBINATION_UNIQUE)
445430
.build();
446431
// test
@@ -469,7 +454,7 @@ void buildActions_WithNewDifferentValues_ShouldReturnActions()
469454
.build();
470455

471456
final AttributeDefinitionDraft newDifferent =
472-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
457+
createMockAttributeDefinitionDraftBuilder()
473458
.label(ofEnglish("label2"))
474459
.isRequired(true)
475460
.attributeConstraint(AttributeConstraintEnum.NONE)
@@ -509,8 +494,7 @@ void buildActions_WithNewDifferentValues_ShouldReturnActions()
509494
void buildActions_WithSameValues_ShouldReturnEmpty() throws UnsupportedOperationException {
510495
final AttributeDefinition old = MockBuilderUtils.createMockAttributeDefinitionBuilder().build();
511496

512-
final AttributeDefinitionDraft newSame =
513-
ResourceToDraftConverters.toAttributeDefinitionDraftBuilder(old).build();
497+
final AttributeDefinitionDraft newSame = createMockAttributeDefinitionDraftBuilder().build();
514498

515499
final List<ProductTypeUpdateAction> result =
516500
AttributeDefinitionUpdateActionUtils.buildActions(old, newSame);
@@ -525,9 +509,7 @@ void buildActions_WithStringAttributeTypesWithLabelChanges_ShouldBuildChangeLabe
525509
MockBuilderUtils.createMockAttributeDefinitionBuilder().label(ofEnglish("label1")).build();
526510

527511
final AttributeDefinitionDraft attributeDefinitionDraft =
528-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
529-
.label(ofEnglish("label2"))
530-
.build();
512+
createMockAttributeDefinitionDraftBuilder().label(ofEnglish("label2")).build();
531513

532514
final List<ProductTypeUpdateAction> result =
533515
AttributeDefinitionUpdateActionUtils.buildActions(
@@ -568,7 +550,7 @@ void buildActions_WithChangedSetOfEnumAttributeTypes_ShouldBuildEnumActions()
568550
.build();
569551

570552
final AttributeDefinitionDraft newDraft =
571-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
553+
createMockAttributeDefinitionDraftBuilder()
572554
.type(
573555
attributeTypeBuilder ->
574556
attributeTypeBuilder
@@ -653,7 +635,7 @@ void buildActions_WithChangedSetOfLocalizedEnumAttributeTypes_ShouldBuildEnumAct
653635
.build();
654636

655637
final AttributeDefinitionDraft newDefinition =
656-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
638+
createMockAttributeDefinitionDraftBuilder()
657639
.type(
658640
attributeTypeBuilder ->
659641
attributeTypeBuilder
@@ -722,7 +704,7 @@ void buildActions_WithNewPlainEnum_ShouldReturnAddEnumValueAction() {
722704
.build();
723705

724706
final AttributeDefinitionDraft attributeDefinitionDraft =
725-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
707+
createMockAttributeDefinitionDraftBuilder()
726708
.type(
727709
attributeTypeBuilder ->
728710
attributeTypeBuilder.enumBuilder().values(ENUM_VALUE_A, ENUM_VALUE_B))
@@ -748,7 +730,7 @@ void buildActions_WithoutOldPlainEnum_ShouldReturnRemoveEnumValueAction() {
748730
.build();
749731

750732
final AttributeDefinitionDraft attributeDefinitionDraft =
751-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
733+
createMockAttributeDefinitionDraftBuilder()
752734
.type(attributeTypeBuilder -> attributeTypeBuilder.enumBuilder().values(emptyList()))
753735
.build();
754736

@@ -775,7 +757,7 @@ void buildActions_WitDifferentPlainEnumValueLabel_ShouldReturnChangeEnumValueLab
775757
AttributePlainEnumValueBuilder.of().key("a").label("label_a_different").build();
776758

777759
final AttributeDefinitionDraft attributeDefinitionDraft =
778-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
760+
createMockAttributeDefinitionDraftBuilder()
779761
.type(
780762
attributeTypeBuilder ->
781763
attributeTypeBuilder.enumBuilder().values(enumValueDiffLabel))
@@ -803,7 +785,7 @@ void buildActions_WithNewLocalizedEnum_ShouldReturnAddLocalizedEnumValueAction()
803785
.build();
804786

805787
final AttributeDefinitionDraft attributeDefinitionDraft =
806-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
788+
createMockAttributeDefinitionDraftBuilder()
807789
.type(
808790
attributeTypeBuilder ->
809791
attributeTypeBuilder
@@ -833,7 +815,7 @@ void buildActions_WithoutOldLocalizedEnum_ShouldReturnRemoveLocalizedEnumValueAc
833815
.build();
834816

835817
final AttributeDefinitionDraft attributeDefinitionDraft =
836-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
818+
createMockAttributeDefinitionDraftBuilder()
837819
.type(attributeTypeBuilder -> attributeTypeBuilder.lenumBuilder().values(emptyList()))
838820
.build();
839821

@@ -863,7 +845,7 @@ void buildActions_WithoutOldLocalizedEnum_ShouldReturnRemoveLocalizedEnumValueAc
863845
AttributeLocalizedEnumValueBuilder.of().key("a").label(ofEnglish("label_a_diff")).build();
864846

865847
final AttributeDefinitionDraft attributeDefinitionDraft =
866-
MockBuilderUtils.createMockAttributeDefinitionDraftBuilder()
848+
createMockAttributeDefinitionDraftBuilder()
867849
.type(
868850
attributeTypeBuilder ->
869851
attributeTypeBuilder.lenumBuilder().values(localizedEnumValueDiffLabel))

0 commit comments

Comments
 (0)