Extract vibrator core tests from FrameworksCoreTests

Move all tests for package android.os that are related to the vibrator from frameworks/base/core/tests/coretests/ to a new folder frameworks/base/core/tests/vibrator/.

Fix: 290746348
Test: atest FrameworksVibratorCoreTests
Change-Id: I0ee71b202e055b10db1d8e697118cb91ed57b620
This commit is contained in:
Ahmad Khalil
2023-07-18 10:22:07 +00:00
parent a7d8d2c6d5
commit 2380c92977
15 changed files with 108 additions and 25 deletions

View File

@@ -1,5 +1,18 @@
{
"presubmit": [
{
"file_patterns": [
"[^/]*(Vibrator|Vibration)[^/]*\\.java",
"vibrator/.*"
],
"name": "FrameworksVibratorCoreTests",
"options": [
{"exclude-annotation": "android.platform.test.annotations.LargeTest"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"},
{"exclude-annotation": "org.junit.Ignore"}
]
},
{
"file_patterns": ["Bugreport[^/]*\\.java"],
"name": "BugreportManagerTestCases",

View File

@@ -0,0 +1,40 @@
package {
// See: http://go/android-license-faq
default_applicable_licenses: ["frameworks_base_license"],
}
android_test {
name: "FrameworksVibratorCoreTests",
srcs: [
"src/**/*.java",
],
static_libs: [
"frameworks-base-testutils",
"guava",
"androidx.core_core",
"androidx.test.ext.junit",
"androidx.test.runner",
"androidx.test.rules",
"mockito-target-minus-junit4",
"truth-prebuilt",
"testng",
],
libs: [
"android.test.runner",
"android.test.base",
"android.test.mock",
"framework",
"framework-res",
],
sdk_version: "core_platform",
test_suites: [
"device-tests",
"automotive-tests",
],
certificate: "platform",
}

View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2023 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.frameworks.core.tests.vibrator">
<!-- vibrator test permissions -->
<uses-permission android:name="android.permission.VIBRATE" />
<application>
<uses-library android:name="android.test.runner" />
</application>
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.frameworks.core.tests.vibrator"
android:label="Frameworks Vibrator Core Tests" />
</manifest>

View File

@@ -1 +1,2 @@
# Bug component: 345036
include platform/frameworks/base:/services/core/java/com/android/server/vibrator/OWNERS

View File

@@ -0,0 +1,22 @@
{
"presubmit": [
{
"name": "FrameworksVibratorCoreTests",
"options": [
{"exclude-annotation": "android.platform.test.annotations.LargeTest"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"},
{"exclude-annotation": "org.junit.Ignore"}
]
}
],
"postsubmit": [
{
"name": "FrameworksVibratorCoreTests",
"options": [
{"exclude-annotation": "org.junit.Ignore"}
]
}
]
}

View File

@@ -22,8 +22,6 @@ import static junit.framework.Assert.assertTrue;
import static org.testng.Assert.assertThrows;
import android.platform.test.annotations.Presubmit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -31,7 +29,6 @@ import org.junit.runners.JUnit4;
import java.util.ArrayList;
import java.util.Arrays;
@Presubmit
@RunWith(JUnit4.class)
public class CombinedVibrationTest {
private static final VibrationEffect VALID_EFFECT = VibrationEffect.createOneShot(10, 255);

View File

@@ -22,12 +22,14 @@ import static org.mockito.Mockito.mock;
import android.media.AudioAttributes;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class ExternalVibrationTest {
@Ignore("b/291713224")
@Test
public void testSerialization() {
AudioAttributes audio = new AudioAttributes.Builder().build();

View File

@@ -40,7 +40,6 @@ import android.net.Uri;
import android.os.VibrationEffect.Composition.UnreachableAfterRepeatingIndefinitelyException;
import android.os.vibrator.PrimitiveSegment;
import android.os.vibrator.StepSegment;
import android.platform.test.annotations.Presubmit;
import androidx.test.InstrumentationRegistry;
@@ -54,7 +53,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.time.Duration;
import java.util.Arrays;
@Presubmit
@RunWith(MockitoJUnitRunner.class)
public class VibrationEffectTest {

View File

@@ -24,13 +24,11 @@ import static org.junit.Assert.assertTrue;
import android.hardware.vibrator.Braking;
import android.hardware.vibrator.IVibrator;
import android.platform.test.annotations.Presubmit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@Presubmit
@RunWith(JUnit4.class)
public class VibratorInfoTest {
private static final float TEST_TOLERANCE = 1e-5f;

View File

@@ -40,7 +40,6 @@ import android.content.ContextWrapper;
import android.hardware.vibrator.IVibrator;
import android.media.AudioAttributes;
import android.os.test.TestLooper;
import android.platform.test.annotations.Presubmit;
import androidx.test.InstrumentationRegistry;
@@ -55,13 +54,6 @@ import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Tests for {@link Vibrator}.
*
* Build/Install/Run:
* atest FrameworksCoreTests:VibratorTest
*/
@Presubmit
@RunWith(MockitoJUnitRunner.class)
public class VibratorTest {

View File

@@ -29,7 +29,6 @@ import android.os.SystemVibrator;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.os.VibratorInfo;
import android.platform.test.annotations.Presubmit;
import androidx.test.InstrumentationRegistry;
@@ -37,7 +36,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@Presubmit
@RunWith(MockitoJUnitRunner.class)
public class PrebakedSegmentTest {

View File

@@ -29,7 +29,6 @@ import android.os.SystemVibrator;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.os.VibratorInfo;
import android.platform.test.annotations.Presubmit;
import androidx.test.InstrumentationRegistry;
@@ -37,7 +36,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@Presubmit
@RunWith(MockitoJUnitRunner.class)
public class PrimitiveSegmentTest {
private static final float TOLERANCE = 1e-2f;

View File

@@ -29,7 +29,6 @@ import static org.testng.Assert.assertThrows;
import android.os.Parcel;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.platform.test.annotations.Presubmit;
import org.junit.Rule;
import org.junit.Test;
@@ -39,7 +38,6 @@ import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.MockitoRule;
@Presubmit
@RunWith(MockitoJUnitRunner.class)
public class RampSegmentTest {
private static final float TOLERANCE = 1e-2f;

View File

@@ -27,7 +27,6 @@ import static org.testng.Assert.assertThrows;
import android.os.Parcel;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.platform.test.annotations.Presubmit;
import org.junit.Rule;
import org.junit.Test;
@@ -37,7 +36,6 @@ import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.MockitoRule;
@Presubmit
@RunWith(MockitoJUnitRunner.class)
public class StepSegmentTest {
private static final float TOLERANCE = 1e-2f;

View File

@@ -28,7 +28,6 @@ import static org.junit.Assert.assertThrows;
import android.os.VibrationEffect;
import android.os.vibrator.PrebakedSegment;
import android.platform.test.annotations.Presubmit;
import android.util.Xml;
import com.android.modules.utils.TypedXmlPullParser;
@@ -50,7 +49,6 @@ import java.util.Map;
* <p>The {@link VibrationEffect} public APIs are covered by CTS to enforce the schema defined at
* services/core/xsd/vibrator/vibration/vibration.xsd.
*/
@Presubmit
@RunWith(JUnit4.class)
public class VibrationEffectXmlSerializationTest {