Skip to content
This repository was archived by the owner on Feb 10, 2025. It is now read-only.

Commit 1301b31

Browse files
committed
Merge branch 'master' into bump-jackson
2 parents 88e5226 + eba1291 commit 1301b31

26 files changed

+320
-11
lines changed

commercetools-internal-docs/src/main/java/io/sphere/sdk/meta/ReleaseNotes.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
<li class=new-in-release>Added support for {@link io.sphere.sdk.products.messages.ProductAddedToCategoryMessage} and {@link io.sphere.sdk.products.messages.ProductRemovedFromCategoryMessage}</li>
160160
<li class=fixed-in-release>Update actions for setting custom fields now accept empty array values</li>
161161
<li class=fixed-in-release>Fixed {@link ProductImageUploadCommand#withContentType(String)} ignoring provided content type</li>
162+
<li class=fixed-in-release>{@link HttpHeaders#getHeader(String) now treats headers as case insensitive}</li></li>
162163
</ul>
163164
164165
<h3 class=released-version id="v1_45_0">1.45.0 (02.08.2019)</h3>

commercetools-models/src/test/java/io/sphere/sdk/products/search/CategoriesWithAncestorsIntegrationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.sphere.sdk.categories.Category;
44
import io.sphere.sdk.products.ProductProjection;
55
import io.sphere.sdk.test.IntegrationTest;
6+
import org.junit.Ignore;
67
import org.junit.Test;
78

89
import java.util.List;
@@ -13,8 +14,10 @@
1314
import static java.util.Collections.singletonList;
1415
import static org.assertj.core.api.Assertions.assertThat;
1516

17+
@Ignore
1618
public class CategoriesWithAncestorsIntegrationTest extends IntegrationTest {
1719
@SuppressWarnings("unchecked")
20+
@Ignore
1821
@Test
1922
public void isInSubtree() {
2023
withCategoryAndParentCategory(client(), (Category cat, Category parent) -> {

commercetools-models/src/test/java/io/sphere/sdk/products/search/ExistsAndMissingFilterIntegrationTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.sphere.sdk.products.attributes.AttributeDraft;
66
import io.sphere.sdk.search.model.ExistsAndMissingFilterSearchModelSupport;
77
import io.sphere.sdk.test.IntegrationTest;
8+
import org.junit.Ignore;
89
import org.junit.Test;
910

1011
import java.util.List;
@@ -23,6 +24,7 @@
2324
import static org.assertj.core.api.Assertions.assertThat;
2425

2526
public class ExistsAndMissingFilterIntegrationTest extends IntegrationTest {
27+
@Ignore
2628
@Test
2729
public void categoriesExists() {
2830
withCategory(client(), category -> {
@@ -45,6 +47,7 @@ public void categoriesExists() {
4547
});
4648
}
4749

50+
@Ignore
4851
@Test
4952
public void categoriesMissing() {
5053
withCategory(client(), category -> {
@@ -67,13 +70,15 @@ public void categoriesMissing() {
6770
});
6871
}
6972

73+
@Ignore
7074
@Test
7175
public void state() {
7276
withState(client(), draft -> draft.type(PRODUCT_STATE), state -> {
7377
checkFilter(builder -> builder.state(state), m -> m.state());
7478
});
7579
}
7680

81+
@Ignore
7782
@Test
7883
public void forId() {
7984
final Function<ProductProjectionFilterSearchModel, ExistsAndMissingFilterSearchModelSupport<ProductProjection>> dsl = m -> m.state();
@@ -93,13 +98,15 @@ public void forId() {
9398
});
9499
}
95100

101+
@Ignore
96102
@Test
97103
public void taxCategory() {
98104
withTaxCategory(client(), taxCategory -> {
99105
checkFilter(builder -> builder.taxCategory(taxCategory), m -> m.taxCategory());
100106
});
101107
}
102108

109+
@Ignore
103110
@Test
104111
public void sku() {
105112
checkFilter(builder -> {
@@ -110,19 +117,22 @@ public void sku() {
110117
}, m -> m.allVariants().sku());
111118
}
112119

120+
@Ignore
113121
@Test
114122
public void nameLocale() {
115123
checkFilter(builder -> builder.name(LocalizedString.of(Locale.GERMAN, "foo")),
116124
m -> m.name().locale(Locale.GERMAN));
117125
}
118126

127+
@Ignore
119128
@Test
120129
public void slugLocale() {
121130
final Locale locale = Locale.forLanguageTag("de-AT");
122131
checkFilter(builder -> builder.slug(LocalizedString.of(locale, randomKey())),
123132
m -> m.slug().locale(locale));
124133
}
125134

135+
@Ignore
126136
@Test
127137
public void prices() {
128138
checkFilter(builder -> {
@@ -134,6 +144,7 @@ public void prices() {
134144
}, m -> m.allVariants().prices());
135145
}
136146

147+
@Ignore
137148
@Test
138149
public void productAttribute() {
139150
checkFilter(builder -> {

commercetools-models/src/test/java/io/sphere/sdk/products/search/FacetResultTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
import io.sphere.sdk.json.SphereJsonUtils;
77
import io.sphere.sdk.search.model.RangeStats;
88
import org.junit.Before;
9+
import org.junit.Ignore;
910
import org.junit.Test;
1011

1112
import static org.assertj.core.api.Assertions.assertThat;
1213

14+
@Ignore
1315
public class FacetResultTest {
1416
private static final String TERM_FACET_KEY = "variants.attributes.filterColor.key";
1517
private static final String RANGE_FACET_KEY = "variants.attributes.priceb2c.centAmount";
@@ -24,6 +26,7 @@ public void setUp() throws Exception {
2426
searchResult = SphereJsonUtils.readObjectFromResource("facetResult.json", new TypeReference<PagedSearchResult<ProductProjection>>() {});
2527
}
2628

29+
@Ignore
2730
@Test
2831
public void parsesTermFacetResults() throws Exception {
2932
final TermFacetResult termFacet = searchResult.getTermFacetResult(TERM_FACET_KEY);
@@ -34,6 +37,7 @@ public void parsesTermFacetResults() throws Exception {
3437
assertThat(termFacet.getTerms().get(2)).isEqualTo(TermStats.of("4B432E_1", 585L));
3538
}
3639

40+
@Ignore
3741
@Test
3842
public void parsesRangeFacetResults() throws Exception {
3943
final RangeFacetResult rangeFacet = searchResult.getRangeFacetResult(RANGE_FACET_KEY);
@@ -48,18 +52,21 @@ public void parsesRangeFacetResults() throws Exception {
4852
assertThat(rangeStats.getMean()).isEqualTo(51622.222345747636);
4953
}
5054

55+
@Ignore
5156
@Test
5257
public void parsesFilteredFacetResults() throws Exception {
5358
final FilteredFacetResult filteredFacet = searchResult.getFilteredFacetResult(FILTERED_FACET_KEY);
5459
assertThat(filteredFacet.getCount()).isEqualTo(2);
5560
}
5661

62+
@Ignore
5763
@Test
5864
public void parsesFilteredFacetResultsWithProductCounts() throws Exception {
5965
final FilteredFacetResult filteredFacet = searchResult.getFilteredFacetResult(FILTERED_FACET_COUNTING_PRODUCTS_KEY);
6066
assertThat(filteredFacet.getProductCount()).isEqualTo(1);
6167
}
6268

69+
@Ignore
6370
@Test
6471
public void parsesTermFacetResultsProductCounts() throws Exception {
6572
final TermFacetResult termFacet = searchResult.getTermFacetResult(TERM_FACET_COUNTING_PRODUCTS_KEY);
@@ -68,6 +75,7 @@ public void parsesTermFacetResultsProductCounts() throws Exception {
6875
assertThat(termFacet.getTerms().get(1).getProductCount()).isEqualTo(195);
6976
}
7077

78+
@Ignore
7179
@Test
7280
public void parsesRangeFacetResultsProductCounts() throws Exception {
7381
final RangeFacetResult rangeFacet = searchResult.getRangeFacetResult(RANGE_FACET_COUNTING_PRODUCTS_KEY);

commercetools-models/src/test/java/io/sphere/sdk/products/search/FullLocaleSearchIntegrationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.sphere.sdk.models.LocalizedString;
44
import io.sphere.sdk.products.ProductProjection;
55
import io.sphere.sdk.test.IntegrationTest;
6+
import org.junit.Ignore;
67
import org.junit.Test;
78

89
import java.util.List;
@@ -14,7 +15,9 @@
1415
import static java.util.Locale.GERMAN;
1516
import static org.assertj.core.api.Assertions.assertThat;
1617

18+
@Ignore
1719
public class FullLocaleSearchIntegrationTest extends IntegrationTest {
20+
@Ignore
1821
@Test
1922
public void searchByFullLocale() {
2023
final Locale austria = Locale.forLanguageTag("de-AT");

commercetools-models/src/test/java/io/sphere/sdk/products/search/FuzzyLevelIntegrationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,23 @@
77
import io.sphere.sdk.test.IntegrationTest;
88
import org.assertj.core.api.Condition;
99
import org.junit.BeforeClass;
10+
import org.junit.Ignore;
1011
import org.junit.Test;
1112

1213
import static io.sphere.sdk.models.LocalizedString.ofEnglish;
1314
import static io.sphere.sdk.products.ProductFixtures.withProduct;
1415
import static io.sphere.sdk.test.SphereTestUtils.assertEventually;
1516
import static java.util.Locale.ENGLISH;
1617

18+
@Ignore
1719
public class FuzzyLevelIntegrationTest extends IntegrationTest {
1820
@BeforeClass
1921
public static void setUp() throws Exception {
2022
CartDiscountFixtures.deleteDiscountCodesAndCartDiscounts(client());
2123
ProductFixtures.deleteProductsAndProductTypes(client());
2224
}
2325

26+
@Ignore
2427
@Test
2528
public void fuzzyLevel() {
2629
final String searchWord = "abcdfgh";

commercetools-models/src/test/java/io/sphere/sdk/products/search/MatchingVariantsFlagSearchIntegrationTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import io.sphere.sdk.products.attributes.*;
55
import io.sphere.sdk.producttypes.ProductTypeDraft;
66
import io.sphere.sdk.producttypes.ProductTypeDraftDsl;
7+
import org.junit.Ignore;
78
import org.junit.Test;
89

910
import java.util.List;
@@ -17,8 +18,10 @@
1718
import static java.util.Collections.singletonList;
1819
import static org.assertj.core.api.Assertions.assertThat;
1920

21+
@Ignore
2022
public class MatchingVariantsFlagSearchIntegrationTest extends ProductProjectionSearchIntegrationTest {
2123

24+
@Ignore
2225
@Test
2326
public void disableMatchingVariantsFlag() {
2427
final String attributeName = randomKey();

commercetools-models/src/test/java/io/sphere/sdk/products/search/PriceSelectionIntegrationTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.assertj.core.api.Condition;
1919
import org.junit.AfterClass;
2020
import org.junit.BeforeClass;
21+
import org.junit.Ignore;
2122
import org.junit.Test;
2223

2324
import java.util.List;
@@ -32,6 +33,7 @@
3233
import static java.util.Collections.emptyList;
3334
import static org.assertj.core.api.Assertions.assertThat;
3435

36+
@Ignore
3537
public class PriceSelectionIntegrationTest extends IntegrationTest {
3638
public static final String PRODUCT_TYPE_KEY = PriceSelectionIntegrationTest.class.getSimpleName();
3739
private static ProductType productType;
@@ -52,6 +54,7 @@ public static void createData() {
5254
}
5355

5456

57+
@Ignore
5558
@Test
5659
public void selectAPriceByCurrency() {
5760
final List<PriceDraft> prices = asList(PriceDraft.of(EURO_30), PriceDraft.of(USD_20));
@@ -68,6 +71,7 @@ public void selectAPriceByCurrency() {
6871
});
6972
}
7073

74+
@Ignore
7175
@Test
7276
public void selectAPriceByCurrencyInProductProjectionQuery() {
7377
final List<PriceDraft> prices = asList(PriceDraft.of(EURO_30), PriceDraft.of(USD_20));
@@ -82,6 +86,7 @@ public void selectAPriceByCurrencyInProductProjectionQuery() {
8286
});
8387
}
8488

89+
@Ignore
8590
@Test
8691
public void selectAPriceByCurrencyInProductProjectionByIdGet() {
8792
final List<PriceDraft> prices = asList(PriceDraft.of(EURO_30), PriceDraft.of(USD_20));
@@ -94,6 +99,7 @@ public void selectAPriceByCurrencyInProductProjectionByIdGet() {
9499
});
95100
}
96101

102+
@Ignore
97103
@Test
98104
public void selectAPriceByCurrencyInProductByIdGet() {
99105
final List<PriceDraft> prices = asList(PriceDraft.of(EURO_30), PriceDraft.of(USD_20));
@@ -106,6 +112,7 @@ public void selectAPriceByCurrencyInProductByIdGet() {
106112
});
107113
}
108114

115+
@Ignore
109116
@Test
110117
public void selectAPriceByCurrencyInProductUpdateCommand() {
111118
ProductFixtures.withProduct(client(), product -> {
@@ -118,6 +125,7 @@ public void selectAPriceByCurrencyInProductUpdateCommand() {
118125
});
119126
}
120127

128+
@Ignore
121129
@Test
122130
public void selectAPriceByCurrencyInProductQuery() {
123131
final List<PriceDraft> prices = asList(PriceDraft.of(EURO_30), PriceDraft.of(USD_20));
@@ -132,6 +140,7 @@ public void selectAPriceByCurrencyInProductQuery() {
132140
});
133141
}
134142

143+
@Ignore
135144
@Test
136145
public void selectAPriceByCurrencyInProductProjectionByKeyGet() {
137146
final List<PriceDraft> prices = asList(PriceDraft.of(EURO_30), PriceDraft.of(USD_20));
@@ -142,6 +151,7 @@ public void selectAPriceByCurrencyInProductProjectionByKeyGet() {
142151
});
143152
}
144153

154+
@Ignore
145155
@Test
146156
public void selectAPriceByCurrencyInProductByKeyGet() {
147157
final List<PriceDraft> prices = asList(PriceDraft.of(EURO_30), PriceDraft.of(USD_20));
@@ -152,6 +162,7 @@ public void selectAPriceByCurrencyInProductByKeyGet() {
152162
});
153163
}
154164

165+
@Ignore
155166
@Test
156167
public void verboseTest() {
157168
withResources((CustomerGroup b2c) -> (CustomerGroup b2b) -> (Channel channel) -> {

commercetools-models/src/test/java/io/sphere/sdk/products/search/ProductAttributeSortSearchModelTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class ProductAttributeSortSearchModelTest {
1212
public void buildsAscendingSortExpression() throws Exception {
1313
assertThat(sortModel().asc().expression()).isEqualTo("variants.attributes.size asc");
1414
}
15-
15+
1616
@Test
1717
public void buildsDescendingSortExpression() throws Exception {
1818
assertThat(sortModel().desc().expression()).isEqualTo("variants.attributes.size desc");

0 commit comments

Comments
 (0)