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

Commit 22c7164d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I9ef0979a,I241c5cea 

* changes:
  Move wifi test package to sdk 26
  Create new ShadowBidiFormatter
parents 493fbd8d 71cf59e6

tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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 com.android.settings.testutils.shadow;



import android.support.v4.text.BidiFormatter;

import android.support.v4.text.TextDirectionHeuristicCompat;



import org.robolectric.annotation.Implements;



@Implements(BidiFormatter.class)

public class ShadowBidiFormatter {



    public CharSequence unicodeWrap(CharSequence str, TextDirectionHeuristicCompat heuristic,

            boolean isolate) {

        return str;

    }

}

tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.Mockito.when;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class CellularFallbackPreferenceControllerTest {



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import org.robolectric.annotation.Config; 
import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class ConfigureWifiSettingsTest {



    private Context mContext;

tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class ConnectedAccessPointPreferenceTest {

    @Mock

    private AccessPoint mAccessPoint;

tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class LinkablePreferenceTest {



    private static final String TITLE = "Title";