History

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

Silence error logging while running tests that are intended to produce errors

Ethan Hugg committed 12 years ago

Commit b6b7bb72 parents 3a37586 0ee25621 file · +5 −0Browse files

Showing the changes to test/encoder/EncUT_EncoderExt.cpp (1 of 1 file). Show all

Unified · Split

test/encoder/EncUT_EncoderExt.cpp+5−0
@@ -205,7 +205,9 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTest) { · 204 unmodified lines
205TEST_F (EncoderInterfaceTest, BasicInitializeTestFalse) {205TEST_F (EncoderInterfaceTest, BasicInitializeTestFalse) {
206 int iResult;206 int iResult;
207 SEncParamBase sEncParamBase;207 SEncParamBase sEncParamBase;
208 int uiTraceLevel = WELS_LOG_QUIET;
208 209
210 pPtrEnc->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel);
209 //iUsageType211 //iUsageType
210 GetValidEncParamBase (&sEncParamBase);212 GetValidEncParamBase (&sEncParamBase);
211 sEncParamBase.iUsageType = static_cast<EUsageType> (2);213 sEncParamBase.iUsageType = static_cast<EUsageType> (2);
@@ -261,6 +263,9 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTestFalse) { · 49 unmodified lines
261 sEncParamBase.iRCMode = static_cast<RC_MODES> (3);263 sEncParamBase.iRCMode = static_cast<RC_MODES> (3);
262 iResult = pPtrEnc->Initialize (&sEncParamBase);264 iResult = pPtrEnc->Initialize (&sEncParamBase);
263 EXPECT_EQ (iResult, static_cast<int> (cmInitParaError));265 EXPECT_EQ (iResult, static_cast<int> (cmInitParaError));
266
267 uiTraceLevel = WELS_LOG_ERROR;
268 pPtrEnc->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel);
264}269}
265 270
266TEST_F (EncoderInterfaceTest, BasicInitializeTestAutoAdjustment) {271TEST_F (EncoderInterfaceTest, BasicInitializeTestAutoAdjustment) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t