diff options
author | Chalard Jean <jchalard@google.com> | 2022-10-24 17:52:57 +0900 |
---|---|---|
committer | Chalard Jean <jchalard@google.com> | 2022-10-24 18:54:45 +0900 |
commit | 9d3026aa49d6584e0cf858d53a7f07205400963a (patch) | |
tree | 817dc29db8d3c23422438b3e910b9f8320d8ad63 | |
parent | cdc2beccf1a11d3efbd414c8d6abbbfef288555a (diff) | |
download | net-9d3026aa49d6584e0cf858d53a7f07205400963a.tar.gz |
[CC07] Add build tests for expect* versions
Also address some comments left on a previous patchset.
Test: NetworkStaticLibTests
Change-Id: I3ea16bb54aec31ddb0368af980483109a1bdb49b
3 files changed, 165 insertions, 6 deletions
diff --git a/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt b/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt index 1866d2e6..f8f2da08 100644 --- a/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt +++ b/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt @@ -38,6 +38,7 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 +import org.junit.Assume.assumeTrue import kotlin.reflect.KClass import kotlin.test.assertEquals import kotlin.test.assertFails @@ -270,6 +271,86 @@ class TestableNetworkCallbackTest { } @Test + fun testAllExpectOverloads() { + // This test should never run, it only checks that all overloads exist and build + assumeTrue(false) + val hn = object : TestableNetworkCallback.HasNetwork { override val network = ANY_NETWORK } + + // Method with all arguments (version that takes a Network) + mCallback.expect(AVAILABLE, ANY_NETWORK, 10, "error") { true } + + // Java overloads omitting one argument. One line for omitting each argument, in positional + // order. Versions that take a Network. + mCallback.expect(AVAILABLE, 10, "error") { true } + mCallback.expect(AVAILABLE, ANY_NETWORK, "error") { true } + mCallback.expect(AVAILABLE, ANY_NETWORK, 10) { true } + mCallback.expect(AVAILABLE, ANY_NETWORK, 10, "error") + + // Java overloads for omitting two arguments. One line for omitting each pair of arguments. + // Versions that take a Network. + mCallback.expect(AVAILABLE, "error") { true } + mCallback.expect(AVAILABLE, 10) { true } + mCallback.expect(AVAILABLE, 10, "error") + mCallback.expect(AVAILABLE, ANY_NETWORK) { true } + mCallback.expect(AVAILABLE, ANY_NETWORK, "error") + mCallback.expect(AVAILABLE, ANY_NETWORK, 10) + + // Java overloads for omitting three arguments. One line for each remaining argument. + // Versions that take a Network. + mCallback.expect(AVAILABLE) { true } + mCallback.expect(AVAILABLE, "error") + mCallback.expect(AVAILABLE, 10) + mCallback.expect(AVAILABLE, ANY_NETWORK) + + // Java overload for omitting all four arguments. + mCallback.expect(AVAILABLE) + + // Same orders as above, but versions that take a HasNetwork. Except overloads that + // were already tested because they omitted the Network argument + mCallback.expect(AVAILABLE, hn, 10, "error") { true } + mCallback.expect(AVAILABLE, hn, "error") { true } + mCallback.expect(AVAILABLE, hn, 10) { true } + mCallback.expect(AVAILABLE, hn, 10, "error") + + mCallback.expect(AVAILABLE, hn) { true } + mCallback.expect(AVAILABLE, hn, "error") + mCallback.expect(AVAILABLE, hn, 10) + + mCallback.expect(AVAILABLE, hn) + + // Same as above but for reified versions. + mCallback.expect<Available>(ANY_NETWORK, 10, "error") { true } + mCallback.expect<Available>(timeoutMs = 10, errorMsg = "error") { true } + mCallback.expect<Available>(network = ANY_NETWORK, errorMsg = "error") { true } + mCallback.expect<Available>(network = ANY_NETWORK, timeoutMs = 10) { true } + mCallback.expect<Available>(network = ANY_NETWORK, timeoutMs = 10, errorMsg = "error") + + mCallback.expect<Available>(errorMsg = "error") { true } + mCallback.expect<Available>(timeoutMs = 10) { true } + mCallback.expect<Available>(timeoutMs = 10, errorMsg = "error") + mCallback.expect<Available>(network = ANY_NETWORK) { true } + mCallback.expect<Available>(network = ANY_NETWORK, errorMsg = "error") + mCallback.expect<Available>(network = ANY_NETWORK, timeoutMs = 10) + + mCallback.expect<Available> { true } + mCallback.expect<Available>(errorMsg = "error") + mCallback.expect<Available>(timeoutMs = 10) + mCallback.expect<Available>(network = ANY_NETWORK) + mCallback.expect<Available>() + + mCallback.expect<Available>(hn, 10, "error") { true } + mCallback.expect<Available>(network = hn, errorMsg = "error") { true } + mCallback.expect<Available>(network = hn, timeoutMs = 10) { true } + mCallback.expect<Available>(network = hn, timeoutMs = 10, errorMsg = "error") + + mCallback.expect<Available>(network = hn) { true } + mCallback.expect<Available>(network = hn, errorMsg = "error") + mCallback.expect<Available>(network = hn, timeoutMs = 10) + + mCallback.expect<Available>(network = hn) + } + + @Test fun testPoll() { assertNull(mCallback.poll(SHORT_TIMEOUT_MS)) TNCInterpreter.interpretTestSpec(initial = mCallback, lineShift = 1, diff --git a/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTestJava.java b/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTestJava.java new file mode 100644 index 00000000..4570d0ae --- /dev/null +++ b/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTestJava.java @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2022 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.testutils; + +import static com.android.testutils.RecorderCallback.CallbackEntry.AVAILABLE; +import static com.android.testutils.TestableNetworkCallbackKt.anyNetwork; + +import static org.junit.Assume.assumeTrue; + +import org.junit.Test; + +public class TestableNetworkCallbackTestJava { + @Test + void testAllExpectOverloads() { + // This test should never run, it only checks that all overloads exist and build + assumeTrue(false); + final TestableNetworkCallback callback = new TestableNetworkCallback(); + TestableNetworkCallback.HasNetwork hn = TestableNetworkCallbackKt::anyNetwork; + + // Method with all arguments (version that takes a Network) + callback.expect(AVAILABLE, anyNetwork(), 10, "error", cb -> true); + + // Overloads omitting one argument. One line for omitting each argument, in positional + // order. Versions that take a Network. + callback.expect(AVAILABLE, 10, "error", cb -> true); + callback.expect(AVAILABLE, anyNetwork(), "error", cb -> true); + callback.expect(AVAILABLE, anyNetwork(), 10, cb -> true); + callback.expect(AVAILABLE, anyNetwork(), 10, "error"); + + // Overloads for omitting two arguments. One line for omitting each pair of arguments. + // Versions that take a Network. + callback.expect(AVAILABLE, "error", cb -> true); + callback.expect(AVAILABLE, 10, cb -> true); + callback.expect(AVAILABLE, 10, "error"); + callback.expect(AVAILABLE, anyNetwork(), cb -> true); + callback.expect(AVAILABLE, anyNetwork(), "error"); + callback.expect(AVAILABLE, anyNetwork(), 10); + + // Overloads for omitting three arguments. One line for each remaining argument. + // Versions that take a Network. + callback.expect(AVAILABLE, cb -> true); + callback.expect(AVAILABLE, "error"); + callback.expect(AVAILABLE, 10); + callback.expect(AVAILABLE, anyNetwork()); + + // Java overload for omitting all four arguments. + callback.expect(AVAILABLE); + + // Same orders as above, but versions that take a HasNetwork. Except overloads that + // were already tested because they omitted the Network argument + callback.expect(AVAILABLE, hn, 10, "error", cb -> true); + callback.expect(AVAILABLE, hn, "error", cb -> true); + callback.expect(AVAILABLE, hn, 10, cb -> true); + callback.expect(AVAILABLE, hn, 10, "error"); + + callback.expect(AVAILABLE, hn, cb -> true); + callback.expect(AVAILABLE, hn, "error"); + callback.expect(AVAILABLE, hn, 10); + + callback.expect(AVAILABLE, hn); + } +} diff --git a/common/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt b/common/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt index a40e57df..406a179c 100644 --- a/common/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt +++ b/common/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt @@ -212,10 +212,11 @@ open class TestableNetworkCallback private constructor( ): CallbackEntry = poll(timeoutMs) ?: fail(errorMsg) /***** - * AssertNextIs family of methods. + * expect family of methods. * These methods fetch the next callback and assert it matches the conditions : type, * passed predicate. If no callback is received within the timeout, these methods fail. */ + @JvmOverloads fun <T : CallbackEntry> expect( type: KClass<T>, network: Network = ANY_NETWORK, @@ -226,6 +227,7 @@ open class TestableNetworkCallback private constructor( test(it as? T ?: fail("Expected callback ${type.simpleName}, got $it")) } as T + @JvmOverloads fun <T : CallbackEntry> expect( type: KClass<T>, network: HasNetwork, @@ -269,7 +271,7 @@ open class TestableNetworkCallback private constructor( type: KClass<T>, network: Network, timeoutMs: Long, - test: (T) -> Boolean = { true } + test: (T) -> Boolean ) = expect(type, network, timeoutMs, null, test) @JvmOverloads @@ -277,7 +279,7 @@ open class TestableNetworkCallback private constructor( type: KClass<T>, network: HasNetwork, timeoutMs: Long, - test: (T) -> Boolean = { true } + test: (T) -> Boolean ) = expect(type, network.network, timeoutMs, null, test) // Without |network| or |timeout| @@ -301,21 +303,21 @@ open class TestableNetworkCallback private constructor( fun <T : CallbackEntry> expect( type: KClass<T>, network: Network, - test: (T) -> Boolean = { true } + test: (T) -> Boolean ) = expect(type, network, defaultTimeoutMs, null, test) @JvmOverloads fun <T : CallbackEntry> expect( type: KClass<T>, network: HasNetwork, - test: (T) -> Boolean = { true } + test: (T) -> Boolean ) = expect(type, network.network, defaultTimeoutMs, null, test) // Without |network| or |timeout| or |errorMsg| @JvmOverloads fun <T : CallbackEntry> expect( type: KClass<T>, - test: (T) -> Boolean = { true } + test: (T) -> Boolean ) = expect(type, ANY_NETWORK, defaultTimeoutMs, null, test) // Kotlin reified versions. Don't call methods above, or the predicate would need to be noinline |