Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CIF-2385: fix NPE in ProductListItemImpl#generateId for placeholder data #677

Merged
merged 4 commits into from
Sep 7, 2021
Merged

CIF-2385: fix NPE in ProductListItemImpl#generateId for placeholder data #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d611561
fix NPE in ProductListItemImpl#generateId for placeholder data
buuhuu Sep 6, 2021
82f22a0
merge tests
buuhuu Sep 6, 2021
f107882
fix formatting
buuhuu Sep 6, 2021
489016e
revert unnecessary changes
buuhuu Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../com/adobe/cq/commerce/core/components/internal/models/v1/common/ProductListItemImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ protected ComponentData getComponentData() {
@Override
protected String generateId() {
String prefix = StringUtils.join(parentId, ID_SEPARATOR, ITEM_ID_PREFIX);
return ComponentUtils.generateId(prefix, getSKU());
return ComponentUtils.generateId(prefix, StringUtils.defaultIfBlank(getSKU(), StringUtils.EMPTY));
}

@Override
Expand Down
41 changes: 32 additions & 9 deletions ...models/v1/common/ProductListItemTest.java → ...ls/v1/common/ProductListItemImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
package com.adobe.cq.commerce.core.components.internal.models.v1.common;

import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;

import com.adobe.cq.commerce.core.components.models.common.CommerceIdentifier;
Expand All @@ -29,11 +28,14 @@
import com.adobe.cq.commerce.magento.graphql.ProductInterface;
import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
import com.day.cq.wcm.api.Page;
import io.wcm.testing.mock.aem.junit.AemContext;

import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

@RunWith(MockitoJUnitRunner.class)
public class ProductListItemTest {
public class ProductListItemImplTest {

final static String sku = "product-sku";
final static String name = "product-name";
Expand All @@ -43,24 +45,22 @@ public class ProductListItemTest {

@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PriceRange priceRange;

@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Money money;

@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ProductImage image;
@Rule
public final AemContext aemContext = new AemContext();

private Page productPage;
private ProductInterface product;

@Before
public void setUp() {
Resource contentResource = Mockito.mock(Resource.class);
productPage = Mockito.mock(Page.class);
when(productPage.getContentResource()).thenReturn(contentResource);
productPage = aemContext.create().page("/my/page");

// setup test product
product = Mockito.mock(ProductInterface.class);
product = mock(ProductInterface.class);
when(product.getSku()).thenReturn(sku);
when(product.getName()).thenReturn(name);
when(product.getUrlKey()).thenReturn(urlKey);
Expand Down Expand Up @@ -123,6 +123,29 @@ public void testGetComponentData() {
Assert.assertNotNull("Component data retrieved successfully", productListItem.getSomeData());
}

@Test
public void testGenerateIdForEmptySku() {
// test for null empty or blank
String[] skus = new String[] { null, "", " " };
String expected = "foobar-item-e3b0c44298";

for (String sku : skus) {
// test all constructors
CommerceIdentifier commerceIdentifier = mock(CommerceIdentifier.class);
when(commerceIdentifier.getType()).thenReturn(CommerceIdentifier.IdentifierType.SKU);
when(commerceIdentifier.getValue()).thenReturn(sku);
ProductListItemImpl item = new ProductListItemImpl(commerceIdentifier, "foobar", productPage);
assertEquals(expected, item.generateId());

item = new ProductListItemImpl(sku, null, null, null, null, null, productPage, null, null, null, "foobar", false);
assertEquals(expected, item.generateId());

when(product.getSku()).thenReturn(sku);
item = new ProductListItemImpl(product, productPage, null, null, null, "foobar");
assertEquals(expected, item.generateId());
}
}

private class TestInheritedItemImpl extends ProductListItemImpl {

public TestInheritedItemImpl(CommerceIdentifier identifier, String parentId, Page productPage) {
Expand Down
Loading