Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 517bfe51 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Fixing tests that did not get updated earlier" into froyo

parents 0e98b9f1 3aba36cc

tests/src/com/android/contacts/EntityDeltaTests.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -367,7 +367,7 @@ public class EntityDeltaTests extends AndroidTestCase { 
        final ArrayList<ContentProviderOperation> diff = Lists.newArrayList();

        final ArrayList<ContentProviderOperation> diff = Lists.newArrayList();

        source.buildAssert(diff);

        source.buildAssert(diff);

        source.buildDiff(diff);

        source.buildDiff(diff);

        assertEquals("Unexpected operations", 1, diff.size());

        assertEquals("Unexpected operations", 2, diff.size());

        {

        {

            final ContentProviderOperation oper = diff.get(0);

            final ContentProviderOperation oper = diff.get(0);

            assertEquals("Incorrect type", TYPE_INSERT, oper.getType());

            assertEquals("Incorrect type", TYPE_INSERT, oper.getType());
@@ -395,7 +395,7 @@ public class EntityDeltaTests extends AndroidTestCase { 
        final ArrayList<ContentProviderOperation> diff = Lists.newArrayList();

        final ArrayList<ContentProviderOperation> diff = Lists.newArrayList();

        source.buildAssert(diff);

        source.buildAssert(diff);

        source.buildDiff(diff);

        source.buildDiff(diff);

        assertEquals("Unexpected operations", 2, diff.size());

        assertEquals("Unexpected operations", 3, diff.size());

        {

        {

            final ContentProviderOperation oper = diff.get(0);

            final ContentProviderOperation oper = diff.get(0);

            assertEquals("Incorrect type", TYPE_INSERT, oper.getType());

            assertEquals("Incorrect type", TYPE_INSERT, oper.getType());

tests/src/com/android/contacts/EntityModifierTests.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -512,7 +512,7 @@ public class EntityModifierTests extends AndroidTestCase { 
        // Build diff, expecting single insert

        // Build diff, expecting single insert

        final ArrayList<ContentProviderOperation> diff = Lists.newArrayList();

        final ArrayList<ContentProviderOperation> diff = Lists.newArrayList();

        state.buildDiff(diff);

        state.buildDiff(diff);

        assertEquals("Unexpected operations", 1, diff.size());

        assertEquals("Unexpected operations", 2, diff.size());

        {

        {

            final ContentProviderOperation oper = diff.get(0);

            final ContentProviderOperation oper = diff.get(0);

            assertEquals("Incorrect type", TYPE_INSERT, oper.getType());

            assertEquals("Incorrect type", TYPE_INSERT, oper.getType());
@@ -540,7 +540,7 @@ public class EntityModifierTests extends AndroidTestCase { 
        // Build diff, expecting two insert operations

        // Build diff, expecting two insert operations

        final ArrayList<ContentProviderOperation> diff = Lists.newArrayList();

        final ArrayList<ContentProviderOperation> diff = Lists.newArrayList();

        state.buildDiff(diff);

        state.buildDiff(diff);

        assertEquals("Unexpected operations", 2, diff.size());

        assertEquals("Unexpected operations", 3, diff.size());

        {

        {

            final ContentProviderOperation oper = diff.get(0);

            final ContentProviderOperation oper = diff.get(0);

            assertEquals("Incorrect type", TYPE_INSERT, oper.getType());

            assertEquals("Incorrect type", TYPE_INSERT, oper.getType());

tests/src/com/android/contacts/EntitySetTests.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -486,6 +486,7 @@ public class EntitySetTests extends AndroidTestCase { 
                buildAssertVersion(VER_FIRST),

                buildAssertVersion(VER_FIRST),

                buildOper(RawContacts.CONTENT_URI, TYPE_INSERT, joeContactInsert),

                buildOper(RawContacts.CONTENT_URI, TYPE_INSERT, joeContactInsert),

                buildOper(Data.CONTENT_URI, TYPE_INSERT, joePhoneInsert),

                buildOper(Data.CONTENT_URI, TYPE_INSERT, joePhoneInsert),

                buildAggregationModeUpdate(RawContacts.AGGREGATION_MODE_DEFAULT),

                buildUpdateAggregationKeepTogether(CONTACT_BOB));

                buildUpdateAggregationKeepTogether(CONTACT_BOB));





        // Merge in the second version, verify that our insert remains

        // Merge in the second version, verify that our insert remains
@@ -495,6 +496,7 @@ public class EntitySetTests extends AndroidTestCase { 
                buildAssertVersion(VER_SECOND),

                buildAssertVersion(VER_SECOND),

                buildOper(RawContacts.CONTENT_URI, TYPE_INSERT, joeContactInsert),

                buildOper(RawContacts.CONTENT_URI, TYPE_INSERT, joeContactInsert),

                buildOper(Data.CONTENT_URI, TYPE_INSERT, joePhoneInsert),

                buildOper(Data.CONTENT_URI, TYPE_INSERT, joePhoneInsert),

                buildAggregationModeUpdate(RawContacts.AGGREGATION_MODE_DEFAULT),

                buildUpdateAggregationKeepTogether(CONTACT_BOB));

                buildUpdateAggregationKeepTogether(CONTACT_BOB));

    }

    }
@@ -545,6 +547,7 @@ public class EntitySetTests extends AndroidTestCase { 
                buildAssertVersion(VER_SECOND),

                buildAssertVersion(VER_SECOND),

                buildOper(RawContacts.CONTENT_URI, TYPE_INSERT, contactInsert),

                buildOper(RawContacts.CONTENT_URI, TYPE_INSERT, contactInsert),

                buildOper(Data.CONTENT_URI, TYPE_INSERT, phoneInsert),

                buildOper(Data.CONTENT_URI, TYPE_INSERT, phoneInsert),

                buildAggregationModeUpdate(RawContacts.AGGREGATION_MODE_DEFAULT),

                buildUpdateAggregationKeepTogether(CONTACT_BOB));

                buildUpdateAggregationKeepTogether(CONTACT_BOB));

    }

    }