Revert "Add support for ReportLog"
This reverts commit a790881ee1467273734417247adf4dc2f7f86121.
Change-Id: Iafd95f0fcc1e2a978d0a716036af155ac3bedccf
diff --git a/libs/deviceutil/src/android/cts/util/DeviceReportLog.java b/libs/deviceutil/src/android/cts/util/DeviceReportLog.java
index a3ceecf..b707fc8 100644
--- a/libs/deviceutil/src/android/cts/util/DeviceReportLog.java
+++ b/libs/deviceutil/src/android/cts/util/DeviceReportLog.java
@@ -16,24 +16,19 @@
package android.cts.util;
+import com.android.cts.util.ReportLog;
+
import android.app.Instrumentation;
import android.os.Bundle;
import android.util.Log;
-import com.android.cts.util.ReportLog;
-
public class DeviceReportLog extends ReportLog {
private static final String TAG = "DeviceCtsReport";
private static final String CTS_RESULT = "CTS_RESULT";
private static final int INST_STATUS_IN_PROGRESS = 2;
- private static final int BASE_DEPTH = 4;
- public DeviceReportLog() {
- mDepth = BASE_DEPTH;
- }
-
- public DeviceReportLog(int depth) {
- mDepth = BASE_DEPTH + depth;
+ DeviceReportLog() {
+ mDepth = 4;
}
@Override
diff --git a/tests/tests/hardware/Android.mk b/tests/tests/hardware/Android.mk
index 8ec3fdc..7fb0d5a 100644
--- a/tests/tests/hardware/Android.mk
+++ b/tests/tests/hardware/Android.mk
@@ -14,13 +14,25 @@
LOCAL_PATH:= $(call my-dir)
+# Reusable Sensor test classes and helpers
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cts-sensors-tests
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src/android/hardware/cts/helpers)
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
# CtsHardwareTestCases package
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner mockito-target android-ex-camera2
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner mockito-target android-ex-camera2
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/hardware/src/android/hardware/cts/SingleSensorTests.java b/tests/tests/hardware/src/android/hardware/cts/SingleSensorTests.java
index 7cbe113..35c312f 100644
--- a/tests/tests/hardware/src/android/hardware/cts/SingleSensorTests.java
+++ b/tests/tests/hardware/src/android/hardware/cts/SingleSensorTests.java
@@ -98,15 +98,6 @@
private static final int RATE_5HZ = 200000;
private static final int RATE_1HZ = 1000000;
- private static final String[] STAT_KEYS = {
- SensorStats.FREQUENCY_KEY,
- SensorStats.JITTER_95_PERCENTILE_KEY,
- SensorStats.EVENT_OUT_OF_ORDER_COUNT_KEY,
- SensorStats.MAGNITUDE_KEY,
- SensorStats.MEAN_KEY,
- SensorStats.STANDARD_DEVIATION_KEY,
- };
-
/**
* This test verifies that the sensor's properties complies with the required properites set in
* the CDD.
@@ -132,6 +123,7 @@
sensorName, sensor.getMinDelay(), expected);
assertTrue(msg, sensor.getMinDelay() <= expected);
}
+
}
}
@@ -222,7 +214,6 @@
runSensorTest(Sensor.TYPE_ORIENTATION, SensorManager.SENSOR_DELAY_FASTEST, BATCHING_OFF);
}
- @SuppressWarnings("deprecation")
public void testOrientation_100hz() throws Throwable {
runSensorTest(Sensor.TYPE_ORIENTATION, RATE_100HZ, BATCHING_OFF);
}
@@ -603,10 +594,6 @@
op.setLogEvents(true);
try {
op.execute();
-
- // Only report stats if it passes.
- SensorStats.logSelectedStatsToReportLog(getInstrumentation(), 2, STAT_KEYS,
- op.getStats());
} finally {
SensorStats.logStats(TAG, op.getStats());
@@ -622,8 +609,6 @@
String fileName = String.format("single_sensor_%s_%s%s.txt",
sensorName, sensorRate, batching);
SensorStats.logStatsToFile(fileName, op.getStats());
-
-
}
}
}
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorStats.java b/tests/tests/hardware/src/android/hardware/cts/helpers/SensorStats.java
index b868ea6..1a500d4 100644
--- a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorStats.java
+++ b/tests/tests/hardware/src/android/hardware/cts/helpers/SensorStats.java
@@ -16,17 +16,10 @@
package android.hardware.cts.helpers;
-import android.app.Instrumentation;
-import android.cts.util.DeviceReportLog;
import android.hardware.cts.helpers.sensoroperations.ISensorOperation;
-import android.os.Bundle;
import android.os.Environment;
import android.util.Log;
-import com.android.cts.util.ReportLog;
-import com.android.cts.util.ResultType;
-import com.android.cts.util.ResultUnit;
-
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -155,36 +148,6 @@
}
}
- /**
- * Utility method to log selected stats to a {@link ReportLog} object. The stats must be
- * a number or an array of numbers.
- */
- public static void logSelectedStatsToReportLog(Instrumentation instrumentation, int depth,
- String[] keys, SensorStats stats) {
- DeviceReportLog reportLog = new DeviceReportLog(depth);
-
- for (String key : keys) {
- Object value = stats.getValue(key);
- if (value instanceof Integer) {
- reportLog.printValue(key, (Integer) value, ResultType.NEUTRAL, ResultUnit.NONE);
- } else if (value instanceof Double) {
- reportLog.printValue(key, (Double) value, ResultType.NEUTRAL, ResultUnit.NONE);
- } else if (value instanceof Float) {
- reportLog.printValue(key, (Float) value, ResultType.NEUTRAL, ResultUnit.NONE);
- } else if (value instanceof double[]) {
- reportLog.printArray(key, (double[]) value, ResultType.NEUTRAL, ResultUnit.NONE);
- } else if (value instanceof float[]) {
- float[] tmpFloat = (float[]) value;
- double[] tmpDouble = new double[tmpFloat.length];
- for (int i = 0; i < tmpDouble.length; i++) tmpDouble[i] = tmpFloat[i];
- reportLog.printArray(key, tmpDouble, ResultType.NEUTRAL, ResultUnit.NONE);
- }
- }
-
- reportLog.printSummary("summary", 0, ResultType.NEUTRAL, ResultUnit.NONE);
- reportLog.deliverReportToHost(instrumentation);
- }
-
private static List<String> getSortedKeys(Map<String, Object> flattenedStats) {
List<String> keys = new ArrayList<String>(flattenedStats.keySet());
Collections.sort(keys);
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorTestCase.java b/tests/tests/hardware/src/android/hardware/cts/helpers/SensorTestCase.java
index a476dab..4bd0eed 100644
--- a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorTestCase.java
+++ b/tests/tests/hardware/src/android/hardware/cts/helpers/SensorTestCase.java
@@ -16,13 +16,14 @@
package android.hardware.cts.helpers;
-import android.cts.util.CtsAndroidTestCase;
+import android.test.AndroidTestCase;
+
import android.util.Log;
/**
* Test Case class that handles gracefully sensors that are not available in the device.
*/
-public abstract class SensorTestCase extends CtsAndroidTestCase {
+public abstract class SensorTestCase extends AndroidTestCase {
protected final String LOG_TAG = "TestRunner";
protected SensorTestCase() {}