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

Add Function3

Browse Source 
...and rename ExceptionUtils to FunctionalUtils as the old name
would no longer be appropriate.

Test: FrameworksNetTests
Change-Id: I2affd69fb84d7f250b4a45497eec6c052bf6ec50
This commit is contained in:
Chalard Jean
2021-08-04 21:56:45 +09:00
parent 0b3378b7d4
commit a19f85124e
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
staticlibs/testutils/devicetests/com/android/testutils/TestPermissionUtil.kt
View File

@@ -20,8 +20,8 @@ package com.android.testutils
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import com.android.modules.utils.build.SdkLevel import com.android.modules.utils.build.SdkLevel
import com.android.testutils.ExceptionUtils.ThrowingRunnable import com.android.testutils.FunctionalUtils.ThrowingRunnable
import com.android.testutils.ExceptionUtils.ThrowingSupplier import com.android.testutils.FunctionalUtils.ThrowingSupplier
/** /**
* Run the specified [task] with the specified [permissions] obtained through shell * Run the specified [task] with the specified [permissions] obtained through shell

4
staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
View File

@@ -18,8 +18,8 @@
package com.android.testutils package com.android.testutils
import com.android.testutils.ExceptionUtils.ThrowingRunnable import com.android.testutils.FunctionalUtils.ThrowingRunnable
import com.android.testutils.ExceptionUtils.ThrowingSupplier import com.android.testutils.FunctionalUtils.ThrowingSupplier
import javax.annotation.CheckReturnValue import javax.annotation.CheckReturnValue
/** /**

19
staticlibs/testutils/hostdevice/com/android/testutils/ExceptionUtils.java → staticlibs/testutils/hostdevice/com/android/testutils/FunctionalUtils.java
View File

@@ -21,7 +21,7 @@ import java.util.function.Supplier;
/** /**
* A class grouping some utilities to deal with exceptions. * A class grouping some utilities to deal with exceptions.
*/ */
public class ExceptionUtils { public class FunctionalUtils {
/** /**
* Like a Consumer, but declared to throw an exception. * Like a Consumer, but declared to throw an exception.
* @param <T> * @param <T>
@@ -79,4 +79,21 @@ public class ExceptionUtils {
} }
}; };
} }
// Java has Function<T, R> and BiFunction<T, U, V> but nothing for higher-arity functions.
// Function3 is what Kotlin and Scala use (they also have higher-arity variants, with
// FunctionN taking N arguments, as the JVM does not have variadic formal parameters)
/**
* A function with three arguments.
* @param <TArg1> Type of the first argument
* @param <TArg2> Type of the second argument
* @param <TArg3> Type of the third argument
* @param <TResult> Type of the return value
*/
public interface Function3<TArg1, TArg2, TArg3, TResult> {
/**
* Apply the function to the arguments
*/
TResult apply(TArg1 a1, TArg2 a2, TArg3 a3);
}
} }

2
staticlibs/testutils/hostdevice/com/android/testutils/MiscAsserts.kt
View File

@@ -18,7 +18,7 @@
package com.android.testutils package com.android.testutils
import com.android.testutils.ExceptionUtils.ThrowingRunnable import com.android.testutils.FunctionalUtils.ThrowingRunnable
import java.lang.reflect.Modifier import java.lang.reflect.Modifier
import kotlin.system.measureTimeMillis import kotlin.system.measureTimeMillis
import kotlin.test.assertEquals import kotlin.test.assertEquals