Camera2: Tests -- Fork each test before executing it
Use CAMERA2_TEST_FORKING_DISABLED=1 environment variable to override this
behavior (e.g. when wanting to attach gdb to the test app).
Change-Id: Ib639885bdb827fc2415c878cbcb1b2d84dff687b
diff --git a/tests/camera2/CameraMetadataTests.cpp b/tests/camera2/CameraMetadataTests.cpp
index 739eba6..18710bc 100644
--- a/tests/camera2/CameraMetadataTests.cpp
+++ b/tests/camera2/CameraMetadataTests.cpp
@@ -32,7 +32,9 @@
#include <gui/SurfaceTextureClient.h>
#include <string>
+
#include "CameraStreamFixture.h"
+#include "TestExtensions.h"
namespace android {
namespace camera2 {
@@ -45,16 +47,18 @@
/*mHeapCount*/ 2
};
-class DISABLED_CameraMetadataTest
+class CameraMetadataTest
: public ::testing::Test,
public CameraStreamFixture {
public:
- DISABLED_CameraMetadataTest()
+ CameraMetadataTest()
: CameraStreamFixture(METADATA_STREAM_PARAMETERS) {
+ TEST_EXTENSION_FORKING_CONSTRUCTOR;
}
- ~DISABLED_CameraMetadataTest() {
+ ~CameraMetadataTest() {
+ TEST_EXTENSION_FORKING_DESTRUCTOR;
}
int GetTypeFromTag(uint32_t tag) const {
@@ -67,22 +71,13 @@
return entry.type;
}
- static void SetUpTestCase() {
- }
-
- static void TearDownTestCase()
- {
- }
-
protected:
};
-TEST_F(DISABLED_CameraMetadataTest, types) {
+TEST_F(CameraMetadataTest, types) {
- if (HasFatalFailure()) {
- return;
- }
+ TEST_EXTENSION_FORKING_INIT;
//FIXME: set this up in an external file of some sort (xml?)
{