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

Commit 968e6e94 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "Remove tests that have been moved to CTS" into nyc-dev 

am: 41c1bb8f

* commit '41c1bb8f':
  Remove tests that have been moved to CTS

Change-Id: I39012b182d637d37fccafbc13677089885dcbcdb
parents 1f337234 41c1bb8f

core/tests/coretests/AndroidManifest.xml

+0 −9
Original line number Diff line number Diff line
@@ -1256,15 +1256,6 @@ 
        <service android:name="android.os.BinderThreadPriorityService"

                android:process=":BinderThreadPriorityService" />



        <!-- Used by ApplyOverrideConfigurationTest -->

        <activity android:name="android.app.activity.ApplyOverrideConfigurationActivity"

                  android:configChanges="orientation|screenSize">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />

            </intent-filter>

        </activity>



        <!-- Application components used for search manager tests -->



        <activity android:name="android.app.activity.SearchableActivity"

core/tests/coretests/src/android/app/activity/ApplyOverrideConfigurationActivity.java

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */

package android.app.activity;



import android.app.Activity;

import android.content.Context;

import android.content.res.Configuration;



public class ApplyOverrideConfigurationActivity extends Activity {



    @Override

    protected void attachBaseContext(Context newBase) {

        super.attachBaseContext(newBase);



        Configuration overrideConfig = new Configuration();

        overrideConfig.smallestScreenWidthDp = ApplyOverrideConfigurationTest.OVERRIDE_WIDTH;

        applyOverrideConfiguration(overrideConfig);

    }

}

core/tests/coretests/src/android/app/activity/ApplyOverrideConfigurationTest.java

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */

package android.app.activity;



import android.app.UiAutomation;

import android.content.res.Configuration;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.test.ActivityInstrumentationTestCase2;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class ApplyOverrideConfigurationTest extends

        ActivityInstrumentationTestCase2<ApplyOverrideConfigurationActivity> {



    public static final int OVERRIDE_WIDTH = 9999;



    public ApplyOverrideConfigurationTest() {

        super(ApplyOverrideConfigurationActivity.class);

    }



    @Before

    @Override

    public void setUp() throws Exception {

        super.setUp();

        injectInstrumentation(InstrumentationRegistry.getInstrumentation());

        getInstrumentation().getUiAutomation().setRotation(UiAutomation.ROTATION_FREEZE_0);

    }



    @Test

    public void testConfigurationIsOverriden() throws Exception {

        Configuration config = getActivity().getResources().getConfiguration();

        assertEquals(OVERRIDE_WIDTH, config.smallestScreenWidthDp);



        getInstrumentation().getUiAutomation().setRotation(UiAutomation.ROTATION_FREEZE_90);



        config = getActivity().getResources().getConfiguration();

        assertEquals(OVERRIDE_WIDTH, config.smallestScreenWidthDp);

    }



    @After

    @Override

    public void tearDown() throws Exception {

        getInstrumentation().getUiAutomation().setRotation(UiAutomation.ROTATION_UNFREEZE);

        super.tearDown();

    }

}