diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-13 00:00:21 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-13 00:00:21 +0000 |
commit | 75b52bca02fa83e24f9a72bd34061fcd92503b3f (patch) | |
tree | 055329caadd12ec2c5448a5d0dc18ef6d3c4cffc | |
parent | 0528eb440a45a76628c277d825181f9b74fef699 (diff) | |
parent | dad59744ecd298454214840fd23b101dba2a4065 (diff) | |
download | cts-75b52bca02fa83e24f9a72bd34061fcd92503b3f.tar.gz |
Snap for 7908942 from dad59744ecd298454214840fd23b101dba2a4065 to pie-vts-release
Change-Id: Id118cdca7d6ee8d5fd77567ffaa1941ed98b1569
-rw-r--r-- | common/device-side/util-axt/src/com/android/compatibility/common/util/ExtraBusinessLogicTestCase.java | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/ExtraBusinessLogicTestCase.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/ExtraBusinessLogicTestCase.java index c0a4eb97ed0..910f0e28d5b 100644 --- a/common/device-side/util-axt/src/com/android/compatibility/common/util/ExtraBusinessLogicTestCase.java +++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/ExtraBusinessLogicTestCase.java @@ -18,8 +18,6 @@ package com.android.compatibility.common.util; import android.util.Log; -import com.android.compatibility.common.util.MultiLog; - import static org.junit.Assert.assertTrue; import org.junit.Before; @@ -39,7 +37,7 @@ import java.util.List; * Now Business Logics rules and actions can be called from the GCL by using the interface fully * qualified name. */ -public abstract class ExtraBusinessLogicTestCase extends BusinessLogicTestCase implements MultiLog { +public abstract class ExtraBusinessLogicTestCase extends BusinessLogicTestCase { private static final String LOG_TAG = BusinessLogicTestCase.class.getSimpleName(); @@ -56,7 +54,8 @@ public abstract class ExtraBusinessLogicTestCase extends BusinessLogicTestCase i "Test \"%s\" is unable to execute as it depends on the missing remote " + "configuration.", mTestCase.getMethodName()), mCanReadBusinessLogic); } else if (!mCanReadBusinessLogic) { - logInfo(LOG_TAG, "Skipping Business Logic for %s", mTestCase.getMethodName()); + Log.i(LOG_TAG, String.format( + "Skipping Business Logic for %s", mTestCase.getMethodName())); return; } @@ -70,29 +69,4 @@ public abstract class ExtraBusinessLogicTestCase extends BusinessLogicTestCase i } executeBusinessLogic(); } - - // copied from MultiLogDevice because pi can't desugar the default methods - /** {@inheritDoc} */ - @Override - public void logInfo(String logTag, String format, Object... args) { - Log.i(logTag, String.format(format, args)); - } - - /** {@inheritDoc} */ - @Override - public void logDebug(String logTag, String format, Object... args) { - Log.d(logTag, String.format(format, args)); - } - - /** {@inheritDoc} */ - @Override - public void logWarn(String logTag, String format, Object... args) { - Log.w(logTag, String.format(format, args)); - } - - /** {@inheritDoc} */ - @Override - public void logError(String logTag, String format, Object... args) { - Log.e(logTag, String.format(format, args)); - } } |