Merge "Remove last user of lookupTimeZoneIdsByCountry()"

import android.icu.util.GregorianCalendar;

import android.icu.util.GregorianCalendar;

import android.icu.util.TimeZone;

import android.icu.util.TimeZone;

import libcore.timezone.TimeZoneFinder;

import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

import org.junit.Test;

import java.util.Calendar;

import java.util.Calendar;

import java.util.Date;

import java.util.Date;

import java.util.List;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.TimeUnit;

public class TimeZoneLookupHelperTest {

public class TimeZoneLookupHelperTest {

            assertEquals(expectedResult, adSummerWithDstResult);

            assertEquals(expectedResult, adSummerWithDstResult);

            assertOffsetResultZoneOffsets(nhSummerTimeMillis, expectedUtcOffset, expectedDstOffset,

            assertOffsetResultZoneOffsets(nhSummerTimeMillis, expectedUtcOffset, expectedDstOffset,

                    adSummerWithDstResult);

                    adSummerWithDstResult);

            assertOffsetResultZoneCountry(adIso, adSummerWithDstResult);

        }

        }

        // Summer, known & incorrect DST state (DST == false)

        // Summer, known & incorrect DST state (DST == false)

        assertTrue(mTimeZoneLookupHelper.countryUsesUtc("gb", NH_WINTER_TIME_MILLIS));

        assertTrue(mTimeZoneLookupHelper.countryUsesUtc("gb", NH_WINTER_TIME_MILLIS));

    }

    }

    private static void assertOffsetResultZoneCountry(

            String isoCountryCode, OffsetResult lookupResult) {

        String timeZoneId = lookupResult.getTimeZone().getID();

        List<String> zoneIdsByCountry =

                TimeZoneFinder.getInstance().lookupTimeZoneIdsByCountry(isoCountryCode);

        assertTrue(timeZoneId + " must be used in " + isoCountryCode,

                zoneIdsByCountry.contains(timeZoneId));

    }

    /**

    /**

     * Assert the time zone in the OffsetResult has the expected properties at the specified time.

     * Assert the time zone in the OffsetResult has the expected properties at the specified time.

     */

     */

    private static TimeZone zone(String zoneId) {

    private static TimeZone zone(String zoneId) {

        return TimeZone.getFrozenTimeZone(zoneId);

        return TimeZone.getFrozenTimeZone(zoneId);

    }

    }

}

}