ref: 9d7080e9f6bba3e840a98e5d9b73c538e30b5f05
parent: 4b41800d497b3e768269db0c63acb5136c7a3a99
author: James Zern <jzern@google.com>
date: Tue Mar 18 15:25:31 EDT 2014
intrapred_test: fix inheritance inheritance should be public; also correct placement of ClearSystemState as the base class doesn't inherit from testing Change-Id: I0f41330fccc62a70b8dd40d66bbd829b9d98cf84
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -26,12 +26,8 @@
class IntraPredBase {
public:
- virtual ~IntraPredBase() {}
+ virtual ~IntraPredBase() { libvpx_test::ClearSystemState(); }
- virtual void TearDown() {
- libvpx_test::ClearSystemState();
- }
-
protected:
void SetupMacroblock(MACROBLOCKD *mbptr,
MODE_INFO *miptr,
@@ -227,8 +223,9 @@
uint8_t *ypred_ptr,
int y_stride);
-class IntraPredYTest : public ::testing::TestWithParam<intra_pred_y_fn_t>,
- protected IntraPredBase {
+class IntraPredYTest
+ : public IntraPredBase,
+ public ::testing::TestWithParam<intra_pred_y_fn_t> {
public:
static void SetUpTestCase() {
mb_ = reinterpret_cast<MACROBLOCKD*>(
@@ -308,8 +305,9 @@
uint8_t *vpred_ptr,
int pred_stride);
-class IntraPredUVTest : public ::testing::TestWithParam<intra_pred_uv_fn_t>,
- protected IntraPredBase {
+class IntraPredUVTest
+ : public IntraPredBase,
+ public ::testing::TestWithParam<intra_pred_uv_fn_t> {
public:
static void SetUpTestCase() {
mb_ = reinterpret_cast<MACROBLOCKD*>(
--
⑨