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

Commit 56e7204c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "De-flake RavenwoodServicesTest" into main am: 591470a1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3336094



Change-Id: I11f57b29a614afc7f88d85766f2956f96e7355d3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a3db2ed 591470a1

ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java

+33 −12
Original line number Diff line number Diff line
@@ -19,18 +19,23 @@ package com.android.ravenwoodtest.servicestest; 
import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;



import android.content.Context;

import android.hardware.SerialManager;

import android.hardware.SerialManagerInternal;

import android.platform.test.annotations.DisabledOnRavenwood;

import android.platform.test.ravenwood.RavenwoodRule;

import android.platform.test.ravenwood.RavenwoodConfig;

import android.platform.test.ravenwood.RavenwoodConfig.Config;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.platform.app.InstrumentationRegistry;



import com.android.server.LocalServices;



import org.junit.Rule;

import com.google.common.collect.Lists;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -38,18 +43,25 @@ import org.junit.runner.RunWith; 
public class RavenwoodServicesTest {

    private static final String TEST_VIRTUAL_PORT = "virtual:example";



    @Rule

    public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder()

    @Config

    public static final RavenwoodConfig sRavenwood = new RavenwoodConfig.Builder()

            .setProcessSystem()

            .setServicesRequired(SerialManager.class)

            .build();



    private Context mContext;



    @Before

    public void setUp() {

        mContext = InstrumentationRegistry.getInstrumentation().getContext();

    }



    @Test

    public void testDefined() {

        final SerialManager fromName = (SerialManager)

                mRavenwood.getContext().getSystemService(Context.SERIAL_SERVICE);

                mContext.getSystemService(Context.SERIAL_SERVICE);

        final SerialManager fromClass =

                mRavenwood.getContext().getSystemService(SerialManager.class);

                mContext.getSystemService(SerialManager.class);

        assertNotNull(fromName);

        assertNotNull(fromClass);

        assertEquals(fromName, fromClass);
@@ -63,9 +75,9 @@ public class RavenwoodServicesTest { 
        // Verify that we can obtain a manager, and talk to the backend service, and that no

        // serial ports are configured by default

        final SerialManager service = (SerialManager)

                mRavenwood.getContext().getSystemService(Context.SERIAL_SERVICE);

                mContext.getSystemService(Context.SERIAL_SERVICE);

        final String[] ports = service.getSerialPorts();

        final String[] refPorts = mRavenwood.getContext().getResources().getStringArray(

        final String[] refPorts = mContext.getResources().getStringArray(

                com.android.internal.R.array.config_serialPorts);

        assertArrayEquals(refPorts, ports);

    }
@@ -73,7 +85,7 @@ public class RavenwoodServicesTest { 
    @Test

    public void testDriven() {

        final SerialManager service = (SerialManager)

                mRavenwood.getContext().getSystemService(Context.SERIAL_SERVICE);

                mContext.getSystemService(Context.SERIAL_SERVICE);

        final SerialManagerInternal internal = LocalServices.getService(

                SerialManagerInternal.class);
@@ -81,8 +93,17 @@ public class RavenwoodServicesTest { 
            throw new UnsupportedOperationException(

                    "Needs socketpair() to offer accurate emulation");

        });

        try {

            final String[] ports = service.getSerialPorts();

        assertEquals(1, ports.length);

        assertEquals(TEST_VIRTUAL_PORT, ports[0]);

            for (var port : ports) {

                if (TEST_VIRTUAL_PORT.equals(port)) {

                    return; // Pass

                }

            }

            fail("Virtual port " + TEST_VIRTUAL_PORT + " not found. Actual="

                    + Lists.newArrayList(ports));

        } finally {

            internal.removeVirtualSerialPortForTest(TEST_VIRTUAL_PORT);

        }

    }

}