Common table for Editor Embedding tests. Added NS_NewChannel test (Tests menu). not part of the build.

git-svn-id: svn://10.0.0.236/trunk@130299 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
depstein%netscape.com 2002-09-23 22:29:24 +00:00
parent 749b5872ab
commit 81f0eaead3
10 changed files with 48 additions and 91 deletions

View File

@ -135,6 +135,7 @@
#include "nsICommandManager.h"
#include "nsICommandParams.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

View File

@ -94,6 +94,7 @@ BEGIN_MESSAGE_MAP(CTests, CWnd)
ON_COMMAND(ID_TESTS_ADDURICONTENTLISTENER_ADDFROMNSIWEBBROWSER, OnTestsAddUriContentListenerByWebBrowser)
ON_COMMAND(ID_TESTS_ADDURICONTENTLISTENER_ADDFROMNSIURILOADER, OnTestsAddUriContentListenerByUriLoader)
ON_COMMAND(ID_TESTS_ADDURICONTENTLISTENER_OPENURI, OnTestsAddUriContentListenerByOpenUri)
ON_COMMAND(ID_TESTS_NSNEWCHANNEL, OnTestsNSNewChannel)
ON_COMMAND(ID_TOOLS_REMOVEGHPAGE, OnToolsRemoveGHPage)
ON_COMMAND(ID_TOOLS_REMOVEALLGH, OnToolsRemoveAllGH)
@ -550,6 +551,25 @@ void CTests::OnTestsAddUriContentListenerByOpenUri()
RvTestResult(rv, "nsIUriLoader->OpenURI() test", 2);
}
void CTests::OnTestsNSNewChannel()
{
CUrlDialog myDialog;
nsCOMPtr<nsIChannel> theChannel;
nsCOMPtr<nsILoadGroup> theLoadGroup(do_CreateInstance(NS_LOADGROUP_CONTRACTID));
nsCOMPtr<nsIURI> theURI;
if (myDialog.DoModal() == IDOK)
{
nsCAutoString theStr;
theStr = myDialog.m_urlfield;
rv = NS_NewURI(getter_AddRefs(theURI), theStr);
RvTestResult(rv, "NS_NewURI() test", 2);
rv = NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
RvTestResult(rv, "NS_NewChannel() test", 2);
}
}
// *********************************************************
// *********************************************************
// TOOLS to help us
@ -620,34 +640,14 @@ void CTests::OnToolsRemoveAllGH()
void CTests::OnToolsTestYourMethod()
{
// place your test code here
/*
nsWeakPtr weakling(
dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl))));
rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIURIContentListener));
RvTestResult(rv, "AddWebBrowserListener(). nsIURIContentListener test", 2);
*/
nsCOMPtr<nsIURILoader> myLoader(do_GetService(NS_URI_LOADER_CONTRACTID,&rv));
RvTestResult(rv, "nsIURILoader() object test", 1);
nsCOMPtr<nsIURIContentListener> cntListener(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl));
if (!cntListener)
QAOutput("Didn't get urIContentListener object.", 2);
else {
/*
rv = myLoader->RegisterContentListener(cntListener);
RvTestResult(rv, "RegisterContentListener() test", 2);
*/
nsCOMPtr<nsIChannel> theChannel;
nsCOMPtr<nsILoadGroup> theLoadGroup(do_CreateInstance(NS_LOADGROUP_CONTRACTID));
nsCOMPtr<nsIURI> theURI;
NS_NewURI(getter_AddRefs(theURI), "http://www.yahoo.com");
NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
nsCOMPtr<nsISupports> mySupports = do_QueryInterface(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl));
myLoader->OpenURI(theChannel, PR_TRUE, mySupports);
}
rv = NS_NewURI(getter_AddRefs(theURI), "http://www.yahoo.com");
RvTestResult(rv, "NS_NewURI(). Test .", 2);
rv = NS_NewChannel(getter_AddRefs(theChannel), theURI, nsnull, nsnull);
RvTestResult(rv, "NS_NewChannel(). Test .", 2);
}
// ***********************************************************************

View File

@ -113,6 +113,7 @@ protected:
afx_msg void OnTestsAddUriContentListenerByWebBrowser();
afx_msg void OnTestsAddUriContentListenerByUriLoader();
afx_msg void OnTestsAddUriContentListenerByOpenUri();
afx_msg void OnTestsNSNewChannel();
afx_msg void OnInterfacesNsifile();
afx_msg void OnToolsRemoveGHPage();
afx_msg void OnToolsRemoveAllGH();

View File

@ -22,58 +22,7 @@ static char THIS_FILE[] = __FILE__;
// note: this table is temporary. will customize later.
// 1st column: command; 2nd column: DoCommand state, 3rd column: CmdParam state;
CommandTest CommandTable2[] = {
{"cmd_bold", "", "state_all", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_italic", "", "state_all", PR_TRUE, 10000000, 2.27, "This is a complete sentence", "This isn't!"},
{"cmd_underline", "", "state_all", PR_TRUE, 17, 7839.3480, "A longer string than the previous one.", "Shorter string, but still pretty long."},
{"cmd_indent", "", "state_enabled", PR_TRUE, 7480, -1.487, "Another string input for testing ...", "How about them Giants?!"},
{"cmd_outdent", "", "state_enabled", PR_FALSE, 0, 24987.2465, "A few numbers: 1 2 3, A few letters: C A B, A few characters: Mickey Goofy $%*&@", "nothing here"},
{"cmd_increaseFont", "", "state_enabled", PR_TRUE, 500000000, 16, "hi", "HI"},
{"cmd_undo", "", "state_enabled", PR_TRUE, 987352487, 36.489, "x ", "x"},
{"cmd_redo", "", "state_enabled", PR_FALSE, 90, -24, "", " "},
{"cmd_decreaseFont", "", "", PR_TRUE, 0.0, 0.0, "hello", "HELLO"},
{"cmd_fontColor", "state_attribute", "state_attribute", PR_TRUE, 25, 100, "#FF0000", "#000000"},
{"cmd_backgroundColor", "state_attribute", "state_attribute", PR_TRUE, -35871678, 15.345363645, "#FF1234", "#001234"},
{"cmd_fontFace", "state_attribute", "state_attribute", PR_TRUE, 50000, 5.798, "Times New Roman, Times, serif", "Courier New, Courier, monospace"},
{"cmd_align", "state_attribute", "state_attribute", PR_TRUE, 10000, 5.798, "right", "center"},
{"cmd_charSet", "state_attribute", "state_attribute", PR_TRUE, 20000, 5.798, "hello", "HELLO"},
{"cmd_copy", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_delete", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_deleteCharBackward", "", "state_enabled", PR_TRUE, 30000, 245.2323, "hello", "HELLO"},
{"cmd_deleteCharForward", "", "state_enabled", PR_TRUE, 50000, -24235.2346, "a very very very very very very very very looooooooooooooooooooong stringgggggggggggggggggggggggggggggggggggggggggggg!!!", "HELLO"},
{"cmd_deleteWordForward", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_deleteWordBackward", "", "state_enabled", PR_TRUE, 6034600, 5.798, "hello", "HELLO"},
{"cmd_deleteToBeginningOfLine", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_deleteToEndOfLine", "", "state_enabled", PR_TRUE, -5434, 5.798, "hello", "HELLO"},
{"cmd_scrollTop", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_scrollBottom", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_scrollPageUp", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_scrollPageDown", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_movePageUp", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_movePageDown", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_moveTop", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_moveBottom", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_selectTop", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_selectBottom", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_lineNext", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_linePrevious", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_selectLineNext", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_selectLinePrevious", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_charPrevious", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_charNext", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_selectCharPrevious", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_selectCharNext", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_beginLine", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_endLine", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_selectBeginLine", "", "state_enabled", PR_FALSE, 50000, 5.798, "hello", "HELLO"},
{"cmd_selectEndLine", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_wordPrevious", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_wordNext", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_selectWordPrevious", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_selectWordNext", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_cut", "", "state_enabled", PR_TRUE, 50000, 5.798, "hello", "HELLO"},
{"cmd_cutOrDelete", "", "state_enabled", PR_FALSE, 50000, 5.798, "hello", "HELLO"},
};
CnsICmdParams::CnsICmdParams(nsIWebBrowser *mWebBrowser)
{
@ -364,18 +313,18 @@ void CnsICmdParams::RunAllTests()
for (i=0; i < 50; i++)
{
FormatAndPrintOutput("loop cnt = ", i, 1);
SetBooleanValueTest(CommandTable2[i].mBooleanValue, CommandTable2[i].mCmdParamState, 1);
SetLongValueTest(CommandTable2[i].mLongValue, CommandTable2[i].mCmdParamState, 1);
SetDoubleValueTest(CommandTable2[i].mDoubleValue, CommandTable2[i].mCmdParamState, 1);
SetStringValueTest(CommandTable2[i].mStringValue, CommandTable2[i].mCmdParamState, 1);
SetCStringValueTest(CommandTable2[i].mCStringValue, CommandTable2[i].mCmdParamState, 1);
SetBooleanValueTest(CommandTable[i].mBooleanValue, CommandTable[i].mCmdParamState, 1);
SetLongValueTest(CommandTable[i].mLongValue, CommandTable[i].mCmdParamState, 1);
SetDoubleValueTest(CommandTable[i].mDoubleValue, CommandTable[i].mCmdParamState, 1);
SetStringValueTest(CommandTable[i].mStringValue, CommandTable[i].mCmdParamState, 1);
SetCStringValueTest(CommandTable[i].mCStringValue, CommandTable[i].mCmdParamState, 1);
GetValueTypeTest(CommandTable2[i].mCmdName, CommandTable2[i].mCmdParamState, 1);
GetBooleanValueTest(CommandTable2[i].mCmdName, CommandTable2[i].mCmdParamState, 1);
GetLongValueTest(CommandTable2[i].mLongValue, CommandTable2[i].mCmdParamState, 1);
GetDoubleValueTest(CommandTable2[i].mDoubleValue, CommandTable2[i].mCmdParamState, 1);
GetStringValueTest(CommandTable2[i].mStringValue, CommandTable2[i].mCmdParamState, 1);
GetCStringValueTest(CommandTable2[i].mCmdName, CommandTable2[i].mCmdParamState, 1);
GetValueTypeTest(CommandTable[i].mCmdName, CommandTable[i].mCmdParamState, 1);
GetBooleanValueTest(CommandTable[i].mCmdName, CommandTable[i].mCmdParamState, 1);
GetLongValueTest(CommandTable[i].mLongValue, CommandTable[i].mCmdParamState, 1);
GetDoubleValueTest(CommandTable[i].mDoubleValue, CommandTable[i].mCmdParamState, 1);
GetStringValueTest(CommandTable[i].mStringValue, CommandTable[i].mCmdParamState, 1);
GetCStringValueTest(CommandTable[i].mCmdName, CommandTable[i].mCmdParamState, 1);
}
QAOutput("Other tests Not implemented yet.", 2);
}

View File

@ -71,6 +71,7 @@ CnsICommandMgr::~CnsICommandMgr()
{
}
// 1st column: command; 2nd column: DoCommand state, 3rd column: CmdParam state;
CommandTest CommandTable[] = {
{"cmd_bold", "", "state_all", PR_TRUE, 50000, 5.798, "hello", "HELLO"},

View File

@ -106,6 +106,8 @@ struct CommandTest
char *mCStringValue;
};
extern CommandTest CommandTable[];
/////////////////////////////////////////////////////////////////////////////
//{{AFX_INSERT_LOCATION}}

View File

@ -88,8 +88,9 @@ Element ReqTable[] = {
{"http://www.intel.com/", 1, 1, 1, 0, 0, 0, 0},
{"http://www.aol.com/", 0, 1, 0, 0, 0, 1, 1},
{"https://www.yahoo.com/", 1, 1, 1, 1, 0, 1, 1},
{"data:text/plain;charset=iso-8859-7,%be%fg%be",
{" data:text/plain;charset=iso-8859-7,%be%fg%be",
1, 1, 1, 1, 0, 1, 1},
// {"mailto:name@netscape.com", 1, 1, 1, 1, 0, 1, 1},
{"file://C|/Program Files/", 1, 1, 1, 1, 0, 1, 1},
{"ftp://ftp.netscape.com/", 1, 1, 1, 1, 0, 1, 1},
{"ftp://ftp.mozilla.org/", 0, 0, 0, 0, 1, 0, 0},
@ -98,9 +99,9 @@ Element ReqTable[] = {
void CNsIRequest::OnStartTests(UINT nMenuID)
{
if (nMenuID == ID_INTERFACES_NSIREQUEST_RUNALLTESTS)
RunAllTests(9);
RunAllTests(10);
else
RunIndividualTests(nMenuID, 9);
RunIndividualTests(nMenuID, 10);
}
void CNsIRequest::RunIndividualTests(UINT nMenuID, int reqTotal)

View File

@ -268,6 +268,7 @@
#define ID_TESTS_ADDURICONTENTLISTENER_ADDFROMNSIWEBBROWSER 32998
#define ID_TESTS_ADDURICONTENTLISTENER_ADDFROMNSIURILOADER 32999
#define ID_TESTS_ADDURICONTENTLISTENER_OPENURI 33000
#define ID_TESTS_NSNEWCHANNEL 33001
#define ID_CLIPBOARDCMD_PASTE 42789
#define ID_CLIPBOARDCMD_COPYSELECTION 42790
#define ID_CLIPBOARDCMD_SELECTALL 42791
@ -284,7 +285,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 153
#define _APS_NEXT_COMMAND_VALUE 33001
#define _APS_NEXT_COMMAND_VALUE 33002
#define _APS_NEXT_CONTROL_VALUE 1033
#define _APS_NEXT_SYMED_VALUE 101
#endif

View File

@ -166,6 +166,7 @@ BEGIN
MENUITEM "OpenUri()", ID_TESTS_ADDURICONTENTLISTENER_OPENURI
END
MENUITEM "NS_NewChannel", ID_TESTS_NSNEWCHANNEL
END
POPUP "&Interfaces"
BEGIN