Update gtest usage in unit tests
This CL changes usages of TEST_CASE to TEST_SUITE and adds some
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST for tests that are
conditionally compiled out.
BUG=b/159031844
Change-Id: Ied753eb6fd4cb0da57b3f0d6fdf4bb0d798ca207
diff --git a/test/active_map_test.cc b/test/active_map_test.cc
index 0f8a732..4b0ae7a 100644
--- a/test/active_map_test.cc
+++ b/test/active_map_test.cc
@@ -92,12 +92,12 @@
TEST_P(ActiveMapTestLarge, Test) { DoTest(); }
-AV1_INSTANTIATE_TEST_CASE(ActiveMapTestLarge,
- ::testing::Values(::libaom_test::kRealTime),
- ::testing::Range(0, 5));
+AV1_INSTANTIATE_TEST_SUITE(ActiveMapTestLarge,
+ ::testing::Values(::libaom_test::kRealTime),
+ ::testing::Range(0, 5));
-AV1_INSTANTIATE_TEST_CASE(ActiveMapTest,
- ::testing::Values(::libaom_test::kRealTime),
- ::testing::Range(5, 9));
+AV1_INSTANTIATE_TEST_SUITE(ActiveMapTest,
+ ::testing::Values(::libaom_test::kRealTime),
+ ::testing::Range(5, 9));
} // namespace
diff --git a/test/altref_test.cc b/test/altref_test.cc
index 43df39f..ea7d955 100644
--- a/test/altref_test.cc
+++ b/test/altref_test.cc
@@ -91,8 +91,8 @@
}
}
-AV1_INSTANTIATE_TEST_CASE(AltRefForcedKeyTestLarge,
- ::testing::Values(::libaom_test::kOnePassGood),
- ::testing::Values(2, 5));
+AV1_INSTANTIATE_TEST_SUITE(AltRefForcedKeyTestLarge,
+ ::testing::Values(::libaom_test::kOnePassGood),
+ ::testing::Values(2, 5));
} // namespace
diff --git a/test/aq_segment_test.cc b/test/aq_segment_test.cc
index 83bfdb6..e2715a1 100644
--- a/test/aq_segment_test.cc
+++ b/test/aq_segment_test.cc
@@ -86,12 +86,12 @@
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
}
-AV1_INSTANTIATE_TEST_CASE(AqSegmentTest,
- ::testing::Values(::libaom_test::kRealTime,
- ::libaom_test::kOnePassGood),
- ::testing::Range(5, 9), ::testing::Range(0, 4));
-AV1_INSTANTIATE_TEST_CASE(AqSegmentTestLarge,
- ::testing::Values(::libaom_test::kRealTime,
- ::libaom_test::kOnePassGood),
- ::testing::Range(3, 5), ::testing::Range(0, 4));
+AV1_INSTANTIATE_TEST_SUITE(AqSegmentTest,
+ ::testing::Values(::libaom_test::kRealTime,
+ ::libaom_test::kOnePassGood),
+ ::testing::Range(5, 9), ::testing::Range(0, 4));
+AV1_INSTANTIATE_TEST_SUITE(AqSegmentTestLarge,
+ ::testing::Values(::libaom_test::kRealTime,
+ ::libaom_test::kOnePassGood),
+ ::testing::Range(3, 5), ::testing::Range(0, 4));
} // namespace
diff --git a/test/av1_encoder_parms_get_to_decoder.cc b/test/av1_encoder_parms_get_to_decoder.cc
index 76b82f5..717584d 100644
--- a/test/av1_encoder_parms_get_to_decoder.cc
+++ b/test/av1_encoder_parms_get_to_decoder.cc
@@ -155,6 +155,6 @@
ASSERT_NO_FATAL_FAILURE(RunLoop(video.get()));
}
-AV1_INSTANTIATE_TEST_CASE(AVxEncoderParmsGetToDecoder,
- ::testing::ValuesIn(kAV1EncodeParameterSet));
+AV1_INSTANTIATE_TEST_SUITE(AVxEncoderParmsGetToDecoder,
+ ::testing::ValuesIn(kAV1EncodeParameterSet));
} // namespace
diff --git a/test/av1_ext_tile_test.cc b/test/av1_ext_tile_test.cc
index 424d2f06..ad45667 100644
--- a/test/av1_ext_tile_test.cc
+++ b/test/av1_ext_tile_test.cc
@@ -199,7 +199,7 @@
TEST_P(AV1ExtTileTest, DecoderResultTest) { TestRoundTrip(); }
-AV1_INSTANTIATE_TEST_CASE(
+AV1_INSTANTIATE_TEST_SUITE(
// Now only test 2-pass mode.
AV1ExtTileTest, ::testing::Values(::libaom_test::kTwoPassGood),
::testing::Range(1, 4));
@@ -208,7 +208,7 @@
TEST_P(AV1ExtTileTestLarge, DecoderResultTest) { TestRoundTrip(); }
-AV1_INSTANTIATE_TEST_CASE(
+AV1_INSTANTIATE_TEST_SUITE(
// Now only test 2-pass mode.
AV1ExtTileTestLarge, ::testing::Values(::libaom_test::kTwoPassGood),
::testing::Range(0, 1));
diff --git a/test/av1_fwd_txfm2d_test.cc b/test/av1_fwd_txfm2d_test.cc
index bf469fc..0e7eb09 100644
--- a/test/av1_fwd_txfm2d_test.cc
+++ b/test/av1_fwd_txfm2d_test.cc
@@ -354,6 +354,7 @@
typedef std::tuple<TX_SIZE, lowbd_fwd_txfm_func> LbdFwdTxfm2dParam;
class AV1FwdTxfm2dTest : public ::testing::TestWithParam<LbdFwdTxfm2dParam> {};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1FwdTxfm2dTest);
TEST_P(AV1FwdTxfm2dTest, match) {
AV1FwdTxfm2dMatchTest(GET_PARAM(0), GET_PARAM(1));
@@ -562,6 +563,7 @@
class AV1HighbdFwdTxfm2dTest
: public ::testing::TestWithParam<HighbdFwdTxfm2dParam> {};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1HighbdFwdTxfm2dTest);
TEST_P(AV1HighbdFwdTxfm2dTest, match) {
AV1HighbdFwdTxfm2dMatchTest(GET_PARAM(0), GET_PARAM(1));
diff --git a/test/av1_highbd_iht_test.cc b/test/av1_highbd_iht_test.cc
index aaa0a6e..a576c0f 100644
--- a/test/av1_highbd_iht_test.cc
+++ b/test/av1_highbd_iht_test.cc
@@ -129,6 +129,7 @@
uint16_t *output_;
uint16_t *output_ref_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1HighbdInvHTNxN);
void AV1HighbdInvHTNxN::RunBitexactCheck() {
ACMRandom rnd(ACMRandom::DeterministicSeed());
@@ -204,6 +205,7 @@
private:
HighbdInvTxfm2dFunc target_func_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1HighbdInvTxfm2d);
void AV1HighbdInvTxfm2d::RunAV1InvTxfm2dTest(TX_TYPE tx_type_, TX_SIZE tx_size_,
int run_times, int bit_depth_,
diff --git a/test/av1_inv_txfm2d_test.cc b/test/av1_inv_txfm2d_test.cc
index eacdf85..d14acfe 100644
--- a/test/av1_inv_txfm2d_test.cc
+++ b/test/av1_inv_txfm2d_test.cc
@@ -272,6 +272,7 @@
private:
LbdInvTxfm2dFunc target_func_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1LbdInvTxfm2d);
void AV1LbdInvTxfm2d::RunAV1InvTxfm2dTest(TxType tx_type, TxSize tx_size,
int run_times, int gt_int16) {
diff --git a/test/av1_nn_predict_test.cc b/test/av1_nn_predict_test.cc
index cdf0417..04b44a2 100644
--- a/test/av1_nn_predict_test.cc
+++ b/test/av1_nn_predict_test.cc
@@ -70,6 +70,7 @@
float *bias[NN_MAX_HIDDEN_LAYERS + 1] = { 0 };
float *weights_buf = nullptr, *bias_buf = nullptr;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(NnPredictTest);
void NnPredictTest::RunNnPredictTest(const NN_CONFIG *const shape) {
libaom_test::ClearSystemState();
diff --git a/test/av1_quantize_test.cc b/test/av1_quantize_test.cc
index 39a3c33..020ae54 100644
--- a/test/av1_quantize_test.cc
+++ b/test/av1_quantize_test.cc
@@ -202,6 +202,7 @@
QuantizeFuncParams params_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1QuantizeTest);
TEST_P(AV1QuantizeTest, BitExactCheck) { RunQuantizeTest(); }
TEST_P(AV1QuantizeTest, EobVerify) { RunEobTest(); }
diff --git a/test/av1_round_shift_array_test.cc b/test/av1_round_shift_array_test.cc
index 993fa9f..07f6b56 100644
--- a/test/av1_round_shift_array_test.cc
+++ b/test/av1_round_shift_array_test.cc
@@ -53,6 +53,7 @@
libaom_test::ACMRandom rnd_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1CompRoundShiftTest);
AV1CompRoundShiftTest::~AV1CompRoundShiftTest() { ; }
diff --git a/test/av1_wedge_utils_test.cc b/test/av1_wedge_utils_test.cc
index f9dc838..69280b4 100644
--- a/test/av1_wedge_utils_test.cc
+++ b/test/av1_wedge_utils_test.cc
@@ -164,6 +164,7 @@
protected:
static const int kIterations = 10000;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(WedgeUtilsSSEOptTest);
TEST_P(WedgeUtilsSSEOptTest, RandomValues) {
DECLARE_ALIGNED(32, int16_t, r1[MAX_SB_SQUARE]);
@@ -230,6 +231,7 @@
static const int kIterations = 10000;
static const int kMaxSize = 8196; // Size limited by SIMD implementation.
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(WedgeUtilsSignOptTest);
TEST_P(WedgeUtilsSignOptTest, RandomValues) {
DECLARE_ALIGNED(32, int16_t, r0[MAX_SB_SQUARE]);
@@ -329,6 +331,7 @@
protected:
static const int kIterations = 10000;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(WedgeUtilsDeltaSquaresOptTest);
TEST_P(WedgeUtilsDeltaSquaresOptTest, RandomValues) {
DECLARE_ALIGNED(32, int16_t, a[MAX_SB_SQUARE]);
diff --git a/test/avg_test.cc b/test/avg_test.cc
index 4b10182..f5c9212 100644
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -215,6 +215,7 @@
int16_t *hbuf_asm_;
int16_t *hbuf_c_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(IntProRowTest);
typedef int16_t (*IntProColFunc)(uint8_t const *ref, const int width);
@@ -270,6 +271,7 @@
int16_t sum_asm_;
int16_t sum_c_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(IntProColTest);
TEST_P(IntProRowTest, MinValue) {
FillConstant(0);
@@ -383,6 +385,7 @@
VectorVarFunc c_func;
VectorVarFunc simd_func;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VectorVarTest);
TEST_P(VectorVarTest, MaxVar) {
FillConstant(0, max_range);
@@ -640,6 +643,8 @@
FillRandom();
RunSpeedTest();
}
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SatdTest);
+
#if HAVE_NEON
INSTANTIATE_TEST_SUITE_P(
NEON, SatdTest,
diff --git a/test/blend_a64_mask_test.cc b/test/blend_a64_mask_test.cc
index 5c2c291..fc45664 100644
--- a/test/blend_a64_mask_test.cc
+++ b/test/blend_a64_mask_test.cc
@@ -190,6 +190,7 @@
}
}
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BlendA64MaskTest8B);
TEST_P(BlendA64MaskTest8B, RandomValues) {
for (int iter = 0; iter < kIterations && !HasFatalFailure(); ++iter) {
@@ -304,6 +305,7 @@
}
}
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BlendA64MaskTest8B_d16);
TEST_P(BlendA64MaskTest8B_d16, RandomValues) {
for (int iter = 0; iter < kIterations && !HasFatalFailure(); ++iter) {
@@ -404,6 +406,7 @@
int bit_depth_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BlendA64MaskTestHBD);
TEST_P(BlendA64MaskTestHBD, RandomValues) {
for (int iter = 0; iter < kIterations && !HasFatalFailure(); ++iter) {
diff --git a/test/borders_test.cc b/test/borders_test.cc
index 31eacab..841f0d9 100644
--- a/test/borders_test.cc
+++ b/test/borders_test.cc
@@ -80,6 +80,6 @@
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
}
-AV1_INSTANTIATE_TEST_CASE(BordersTestLarge,
- ::testing::Values(::libaom_test::kTwoPassGood));
+AV1_INSTANTIATE_TEST_SUITE(BordersTestLarge,
+ ::testing::Values(::libaom_test::kTwoPassGood));
} // namespace
diff --git a/test/cdef_test.cc b/test/cdef_test.cc
index a2ec1e3..14fa12b 100644
--- a/test/cdef_test.cc
+++ b/test/cdef_test.cc
@@ -53,8 +53,10 @@
cdef_filter_block_func cdef;
cdef_filter_block_func ref_cdef;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CDEFBlockTest);
typedef CDEFBlockTest CDEFSpeedTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CDEFSpeedTest);
void test_cdef(int bsize, int iterations, cdef_filter_block_func cdef,
cdef_filter_block_func ref_cdef, int boundary, int depth) {
@@ -202,8 +204,10 @@
find_dir_t finddir;
find_dir_t ref_finddir;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CDEFFindDirTest);
typedef CDEFFindDirTest CDEFFindDirSpeedTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CDEFFindDirSpeedTest);
void test_finddir(int (*finddir)(const uint16_t *img, int stride, int32_t *var,
int coeff_shift),
diff --git a/test/cfl_test.cc b/test/cfl_test.cc
index d297315..6959dbe 100644
--- a/test/cfl_test.cc
+++ b/test/cfl_test.cc
@@ -183,6 +183,7 @@
cfl_subtract_average_fn sub_avg;
cfl_subtract_average_fn sub_avg_ref;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CFLSubAvgTest);
TEST_P(CFLSubAvgTest, SubAvgTest) {
for (int it = 0; it < NUM_ITERATIONS; it++) {
@@ -286,6 +287,7 @@
fun_444_ref = cfl_get_luma_subsampling_444_lbd_c(tx_size);
}
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CFLSubsampleLBDTest);
TEST_P(CFLSubsampleLBDTest, SubsampleLBD420Test) {
subsampleTest(fun_420, fun_420_ref, width >> 1, height >> 1,
@@ -329,6 +331,7 @@
fun_444_ref = cfl_get_luma_subsampling_444_hbd_c(tx_size);
}
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CFLSubsampleHBDTest);
TEST_P(CFLSubsampleHBDTest, SubsampleHBD420Test) {
subsampleTest(fun_420, fun_420_ref, width >> 1, height >> 1,
@@ -372,6 +375,7 @@
cfl_predict_lbd_fn predict;
cfl_predict_lbd_fn predict_ref;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CFLPredictTest);
TEST_P(CFLPredictTest, PredictTest) {
for (int it = 0; it < NUM_ITERATIONS; it++) {
@@ -419,6 +423,7 @@
cfl_predict_hbd_fn predict;
cfl_predict_hbd_fn predict_ref;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(CFLPredictHBDTest);
TEST_P(CFLPredictHBDTest, PredictHBDTest) {
int bd = 12;
diff --git a/test/codec_factory.h b/test/codec_factory.h
index 801b894..5ceb70b 100644
--- a/test/codec_factory.h
+++ b/test/codec_factory.h
@@ -161,7 +161,7 @@
const libaom_test::AV1CodecFactory kAV1;
-#define AV1_INSTANTIATE_TEST_CASE(test, ...) \
+#define AV1_INSTANTIATE_TEST_SUITE(test, ...) \
INSTANTIATE_TEST_SUITE_P( \
AV1, test, \
::testing::Combine( \
diff --git a/test/comp_avg_pred_test.cc b/test/comp_avg_pred_test.cc
index ac625a7..4218ac3 100644
--- a/test/comp_avg_pred_test.cc
+++ b/test/comp_avg_pred_test.cc
@@ -13,10 +13,15 @@
using libaom_test::ACMRandom;
using libaom_test::AV1DISTWTDCOMPAVG::AV1DISTWTDCOMPAVGTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1DISTWTDCOMPAVGTest);
using libaom_test::AV1DISTWTDCOMPAVG::AV1DISTWTDCOMPAVGUPSAMPLEDTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1DISTWTDCOMPAVGUPSAMPLEDTest);
#if CONFIG_AV1_HIGHBITDEPTH
using libaom_test::AV1DISTWTDCOMPAVG::AV1HighBDDISTWTDCOMPAVGTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1HighBDDISTWTDCOMPAVGTest);
using libaom_test::AV1DISTWTDCOMPAVG::AV1HighBDDISTWTDCOMPAVGUPSAMPLEDTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(
+ AV1HighBDDISTWTDCOMPAVGUPSAMPLEDTest);
#endif
using std::make_tuple;
using std::tuple;
diff --git a/test/comp_mask_variance_test.cc b/test/comp_mask_variance_test.cc
index b666306..6107203 100644
--- a/test/comp_mask_variance_test.cc
+++ b/test/comp_mask_variance_test.cc
@@ -75,6 +75,7 @@
uint8_t *ref_buffer_;
uint8_t *ref_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1CompMaskVarianceTest);
AV1CompMaskVarianceTest::~AV1CompMaskVarianceTest() { ; }
@@ -318,6 +319,7 @@
uint16_t *ref_buffer_;
uint16_t *ref_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1HighbdCompMaskVarianceTest);
AV1HighbdCompMaskVarianceTest::~AV1HighbdCompMaskVarianceTest() { ; }
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 2175ded..f4f8f39 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -268,7 +268,7 @@
class ConvolveTest : public ::testing::TestWithParam<ConvolveParam> {
public:
- static void SetUpTestCase() {
+ static void SetUpTestSuite() {
// Force input_ to be unaligned, output to be 16 byte aligned.
input_ = reinterpret_cast<uint8_t *>(
aom_memalign(kDataAlignment, kInputBufferSize + 1)) +
@@ -292,7 +292,7 @@
virtual void TearDown() { libaom_test::ClearSystemState(); }
- static void TearDownTestCase() {
+ static void TearDownTestSuite() {
aom_free(input_ - 1);
input_ = NULL;
aom_free(ref8_);
diff --git a/test/corner_match_test.cc b/test/corner_match_test.cc
index c685dca..9c3a2b9 100644
--- a/test/corner_match_test.cc
+++ b/test/corner_match_test.cc
@@ -47,6 +47,7 @@
libaom_test::ACMRandom rnd_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1CornerMatchTest);
AV1CornerMatchTest::~AV1CornerMatchTest() {}
void AV1CornerMatchTest::SetUp() {
diff --git a/test/cpu_speed_test.cc b/test/cpu_speed_test.cc
index 2a16497..9ef3a5c 100644
--- a/test/cpu_speed_test.cc
+++ b/test/cpu_speed_test.cc
@@ -169,12 +169,12 @@
TEST_P(CpuSpeedTestLarge, TestEncodeHighBitrate) { TestEncodeHighBitrate(); }
TEST_P(CpuSpeedTestLarge, TestLowBitrate) { TestLowBitrate(); }
-AV1_INSTANTIATE_TEST_CASE(CpuSpeedTest,
- ::testing::Values(::libaom_test::kTwoPassGood,
- ::libaom_test::kOnePassGood),
- ::testing::Range(1, 3));
-AV1_INSTANTIATE_TEST_CASE(CpuSpeedTestLarge,
- ::testing::Values(::libaom_test::kTwoPassGood,
- ::libaom_test::kOnePassGood),
- ::testing::Range(0, 1));
+AV1_INSTANTIATE_TEST_SUITE(CpuSpeedTest,
+ ::testing::Values(::libaom_test::kTwoPassGood,
+ ::libaom_test::kOnePassGood),
+ ::testing::Range(1, 3));
+AV1_INSTANTIATE_TEST_SUITE(CpuSpeedTestLarge,
+ ::testing::Values(::libaom_test::kTwoPassGood,
+ ::libaom_test::kOnePassGood),
+ ::testing::Range(0, 1));
} // namespace
diff --git a/test/datarate_test.cc b/test/datarate_test.cc
index 053c055..2380401 100644
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -347,27 +347,27 @@
ChangingSpeedTest();
}
-AV1_INSTANTIATE_TEST_CASE(DatarateTestLarge,
- ::testing::Values(::libaom_test::kRealTime),
- ::testing::Range(5, 7), ::testing::Values(0, 3),
- ::testing::Values(0, 1));
+AV1_INSTANTIATE_TEST_SUITE(DatarateTestLarge,
+ ::testing::Values(::libaom_test::kRealTime),
+ ::testing::Range(5, 7), ::testing::Values(0, 3),
+ ::testing::Values(0, 1));
-AV1_INSTANTIATE_TEST_CASE(DatarateTestFrameDropLarge,
- ::testing::Values(::libaom_test::kRealTime),
- ::testing::Range(5, 7), ::testing::Values(0, 3));
+AV1_INSTANTIATE_TEST_SUITE(DatarateTestFrameDropLarge,
+ ::testing::Values(::libaom_test::kRealTime),
+ ::testing::Range(5, 7), ::testing::Values(0, 3));
-AV1_INSTANTIATE_TEST_CASE(DatarateTestRealtime,
- ::testing::Values(::libaom_test::kRealTime),
- ::testing::Range(7, 9), ::testing::Values(0, 3),
- ::testing::Values(0, 1));
+AV1_INSTANTIATE_TEST_SUITE(DatarateTestRealtime,
+ ::testing::Values(::libaom_test::kRealTime),
+ ::testing::Range(7, 9), ::testing::Values(0, 3),
+ ::testing::Values(0, 1));
-AV1_INSTANTIATE_TEST_CASE(DatarateTestFrameDropRealtime,
- ::testing::Values(::libaom_test::kRealTime),
- ::testing::Range(7, 9), ::testing::Values(0, 3));
+AV1_INSTANTIATE_TEST_SUITE(DatarateTestFrameDropRealtime,
+ ::testing::Values(::libaom_test::kRealTime),
+ ::testing::Range(7, 9), ::testing::Values(0, 3));
-AV1_INSTANTIATE_TEST_CASE(DatarateTestSpeedChangeRealtime,
- ::testing::Values(::libaom_test::kRealTime),
- ::testing::Values(0, 3));
+AV1_INSTANTIATE_TEST_SUITE(DatarateTestSpeedChangeRealtime,
+ ::testing::Values(::libaom_test::kRealTime),
+ ::testing::Values(0, 3));
} // namespace
} // namespace datarate_test
diff --git a/test/decode_multithreaded_test.cc b/test/decode_multithreaded_test.cc
index 0aa7eb0..5224dcc 100644
--- a/test/decode_multithreaded_test.cc
+++ b/test/decode_multithreaded_test.cc
@@ -157,14 +157,14 @@
}
// TODO(ranjit): More tests have to be added using pre-generated MD5.
-AV1_INSTANTIATE_TEST_CASE(AV1DecodeMultiThreadedTest, ::testing::Values(1, 2),
- ::testing::Values(1, 2), ::testing::Values(1),
- ::testing::Values(3), ::testing::Values(0, 1));
-AV1_INSTANTIATE_TEST_CASE(AV1DecodeMultiThreadedTestLarge,
- ::testing::Values(0, 1, 2, 6),
- ::testing::Values(0, 1, 2, 6),
- ::testing::Values(1, 4), ::testing::Values(0),
- ::testing::Values(0, 1));
+AV1_INSTANTIATE_TEST_SUITE(AV1DecodeMultiThreadedTest, ::testing::Values(1, 2),
+ ::testing::Values(1, 2), ::testing::Values(1),
+ ::testing::Values(3), ::testing::Values(0, 1));
+AV1_INSTANTIATE_TEST_SUITE(AV1DecodeMultiThreadedTestLarge,
+ ::testing::Values(0, 1, 2, 6),
+ ::testing::Values(0, 1, 2, 6),
+ ::testing::Values(1, 4), ::testing::Values(0),
+ ::testing::Values(0, 1));
class AV1DecodeMultiThreadedLSTestLarge
: public AV1DecodeMultiThreadedTestLarge {};
@@ -177,9 +177,9 @@
DoTest();
}
-AV1_INSTANTIATE_TEST_CASE(AV1DecodeMultiThreadedLSTestLarge,
- ::testing::Values(6), ::testing::Values(6),
- ::testing::Values(1), ::testing::Values(0, 3),
- ::testing::Values(0, 1));
+AV1_INSTANTIATE_TEST_SUITE(AV1DecodeMultiThreadedLSTestLarge,
+ ::testing::Values(6), ::testing::Values(6),
+ ::testing::Values(1), ::testing::Values(0, 3),
+ ::testing::Values(0, 1));
} // namespace
diff --git a/test/decode_perf_test.cc b/test/decode_perf_test.cc
index 691337c..9f0de03 100644
--- a/test/decode_perf_test.cc
+++ b/test/decode_perf_test.cc
@@ -242,6 +242,6 @@
printf("}\n");
}
-AV1_INSTANTIATE_TEST_CASE(AV1NewEncodeDecodePerfTest,
- ::testing::Values(::libaom_test::kTwoPassGood));
+AV1_INSTANTIATE_TEST_SUITE(AV1NewEncodeDecodePerfTest,
+ ::testing::Values(::libaom_test::kTwoPassGood));
} // namespace
diff --git a/test/encode_perf_test.cc b/test/encode_perf_test.cc
index 390a6e0..b626acd 100644
--- a/test/encode_perf_test.cc
+++ b/test/encode_perf_test.cc
@@ -179,6 +179,6 @@
}
}
-AV1_INSTANTIATE_TEST_CASE(AV1EncodePerfTest,
- ::testing::Values(::libaom_test::kRealTime));
+AV1_INSTANTIATE_TEST_SUITE(AV1EncodePerfTest,
+ ::testing::Values(::libaom_test::kRealTime));
} // namespace
diff --git a/test/encodetxb_test.cc b/test/encodetxb_test.cc
index 042d157..61838ca 100644
--- a/test/encodetxb_test.cc
+++ b/test/encodetxb_test.cc
@@ -186,6 +186,7 @@
int8_t *coeff_contexts_ref_;
int8_t *coeff_contexts_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EncodeTxbTest);
TEST_P(EncodeTxbTest, GetNzMapContexts) { GetNzMapContextsRun(); }
@@ -216,6 +217,7 @@
virtual void TearDown() { libaom_test::ClearSystemState(); }
void RunTest(av1_txb_init_levels_func test_func, int tx_size, int is_speed);
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EncodeTxbInitLevelTest);
void EncodeTxbInitLevelTest::RunTest(av1_txb_init_levels_func test_func,
int tx_size, int is_speed) {
diff --git a/test/end_to_end_test.cc b/test/end_to_end_test.cc
index 162a7c7..82a4a8c 100644
--- a/test/end_to_end_test.cc
+++ b/test/end_to_end_test.cc
@@ -199,13 +199,13 @@
TEST_P(EndToEndTest, EndtoEndPSNRTest) { DoTest(); }
-AV1_INSTANTIATE_TEST_CASE(EndToEndTestLarge,
- ::testing::ValuesIn(kEncodingModeVectors),
- ::testing::ValuesIn(kTestVectors),
- ::testing::ValuesIn(kCpuUsedVectors));
+AV1_INSTANTIATE_TEST_SUITE(EndToEndTestLarge,
+ ::testing::ValuesIn(kEncodingModeVectors),
+ ::testing::ValuesIn(kTestVectors),
+ ::testing::ValuesIn(kCpuUsedVectors));
-AV1_INSTANTIATE_TEST_CASE(EndToEndTest,
- ::testing::Values(kEncodingModeVectors[0]),
- ::testing::Values(kTestVectors[2]), // 444
- ::testing::Values(kCpuUsedVectors[2]));
+AV1_INSTANTIATE_TEST_SUITE(EndToEndTest,
+ ::testing::Values(kEncodingModeVectors[0]),
+ ::testing::Values(kTestVectors[2]), // 444
+ ::testing::Values(kCpuUsedVectors[2]));
} // namespace
diff --git a/test/error_block_test.cc b/test/error_block_test.cc
index 462661e..ea0acf4 100644
--- a/test/error_block_test.cc
+++ b/test/error_block_test.cc
@@ -67,6 +67,7 @@
ErrorBlockFunc error_block_op_;
ErrorBlockFunc ref_error_block_op_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ErrorBlockTest);
TEST_P(ErrorBlockTest, OperationCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed());
diff --git a/test/error_resilience_test.cc b/test/error_resilience_test.cc
index 84116ef..f9ef680 100644
--- a/test/error_resilience_test.cc
+++ b/test/error_resilience_test.cc
@@ -456,5 +456,5 @@
EXPECT_LE(GetMismatchFrames(), GetEncodedFrames() - s_frame_list[0]);
}
-AV1_INSTANTIATE_TEST_CASE(ErrorResilienceTestLarge, NONREALTIME_TEST_MODES);
+AV1_INSTANTIATE_TEST_SUITE(ErrorResilienceTestLarge, NONREALTIME_TEST_MODES);
} // namespace
diff --git a/test/ethread_test.cc b/test/ethread_test.cc
index 20f4b5a..04ee4d7 100644
--- a/test/ethread_test.cc
+++ b/test/ethread_test.cc
@@ -439,25 +439,25 @@
}
// first pass stats test
-AV1_INSTANTIATE_TEST_CASE(AVxFirstPassEncoderThreadTest,
- ::testing::Values(::libaom_test::kTwoPassGood),
- ::testing::Range(0, 6, 2), ::testing::Range(0, 2),
- ::testing::Range(1, 3));
+AV1_INSTANTIATE_TEST_SUITE(AVxFirstPassEncoderThreadTest,
+ ::testing::Values(::libaom_test::kTwoPassGood),
+ ::testing::Range(0, 6, 2), ::testing::Range(0, 2),
+ ::testing::Range(1, 3));
// For AV1, test speed 0, 1, 2, 3, 5.
// Only test cpu_used 2 here.
-AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTest,
- ::testing::Values(::libaom_test::kTwoPassGood),
- ::testing::Values(2), ::testing::Values(0, 2),
- ::testing::Values(0, 2), ::testing::Values(0, 1));
+AV1_INSTANTIATE_TEST_SUITE(AVxEncoderThreadTest,
+ ::testing::Values(::libaom_test::kTwoPassGood),
+ ::testing::Values(2), ::testing::Values(0, 2),
+ ::testing::Values(0, 2), ::testing::Values(0, 1));
// Test cpu_used 0, 1, 3 and 5.
-AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTestLarge,
- ::testing::Values(::libaom_test::kTwoPassGood,
- ::libaom_test::kOnePassGood),
- ::testing::Values(0, 1, 3, 5),
- ::testing::Values(1, 6), ::testing::Values(1, 6),
- ::testing::Values(0, 1));
+AV1_INSTANTIATE_TEST_SUITE(AVxEncoderThreadTestLarge,
+ ::testing::Values(::libaom_test::kTwoPassGood,
+ ::libaom_test::kOnePassGood),
+ ::testing::Values(0, 1, 3, 5),
+ ::testing::Values(1, 6), ::testing::Values(1, 6),
+ ::testing::Values(0, 1));
class AVxEncoderThreadLSTest : public AVxEncoderThreadTest {
virtual void SetTileSize(libaom_test::Encoder *encoder) {
@@ -475,6 +475,7 @@
(void)ref_md5_dec;
}
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AVxEncoderThreadLSTest);
TEST_P(AVxEncoderThreadLSTest, EncoderResultTest) {
cfg_.large_scale_tile = 1;
@@ -492,9 +493,9 @@
DoTest();
}
-AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadLSTestLarge,
- ::testing::Values(::libaom_test::kTwoPassGood,
- ::libaom_test::kOnePassGood),
- ::testing::Values(1, 3), ::testing::Values(0, 6),
- ::testing::Values(0, 6), ::testing::Values(1));
+AV1_INSTANTIATE_TEST_SUITE(AVxEncoderThreadLSTestLarge,
+ ::testing::Values(::libaom_test::kTwoPassGood,
+ ::libaom_test::kOnePassGood),
+ ::testing::Values(1, 3), ::testing::Values(0, 6),
+ ::testing::Values(0, 6), ::testing::Values(1));
} // namespace
diff --git a/test/external_frame_buffer_test.cc b/test/external_frame_buffer_test.cc
index 1d726a4..5006b5b 100644
--- a/test/external_frame_buffer_test.cc
+++ b/test/external_frame_buffer_test.cc
@@ -532,7 +532,7 @@
}
#endif // CONFIG_WEBM_IO
-AV1_INSTANTIATE_TEST_CASE(
+AV1_INSTANTIATE_TEST_SUITE(
ExternalFrameBufferMD5Test,
::testing::ValuesIn(libaom_test::kAV1TestVectors,
libaom_test::kAV1TestVectors +
diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc
index 6600f2c..69e4bda 100644
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -89,10 +89,12 @@
};
using Trans4x4FDCTTranLow = Trans4x4FDCT<tran_low_t>;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Trans4x4FDCTTranLow);
TEST_P(Trans4x4FDCTTranLow, CoeffCheck) { RunCoeffCheck(); }
TEST_P(Trans4x4FDCTTranLow, MemCheck) { RunMemCheck(); }
using Trans4x4FDCTInt16 = Trans4x4FDCT<int16_t>;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Trans4x4FDCTInt16);
TEST_P(Trans4x4FDCTInt16, CoeffCheck) { RunCoeffCheck(); }
TEST_P(Trans4x4FDCTInt16, MemCheck) { RunMemCheck(); }
diff --git a/test/frame_error_test.cc b/test/frame_error_test.cc
index 6d74a68..6478f09 100644
--- a/test/frame_error_test.cc
+++ b/test/frame_error_test.cc
@@ -52,6 +52,7 @@
void RunSpeedTest(frame_error_func test_impl, int width, int height);
libaom_test::ACMRandom rnd_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1FrameErrorTest);
void AV1FrameErrorTest::RandomValues(frame_error_func test_impl, int width,
int height) {
diff --git a/test/fwd_kf_test.cc b/test/fwd_kf_test.cc
index d26108d..e36947c 100644
--- a/test/fwd_kf_test.cc
+++ b/test/fwd_kf_test.cc
@@ -110,9 +110,9 @@
<< "kf max dist = " << kf_max_dist_;
}
-AV1_INSTANTIATE_TEST_CASE(ForwardKeyTest,
- ::testing::Values(::libaom_test::kTwoPassGood),
- ::testing::ValuesIn(kTestParams));
+AV1_INSTANTIATE_TEST_SUITE(ForwardKeyTest,
+ ::testing::Values(::libaom_test::kTwoPassGood),
+ ::testing::ValuesIn(kTestParams));
typedef struct {
const unsigned int min_kf_dist;
@@ -188,9 +188,9 @@
ASSERT_EQ(is_fwd_kf_present_, 1);
}
-AV1_INSTANTIATE_TEST_CASE(ForwardKeyPresenceTestLarge,
- ::testing::Values(::libaom_test::kOnePassGood,
- ::libaom_test::kTwoPassGood),
- ::testing::ValuesIn(kfTestParams),
- ::testing::Values(AOM_Q, AOM_VBR, AOM_CBR, AOM_CQ));
+AV1_INSTANTIATE_TEST_SUITE(ForwardKeyPresenceTestLarge,
+ ::testing::Values(::libaom_test::kOnePassGood,
+ ::libaom_test::kTwoPassGood),
+ ::testing::ValuesIn(kfTestParams),
+ ::testing::Values(AOM_Q, AOM_VBR, AOM_CBR, AOM_CQ));
} // namespace
diff --git a/test/gf_pyr_height_test.cc b/test/gf_pyr_height_test.cc
index f153092..87a0d0d 100644
--- a/test/gf_pyr_height_test.cc
+++ b/test/gf_pyr_height_test.cc
@@ -150,7 +150,7 @@
<< "GF Max Pyramid Height = " << gf_max_pyr_height_;
}
-AV1_INSTANTIATE_TEST_CASE(GFPyrHeightTest, NONREALTIME_TEST_MODES,
- ::testing::Values(AOM_Q, AOM_VBR),
- ::testing::ValuesIn(kTestParams));
+AV1_INSTANTIATE_TEST_SUITE(GFPyrHeightTest, NONREALTIME_TEST_MODES,
+ ::testing::Values(AOM_Q, AOM_VBR),
+ ::testing::ValuesIn(kTestParams));
} // namespace
diff --git a/test/hiprec_convolve_test.cc b/test/hiprec_convolve_test.cc
index 59d28e8..3e93a06 100644
--- a/test/hiprec_convolve_test.cc
+++ b/test/hiprec_convolve_test.cc
@@ -17,8 +17,10 @@
using libaom_test::ACMRandom;
#if CONFIG_AV1_HIGHBITDEPTH
using libaom_test::AV1HighbdHiprecConvolve::AV1HighbdHiprecConvolveTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1HighbdHiprecConvolveTest);
#endif
using libaom_test::AV1HiprecConvolve::AV1HiprecConvolveTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1HiprecConvolveTest);
using std::make_tuple;
using std::tuple;
diff --git a/test/horver_correlation_test.cc b/test/horver_correlation_test.cc
index 2fe77c8..d1fd578 100644
--- a/test/horver_correlation_test.cc
+++ b/test/horver_correlation_test.cc
@@ -48,6 +48,7 @@
ACMRandom rng_;
int16_t *data_buf_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(HorverTest);
void HorverTest::RunHorverTest(void) {
for (int block_size = 0; block_size < BLOCK_SIZES_ALL; block_size++) {
diff --git a/test/horz_superres_test.cc b/test/horz_superres_test.cc
index 09f6f47..451555e 100644
--- a/test/horz_superres_test.cc
+++ b/test/horz_superres_test.cc
@@ -177,9 +177,9 @@
TEST_P(HorzSuperresEndToEndTest, HorzSuperresEndToEndPSNRTest) { DoTest(); }
-AV1_INSTANTIATE_TEST_CASE(HorzSuperresEndToEndTest,
- ::testing::ValuesIn(kTestVideoVectors),
- ::testing::ValuesIn(kSuperresModesWithoutParams));
+AV1_INSTANTIATE_TEST_SUITE(HorzSuperresEndToEndTest,
+ ::testing::ValuesIn(kTestVideoVectors),
+ ::testing::ValuesIn(kSuperresModesWithoutParams));
// Test parameter list:
// <[needed for EncoderTest], test_video_param_, tuple(superres_denom_,
@@ -288,9 +288,9 @@
TEST_P(HorzSuperresFixedEndToEndTest, HorzSuperresFixedTestParam) { DoTest(); }
-AV1_INSTANTIATE_TEST_CASE(HorzSuperresFixedEndToEndTest,
- ::testing::ValuesIn(kTestVideoVectors),
- ::testing::ValuesIn(kSuperresDenominators));
+AV1_INSTANTIATE_TEST_SUITE(HorzSuperresFixedEndToEndTest,
+ ::testing::ValuesIn(kTestVideoVectors),
+ ::testing::ValuesIn(kSuperresDenominators));
// Test parameter list:
// <[needed for EncoderTest], test_video_param_,
@@ -401,8 +401,8 @@
DoTest();
}
-AV1_INSTANTIATE_TEST_CASE(HorzSuperresQThreshEndToEndTest,
- ::testing::ValuesIn(kTestVideoVectors),
- ::testing::ValuesIn(kSuperresQThresholds));
+AV1_INSTANTIATE_TEST_SUITE(HorzSuperresQThreshEndToEndTest,
+ ::testing::ValuesIn(kTestVideoVectors),
+ ::testing::ValuesIn(kSuperresQThresholds));
} // namespace
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc
index cb7311d..6be52eb 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -215,6 +215,8 @@
}
}
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(HighbdIntraPredTest);
+
#endif
class LowbdIntraPredTest : public AV1IntraPredTest<IntraPred, uint8_t> {
@@ -235,6 +237,7 @@
}
}
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(LowbdIntraPredTest);
#if CONFIG_AV1_HIGHBITDEPTH
// Suppress an unitialized warning. Once there are implementations to test then
diff --git a/test/invalid_file_test.cc b/test/invalid_file_test.cc
index dd0956d..30880b2 100644
--- a/test/invalid_file_test.cc
+++ b/test/invalid_file_test.cc
@@ -153,7 +153,7 @@
#endif
};
-AV1_INSTANTIATE_TEST_CASE(InvalidFileTest,
- ::testing::ValuesIn(kAV1InvalidFileTests));
+AV1_INSTANTIATE_TEST_SUITE(InvalidFileTest,
+ ::testing::ValuesIn(kAV1InvalidFileTests));
} // namespace
diff --git a/test/kf_test.cc b/test/kf_test.cc
index 0067796..1b4b5f3 100644
--- a/test/kf_test.cc
+++ b/test/kf_test.cc
@@ -109,9 +109,9 @@
ASSERT_EQ(is_kf_interval_violated_, false) << kf_dist_param_;
}
-AV1_INSTANTIATE_TEST_CASE(KeyFrameIntervalTestLarge,
- ::testing::Values(::libaom_test::kOnePassGood,
- ::libaom_test::kTwoPassGood),
- ::testing::ValuesIn(kfTestParams),
- ::testing::Values(AOM_Q, AOM_VBR, AOM_CBR, AOM_CQ));
+AV1_INSTANTIATE_TEST_SUITE(KeyFrameIntervalTestLarge,
+ testing::Values(::libaom_test::kOnePassGood,
+ ::libaom_test::kTwoPassGood),
+ ::testing::ValuesIn(kfTestParams),
+ ::testing::Values(AOM_Q, AOM_VBR, AOM_CBR, AOM_CQ));
} // namespace
diff --git a/test/level_test.cc b/test/level_test.cc
index 9e9cf99..8e02d49 100644
--- a/test/level_test.cc
+++ b/test/level_test.cc
@@ -151,7 +151,7 @@
}
}
-AV1_INSTANTIATE_TEST_CASE(LevelTest,
- ::testing::Values(::libaom_test::kTwoPassGood),
- ::testing::ValuesIn(kCpuUsedVectors));
+AV1_INSTANTIATE_TEST_SUITE(LevelTest,
+ ::testing::Values(::libaom_test::kTwoPassGood),
+ ::testing::ValuesIn(kCpuUsedVectors));
} // namespace
diff --git a/test/lossless_test.cc b/test/lossless_test.cc
index 71ae5e7..124e7b2 100644
--- a/test/lossless_test.cc
+++ b/test/lossless_test.cc
@@ -120,7 +120,7 @@
EXPECT_GE(psnr_lossless, kMaxPsnr);
}
-AV1_INSTANTIATE_TEST_CASE(LosslessTestLarge,
- ::testing::Values(::libaom_test::kOnePassGood,
- ::libaom_test::kTwoPassGood));
+AV1_INSTANTIATE_TEST_SUITE(LosslessTestLarge,
+ ::testing::Values(::libaom_test::kOnePassGood,
+ ::libaom_test::kTwoPassGood));
} // namespace
diff --git a/test/lpf_test.cc b/test/lpf_test.cc
index e8eeceb..a30d02d 100644
--- a/test/lpf_test.cc
+++ b/test/lpf_test.cc
@@ -165,11 +165,15 @@
#if CONFIG_AV1_HIGHBITDEPTH
typedef LoopTestParam<hbdloop_op_t, hbdloop_param_t> Loop8Test6Param_hbd;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Loop8Test6Param_hbd);
typedef LoopTestParam<hbddual_loop_op_t, hbddual_loop_param_t>
Loop8Test9Param_hbd;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Loop8Test9Param_hbd);
#endif
typedef LoopTestParam<loop_op_t, loop_param_t> Loop8Test6Param_lbd;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Loop8Test6Param_lbd);
typedef LoopTestParam<dual_loop_op_t, dual_loop_param_t> Loop8Test9Param_lbd;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Loop8Test9Param_lbd);
#define OPCHECK(a, b) \
ACMRandom rnd(ACMRandom::DeterministicSeed()); \
diff --git a/test/masked_sad_test.cc b/test/masked_sad_test.cc
index aa4dd83..61d8fc2 100644
--- a/test/masked_sad_test.cc
+++ b/test/masked_sad_test.cc
@@ -86,6 +86,7 @@
MaskedSADFunc maskedSAD_op_;
MaskedSADFunc ref_maskedSAD_op_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MaskedSADTest);
class MaskedSADx4Test : public MaskedSADTestBase,
public ::testing::WithParamInterface<MaskedSADx4Param> {
@@ -109,6 +110,7 @@
MaskedSADx4Func maskedSAD_op_;
MaskedSADx4Func ref_maskedSAD_op_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MaskedSADx4Test);
void MaskedSADTest::runRef(const uint8_t *src_ptr, int src_stride,
const uint8_t *ref_ptr[], int ref_stride,
@@ -259,6 +261,8 @@
HighbdMaskedSADFunc maskedSAD_op_;
HighbdMaskedSADFunc ref_maskedSAD_op_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(HighbdMaskedSADTest);
+
void HighbdMaskedSADTest::runHighbdMaskedSADTest(int run_times) {
unsigned int ref_ret = 0, ret = 1;
ACMRandom rnd(ACMRandom::DeterministicSeed());
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index bf814ce..49ed3b1 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -56,6 +56,7 @@
MaskedSubPixelVarianceFunc opt_func_;
MaskedSubPixelVarianceFunc ref_func_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MaskedSubPixelVarianceTest);
TEST_P(MaskedSubPixelVarianceTest, OperationCheck) {
unsigned int ref_ret, opt_ret;
@@ -193,6 +194,7 @@
MaskedSubPixelVarianceFunc ref_func_;
aom_bit_depth_t bit_depth_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(HighbdMaskedSubPixelVarianceTest);
TEST_P(HighbdMaskedSubPixelVarianceTest, OperationCheck) {
unsigned int ref_ret, opt_ret;
diff --git a/test/metadata_test.cc b/test/metadata_test.cc
index 79e08a7..c102b7a 100644
--- a/test/metadata_test.cc
+++ b/test/metadata_test.cc
@@ -193,8 +193,8 @@
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
}
-AV1_INSTANTIATE_TEST_CASE(MetadataEncodeTest,
- ::testing::Values(::libaom_test::kOnePassGood));
+AV1_INSTANTIATE_TEST_SUITE(MetadataEncodeTest,
+ ::testing::Values(::libaom_test::kOnePassGood));
#endif // CONFIG_AV1_ENCODER
} // namespace
diff --git a/test/monochrome_test.cc b/test/monochrome_test.cc
index 3c9175e..4688961 100644
--- a/test/monochrome_test.cc
+++ b/test/monochrome_test.cc
@@ -124,8 +124,8 @@
}
}
-AV1_INSTANTIATE_TEST_CASE(MonochromeTest,
- ::testing::Values(::libaom_test::kOnePassGood,
- ::libaom_test::kTwoPassGood));
+AV1_INSTANTIATE_TEST_SUITE(MonochromeTest,
+ ::testing::Values(::libaom_test::kOnePassGood,
+ ::libaom_test::kTwoPassGood));
} // namespace
diff --git a/test/motion_vector_test.cc b/test/motion_vector_test.cc
index 2636c39..7516a36 100644
--- a/test/motion_vector_test.cc
+++ b/test/motion_vector_test.cc
@@ -100,8 +100,8 @@
ASSERT_NO_FATAL_FAILURE(RunLoop(video.get()));
}
-AV1_INSTANTIATE_TEST_CASE(MotionVectorTestLarge,
- ::testing::ValuesIn(kEncodingModeVectors),
- ::testing::ValuesIn(kCpuUsedVectors),
- ::testing::ValuesIn(kMVTestModes));
+AV1_INSTANTIATE_TEST_SUITE(MotionVectorTestLarge,
+ ::testing::ValuesIn(kEncodingModeVectors),
+ ::testing::ValuesIn(kCpuUsedVectors),
+ ::testing::ValuesIn(kMVTestModes));
} // namespace
diff --git a/test/noise_model_test.cc b/test/noise_model_test.cc
index 5b61236..aad8905 100644
--- a/test/noise_model_test.cc
+++ b/test/noise_model_test.cc
@@ -1153,7 +1153,7 @@
template <typename T>
class WienerDenoiseTest : public ::testing::Test, public T {
public:
- static void SetUpTestCase() { aom_dsp_rtcd(); }
+ static void SetUpTestSuite() { aom_dsp_rtcd(); }
protected:
void SetUp() {
diff --git a/test/obmc_sad_test.cc b/test/obmc_sad_test.cc
index 6b4382c..a8290b2 100644
--- a/test/obmc_sad_test.cc
+++ b/test/obmc_sad_test.cc
@@ -37,6 +37,7 @@
////////////////////////////////////////////////////////////////////////////////
class ObmcSadTest : public FunctionEquivalenceTest<ObmcSadF> {};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ObmcSadTest);
TEST_P(ObmcSadTest, RandomValues) {
DECLARE_ALIGNED(32, uint8_t, pre[MAX_SB_SQUARE]);
@@ -152,6 +153,7 @@
////////////////////////////////////////////////////////////////////////////////
class ObmcSadHBDTest : public FunctionEquivalenceTest<ObmcSadF> {};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ObmcSadHBDTest);
TEST_P(ObmcSadHBDTest, RandomValues) {
DECLARE_ALIGNED(32, uint16_t, pre[MAX_SB_SQUARE]);
diff --git a/test/obmc_variance_test.cc b/test/obmc_variance_test.cc
index fc281d7..58d2ad6 100644
--- a/test/obmc_variance_test.cc
+++ b/test/obmc_variance_test.cc
@@ -40,6 +40,7 @@
////////////////////////////////////////////////////////////////////////////////
class ObmcVarianceTest : public FunctionEquivalenceTest<ObmcVarF> {};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ObmcVarianceTest);
TEST_P(ObmcVarianceTest, RandomValues) {
DECLARE_ALIGNED(32, uint8_t, pre[MAX_SB_SQUARE]);
@@ -197,6 +198,7 @@
////////////////////////////////////////////////////////////////////////////////
#if CONFIG_AV1_HIGHBITDEPTH
class ObmcVarianceHBDTest : public FunctionEquivalenceTest<ObmcVarF> {};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ObmcVarianceHBDTest);
TEST_P(ObmcVarianceHBDTest, RandomValues) {
DECLARE_ALIGNED(32, uint16_t, pre[MAX_SB_SQUARE]);
diff --git a/test/pickrst_test.cc b/test/pickrst_test.cc
index 77c6b47..41ef66a 100644
--- a/test/pickrst_test.cc
+++ b/test/pickrst_test.cc
@@ -75,6 +75,7 @@
int32_t *flt0_;
int32_t *flt1_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(PixelProjErrorTest);
void PixelProjErrorTest::RunPixelProjErrorTest(int32_t run_times) {
int h_end = run_times != 1 ? 128 : (rng_.Rand16() % MAX_DATA_BLOCK) + 1;
@@ -246,6 +247,7 @@
int32_t *flt0_;
int32_t *flt1_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(PixelProjHighbdErrorTest);
void PixelProjHighbdErrorTest::RunPixelProjErrorTest(int32_t run_times) {
int h_end = run_times != 1 ? 128 : (rng_.Rand16() % MAX_DATA_BLOCK) + 1;
@@ -415,6 +417,7 @@
int32_t *flt0_;
int32_t *flt1_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(GetProjSubspaceTest);
void GetProjSubspaceTest::RunGetProjSubspaceTest(int32_t run_times) {
int h_end = run_times != 1
diff --git a/test/qm_test.cc b/test/qm_test.cc
index d1dfbb8..9e9799f 100644
--- a/test/qm_test.cc
+++ b/test/qm_test.cc
@@ -74,8 +74,8 @@
// encodes and decodes without a mismatch.
TEST_P(QMTest, TestNoMisMatchQM3) { DoTest(9, 15); }
-AV1_INSTANTIATE_TEST_CASE(QMTest,
- ::testing::Values(::libaom_test::kRealTime,
- ::libaom_test::kOnePassGood),
- ::testing::Range(5, 9));
+AV1_INSTANTIATE_TEST_SUITE(QMTest,
+ ::testing::Values(::libaom_test::kRealTime,
+ ::libaom_test::kOnePassGood),
+ ::testing::Range(5, 9));
} // namespace
diff --git a/test/reconinter_test.cc b/test/reconinter_test.cc
index 51bec0e..7e440c9 100644
--- a/test/reconinter_test.cc
+++ b/test/reconinter_test.cc
@@ -88,6 +88,7 @@
DIFFWTD_MASK_TYPE mask_type);
libaom_test::ACMRandom rnd_;
}; // class BuildCompDiffwtdMaskD16Test
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BuildCompDiffwtdMaskD16Test);
void BuildCompDiffwtdMaskD16Test::RunCheckOutput(
buildcompdiffwtdmaskd16_func test_impl) {
diff --git a/test/resize_test.cc b/test/resize_test.cc
index 468027e..060d545 100644
--- a/test/resize_test.cc
+++ b/test/resize_test.cc
@@ -729,13 +729,13 @@
}
}
-AV1_INSTANTIATE_TEST_CASE(ResizeTest,
- ::testing::Values(::libaom_test::kRealTime));
-AV1_INSTANTIATE_TEST_CASE(ResizeInternalTestLarge,
- ::testing::Values(::libaom_test::kOnePassGood));
-AV1_INSTANTIATE_TEST_CASE(ResizeRealtimeTest,
- ::testing::Values(::libaom_test::kRealTime),
- ::testing::Range(5, 9));
-AV1_INSTANTIATE_TEST_CASE(ResizeCspTest,
- ::testing::Values(::libaom_test::kRealTime));
+AV1_INSTANTIATE_TEST_SUITE(ResizeTest,
+ ::testing::Values(::libaom_test::kRealTime));
+AV1_INSTANTIATE_TEST_SUITE(ResizeInternalTestLarge,
+ ::testing::Values(::libaom_test::kOnePassGood));
+AV1_INSTANTIATE_TEST_SUITE(ResizeRealtimeTest,
+ ::testing::Values(::libaom_test::kRealTime),
+ ::testing::Range(5, 9));
+AV1_INSTANTIATE_TEST_SUITE(ResizeCspTest,
+ ::testing::Values(::libaom_test::kRealTime));
} // namespace
diff --git a/test/rt_end_to_end_test.cc b/test/rt_end_to_end_test.cc
index f2799b0..1beb516 100644
--- a/test/rt_end_to_end_test.cc
+++ b/test/rt_end_to_end_test.cc
@@ -161,14 +161,14 @@
TEST_P(RTEndToEndTestThreaded, EndtoEndPSNRTest) { DoTest(); }
-AV1_INSTANTIATE_TEST_CASE(RTEndToEndTest, ::testing::ValuesIn(kTestVectors),
- ::testing::Range(5, 9),
- ::testing::Values<unsigned int>(0, 3),
- ::testing::Values(1), ::testing::Values(1));
+AV1_INSTANTIATE_TEST_SUITE(RTEndToEndTest, ::testing::ValuesIn(kTestVectors),
+ ::testing::Range(5, 9),
+ ::testing::Values<unsigned int>(0, 3),
+ ::testing::Values(1), ::testing::Values(1));
-AV1_INSTANTIATE_TEST_CASE(RTEndToEndTestThreaded,
- ::testing::ValuesIn(kTestVectors),
- ::testing::Range(5, 9),
- ::testing::Values<unsigned int>(0, 3),
- ::testing::Range(2, 5), ::testing::Range(2, 5));
+AV1_INSTANTIATE_TEST_SUITE(RTEndToEndTestThreaded,
+ ::testing::ValuesIn(kTestVectors),
+ ::testing::Range(5, 9),
+ ::testing::Values<unsigned int>(0, 3),
+ ::testing::Range(2, 5), ::testing::Range(2, 5));
} // namespace
diff --git a/test/sad_test.cc b/test/sad_test.cc
index ae3fd1d..101204f 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -74,7 +74,7 @@
SADTestBase(int width, int height, int bit_depth)
: width_(width), height_(height), bd_(bit_depth) {}
- static void SetUpTestCase() {
+ static void SetUpTestSuite() {
source_data8_ = reinterpret_cast<uint8_t *>(
aom_memalign(kDataAlignment, kDataBlockSize));
reference_data8_ = reinterpret_cast<uint8_t *>(
@@ -97,7 +97,7 @@
aom_memalign(kDataAlignment, 128 * 128 * sizeof(uint16_t)));
}
- static void TearDownTestCase() {
+ static void TearDownTestSuite() {
aom_free(source_data8_);
source_data8_ = NULL;
aom_free(reference_data8_);
@@ -501,6 +501,7 @@
}
}
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DistWtdSADTest);
class DistWtdSADavgTest
: public ::testing::WithParamInterface<DistWtdSadMxNAvgParam>,
diff --git a/test/sb_multipass_test.cc b/test/sb_multipass_test.cc
index 0ca76ab..051a24f 100644
--- a/test/sb_multipass_test.cc
+++ b/test/sb_multipass_test.cc
@@ -147,7 +147,7 @@
TEST_P(AV1SBMultipassTest, TwoPassMatchTest) { DoTest(); }
-AV1_INSTANTIATE_TEST_CASE(AV1SBMultipassTest, ::testing::Range(0, 6),
- ::testing::Bool());
+AV1_INSTANTIATE_TEST_SUITE(AV1SBMultipassTest, ::testing::Range(0, 6),
+ ::testing::Bool());
} // namespace
diff --git a/test/scalability_test.cc b/test/scalability_test.cc
index b399188..d38d8ab 100644
--- a/test/scalability_test.cc
+++ b/test/scalability_test.cc
@@ -75,7 +75,7 @@
TEST_P(ScalabilityTest, TestNoMismatch3SpatialLayers) { DoTest(3); }
-AV1_INSTANTIATE_TEST_CASE(ScalabilityTest,
- ::testing::Values(::libaom_test::kRealTime));
+AV1_INSTANTIATE_TEST_SUITE(ScalabilityTest,
+ ::testing::Values(::libaom_test::kRealTime));
} // namespace
diff --git a/test/selfguided_filter_test.cc b/test/selfguided_filter_test.cc
index d65cce5..48ec461 100644
--- a/test/selfguided_filter_test.cc
+++ b/test/selfguided_filter_test.cc
@@ -197,6 +197,7 @@
private:
SgrFunc tst_fun_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1SelfguidedFilterTest);
TEST_P(AV1SelfguidedFilterTest, DISABLED_SpeedTest) { RunSpeedTest(); }
TEST_P(AV1SelfguidedFilterTest, CorrectnessTest) { RunCorrectnessTest(); }
@@ -388,6 +389,7 @@
private:
SgrFunc tst_fun_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1HighbdSelfguidedFilterTest);
TEST_P(AV1HighbdSelfguidedFilterTest, DISABLED_SpeedTest) { RunSpeedTest(); }
TEST_P(AV1HighbdSelfguidedFilterTest, CorrectnessTest) { RunCorrectnessTest(); }
diff --git a/test/subtract_test.cc b/test/subtract_test.cc
index 4001e8b..9ac56fc 100644
--- a/test/subtract_test.cc
+++ b/test/subtract_test.cc
@@ -159,6 +159,7 @@
uint8_t *pred_;
int16_t *diff_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AV1HBDSubtractBlockTest);
void AV1HBDSubtractBlockTest::CheckResult() {
const int test_num = 100;
diff --git a/test/sum_squares_test.cc b/test/sum_squares_test.cc
index 60ee57f..4f26a3d 100644
--- a/test/sum_squares_test.cc
+++ b/test/sum_squares_test.cc
@@ -85,6 +85,7 @@
int16_t *src_;
ACMRandom rnd_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SumSquaresTest);
void SumSquaresTest::RunTest(int isRandom) {
int failed = 0;
@@ -193,6 +194,7 @@
static const int kIterations = 1000;
static const int kMaxSize = 256;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SumSquares1DTest);
TEST_P(SumSquares1DTest, RandomValues) {
DECLARE_ALIGNED(16, int16_t, src[kMaxSize * kMaxSize]);
@@ -312,6 +314,7 @@
uint8_t *ref_;
ACMRandom rnd_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SSETest);
void SSETest::RunTest(int isRandom, int width, int height, int run_times) {
int failed = 0;
@@ -481,6 +484,7 @@
int16_t *src_;
ACMRandom rnd_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SSE_Sum_Test);
void SSE_Sum_Test::RunTest(int isRandom, int width, int height, int run_times) {
aom_usec_timer ref_timer, test_timer;
@@ -628,6 +632,7 @@
uint8_t *src_;
ACMRandom rnd_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Lowbd2dVarTest);
void Lowbd2dVarTest::RunTest(int isRandom) {
int failed = 0;
@@ -758,6 +763,7 @@
uint16_t *src_;
ACMRandom rnd_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Highbd2dVarTest);
void Highbd2dVarTest::RunTest(int isRandom) {
int failed = 0;
diff --git a/test/superframe_test.cc b/test/superframe_test.cc
index 024a18b..b164286 100644
--- a/test/superframe_test.cc
+++ b/test/superframe_test.cc
@@ -94,6 +94,7 @@
int n_tile_cols_;
int n_tile_rows_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SuperframeTest);
TEST_P(SuperframeTest, TestSuperframeIndexIsOptional) {
sf_count_max_ = 0; // early exit on successful test.
diff --git a/test/svc_datarate_test.cc b/test/svc_datarate_test.cc
index fc7cb242..e79ea94 100644
--- a/test/svc_datarate_test.cc
+++ b/test/svc_datarate_test.cc
@@ -856,11 +856,11 @@
BasicRateTargetingSVC3TL1SLDropAllEnhFrameERTest();
}
-AV1_INSTANTIATE_TEST_CASE(DatarateTestSVC,
- ::testing::Values(::libaom_test::kRealTime),
- ::testing::Range(7, 9),
- ::testing::Range<unsigned int>(0, 4),
- ::testing::Values(0, 1));
+AV1_INSTANTIATE_TEST_SUITE(DatarateTestSVC,
+ ::testing::Values(::libaom_test::kRealTime),
+ ::testing::Range(7, 9),
+ ::testing::Range<unsigned int>(0, 4),
+ ::testing::Values(0, 1));
} // namespace
} // namespace datarate_test
diff --git a/test/temporal_filter_test.cc b/test/temporal_filter_test.cc
index 8ff90eb..503f715 100644
--- a/test/temporal_filter_test.cc
+++ b/test/temporal_filter_test.cc
@@ -93,6 +93,7 @@
uint8_t *src2_;
ACMRandom rnd_;
};
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TemporalFilterTest);
void TemporalFilterTest::RunTest(int isRandom, int width, int height,
int run_times) {
diff --git a/test/test_vector_test.cc b/test/test_vector_test.cc
index eab92b6..5cfcb6f 100644
--- a/test/test_vector_test.cc
+++ b/test/test_vector_test.cc
@@ -148,7 +148,7 @@
}
#if CONFIG_AV1_DECODER
-AV1_INSTANTIATE_TEST_CASE(
+AV1_INSTANTIATE_TEST_SUITE(
TestVectorTest,
::testing::Combine(::testing::Values(1), // Single thread.
::testing::ValuesIn(libaom_test::kAV1TestVectors,
diff --git a/test/tile_independence_test.cc b/test/tile_independence_test.cc
index 4f7c4a4..5f167be 100644
--- a/test/tile_independence_test.cc
+++ b/test/tile_independence_test.cc
@@ -139,10 +139,10 @@
DoTest();
}
-AV1_INSTANTIATE_TEST_CASE(TileIndependenceTest, ::testing::Values(0, 1),
- ::testing::Values(0, 1), ::testing::Values(1, 2, 4));
-AV1_INSTANTIATE_TEST_CASE(TileIndependenceTestLarge, ::testing::Values(0, 1),
- ::testing::Values(0, 1), ::testing::Values(1, 2, 4));
+AV1_INSTANTIATE_TEST_SUITE(TileIndependenceTest, ::testing::Values(0, 1),
+ ::testing::Values(0, 1), ::testing::Values(1, 2, 4));
+AV1_INSTANTIATE_TEST_SUITE(TileIndependenceTestLarge, ::testing::Values(0, 1),
+ ::testing::Values(0, 1), ::testing::Values(1, 2, 4));
class TileIndependenceLSTest : public TileIndependenceTest {};
@@ -166,8 +166,8 @@
DoTest();
}
-AV1_INSTANTIATE_TEST_CASE(TileIndependenceLSTest, ::testing::Values(6),
- ::testing::Values(6), ::testing::Values(1));
-AV1_INSTANTIATE_TEST_CASE(TileIndependenceLSTestLarge, ::testing::Values(6),
- ::testing::Values(6), ::testing::Values(1));
+AV1_INSTANTIATE_TEST_SUITE(TileIndependenceLSTest, ::testing::Values(6),
+ ::testing::Values(6), ::testing::Values(1));
+AV1_INSTANTIATE_TEST_SUITE(TileIndependenceLSTestLarge, ::testing::Values(6),
+ ::testing::Values(6), ::testing::Values(1));
} // namespace
diff --git a/test/time_stamp_test.cc b/test/time_stamp_test.cc
index 679e4da..3e2fa97 100644
--- a/test/time_stamp_test.cc
+++ b/test/time_stamp_test.cc
@@ -99,7 +99,7 @@
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
}
-AV1_INSTANTIATE_TEST_CASE(TimestampTest,
- ::testing::Values(::libaom_test::kTwoPassGood));
+AV1_INSTANTIATE_TEST_SUITE(TimestampTest,
+ ::testing::Values(::libaom_test::kTwoPassGood));
} // namespace
diff --git a/test/variance_test.cc b/test/variance_test.cc
index e9eb04d..95f22ef 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -1480,11 +1480,14 @@
typedef TestParams<MseHBDWxH16bitFunc> MseHBDWxHParams;
typedef MseHBDWxHTestClass<MseHBDWxH16bitFunc> MseHBDWxHTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MseHBDWxHTest);
typedef MainTestClass<VarianceMxNFunc> AvxHBDMseTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AvxHBDMseTest);
typedef MainTestClass<VarianceMxNFunc> AvxHBDVarianceTest;
typedef SubpelVarianceTest<SubpixVarMxNFunc> AvxHBDSubpelVarianceTest;
typedef SubpelVarianceTest<SubpixAvgVarMxNFunc> AvxHBDSubpelAvgVarianceTest;
typedef ObmcVarianceTest<ObmcSubpelVarFunc> AvxHBDObmcSubpelVarianceTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AvxHBDObmcSubpelVarianceTest);
TEST_P(MseHBDWxHTest, RefMse) { RefMatchTestMse(); }
TEST_P(MseHBDWxHTest, DISABLED_SpeedMse) { SpeedTest(); }
