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

Commit ad8c40cf authored by Yeabkal Wubshit's avatar Yeabkal Wubshit Committed by Android (Google) Code Review
Browse files

Merge "Rename getVibrationEffectListForTesting to getVibrationEffects" into main

parents cc39b82f 9427d8dd

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2712,7 +2712,7 @@ package android.os.vibrator { 
package android.os.vibrator.persistence {



  public class ParsedVibration {

    method @NonNull public java.util.List<android.os.VibrationEffect> getVibrationEffectListForTesting();

    method @NonNull public java.util.List<android.os.VibrationEffect> getVibrationEffects();

    method @Nullable public android.os.VibrationEffect resolve(@NonNull android.os.Vibrator);

  }

core/java/android/os/vibrator/persistence/ParsedVibration.java

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class ParsedVibration { 
    @TestApi

    @VisibleForTesting

    @NonNull

    public List<VibrationEffect> getVibrationEffectListForTesting() {

    public List<VibrationEffect> getVibrationEffects() {

        return Collections.unmodifiableList(mEffects);

    }

core/tests/vibrator/src/android/os/vibrator/persistence/ParsedVibrationTest.java

+4 −4
Original line number Diff line number Diff line
@@ -92,18 +92,18 @@ public class ParsedVibrationTest { 
    }



    @Test

    public void testGetVibrationEffectListForTesting() {

    public void testGetVibrationEffects() {

        ParsedVibration parsedVibration =

                new ParsedVibration(List.of(mEffect1, mEffect2, mEffect3));

        assertThat(parsedVibration.getVibrationEffectListForTesting())

        assertThat(parsedVibration.getVibrationEffects())

                .containsExactly(mEffect1, mEffect2, mEffect3)

                .inOrder();



        parsedVibration = new ParsedVibration(List.of(mEffect1));

        assertThat(parsedVibration.getVibrationEffectListForTesting()).containsExactly(mEffect1);

        assertThat(parsedVibration.getVibrationEffects()).containsExactly(mEffect1);



        parsedVibration = new ParsedVibration(List.of());

        assertThat(parsedVibration.getVibrationEffectListForTesting()).isEmpty();

        assertThat(parsedVibration.getVibrationEffects()).isEmpty();

    }



    private Subject assertThatResolution(

core/tests/vibrator/src/android/os/vibrator/persistence/VibrationEffectXmlSerializationTest.java

+2 −4
Original line number Diff line number Diff line
@@ -363,8 +363,7 @@ public class VibrationEffectXmlSerializationTest { 


    private void assertParseDocumentSucceeds(String xml, int flags, VibrationEffect... effects)

            throws Exception {

        assertThat(parseDocument(xml, flags).getVibrationEffectListForTesting())

                .containsExactly(effects);

        assertThat(parseDocument(xml, flags).getVibrationEffects()).containsExactly(effects);

    }



    /**
@@ -381,8 +380,7 @@ public class VibrationEffectXmlSerializationTest { 
        String tagName = parser.getName();

        assertThat(Set.of("vibration", "vibration-select")).contains(tagName);



        assertThat(parseElement(parser, flags).getVibrationEffectListForTesting())

                .containsExactly(effects);

        assertThat(parseElement(parser, flags).getVibrationEffects()).containsExactly(effects);

        assertThat(parser.getEventType()).isEqualTo(XmlPullParser.END_TAG);

        assertThat(parser.getName()).isEqualTo(tagName);

    }