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

Commit c57eb708 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I866d20b9,I866d20b9 into main 

* changes:
  Removed temporary method from HsumBootUserInitializerDesignateMainUserOnBootTest.
  Refactored HsumBootUserInitializerDesignateMainUserOnBootTest.junitParametersPassedToConstructor()
parents c3cfb29e 3f083009

services/tests/mockingservicestests/src/com/android/server/pm/AbstractHsumBootUserInitializerConstructorHelpersTestCase.java

+3 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ abstract class AbstractHsumBootUserInitializerConstructorHelpersTestCase { 
        return value;

    }



    protected static boolean CFG_DESIGNATE_MAIN(boolean value) {

    protected static boolean CFG_DESIGNATE(boolean value) {

        return value;

    }
@@ -140,7 +140,8 @@ abstract class AbstractHsumBootUserInitializerConstructorHelpersTestCase { 
        return value;

    }



    protected static boolean CFG_CREATE_INITIAL(boolean value) {

    // NOTE: called CREAT on purpose as lines fit. After all, there's a creat() method on UNIX...

    protected static boolean CFG_CREAT_INITIAL(boolean value) {

        return value;

    }

services/tests/mockingservicestests/src/com/android/server/pm/HsumBootUserInitializerCreateInitialUserOnBootTest.java

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ public final class HsumBootUserInitializerCreateInitialUserOnBootTest 
    @Parameters(name = "{index}: cfgCreateIU={0},result={1}")

    public static Collection<Object[]> junitParametersPassedToConstructor() {

        return Arrays.asList(new Object[][] {

            { CFG_CREATE_INITIAL(false), RESULT(false) },

            { CFG_CREATE_INITIAL(true), RESULT(true) }

            { CFG_CREAT_INITIAL(false), RESULT(false) },

            { CFG_CREAT_INITIAL(true), RESULT(true) }

        });

    }

services/tests/mockingservicestests/src/com/android/server/pm/HsumBootUserInitializerDesignateMainUserOnBootTest.java

+141 −345

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/mockingservicestests/src/com/android/server/pm/HsumBootUserInitializerNonParameterizedTest.java

0 → 100644
+89 −0

File added.

Preview size limit exceeded, changes collapsed.