diff -r b6488ac24ddc -r 1cbb0d5bf7f2 mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer.cpp --- a/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer.cpp Wed Sep 08 17:15:23 2010 +0100 +++ b/mmlibs/mmfw/tsrc/mmfintegrationtest/vclntavi/src/testvideoplayer.cpp Thu Sep 16 18:39:58 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -1131,10 +1131,22 @@ TSize clipSize(176, 144); TRect clipRect(clipOrigin, clipSize); + // first call tests creation of display instance TRAPD(err, aPlayer->SetDisplayWindowL(iWs, *iScreen, *iWindow, rect, clipRect)); + INFO_PRINTF1(_L("Test : Made first call to SetDisplayWindowL()")); if(err) { - ERR_PRINTF2(_L("SetDisplayWindowL() failed, error %d"), err); + ERR_PRINTF2(_L("First call to SetDisplayWindowL() failed, error %d"), err); + CActiveScheduler::Stop(); + return EFail; + } + + // second call tests update of display instance + TRAP(err, aPlayer->SetDisplayWindowL(iWs, *iScreen, *iWindow, rect, clipRect)); + INFO_PRINTF1(_L("Test : Made second call to SetDisplayWindowL()")); + if(err) + { + ERR_PRINTF2(_L("Second call to SetDisplayWindowL() failed, error %d"), err); ret = EFail; } else @@ -1143,7 +1155,6 @@ } CActiveScheduler::Stop(); - return ret; }