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

Commit 87ae3a5d authored by Youngtae Cha's avatar Youngtae Cha Committed by Android (Google) Code Review
Browse files

Merge "Update to check if the s2cellfile is null" into 24D1-dev

parents 07be47a2 48d502d0

src/java/com/android/internal/telephony/satellite/SatelliteConfig.java

+4 −0
Original line number Diff line number Diff line
@@ -228,6 +228,10 @@ public class SatelliteConfig { 
     */

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

    public boolean isFileExist(Path filePath) {

        if (filePath == null) {

            Log.d(TAG, "isFileExist : filePath is null");

            return false;

        }

        return Files.exists(filePath);

    }

}

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteConfigParserTest.java

+13 −13
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.telephony.satellite;



import static junit.framework.Assert.assertNotNull;

import static junit.framework.TestCase.assertFalse;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotEquals;
@@ -185,27 +186,26 @@ public class SatelliteConfigParserTest extends TelephonyTest { 
        final String filePath = "/data/user_de/0/com.android.phone/app_satellite/s2_cell_file";

        Path targetSatS2FilePath = Paths.get(filePath);



        SatelliteConfigParser mockedSatelliteConfigParserNull = spy(

        SatelliteConfigParser spySatelliteConfigParserNull = spy(

                new SatelliteConfigParser((byte[]) null));

        assertNotNull(mockedSatelliteConfigParserNull);

        assertNull(mockedSatelliteConfigParserNull.getConfig());

        assertNotNull(spySatelliteConfigParserNull);

        assertNull(spySatelliteConfigParserNull.getConfig());



        SatelliteConfigParser mockedSatelliteConfigParserPlaceholder = spy(

        SatelliteConfigParser spySatelliteConfigParserPlaceholder = spy(

                new SatelliteConfigParser("test".getBytes()));

        assertNotNull(mockedSatelliteConfigParserPlaceholder);

        assertNull(mockedSatelliteConfigParserPlaceholder.getConfig());

        assertNotNull(spySatelliteConfigParserPlaceholder);

        assertNull(spySatelliteConfigParserPlaceholder.getConfig());



        SatelliteConfigParser mockedSatelliteConfigParser =

        SatelliteConfigParser spySatelliteConfigParser =

                spy(new SatelliteConfigParser(mBytesProtoBuffer));

        assertNotNull(spySatelliteConfigParser.getConfig());

        assertFalse(spySatelliteConfigParser.getConfig().isFileExist(null));



        SatelliteConfig mockedSatelliteConfig = Mockito.mock(SatelliteConfig.class);

        doReturn(targetSatS2FilePath).when(mockedSatelliteConfig).getSatelliteS2CellFile(any());

        doReturn(mockedSatelliteConfig).when(mockedSatelliteConfigParser).getConfig();

//        assertNotNull(mockedSatelliteConfigParser.getConfig());

//        doReturn(false).when(mockedSatelliteConfigParser).getConfig().isFileExist(any());

//        doReturn(targetSatS2FilePath).when(mockedSatelliteConfigParser).getConfig()

//                .copySatS2FileToPhoneDirectory(any(), any());

        doReturn(mockedSatelliteConfig).when(spySatelliteConfigParser).getConfig();

        assertEquals(targetSatS2FilePath,

                mockedSatelliteConfigParser.getConfig().getSatelliteS2CellFile(mContext));

                spySatelliteConfigParser.getConfig().getSatelliteS2CellFile(mContext));

    }



    @Test