LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Dump debug logs after a test failure before running tearDown()s." into rvc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2020-04-06 19:20:19 +00:00
committed by Android (Google) Code Review
parent a268611629 1f4e465b5a
commit 9eb1424bcf
2 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
View File

@@ -62,13 +62,10 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
/**
* Superclass for tests related to background network restrictions.
*/
@RunWith(AndroidJUnit4.class)
@RunWith(NetworkPolicyTestRunner.class)
public abstract class AbstractRestrictBackgroundNetworkTestCase {
public static final String TAG = "RestrictBackgroundNetworkTests";
@@ -137,8 +134,7 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
private boolean mIsLocationOn;
@Rule
public final RuleChain mRuleChain = RuleChain.outerRule(new DumpOnFailureRule())
.around(new RequiredPropertiesRule())
public final RuleChain mRuleChain = RuleChain.outerRule(new RequiredPropertiesRule())
.around(new MeterednessConfigurationRule());
protected void setUp() throws Exception {

44
tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyTestRunner.java Normal file
View File

@@ -0,0 +1,44 @@
/*
* Copyright (C) 2020 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.cts.net.hostside;
import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
import org.junit.rules.RunRules;
import org.junit.rules.TestRule;
import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.Statement;
import java.util.List;
/**
* Custom runner to allow dumping logs after a test failure before the @After methods get to run.
*/
public class NetworkPolicyTestRunner extends AndroidJUnit4ClassRunner {
private TestRule mDumpOnFailureRule = new DumpOnFailureRule();
public NetworkPolicyTestRunner(Class<?> klass) throws InitializationError {
super(klass);
}
@Override
public Statement methodInvoker(FrameworkMethod method, Object test) {
return new RunRules(super.methodInvoker(method, test), List.of(mDumpOnFailureRule),
describeChild(method));
}
}