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

Commit 3931add0 authored by Antonio Kantek's avatar Antonio Kantek
Browse files

Move IME unit tests to InputMethodSystemServerTests 

Bug: 319948502
Test: atest FrameworksInputMethodSystemServerTests
Change-Id: I07f600f4f1e06b8f01d413e5a5c7941c2c215baf
parent 4a412a38

services/tests/servicestests/src/com/android/server/inputmethod/AdditionalSubtypeUtilsTest.java→services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/AdditionalSubtypeUtilsTest.java

+2 −7
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 * Copyright (C) 2024 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.
@@ -26,18 +26,13 @@ import android.view.inputmethod.InputMethodInfo; 
import android.view.inputmethod.InputMethodSubtype;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



import java.io.File;

import java.util.List;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class AdditionalSubtypeUtilsTest {

public final class AdditionalSubtypeUtilsTest {



    @Test

    public void testSaveAndLoad() throws Exception {

services/tests/servicestests/src/com/android/server/inputmethod/HardwareKeyboardShortcutControllerTest.java→services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/HardwareKeyboardShortcutControllerTest.java

+1 −7
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 * Copyright (C) 2024 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.
@@ -19,17 +19,11 @@ package com.android.server.inputmethod; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNull;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.Arrays;

import java.util.List;



@SmallTest

@RunWith(AndroidJUnit4.class)

public final class HardwareKeyboardShortcutControllerTest {



    @Test

services/tests/servicestests/src/com/android/server/inputmethod/InputMethodSubtypeSwitchingControllerTest.java→services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodSubtypeSwitchingControllerTest.java

+2 −8
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 * Copyright (C) 2024 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.
@@ -28,22 +28,16 @@ import android.view.inputmethod.InputMethodInfo; 
import android.view.inputmethod.InputMethodSubtype;

import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.server.inputmethod.InputMethodSubtypeSwitchingController.ControllerImpl;

import com.android.server.inputmethod.InputMethodSubtypeSwitchingController.ImeSubtypeListItem;



import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class InputMethodSubtypeSwitchingControllerTest {

public final class InputMethodSubtypeSwitchingControllerTest {

    private static final String DUMMY_PACKAGE_NAME = "dummy package name";

    private static final String DUMMY_IME_LABEL = "dummy ime label";

    private static final String DUMMY_SETTING_ACTIVITY_NAME = "";

services/tests/servicestests/src/com/android/server/inputmethod/InputMethodUtilsTest.java→services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodUtilsTest.java

+2 −7
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 * Copyright (C) 2024 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.
@@ -41,15 +41,12 @@ import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder; 


import androidx.annotation.NonNull;

import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.inputmethod.StartInputFlags;



import com.google.common.truth.Truth;



import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.ArrayList;

import java.util.Collections;
@@ -57,9 +54,7 @@ import java.util.List; 
import java.util.Locale;

import java.util.Objects;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class InputMethodUtilsTest {

public final class InputMethodUtilsTest {

    private static final boolean IS_AUX = true;

    private static final boolean IS_DEFAULT = true;

    private static final boolean IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE = true;

services/tests/servicestests/src/com/android/server/inputmethod/LocaleUtilsTest.java→services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/LocaleUtilsTest.java

+2 −8
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 * Copyright (C) 2024 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.
@@ -22,18 +22,12 @@ import static org.junit.Assert.assertEquals; 


import android.os.LocaleList;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.ArrayList;

import java.util.Locale;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class LocaleUtilsTest {

public final class LocaleUtilsTest {



    private static final LocaleUtils.LocaleExtractor<Locale> sIdentityMapper = source -> source;