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

Commit 0a0f0ecd authored by Dikra Prasetya's avatar Dikra Prasetya Committed by Automerger Merge Worker
Browse files

Merge "Refactor ObexTime to use java.time.Instant to prevent introducing new... 

Merge "Refactor ObexTime to use java.time.Instant to prevent introducing new usages of java.util.Date." am: c7edfd00

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2494262



Change-Id: I95e6298d2a3766c6f9098b441806fdfc3c6c0669
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 040631ee c7edfd00

android/app/src/com/android/bluetooth/mapclient/obex/ObexTime.java

+26 −7
Original line number Diff line number Diff line
@@ -16,8 +16,12 @@ 


package com.android.bluetooth.mapclient;



import java.time.Instant;

import java.time.ZoneId;

import java.time.ZonedDateTime;

import java.util.Calendar;

import java.util.Date;

import java.util.GregorianCalendar;

import java.util.Locale;

import java.util.TimeZone;

import java.util.regex.Matcher;
@@ -25,7 +29,7 @@ import java.util.regex.Pattern; 


public final class ObexTime {



    private Date mDate;

    private Instant mInstant;



    public ObexTime(String time) {

        /*
@@ -86,26 +90,41 @@ public final class ObexTime { 
                builder.setTimeZone(tz);

            }



            mDate = builder.build().getTime();

            mInstant = builder.build().toInstant();

        }

    }



    public ObexTime(Date date) {

        mDate = date;

        mInstant = date.toInstant();

    }



    public ObexTime(Instant instant) {

        mInstant = instant;

    }



    /**

     * @deprecated Use #{@link #getInstant()} instead.

     */

    @Deprecated

    public Date getTime() {

        return mDate;

        if (mInstant == null) {

            return null;

        }

        return Date.from(mInstant);

    }



    public Instant getInstant() {

        return mInstant;

    }



    @Override

    public String toString() {

        if (mDate == null) {

        if (mInstant == null) {

            return null;

        }



        Calendar cal = Calendar.getInstance();

        cal.setTime(mDate);

        Calendar cal = GregorianCalendar.from(

                ZonedDateTime.ofInstant(mInstant, ZoneId.systemDefault()));



        /* note that months are numbered stating from 0 */

        return String.format(Locale.US, "%04d%02d%02dT%02d%02d%02d", cal.get(Calendar.YEAR),

android/app/tests/unit/src/com/android/bluetooth/mapclient/ObexTimeTest.java

+30 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import org.junit.Assert; 
import org.junit.Test;

import org.junit.runner.RunWith;



import java.time.Instant;

import java.util.Date;

import java.util.TimeZone;
@@ -56,34 +57,57 @@ public class ObexTimeTest { 
    private static final Date VALID_DATE_WITH_OFFSET_POS = new Date(VALID_TS_OFFSET_POS);

    private static final Date VALID_DATE_WITH_OFFSET_NEG = new Date(VALID_TS_OFFSET_NEG);



    private static final Instant VALID_INSTANT = Instant.ofEpochMilli(VALID_TS);

    private static final Instant VALID_INSTANT_WITH_OFFSET_POS =

            Instant.ofEpochMilli(VALID_TS_OFFSET_POS);

    private static final Instant VALID_INSTANT_WITH_OFFSET_NEG =

            Instant.ofEpochMilli(VALID_TS_OFFSET_NEG);



    @Test

    public void createWithValidDateTimeString_TimestampCorrect() {

        ObexTime timestamp = new ObexTime(VALID_TIME_STRING);

        Assert.assertEquals("Parsed timestamp must match expected", VALID_DATE_LOCAL_TZ,

                timestamp.getTime());

        Assert.assertEquals("Parsed instant must match expected", VALID_INSTANT,

                timestamp.getInstant());

        Assert.assertEquals("Parsed date must match expected",

                VALID_DATE_LOCAL_TZ, timestamp.getTime());

    }



    @Test

    public void createWithValidDateTimeStringWithPosOffset_TimestampCorrect() {

        ObexTime timestamp = new ObexTime(VALID_TIME_STRING_WITH_OFFSET_POS);

        Assert.assertEquals("Parsed timestamp must match expected", VALID_DATE_WITH_OFFSET_POS,

                timestamp.getTime());

        Assert.assertEquals("Parsed instant must match expected", VALID_INSTANT_WITH_OFFSET_POS,

                timestamp.getInstant());

        Assert.assertEquals("Parsed date must match expected",

                VALID_DATE_WITH_OFFSET_POS, timestamp.getTime());

    }



    @Test

    public void createWithValidDateTimeStringWithNegOffset_TimestampCorrect() {

        ObexTime timestamp = new ObexTime(VALID_TIME_STRING_WITH_OFFSET_NEG);

        Assert.assertEquals("Parsed timestamp must match expected", VALID_DATE_WITH_OFFSET_NEG,

                timestamp.getTime());

        Assert.assertEquals("Parsed instant must match expected", VALID_INSTANT_WITH_OFFSET_NEG,

                timestamp.getInstant());

        Assert.assertEquals("Parsed date must match expected",

                VALID_DATE_WITH_OFFSET_NEG, timestamp.getTime());

    }



    @Test

    public void createWithValidDate_TimestampCorrect() {

        ObexTime timestamp = new ObexTime(VALID_DATE_LOCAL_TZ);

        Assert.assertEquals("ObexTime created with a date must return the expected instant",

                VALID_INSTANT, timestamp.getInstant());

        Assert.assertEquals("ObexTime created with a date must return the same date",

                VALID_DATE_LOCAL_TZ, timestamp.getTime());

    }



    @Test

    public void createWithValidInstant_TimestampCorrect() {

        ObexTime timestamp = new ObexTime(VALID_INSTANT);

        Assert.assertEquals("ObexTime created with a instant must return the same instant",

                VALID_INSTANT, timestamp.getInstant());

        Assert.assertEquals("ObexTime created with a instant must return the expected date",

                VALID_DATE_LOCAL_TZ, timestamp.getTime());

    }



    @Test

    public void printValidTime_TimestampMatchesInput() {

        ObexTime timestamp = new ObexTime(VALID_TIME_STRING);