Merge pull request #1153 from mstorsjo/silence-error-testing

Silence error logging while running tests that are intended to produce errors
This commit is contained in:
Ethan Hugg 2014-07-14 07:53:45 -07:00
commit b6b7bb7680

View File

@ -205,7 +205,9 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTest) {
TEST_F (EncoderInterfaceTest, BasicInitializeTestFalse) { TEST_F (EncoderInterfaceTest, BasicInitializeTestFalse) {
int iResult; int iResult;
SEncParamBase sEncParamBase; SEncParamBase sEncParamBase;
int uiTraceLevel = WELS_LOG_QUIET;
pPtrEnc->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel);
//iUsageType //iUsageType
GetValidEncParamBase (&sEncParamBase); GetValidEncParamBase (&sEncParamBase);
sEncParamBase.iUsageType = static_cast<EUsageType> (2); sEncParamBase.iUsageType = static_cast<EUsageType> (2);
@ -261,6 +263,9 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTestFalse) {
sEncParamBase.iRCMode = static_cast<RC_MODES> (3); sEncParamBase.iRCMode = static_cast<RC_MODES> (3);
iResult = pPtrEnc->Initialize (&sEncParamBase); iResult = pPtrEnc->Initialize (&sEncParamBase);
EXPECT_EQ (iResult, static_cast<int> (cmInitParaError)); EXPECT_EQ (iResult, static_cast<int> (cmInitParaError));
uiTraceLevel = WELS_LOG_ERROR;
pPtrEnc->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel);
} }
TEST_F (EncoderInterfaceTest, BasicInitializeTestAutoAdjustment) { TEST_F (EncoderInterfaceTest, BasicInitializeTestAutoAdjustment) {