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

Commit 3956fd7e authored by Sam Blitzstein's avatar Sam Blitzstein Committed by Android (Google) Code Review
Browse files

Merge "Resolving test errors." into ics-ub-calendar-cream

parents fac4eef3 b6b9cb4a

proguard.flags

+8 −2
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ 
}

-keepclassmembers class com.android.calendar.AsyncQueryService {

  *** setTestHandler(...);

  *** getLastCancelableOperation(...);

}

-keepclassmembers class com.android.calendar.AsyncQueryServiceHelper$OperationInfo {

  *** equivalent(...);

}

-keepclassmembers class com.android.calendar.DayView {

  *** setAnimateDayHeight(...);
@@ -26,8 +30,10 @@ 
-keepclassmembers class com.android.calendar.month.MonthWeekEventsView {

  *** setAnimateTodayAlpha(...);

}

-keepclassmembers class com.android.calendar.event.EditEventHelper {

 *** extractDomain(...);

}



-keepclassmembers class * implements android.content.SharedPreferences$Editor {

  public *** apply();

}
 
 No newline at end of file

tests/src/com/android/calendar/AsyncQueryServiceTest.java

+31 −1
Original line number Diff line number Diff line
@@ -27,11 +27,14 @@ import android.content.ContentResolver; 
import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.database.Cursor;

import android.net.Uri;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Message;

import android.test.IsolatedContext;

import android.test.RenamingDelegatingContext;

import android.test.ServiceTestCase;

import android.test.mock.MockContentResolver;

import android.test.mock.MockContext;
@@ -41,6 +44,7 @@ import android.test.suitebuilder.annotation.SmallTest; 
import android.test.suitebuilder.annotation.Smoke;

import android.util.Log;



import java.io.File;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.concurrent.Semaphore;
@@ -81,6 +85,23 @@ public class AsyncQueryServiceTest extends ServiceTestCase<AsyncQueryServiceHelp 
        super.setUp();

    }



    private class MockContext2 extends MockContext {

        @Override

        public Resources getResources() {

            return getContext().getResources();

        }



        @Override

        public File getDir(String name, int mode) {

            return getContext().getDir("mockcontext2_+" + name, mode);

        }



        @Override

        public Context getApplicationContext() {

            return this;

        }

    }



    @Smoke

    @SmallTest

    public void testQuery() throws Exception {
@@ -402,8 +423,17 @@ public class AsyncQueryServiceTest extends ServiceTestCase<AsyncQueryServiceHelp 
            @Override

            public ContentResolver getContentResolver() {

                if (mResolver == null) {

                    ContentProvider provider = new TestProvider(work);

                    mResolver = new MockContentResolver();



                    final String filenamePrefix = "test.";

                    RenamingDelegatingContext targetContextWrapper = new RenamingDelegatingContext(

                            new MockContext2(), getContext(), filenamePrefix);

                    IsolatedContext providerContext =

                            new IsolatedContext(mResolver, targetContextWrapper);



                    ContentProvider provider = new TestProvider(work);

                    provider.attachInfo(providerContext, null);



                    mResolver.addProvider(AUTHORITY, provider);

                }

                return mResolver;

tests/src/com/android/calendar/FormatDateRangeTest.java

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public class FormatDateRangeTest extends AndroidTestCase { 
            new DateTest(0, 10, 9, 8, 0, 0, 10, 9, 11, 0,

                    DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_ALL, "8am \u2013 11am"),

            new DateTest(0, 10, 9, 8, 0, 0, 10, 9, 11, 0,

                    DateUtils.FORMAT_SHOW_TIME, "8:00am \u2013 11:00am"),

                    DateUtils.FORMAT_SHOW_TIME, "8:00AM \u2013 11:00AM"),

            new DateTest(0, 10, 9, 8, 0, 0, 10, 9, 17, 0,

                    DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_24HOUR, "08:00 \u2013 17:00"),

            new DateTest(0, 10, 9, 8, 0, 0, 10, 9, 12, 0,
@@ -87,7 +87,7 @@ public class FormatDateRangeTest extends AndroidTestCase { 
                    DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_CAP_NOON | DateUtils.FORMAT_ABBREV_ALL,

                    "8am \u2013 Noon"),

            new DateTest(0, 10, 9, 10, 30, 0, 10, 9, 13, 0,

                    DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_ALL, "10:30am \u2013 1pm"),

                    DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_ALL, "10:30AM \u2013 1pm"),

            new DateTest(0, 10, 9, 13, 0, 0, 10, 9, 14, 0,

                    DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_ALL, "1pm \u2013 2pm"),

            new DateTest(0, 10, 9, 0, 0, 0, 10, 9, 14, 0,
@@ -155,7 +155,7 @@ public class FormatDateRangeTest extends AndroidTestCase { 
                    "Fri, Nov 9, 2007, 8am \u2013 Sun, Nov 11, 2007, 5pm"),

            new DateTest(2007, 11, 3, 13, 0, 2007, 11, 3, 14, 0,

                    DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR,

                    "1:00pm \u2013 2:00pm, December 3, 2007"),

                    "1:00PM \u2013 2:00PM, December 3, 2007"),

            // Tests that FORMAT_SHOW_YEAR takes precedence over FORMAT_NO_YEAR:

            new DateTest(2007, 11, 3, 13, 0, 2007, 11, 3, 13, 0,

                    DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_NO_YEAR,

tests/src/com/android/calendar/UtilsTests.java

+19 −19
Original line number Diff line number Diff line
@@ -508,14 +508,14 @@ public class UtilsTests extends TestCase { 
        long end = createTimeInMillis(0, 0, 18, 12, 3, 2000);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,

                false, dbUtils.getContext());

        assertEquals("Wednesday, April 12, 2000, 5:00pm \u2013 6:00pm", result);

        assertEquals("Wednesday, April 12, 2000, 5:00PM \u2013 6:00PM", result);



        // 12/31/2012 5pm - 1/1/2013 6pm

        start = createTimeInMillis(0, 0, 17, 31, 11, 2012);

        end = createTimeInMillis(0, 0, 18, 1, 0, 2013);

        result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,

                false, dbUtils.getContext());

        assertEquals("Mon, Dec 31, 2012, 5:00pm – Tue, Jan 1, 2013, 6:00pm", result);

        assertEquals("Mon, Dec 31, 2012, 5:00PM – Tue, Jan 1, 2013, 6:00PM", result);

    }



    @SmallTest
@@ -525,7 +525,7 @@ public class UtilsTests extends TestCase { 
        long end = createTimeInMillis(0, 0, 18, 12, 3, 2012);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,

                false, dbUtils.getContext());

        assertEquals("Thursday, April 12, 5:00pm \u2013 6:00pm", result);

        assertEquals("Thursday, April 12, 2012, 5:00PM \u2013 6:00PM", result);

    }



    @SmallTest
@@ -535,7 +535,7 @@ public class UtilsTests extends TestCase { 
        long end = createTimeInMillis(0, 0, 18, NOW_DAY, NOW_MONTH, NOW_YEAR);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,

                false, dbUtils.getContext());

        assertEquals("Today at 5:00pm \u2013 6:00pm", result);

        assertEquals("Today at 5:00PM \u2013 6:00PM", result);

    }



    @SmallTest
@@ -545,17 +545,17 @@ public class UtilsTests extends TestCase { 
        long end = createTimeInMillis(0, 0, 0, NOW_DAY + 1, NOW_MONTH, NOW_YEAR);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,

                false, dbUtils.getContext());

        assertEquals("Today at 5:00pm \u2013 midnight", result);

        assertEquals("Today at 5:00PM \u2013 midnight", result);

    }



    @SmallTest

    public void testGetDisplayedDatetime_tomorrow() {

        // 4/11/2012 12:01am - 4/11/2012 11:59pm

        // 4/11/2012 12:01AM - 4/11/2012 11:59pm

        long start = createTimeInMillis(0, 1, 0, NOW_DAY + 1, NOW_MONTH, NOW_YEAR);

        long end = createTimeInMillis(0, 59, 23, NOW_DAY + 1, NOW_MONTH, NOW_YEAR);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,

                false, dbUtils.getContext());

        assertEquals("Tomorrow at 12:01am \u2013 11:59pm", result);

        assertEquals("Tomorrow at 12:01AM \u2013 11:59PM", result);

    }



    @SmallTest
@@ -565,32 +565,32 @@ public class UtilsTests extends TestCase { 
        long end = createTimeInMillis(0, 0, 18, 9, 3, 2012);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,

                false, dbUtils.getContext());

        assertEquals("Monday, April 9, 5:00pm \u2013 6:00pm", result);

        assertEquals("Monday, April 9, 2012, 5:00PM \u2013 6:00PM", result);

    }



    @SmallTest

    public void testGetDisplayedDatetime_multiDay() {

        // 4/10/2012 12:01am - 4/11/2012 12:01am

        // 4/10/2012 12:01AM - 4/11/2012 12:01AM

        long start = createTimeInMillis(0, 1, 0, NOW_DAY, NOW_MONTH, NOW_YEAR);

        long end = createTimeInMillis(0, 1, 0, NOW_DAY + 1, NOW_MONTH, NOW_YEAR);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,

                false, dbUtils.getContext());

        assertEquals("Tue, Apr 10, 12:01am \u2013 Wed, Apr 11, 12:01am", result);

        assertEquals("Tue, Apr 10, 2012, 12:01AM \u2013 Wed, Apr 11, 2012, 12:01AM", result);

    }



    @SmallTest

    public void testGetDisplayedDatetime_allDay() {

        // 4/2/2012 12:00am - 4/3/2012 12:00am

        // 4/2/2012 12:00AM - 4/3/2012 12:00AM

        long start = createTimeInMillis(0, 0, 0, 2, 3, NOW_YEAR, Time.TIMEZONE_UTC);

        long end = createTimeInMillis(0, 0, 0, 3, 3, NOW_YEAR, Time.TIMEZONE_UTC);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,

                true, dbUtils.getContext());

        assertEquals("Monday, April 2", result);

        assertEquals("Monday, April 2, 2012", result);

    }



    @SmallTest

    public void testGetDisplayedDatetime_allDayToday() {

        // 4/10/2012 12:00am - 4/11/2012 12:00am

        // 4/10/2012 12:00AM - 4/11/2012 12:00AM

        long start = createTimeInMillis(0, 0, 0, NOW_DAY, NOW_MONTH, NOW_YEAR, Time.TIMEZONE_UTC);

        long end = createTimeInMillis(0, 0, 0, NOW_DAY + 1, NOW_MONTH, NOW_YEAR, Time.TIMEZONE_UTC);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,
@@ -600,12 +600,12 @@ public class UtilsTests extends TestCase { 


    @SmallTest

    public void testGetDisplayedDatetime_allDayMultiday() {

        // 4/10/2012 12:00am - 4/13/2012 12:00am

        // 4/10/2012 12:00AM - 4/13/2012 12:00AM

        long start = createTimeInMillis(0, 0, 0, NOW_DAY, NOW_MONTH, NOW_YEAR, Time.TIMEZONE_UTC);

        long end = createTimeInMillis(0, 0, 0, NOW_DAY + 3, NOW_MONTH, NOW_YEAR, Time.TIMEZONE_UTC);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, DEFAULT_TIMEZONE,

                true, dbUtils.getContext());

        assertEquals("Tuesday, April 10 \u2013 Thursday, April 12", result);

        assertEquals("Tuesday, April 10, 2012 \u2013 Thursday, April 12, 2012", result);

    }



    @SmallTest
@@ -619,7 +619,7 @@ public class UtilsTests extends TestCase { 
        long end = createTimeInMillis(0, 0, 18, 12, 3, 2012, eventTz);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, localTz, false,

                dbUtils.getContext());

        assertEquals("Thursday, April 12, 8:00pm \u2013 9:00pm", result);

        assertEquals("Thursday, April 12, 2012, 8:00PM \u2013 9:00PM", result);

    }



    @SmallTest
@@ -627,12 +627,12 @@ public class UtilsTests extends TestCase { 
        String localTz = "America/New_York";

        setTimezone(localTz);



        // 4/2/2012 12:00am - 4/3/2012 12:00am

        // 4/2/2012 12:00AM - 4/3/2012 12:00AM

        long start = createTimeInMillis(0, 0, 0, 2, 3, NOW_YEAR, Time.TIMEZONE_UTC);

        long end = createTimeInMillis(0, 0, 0, 3, 3, NOW_YEAR, Time.TIMEZONE_UTC);

        String result = Utils.getDisplayedDatetime(start, end, NOW_TIME, localTz, true,

                dbUtils.getContext());

        assertEquals("Monday, April 2", result);

        assertEquals("Monday, April 2, 2012", result);

    }



    @SmallTest
@@ -640,7 +640,7 @@ public class UtilsTests extends TestCase { 
        String localTz = "America/New_York";

        setTimezone(localTz);



        // 4/2/2012 12:00am - 4/3/2012 12:00am

        // 4/2/2012 12:00AM - 4/3/2012 12:00AM

        long start = createTimeInMillis(0, 0, 0, NOW_DAY + 1, NOW_MONTH, NOW_YEAR,

                Time.TIMEZONE_UTC);

        long end = createTimeInMillis(0, 0, 0, NOW_DAY + 2, NOW_MONTH, NOW_YEAR,

tests/src/com/android/calendar/event/EditEventHelperTest.java

+127 −56

File changed.

Preview size limit exceeded, changes collapsed.