From c9f4a3195f3516f8bd435b0aec5251393537c063 Mon Sep 17 00:00:00 2001 From: "depstein%netscape.com" Date: Tue, 7 Jan 2003 04:26:49 +0000 Subject: [PATCH] Added nsIHttpChannel->GetResponseText test. Not part of the build. git-svn-id: svn://10.0.0.236/trunk@135925 18797224-902f-48f8-a5cc-f745e15eee43 --- .../embedding/qa/testembed/BrowserImpl.cpp | 5 ++-- mozilla/embedding/qa/testembed/Tests.cpp | 1 + .../qa/testembed/nsihttpchanneltests.cpp | 27 +++++++++++++++++- .../qa/testembed/nsihttpchanneltests.h | 2 ++ mozilla/embedding/qa/testembed/resource.h | 3 +- mozilla/embedding/qa/testembed/testembed.aps | Bin 718 -> 718 bytes mozilla/embedding/qa/testembed/testembed.rc | 2 ++ 7 files changed, 36 insertions(+), 4 deletions(-) diff --git a/mozilla/embedding/qa/testembed/BrowserImpl.cpp b/mozilla/embedding/qa/testembed/BrowserImpl.cpp index cd0b74c6e89..afbd2c2b568 100644 --- a/mozilla/embedding/qa/testembed/BrowserImpl.cpp +++ b/mozilla/embedding/qa/testembed/BrowserImpl.cpp @@ -556,9 +556,10 @@ NS_IMETHODIMP CBrowserImpl::OnStartRequest(nsIRequest *request, if (!httpObj) QAOutput("No object to run GetResponseStatusTest().", 1); - else + else { httpObj->GetResponseStatusTest(httpChannel, 1); - + httpObj->GetResponseStatusTextTest(httpChannel, 1); + } if (!ctxt) QAOutput("OnStartRequest():We didn't get the nsISupports object.", 1); diff --git a/mozilla/embedding/qa/testembed/Tests.cpp b/mozilla/embedding/qa/testembed/Tests.cpp index c19a2f09bcd..f5da8d5c039 100644 --- a/mozilla/embedding/qa/testembed/Tests.cpp +++ b/mozilla/embedding/qa/testembed/Tests.cpp @@ -308,6 +308,7 @@ BEGIN_MESSAGE_MAP(CTests, CWnd) ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_SETREDIRECTIONLIMIT, OnInterfacesNsihttpchannel) ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_GETREDIRECTIONLIMIT, OnInterfacesNsihttpchannel) ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUS, OnInterfacesNsihttpchannel) + ON_COMMAND(ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUSTEXT, OnInterfacesNsihttpchannel) ON_COMMAND(ID_INTERFACES_RUNALLTESTCASES, OnInterfacesRunalltestcases) //}}AFX_MSG_MAP diff --git a/mozilla/embedding/qa/testembed/nsihttpchanneltests.cpp b/mozilla/embedding/qa/testembed/nsihttpchanneltests.cpp index 16d4c6ae14f..fd5dfc56c33 100644 --- a/mozilla/embedding/qa/testembed/nsihttpchanneltests.cpp +++ b/mozilla/embedding/qa/testembed/nsihttpchanneltests.cpp @@ -105,6 +105,9 @@ void CnsIHttpChannelTests::OnStartTests(UINT nMenuID) case ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUS : GetResponseStatusTest(theHttpChannel, 2); break; + case ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUSTEXT : + GetResponseStatusTextTest(theHttpChannel, 2); + break; } } @@ -132,9 +135,11 @@ void CnsIHttpChannelTests::RunAllTests() SetRedirectionLimitTest(theHttpChannel, 5, 1); GetRedirectionLimitTest(theHttpChannel, 1); - // see nsIRequestObserver->OnStartRequest for response tests + // see nsIRequestObserver->OnStartRequest for Successful response tests + // we're running response tests here to verify they fail when called here. GetResponseStatusTest(theHttpChannel, 1); + GetResponseStatusTextTest(theHttpChannel, 1); QAOutput("\n"); } @@ -263,6 +268,15 @@ void CnsIHttpChannelTests::GetRedirectionLimitTest(nsIHttpChannel *theHttpChann FormatAndPrintOutput("GetRedirectionLimit value = ", mRedirectionLimit, displayMode); } +// Response tests + +void CnsIHttpChannelTests::CallResponseTests(nsIHttpChannel *theHttpChannel, + PRInt16 displayMode) +{ + GetResponseStatusTest(theHttpChannel, displayMode); + GetResponseStatusTextTest(theHttpChannel, displayMode); +} + void CnsIHttpChannelTests::GetResponseStatusTest(nsIHttpChannel *theHttpChannel, PRInt16 displayMode) { @@ -273,4 +287,15 @@ void CnsIHttpChannelTests::GetResponseStatusTest(nsIHttpChannel *theHttpChannel, FormatAndPrintOutput("GetResponseStatus value = ", mResponseStatus, displayMode); } +void CnsIHttpChannelTests::GetResponseStatusTextTest(nsIHttpChannel *theHttpChannel, + PRInt16 displayMode) +{ + nsCAutoString mText; + + rv = theHttpChannel->GetResponseStatusText(mText); + RvTestResult(rv, "GetResponseStatusText()", displayMode); + FormatAndPrintOutput("GetResponseStatusText = ", mText, displayMode); +} + + diff --git a/mozilla/embedding/qa/testembed/nsihttpchanneltests.h b/mozilla/embedding/qa/testembed/nsihttpchanneltests.h index 573ddf88e21..7eb3c670a50 100644 --- a/mozilla/embedding/qa/testembed/nsihttpchanneltests.h +++ b/mozilla/embedding/qa/testembed/nsihttpchanneltests.h @@ -36,7 +36,9 @@ public: void GetRedirectionLimitTest(nsIHttpChannel *, PRInt16); // response methods + void CallResponseTests(nsIHttpChannel *, PRInt16); void GetResponseStatusTest(nsIHttpChannel *, PRInt16); + void GetResponseStatusTextTest(nsIHttpChannel *, PRInt16); public: diff --git a/mozilla/embedding/qa/testembed/resource.h b/mozilla/embedding/qa/testembed/resource.h index c4ee9b6bb50..ede347f6d70 100644 --- a/mozilla/embedding/qa/testembed/resource.h +++ b/mozilla/embedding/qa/testembed/resource.h @@ -305,6 +305,7 @@ #define ID_INTERFACES_NSIHTTPCHANNEL_SETREDIRECTIONLIMIT 33042 #define ID_INTERFACES_NSIHTTPCHANNEL_GETREDIRECTIONLIMIT 33043 #define ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUS 33044 +#define ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUSTEXT 33045 #define ID_CLIPBOARDCMD_PASTE 42789 #define ID_CLIPBOARDCMD_COPYSELECTION 42790 #define ID_CLIPBOARDCMD_SELECTALL 42791 @@ -321,7 +322,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 153 -#define _APS_NEXT_COMMAND_VALUE 33045 +#define _APS_NEXT_COMMAND_VALUE 33046 #define _APS_NEXT_CONTROL_VALUE 1033 #define _APS_NEXT_SYMED_VALUE 101 #endif diff --git a/mozilla/embedding/qa/testembed/testembed.aps b/mozilla/embedding/qa/testembed/testembed.aps index e39c8b6483d54ef9741646e85c8ca3d63dd466af..924f893a00330692e0592a34c6e92ea0233bd2ea 100644 GIT binary patch delta 19 acmX@ddX9C13)6z8iEegG1%(^iJeUAV=m!`8 delta 19 acmX@ddX9C13zJUcL^nI8e+3)cJeUATyazA< diff --git a/mozilla/embedding/qa/testembed/testembed.rc b/mozilla/embedding/qa/testembed/testembed.rc index 48e7e70508d..ebbcb5e1847 100644 --- a/mozilla/embedding/qa/testembed/testembed.rc +++ b/mozilla/embedding/qa/testembed/testembed.rc @@ -670,6 +670,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "GetResponseStatus", ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUS + MENUITEM "GetResponseStatusText", ID_INTERFACES_NSIHTTPCHANNEL_GETRESPONSESTATUSTEXT + END END POPUP "T&ools"