/*
 * Copyright (c) 2004-2019, University of Oslo
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice, this
 * list of conditions and the following disclaimer.
 *
 * Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 * Neither the name of the HISP project nor the names of its contributors may
 * be used to endorse or promote products derived from this software without
 * specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package org.hisp.dhis.android.core.category.internal;

import org.hisp.dhis.android.core.category.CategoryCategoryComboLink;
import org.hisp.dhis.android.core.category.CategoryCategoryComboLinkTableInfo;
import org.hisp.dhis.android.core.data.category.CategoryCategoryComboLinkSamples;
import org.hisp.dhis.android.core.data.database.LinkStoreAbstractIntegrationShould;
import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory;
import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
import org.junit.Test;
import org.junit.runner.RunWith;

import java.util.Map;

import static com.google.common.truth.Truth.assertThat;

@RunWith(D2JunitRunner.class)
public class CategoryCategoryComboLinkStoreIntegrationShould
        extends LinkStoreAbstractIntegrationShould<CategoryCategoryComboLink> {

    private String otherMasterUid = "new_category_combo";

    public CategoryCategoryComboLinkStoreIntegrationShould() {
        super(CategoryCategoryComboLinkStore.create(TestDatabaseAdapterFactory.get()),
                CategoryCategoryComboLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
    }

    @Override
    protected String addMasterUid() {
        return CategoryCategoryComboLinkSamples.getCategoryCategoryComboLink().categoryCombo();
    }

    @Override
    protected CategoryCategoryComboLink buildObject() {
        return CategoryCategoryComboLinkSamples.getCategoryCategoryComboLink();
    }

    @Override
    protected CategoryCategoryComboLink buildObjectWithOtherMasterUid() {
        return buildObject().toBuilder()
                .categoryCombo(otherMasterUid)
                .build();
    }

    @Test
    public void count_by_master_column() {
        store.insert(buildObjectWithOtherMasterUid());
        store.insert(buildObject());
        Map<String, Integer> count = store.groupAndGetCountBy(CategoryCategoryComboLinkTableInfo.Columns.CATEGORY_COMBO);
        assertThat(count.keySet().size()).isEqualTo(2);
        assertThat(count.get(addMasterUid())).isEqualTo(1);
        assertThat(count.get(otherMasterUid)).isEqualTo(1);
    }
}
@@ -2381,67 +2381,8 @@
  %7B%0A%0A
-    private String otherMasterUid = %22new_category_combo%22;%0A%0A
     
@@ -3104,30 +3104,36 @@
 ryCombo(
-otherMasterUid
+%22new_category_combo%22
 )%0A      
@@ -3511,28 +3511,61 @@
 unt.get(
-addMasterUid
+buildObjectWithOtherMasterUid().categoryCombo
 ())).isE
@@ -3608,22 +3608,37 @@
 get(
-otherMasterUid
+buildObject().categoryCombo()
 )).i

Fix android test