Merge "Fix import order for BatteryTerminatorTest and TimeoutTerminatorTest."
diff --git a/libraries/health/runners/longevity/host/src/android/host/test/longevity/listener/TimeoutTerminator.java b/libraries/health/runners/longevity/host/src/android/host/test/longevity/listener/TimeoutTerminator.java
index 65e6a0d..bf4dcba 100644
--- a/libraries/health/runners/longevity/host/src/android/host/test/longevity/listener/TimeoutTerminator.java
+++ b/libraries/health/runners/longevity/host/src/android/host/test/longevity/listener/TimeoutTerminator.java
@@ -17,11 +17,11 @@
import static java.util.concurrent.TimeUnit.MINUTES;
-import java.util.Map;
-
import org.junit.runner.Description;
import org.junit.runner.notification.RunNotifier;
+import java.util.Map;
+
/**
* A {@link RunTerminator} for terminating early on test end due to long duration for host suites.
*/
diff --git a/libraries/health/runners/longevity/platform/src/android/platform/test/longevity/listener/BatteryTerminator.java b/libraries/health/runners/longevity/platform/src/android/platform/test/longevity/listener/BatteryTerminator.java
index f55763d..3cf6770 100644
--- a/libraries/health/runners/longevity/platform/src/android/platform/test/longevity/listener/BatteryTerminator.java
+++ b/libraries/health/runners/longevity/platform/src/android/platform/test/longevity/listener/BatteryTerminator.java
@@ -20,13 +20,14 @@
import android.content.IntentFilter;
import android.host.test.longevity.listener.RunTerminator;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-import java.util.Map;
+import androidx.annotation.VisibleForTesting;
import org.junit.runner.Description;
import org.junit.runner.notification.RunNotifier;
+import java.util.Map;
+
/**
* A {@link RunTerminator} for terminating early on test end due to low battery.
*/
diff --git a/libraries/health/runners/longevity/platform/src/android/platform/test/longevity/listener/TimeoutTerminator.java b/libraries/health/runners/longevity/platform/src/android/platform/test/longevity/listener/TimeoutTerminator.java
index b220768..badcc87 100644
--- a/libraries/health/runners/longevity/platform/src/android/platform/test/longevity/listener/TimeoutTerminator.java
+++ b/libraries/health/runners/longevity/platform/src/android/platform/test/longevity/listener/TimeoutTerminator.java
@@ -18,10 +18,10 @@
import android.os.SystemClock;
import android.util.Log;
-import java.util.Map;
-
import org.junit.runner.notification.RunNotifier;
+import java.util.Map;
+
/**
* A {@link RunTerminator} for terminating early on test end due to long duration for platform
* suites.
diff --git a/libraries/health/runners/longevity/platform/tests/src/android/platform/test/longevity/listener/BatteryTerminatorTest.java b/libraries/health/runners/longevity/platform/tests/src/android/platform/test/longevity/listener/BatteryTerminatorTest.java
index 5a1d3b8..106cae4 100644
--- a/libraries/health/runners/longevity/platform/tests/src/android/platform/test/longevity/listener/BatteryTerminatorTest.java
+++ b/libraries/health/runners/longevity/platform/tests/src/android/platform/test/longevity/listener/BatteryTerminatorTest.java
@@ -22,10 +22,8 @@
import android.content.Context;
import android.content.Intent;
-import androidx.test.filters.SmallTest;
-import java.util.HashMap;
-import java.util.Map;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
@@ -37,6 +35,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Unit test the logic for {@link BatteryTerminator}
*/
diff --git a/libraries/health/runners/longevity/platform/tests/src/android/platform/test/longevity/listener/TimeoutTerminatorTest.java b/libraries/health/runners/longevity/platform/tests/src/android/platform/test/longevity/listener/TimeoutTerminatorTest.java
index a6dfb79..648a996 100644
--- a/libraries/health/runners/longevity/platform/tests/src/android/platform/test/longevity/listener/TimeoutTerminatorTest.java
+++ b/libraries/health/runners/longevity/platform/tests/src/android/platform/test/longevity/listener/TimeoutTerminatorTest.java
@@ -20,9 +20,6 @@
import android.os.SystemClock;
-import java.util.HashMap;
-import java.util.Map;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.Description;
@@ -33,6 +30,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Unit tests for the platform-specific {@link TimeoutTerminator}.
*/
