Added TestProtocols.cpp and renamed nettest to testnet since that was conflicting with nettest in dist.

netwerk/test/TestProtocols.cpp

@@ -0,0 +1,256 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* 
+	The TestProtocols tests the basic protocols architecture and can 
+   	be used to test individual protocols as well. If this grows too
+	big then we should split it to individual protocols. 
+	
+	-Gagan Saksena 04/29/99
+*/
+
+#include <stdio.h>
+//#ifdef XP_WIN //TODO check
+#include <windows.h>
+
+#include "nspr.h"
+#include "nscore.h"
+#include "nsXPComCIID.h"
+#include "nsCOMPtr.h"
+#include "nsIEventQueueService.h"
+#include "nsINetService.h"
+#include "nsIServiceManager.h"
+#include "nsIStreamObserver.h"
+#include "nsIStreamListener.h"
+#include "nsIInputStream.h"
+#include "nsIByteBufferInputStream.h"
+#include "nsCRT.h"
+#include "nsIProtocolConnection.h"
+#include "nsIUrl.h"
+
+#ifdef XP_PC
+#define XPCOM_DLL  "xpcom32.dll"
+#else
+#ifdef XP_MAC
+#include "nsMacRepository.h"
+#else
+#define XPCOM_DLL  "libxpcom.so"
+#endif
+#endif
+
+static NS_DEFINE_CID(kEventQueueServiceCID,      NS_EVENTQUEUESERVICE_CID);
+static NS_DEFINE_CID(kNetServiceCID,             NS_NETSERVICE_CID);
+
+static PRTime gElapsedTime;
+static int gKeepRunning = 1;
+static nsIEventQueue* gEventQ = nsnull;
+
+class InputTestConsumer : public nsIStreamListener
+{
+public:
+
+  InputTestConsumer();
+  virtual ~InputTestConsumer();
+
+  // ISupports interface...
+  NS_DECL_ISUPPORTS
+
+  // IStreamListener interface...
+  NS_IMETHOD OnStartBinding(nsISupports* context);
+
+  NS_IMETHOD OnDataAvailable(nsISupports* context,
+                             nsIInputStream *aIStream, 
+                             PRUint32 aSourceOffset,
+                             PRUint32 aLength);
+
+  NS_IMETHOD OnStopBinding(nsISupports* context,
+                           nsresult aStatus,
+                           nsIString* aMsg);
+};
+
+
+InputTestConsumer::InputTestConsumer()
+{
+  NS_INIT_REFCNT();
+}
+
+InputTestConsumer::~InputTestConsumer()
+{
+}
+
+
+NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
+NS_IMPL_ISUPPORTS(InputTestConsumer,kIStreamListenerIID);
+
+
+NS_IMETHODIMP
+InputTestConsumer::OnStartBinding(nsISupports* context)
+{
+  printf("\n+++ InputTestConsumer::OnStartBinding +++\n");
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+InputTestConsumer::OnDataAvailable(nsISupports* context,
+                                   nsIInputStream *aIStream, 
+                                   PRUint32 aSourceOffset,
+                                   PRUint32 aLength)
+{
+  char buf[1025];
+  PRUint32 amt;
+  do {
+    nsresult rv = aIStream->Read(buf, 1024, &amt);
+    buf[amt] = '\0';
+    printf(buf);
+  } while (amt != 0);
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+InputTestConsumer::OnStopBinding(nsISupports* context,
+                         nsresult aStatus,
+                         nsIString* aMsg)
+{
+  gKeepRunning = 0;
+  printf("\n+++ InputTestConsumer::OnStopBinding (status = %x) +++\n", aStatus);
+  return NS_OK;
+}
+
+
+int
+main(int argc, char* argv[])
+{
+    nsresult rv= -1;
+
+    if (argc < 2) {
+        printf("usage: %s <url> \n", argv[0]);
+        return -1;
+    }
+
+    /* 
+        The following code only deals with XPCOM registration stuff. and setting
+        up the event queues. Copied from TestSocketIO.cpp
+    */
+    // XXX why do I have to do this?!
+    nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE);
+    rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
+                                        "components");
+    if (NS_FAILED(rv)) return rv;
+
+    // Create the Event Queue for this thread...
+    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsIEventQueue* eventQ;
+    rv = eventQService->CreateThreadEventQueue();
+    if (NS_FAILED(rv)) return rv;
+
+    eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQ);
+
+    //Create the nsINetService...
+    NS_WITH_SERVICE(nsINetService, pService, kNetServiceCID, &rv);
+
+    if (NS_FAILED(rv)) return rv;
+
+    // The story of how to retrieve a document. 
+	// Now available in 2 different flavours.
+
+    if (pService)
+    {
+        nsCOMPtr<nsIUrl> pURL;
+
+        if (NS_OK == pService->NewUrl("http://gagan.mcom.com/", getter_AddRefs(pURL)))
+        {
+            if (pURL)
+            {
+                nsCOMPtr<nsIProtocolConnection> pConnection;
+                if (NS_OK == pService->NewConnection(pURL, nsnull, nsnull, getter_AddRefs(pConnection)))
+                {
+                    /* Flavour One! */
+                    // Plain vanilla getting a file... in blocking mode
+                    nsCOMPtr<nsIInputStream> pStream;
+                    if (NS_OK == pConnection->GetInputStream(getter_AddRefs(pStream)))
+                    {
+                        if (pStream)
+                        {
+                            char buffer[1024];
+                            PRUint32 readCount;
+                            do 
+                            {
+                                if (NS_OK == pStream->Read(buffer, 1024, &readCount))
+                                {
+                                    printf(buffer);
+                                }
+                            }
+                            while (readCount != 0);
+                        }
+                    }
+                }
+
+#if 0
+                /* Flavour Two */
+                // Async reading thru the calls of the event sink interface
+                if (NS_OK == pService->NewConnection(pURL, pMyConsumer, nsnull, getter_AddRefs(pConnection)))
+                {
+                    if (pConnection)
+                    {
+                        /* 
+                            You may optionally add/set other headers on this
+                            request object. This is done by QI for the specific
+                            protocolConnection.
+                        */
+                        nsCOMPtr<nsIHTTPConnection> pHTTPCon(pConnection);
+
+                        if (pHTTPCon)
+                        {
+                            // Setting a sample user agent string.
+                            if (NS_OK == pHTTPCon->SetAgent("Mozilla/5.0 [en] (Win98; U)"))
+                            {
+                            }
+                        }
+                    
+                        // But calling the open is required!
+                        pConnection->Open();
+                    }
+                }
+#endif
+
+            }
+        }
+    }
+
+  // Enter the message pump to allow the URL load to proceed.
+  while ( gKeepRunning ) {
+#ifdef XP_PC
+    MSG msg;
+
+    if (GetMessage(&msg, NULL, 0, 0)) {
+      TranslateMessage(&msg);
+      DispatchMessage(&msg);
+    } else {
+      gKeepRunning = FALSE;
+    }
+#endif
+  }
+
+    return rv;
+}
+

netwerk/test/makefile.win

@@ -23,8 +23,10 @@ MAKE_OBJ_TYPE	= EXE
 PROG1 = .\$(OBJDIR)\TestFileInput.exe
 PROG2 = .\$(OBJDIR)\TestSocketInput.exe
 PROG3 = .\$(OBJDIR)\TestSocketIO.exe
-PROG4 = .\$(OBJDIR)\nettest.exe
-PROGRAMS = $(PROG1) $(PROG2) $(PROG3) $(PROG4)
+PROG4 = .\$(OBJDIR)\TestProtocols.exe
+# nettest was conflicting with the old one in dist
+PROG5 = .\$(OBJDIR)\testnet.exe
+PROGRAMS = $(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5)
 
 LCFLAGS=-DUSE_NSREG -GX
 
@@ -39,7 +41,6 @@ LINCS =                     \
 LLIBS=					\
  $(DIST)\lib\xpcom32.lib		\
  $(DIST)\lib\raptorbase.lib		\
- $(DIST)\lib\netwerkbase_s.lib \
  $(LIBNSPR)				\
  $(DIST)\lib\plc3.lib
 !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
@@ -76,4 +77,6 @@ $(PROG2): $(OBJDIR) TestSocketInput.cpp
 
 $(PROG3): $(OBJDIR) TestSocketIO.cpp
 
-$(PROG4): $(OBJDIR) nettest.cpp
+$(PROG4): $(OBJDIR) TestProtocols.cpp
+
+$(PROG5): $(OBJDIR) nettest.cpp