diff --git a/netwerk/test/TestProtocols.cpp b/netwerk/test/TestProtocols.cpp index a042d9187f4..7a2285026b8 100644 --- a/netwerk/test/TestProtocols.cpp +++ b/netwerk/test/TestProtocols.cpp @@ -65,7 +65,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static int gKeepRunning = 0; static PRBool gVerbose = PR_FALSE; static nsIEventQueue* gEventQ = nsnull; -static PRBool gTestAsyncOpen = PR_FALSE; class URLLoadInfo : public nsISupports { @@ -240,11 +239,6 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSISTREAMOBSERVER NS_DECL_NSISTREAMLISTENER - - void SetAsyncOpenCompleted() { mAsyncOpenCompleted = PR_TRUE; } - -protected: - PRBool mAsyncOpenCompleted; }; //////////////////////////////////////////////////////////////////////////////// @@ -282,7 +276,6 @@ OpenObserver::OnStartRequest(nsIChannel* channel, nsISupports* context) printf(" contentType = %s length = %d\n", type, length); nsCRT::free(type); - mInputConsumer->SetAsyncOpenCompleted(); return NS_OK; } @@ -301,7 +294,6 @@ OpenObserver::OnStopRequest(nsIChannel* channel, //////////////////////////////////////////////////////////////////////////////// InputTestConsumer::InputTestConsumer() - : mAsyncOpenCompleted(PR_FALSE) { NS_INIT_REFCNT(); } @@ -317,8 +309,6 @@ NS_IMPL_ISUPPORTS(InputTestConsumer,NS_GET_IID(nsIStreamListener)); NS_IMETHODIMP InputTestConsumer::OnStartRequest(nsIChannel* channel, nsISupports* context) { - NS_ASSERTION(!gTestAsyncOpen || mAsyncOpenCompleted, "AsyncOpen failed"); - URLLoadInfo* info = (URLLoadInfo*)context; if (info) { info->mConnectTime = PR_Now() - info->mConnectTime; @@ -351,7 +341,6 @@ InputTestConsumer::OnDataAvailable(nsIChannel* channel, PRUint32 aSourceOffset, PRUint32 aLength) { - NS_ASSERTION(!gTestAsyncOpen || mAsyncOpenCompleted, "AsyncOpen failed"); char buf[1025]; PRUint32 amt, size; @@ -387,8 +376,6 @@ InputTestConsumer::OnStopRequest(nsIChannel* channel, nsresult aStatus, const PRUnichar* aMsg) { - NS_ASSERTION(!gTestAsyncOpen || mAsyncOpenCompleted, "AsyncOpen failed"); - URLLoadInfo* info = (URLLoadInfo*)context; if (info) { @@ -531,19 +518,6 @@ nsresult StartLoadingURL(const char* aUrlString) return NS_ERROR_OUT_OF_MEMORY;; } - if (gTestAsyncOpen) { - OpenObserver* obs = new OpenObserver(listener); - if (obs == nsnull) - return NS_ERROR_OUT_OF_MEMORY; - NS_ADDREF(obs); - rv = pChannel->AsyncOpen(obs, nsnull); - NS_RELEASE(obs); - if (NS_FAILED(rv)) { - NS_ERROR("Error: AsyncOpen failed..."); - return rv; - } - } - URLLoadInfo* info; info = new URLLoadInfo(aUrlString); NS_IF_ADDREF(info); @@ -662,11 +636,6 @@ main(int argc, char* argv[]) continue; } - if (PL_strcasecmp(argv[i], "-asyncopen") == 0) { - gTestAsyncOpen = PR_TRUE; - continue; - } - printf("\t%s\n", argv[i]); rv = StartLoadingURL(argv[i]); } diff --git a/netwerk/test/TestSocketTransport.cpp b/netwerk/test/TestSocketTransport.cpp index 92dbde512b4..1fe6fc97247 100644 --- a/netwerk/test/TestSocketTransport.cpp +++ b/netwerk/test/TestSocketTransport.cpp @@ -145,8 +145,6 @@ public: nsresult Suspend(void); nsresult Resume(void); - void SetAsyncOpenCompleted() { mAsyncOpenCompleted = PR_TRUE; } - NS_IMETHOD GetInterface(const nsIID & uuid, void * *result) { if (uuid.Equals(NS_GET_IID(nsIProgressEventSink))) { *result = (nsIProgressEventSink*)this; @@ -185,8 +183,6 @@ protected: PRInt32 mBytesRead; - PRBool mTestAsyncOpen; - PRBool mAsyncOpenCompleted; }; //////////////////////////////////////////////////////////////////////////////// @@ -216,7 +212,6 @@ TestConnectionOpenObserver::OnStartRequest(nsIChannel* channel, nsISupports* con if (gVerbose) printf("\n+++ TestConnectionOpenObserver::OnStartRequest +++. Context = %p\n", context); - mTestConnection->SetAsyncOpenCompleted(); return NS_OK; } @@ -238,8 +233,6 @@ TestConnectionOpenObserver::OnStopRequest(nsIChannel* channel, NS_IMETHODIMP TestConnection::OnStartRequest(nsIChannel* channel, nsISupports* context) { - NS_ASSERTION(!mTestAsyncOpen || mAsyncOpenCompleted, "AsyncOpen failed"); - if (gVerbose) printf("\n+++ TestConnection::OnStartRequest +++. Context = %p\n", context); return NS_OK; @@ -253,7 +246,6 @@ TestConnection::OnDataAvailable(nsIChannel* channel, nsISupports* context, PRUint32 aLength) { nsresult rv; - NS_ASSERTION(!mTestAsyncOpen || mAsyncOpenCompleted, "AsyncOpen failed"); char buf[TRANSFER_AMOUNT]; PRUint32 amt; @@ -289,8 +281,6 @@ TestConnection::OnStopRequest(nsIChannel* channel, nsresult aStatus, const PRUnichar* aMsg) { - NS_ASSERTION(!mTestAsyncOpen || mAsyncOpenCompleted, "AsyncOpen failed"); - if (gVerbose || NS_FAILED(aStatus)) printf("\n+++ TestConnection::OnStopRequest (status = %x) +++." "\tContext = %p\n", @@ -308,9 +298,6 @@ TestConnection::TestConnection(const char* aHostName, PRInt32 aPort, mIsAsync = aAsyncFlag; - mTestAsyncOpen = testAsyncRead; - mAsyncOpenCompleted = PR_FALSE; - mBufferLength = TRANSFER_AMOUNT; mBufferChar = 'a'; mBytesRead = 0; @@ -404,18 +391,6 @@ TestConnection::Run(void) if (NS_SUCCEEDED(rv)) { if (mIsAsync) { - if (mTestAsyncOpen) { - TestConnectionOpenObserver* obs = new TestConnectionOpenObserver(this); - if (obs == nsnull) - return NS_ERROR_OUT_OF_MEMORY; - NS_ADDREF(obs); - rv = mTransport->AsyncOpen(obs, nsnull); - NS_RELEASE(obs); - if (NS_FAILED(rv)) { - printf("Error: AsyncOpen failed..."); - } - } - // // Initiate an async read... // @@ -634,12 +609,11 @@ main(int argc, char* argv[]) // // ----- /// if (argc < 3) { -/// printf("usage: %s [-sync|-asyncopen|-silent] \n", argv[0]); +/// printf("usage: %s [-sync|-silent] \n", argv[0]); /// return -1; /// } PRBool bIsAsync = PR_TRUE; - PRBool bTestAsyncOpen = PR_FALSE; char* hostName = nsnull; int i; @@ -650,10 +624,6 @@ main(int argc, char* argv[]) bIsAsync = PR_FALSE; continue; } - if (PL_strcasecmp(argv[i], "-asyncopen") == 0) { - bTestAsyncOpen = PR_TRUE; - continue; - } if (PL_strcasecmp(argv[i], "-silent") == 0) { gVerbose = PR_FALSE; continue; @@ -692,7 +662,7 @@ main(int argc, char* argv[]) // Create the connections and threads... // for (i=0; i