Remove unused return type in test method
This shaves off a couple of lines of code
Test: atest CtsCompanionDeviceManagerCoreTestCases
Change-Id: Ia09232455d1b059b859740723bd418e559f69074
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/InvocationTracker.kt b/tests/tests/companion/common/src/android/companion/cts/common/InvocationTracker.kt
index 2a571ca..25240d7 100644
--- a/tests/tests/companion/common/src/android/companion/cts/common/InvocationTracker.kt
+++ b/tests/tests/companion/common/src/android/companion/cts/common/InvocationTracker.kt
@@ -48,7 +48,7 @@
fun clearRecordedInvocations()
- fun recordInvocation(invocation: T): Boolean
+ fun recordInvocation(invocation: T)
}
internal class InvocationContainer<T> : InvocationTracker<T> {
@@ -58,5 +58,7 @@
override fun clearRecordedInvocations() = _invocations.clear()
- override fun recordInvocation(invocation: T) = _invocations.add(invocation)
+ override fun recordInvocation(invocation: T) {
+ _invocations.add(invocation)
+ }
}
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/RecordingCallback.kt b/tests/tests/companion/common/src/android/companion/cts/common/RecordingCallback.kt
index c438f4c..52a4610 100644
--- a/tests/tests/companion/common/src/android/companion/cts/common/RecordingCallback.kt
+++ b/tests/tests/companion/common/src/android/companion/cts/common/RecordingCallback.kt
@@ -28,17 +28,14 @@
constructor() : this(InvocationContainer())
- override fun onDeviceFound(intentSender: IntentSender) {
+ override fun onDeviceFound(intentSender: IntentSender) =
logAndRecordInvocation(OnDeviceFound(intentSender))
- }
- override fun onAssociationPending(intentSender: IntentSender) {
+ override fun onAssociationPending(intentSender: IntentSender) =
logAndRecordInvocation(OnAssociationPending(intentSender))
- }
- override fun onAssociationCreated(associationInfo: AssociationInfo) {
+ override fun onAssociationCreated(associationInfo: AssociationInfo) =
logAndRecordInvocation(OnAssociationCreated(associationInfo))
- }
override fun onFailure(error: CharSequence?) = logAndRecordInvocation(OnFailure(error))
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/RecordingCdmEventObserver.kt b/tests/tests/companion/common/src/android/companion/cts/common/RecordingCdmEventObserver.kt
index 87677ff..7ba5552 100644
--- a/tests/tests/companion/common/src/android/companion/cts/common/RecordingCdmEventObserver.kt
+++ b/tests/tests/companion/common/src/android/companion/cts/common/RecordingCdmEventObserver.kt
@@ -43,27 +43,22 @@
// association change listener behavior
- override fun onAssociationsChanged(associations: List<AssociationInfo>) {
+ override fun onAssociationsChanged(associations: List<AssociationInfo>) =
recordInvocation(AssociationChange(associations))
- }
// CDM callback behavior
- override fun onDeviceFound(intentSender: IntentSender) {
+ override fun onDeviceFound(intentSender: IntentSender) =
recordInvocation(CdmCallback(OnDeviceFound(intentSender)))
- }
- override fun onAssociationPending(intentSender: IntentSender) {
+ override fun onAssociationPending(intentSender: IntentSender) =
recordInvocation(CdmCallback(OnAssociationPending(intentSender)))
- }
- override fun onAssociationCreated(associationInfo: AssociationInfo) {
+ override fun onAssociationCreated(associationInfo: AssociationInfo) =
recordInvocation(CdmCallback(OnAssociationCreated(associationInfo)))
- }
- override fun onFailure(error: CharSequence?) {
+ override fun onFailure(error: CharSequence?) =
recordInvocation(CdmCallback(OnFailure(error)))
- }
sealed interface CdmEvent
data class AssociationChange(val associations: List<AssociationInfo>) : CdmEvent
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/RecordingOnAssociationsChangedListener.kt b/tests/tests/companion/common/src/android/companion/cts/common/RecordingOnAssociationsChangedListener.kt
index 2020f99..c024a79 100644
--- a/tests/tests/companion/common/src/android/companion/cts/common/RecordingOnAssociationsChangedListener.kt
+++ b/tests/tests/companion/common/src/android/companion/cts/common/RecordingOnAssociationsChangedListener.kt
@@ -25,7 +25,6 @@
constructor() : this(InvocationContainer())
- override fun onAssociationsChanged(associations: List<AssociationInfo>) {
+ override fun onAssociationsChanged(associations: List<AssociationInfo>) =
recordInvocation(associations)
- }
}
\ No newline at end of file
