Minor changes. Added hex support for status string in nsIWebProgLstnr::OnChangeState() (in QaUtils.cpp). Added reload() method in nsIWebNav.cpp for Reload menu test under nsIWebNav.

a=asa for QA checkins that are not part of the default builds
This commit is contained in:
depstein%netscape.com 2002-04-06 02:58:50 +00:00
parent 66cac563c2
commit 6a2d8bbadd
3 changed files with 6 additions and 19 deletions

View File

@ -121,6 +121,7 @@ void WriteToOutputFile(const char *pLine)
void QAOutput(const char *pLine, int displayMethod)
{
// note: default displayMethod = 1 in .h file
// displayMethod 0 = mfc dialog; 1 = output log file; 2 = both
//#if 0
CString strLine = pLine;
@ -270,8 +271,8 @@ void onStateChangeString(char *theStateType, char *theDocType,
totalMsg += theDocType;
totalMsg += ", ";
totalMsg += stringMsg;
totalMsg += ", status = ";
totalMsg.AppendInt(status);
totalMsg += ", status (hex) = ";
totalMsg.AppendInt(status, 16);
QAOutput(totalMsg.get(), displayMode);
}

View File

@ -240,10 +240,6 @@ void CTestEmbedApp::ShowDebugConsole()
//
BOOL CTestEmbedApp::InitInstance()
{
// CQaUtils *myUtils = new CQaUtils();
// myUtils->QAOutput("****************************************************\r\n");
QAOutput("****************************************************\r\n");
ParseCmdLine();
@ -265,13 +261,11 @@ BOOL CTestEmbedApp::InitInstance()
rv = NS_InitEmbedding(nsnull, provider);
if(NS_FAILED(rv))
{
//myUtils->QAOutput("TestEmbed didn't start up.");
QAOutput("TestEmbed didn't start up.");
ASSERT(FALSE);
return FALSE;
}
else
//myUtils->QAOutput("TestEmbed started up.");
QAOutput("TestEmbed started up.");
rv = OverrideComponents();
@ -293,8 +287,6 @@ BOOL CTestEmbedApp::InitInstance()
{
ASSERT(FALSE);
rv = NS_TermEmbedding();
//myUtils->RvTestResult(rv, "TestEmbed shutdown");
RvTestResult(rv, "TestEmbed shutdown");
return FALSE;
}
@ -311,7 +303,6 @@ BOOL CTestEmbedApp::InitInstance()
{
ASSERT(FALSE);
rv = NS_TermEmbedding();
//myUtils->RvTestResult(rv, "TestEmbed shutdown");
RvTestResult(rv, "TestEmbed shutdown");
return FALSE;
}
@ -460,8 +451,6 @@ void CTestEmbedApp::OnEditPreferences()
// Save these changes to disk now
nsresult rv;
//NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID,&rv));
if (NS_SUCCEEDED(rv))
@ -484,8 +473,6 @@ BOOL CTestEmbedApp::InitializeProfiles()
nsresult rv;
//NS_WITH_SERVICE(nsIObserverService, observerService, "@mozilla.org/observer-service;1", &rv);
nsCOMPtr<nsIObserverService>observerService(do_GetService("@mozilla.org/observer-service;1",&rv));
if (NS_SUCCEEDED(rv))
{
@ -520,7 +507,6 @@ BOOL CTestEmbedApp::CreateHiddenWindow()
nsresult CTestEmbedApp::InitializePrefs()
{
nsresult rv;
//NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID,&rv));

View File

@ -76,10 +76,10 @@ CNsIWebNav::~CNsIWebNav()
// Url table for web navigation
NavElement UrlTable[] = {
{"http://www.netscape.com/", nsIWebNavigation::LOAD_FLAGS_NONE},
{"http://www.yahoo.com/", nsIWebNavigation::LOAD_FLAGS_NONE},
{"http://www.oracle.com/", nsIWebNavigation::LOAD_FLAGS_NONE},
{"http://www.oracle.com/", nsIWebNavigation::LOAD_FLAGS_IS_LINK},
{"http://www.sun.com/", nsIWebNavigation::LOAD_FLAGS_IS_REFRESH},
{"http://www.netscape.com/", nsIWebNavigation::LOAD_FLAGS_IS_LINK},
{"http://www.aol.com/", nsIWebNavigation::LOAD_FLAGS_REPLACE_HISTORY},
{"https://www.yahoo.com/", nsIWebNavigation::LOAD_FLAGS_NONE},
};
@ -113,7 +113,7 @@ void CNsIWebNav::OnStartTests(UINT nMenuID)
LoadUriandReload();
break ;
case ID_INTERFACES_NSIWEBNAV_RELOAD :
LoadUriandReload();
ReloadTest(nsIWebNavigation::LOAD_FLAGS_NONE);
break ;
case ID_INTERFACES_NSIWEBNAV_STOP :
StopUriTest("http://www.microsoft.com/");