From a8d05e73daa133bc3d40f30d8d501ba9f8b13ba0 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Tue, 30 Jan 2001 04:54:07 +0000 Subject: [PATCH] remove obsolete test files sr=sspitzer --- mailnews/compose/tests/sendpage/.cvsignore | 2 - mailnews/compose/tests/sendpage/Makefile.in | 48 -- mailnews/compose/tests/sendpage/Test.cpp | 449 ------------------- mailnews/compose/tests/sendpage/makefile.win | 92 ---- 4 files changed, 591 deletions(-) delete mode 100644 mailnews/compose/tests/sendpage/.cvsignore delete mode 100644 mailnews/compose/tests/sendpage/Makefile.in delete mode 100644 mailnews/compose/tests/sendpage/Test.cpp delete mode 100644 mailnews/compose/tests/sendpage/makefile.win diff --git a/mailnews/compose/tests/sendpage/.cvsignore b/mailnews/compose/tests/sendpage/.cvsignore deleted file mode 100644 index f301b280c505..000000000000 --- a/mailnews/compose/tests/sendpage/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -sendpage diff --git a/mailnews/compose/tests/sendpage/Makefile.in b/mailnews/compose/tests/sendpage/Makefile.in deleted file mode 100644 index e07580ab8f6f..000000000000 --- a/mailnews/compose/tests/sendpage/Makefile.in +++ /dev/null @@ -1,48 +0,0 @@ -# -# The contents of this file are subject to the Netscape Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/NPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# - -DEPTH = ../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -PROGRAM = sendpage$(BIN_SUFFIX) -REQUIRES = xpcom mailnews pref js msgbase msgbaseutil msgcompose necko editor msgdb dom widget layout appshell - -CPPSRCS = Test.cpp - -ifeq ($(USE_SHORT_LIBNAME),1) -EXTRA_DSO_LIBS = msgbsutl -else -EXTRA_DSO_LIBS = msgbaseutil -endif - -LIBS = \ - $(EXTRA_DSO_LIBS) \ - $(XPCOM_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSPR_LIBS) \ - $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/mailnews/compose/tests/sendpage/Test.cpp b/mailnews/compose/tests/sendpage/Test.cpp deleted file mode 100644 index a29a1038bfe2..000000000000 --- a/mailnews/compose/tests/sendpage/Test.cpp +++ /dev/null @@ -1,449 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * The contents of this file are subject to the Netscape Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * Pierre Phaneuf - */ - -#include "nsCOMPtr.h" -#include "nsIMsgCompFields.h" -#include "nsIMsgSend.h" -#include "prmem.h" -#include "nsIComponentManager.h" -#include "nsIPref.h" -#include "nsIMemory.h" -#include "nsIEventQueueService.h" -#include "nsMsgCompCID.h" -#include "nsIGenericFactory.h" -#include "nsIServiceManager.h" -#include "nsIMsgAccountManager.h" -#include "nsMsgBaseCID.h" -#include "nsIFileLocator.h" -#include "nsIMsgSendListener.h" -#include "nsIMsgCopyServiceListener.h" -#include "nsIIOService.h" - -#include -#if defined(XP_PC) && !defined(XP_OS2) -#include -#endif - -#ifdef XP_PC -#define XPCOM_DLL "xpcom32.dll" -#define PREF_DLL "xppref32.dll" -#define APPSHELL_DLL "appshell.dll" -#else -#ifdef XP_MAC -#include "nsMacRepository.h" -#else -#define XPCOM_DLL "libxpcom"MOZ_DLL_SUFFIX -#define PREF_DLL "libpref"MOZ_DLL_SUFFIX -#define APPSHELL_DLL "libnsappshell"MOZ_DLL_SUFFIX -#endif -#endif - -///////////////////////////////////////////////////////////////////////////////// -// Define keys for all of the interfaces we are going to require for this test -///////////////////////////////////////////////////////////////////////////////// -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_CID(kMemoryCID, NS_MEMORY_CID); -static NS_DEFINE_CID(kMsgCompFieldsCID, NS_MSGCOMPFIELDS_CID); -static NS_DEFINE_CID(kMsgSendCID, NS_MSGSEND_CID); -static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); -static NS_DEFINE_CID(kGenericFactoryCID, NS_GENERICFACTORY_CID); -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kFileLocatorCID, NS_FILELOCATOR_CID); - -//////////////////////////////////////////////////////////////////////////////////// -// This is the listener class for the send operation. We have to create this class -// to listen for message send completion and eventually notify the caller -//////////////////////////////////////////////////////////////////////////////////// -class nsMsgSendLater; -class SendOperationListener : public nsIMsgSendListener, public nsIMsgCopyServiceListener -{ -public: - SendOperationListener(void); - virtual ~SendOperationListener(void); - - // nsISupports interface - NS_DECL_ISUPPORTS - - /* void OnStartSending (in string aMsgID, in PRUint32 aMsgSize); */ - NS_IMETHOD OnStartSending(const char *aMsgID, PRUint32 aMsgSize); - - /* void OnProgress (in string aMsgID, in PRUint32 aProgress, in PRUint32 aProgressMax); */ - NS_IMETHOD OnProgress(const char *aMsgID, PRUint32 aProgress, PRUint32 aProgressMax); - - /* void OnStatus (in string aMsgID, in wstring aMsg); */ - NS_IMETHOD OnStatus(const char *aMsgID, const PRUnichar *aMsg); - - /* void OnStopSending (in string aMsgID, in nsresult aStatus, in wstring aMsg, in nsIFileSpec returnFileSpec); */ - NS_IMETHOD OnStopSending(const char *aMsgID, nsresult aStatus, const PRUnichar *aMsg, - nsIFileSpec *returnFileSpec); - - // For the nsIMsgCopySerivceListener! - NS_IMETHOD OnStartCopy(); - - NS_IMETHOD OnProgress(PRUint32 aProgress, PRUint32 aProgressMax); - - NS_IMETHOD OnStopCopy(nsresult aStatus); - NS_IMETHOD SetMessageKey(PRUint32 aMessageKey); - NS_IMETHOD GetMessageId(nsCString* aMessageId); - -private: - nsMsgSendLater *mSendLater; -}; - -//////////////////////////////////////////////////////////////////////////////////// -// This is the listener class for the send operation. We have to create this class -// to listen for message send completion and eventually notify the caller -//////////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ADDREF(SendOperationListener) -NS_IMPL_RELEASE(SendOperationListener) - -NS_IMETHODIMP -SendOperationListener::QueryInterface(const nsIID &aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) - return NS_ERROR_NULL_POINTER; - *aInstancePtr = NULL; - - if (aIID.Equals(NS_GET_IID(nsIMsgSendListener))) - { - *aInstancePtr = (nsIMsgSendListener *) this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIMsgCopyServiceListener))) - { - *aInstancePtr = (nsIMsgCopyServiceListener *) this; - NS_ADDREF_THIS(); - return NS_OK; - } - - return NS_NOINTERFACE; -} - -SendOperationListener::SendOperationListener(void) -{ - mSendLater = nsnull; - NS_INIT_REFCNT(); -} - -SendOperationListener::~SendOperationListener(void) -{ -} - -nsresult -SendOperationListener::OnStartSending(const char *aMsgID, PRUint32 aMsgSize) -{ -#ifdef NS_DEBUG - printf("SendOperationListener::OnStartSending()\n"); -#endif - return NS_OK; -} - -nsresult -SendOperationListener::OnProgress(const char *aMsgID, PRUint32 aProgress, PRUint32 aProgressMax) -{ -#ifdef NS_DEBUG - printf("SendOperationListener::OnProgress()\n"); -#endif - return NS_OK; -} - -nsresult -SendOperationListener::OnStatus(const char *aMsgID, const PRUnichar *aMsg) -{ -#ifdef NS_DEBUG - printf("SendOperationListener::OnStatus()\n"); -#endif - - return NS_OK; -} - -PRBool keepOnRunning = PR_TRUE; -nsresult -SendOperationListener::OnStopSending(const char *aMsgID, nsresult aStatus, const PRUnichar *aMsg, - nsIFileSpec *returnFileSpec) -{ - if (NS_SUCCEEDED(aStatus)) - { - printf("Send Mail Operation Completed Successfully!\n"); - } - else - { - printf("Send Mail Operation FAILED!\n"); - } - - printf("Exit code = [%d]\n", aStatus); - keepOnRunning = PR_FALSE; - return NS_OK; -} - -nsresult -SendOperationListener::OnStartCopy() -{ -#ifdef NS_DEBUG - printf("SendOperationListener::OnStartCopy()\n"); -#endif - - return NS_OK; -} - -nsresult -SendOperationListener::OnProgress(PRUint32 aProgress, PRUint32 aProgressMax) -{ -#ifdef NS_DEBUG - printf("SendOperationListener::OnProgress() - COPY\n"); -#endif - return NS_OK; -} - -nsresult -SendOperationListener::OnStopCopy(nsresult aStatus) -{ - if (NS_SUCCEEDED(aStatus)) - { - printf("SendOperationListener::OnStopCopy() Completed Successfully!\n"); - } - else - { - printf("SendOperationListener::OnStopCopy() Completed FAILED!\n"); - } - - return NS_OK; -} - -nsresult -SendOperationListener::SetMessageKey(PRUint32 aMessageKey) -{ - return NS_OK; -} - -nsresult -SendOperationListener::GetMessageId(nsCString* aMessageId) -{ - return NS_OK; -} - -nsIMsgSendListener ** -CreateListenerArray(nsIMsgSendListener *listener) -{ - if (!listener) - return nsnull; - - nsIMsgSendListener **tArray = (nsIMsgSendListener **)PR_Malloc(sizeof(nsIMsgSendListener *) * 2); - if (!tArray) - return nsnull; - nsCRT::memset(tArray, 0, sizeof(nsIMsgSendListener *) * 2); - tArray[0] = listener; - return tArray; -} - -// Utility to create a nsIURI object... -nsresult -nsMsgNewURL(nsIURI** aInstancePtrResult, const char * aSpec) -{ - nsresult rv = NS_OK; - if (nsnull == aInstancePtrResult) - return NS_ERROR_NULL_POINTER; - - NS_WITH_SERVICE(nsIIOService, pNetService, kIOServiceCID, &rv); - if (NS_SUCCEEDED(rv) && pNetService) - rv = pNetService->NewURI(aSpec, nsnull, aInstancePtrResult); - return rv; -} - -static nsresult -SetupRegistry(void) -{ - // xpcom - nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); - nsComponentManager::RegisterComponent(kEventQueueCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); - nsComponentManager::RegisterComponent(kGenericFactoryCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); - nsComponentManager::RegisterComponent(kMemoryCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); - - // prefs - nsComponentManager::RegisterComponent(kPrefCID, NULL, NULL, PREF_DLL, PR_FALSE, PR_FALSE); - nsComponentManager::RegisterComponent(kFileLocatorCID, NULL, NS_FILELOCATOR_CONTRACTID, APPSHELL_DLL, PR_FALSE, PR_FALSE); - - return NS_OK; -} - -nsIMsgIdentity * -GetHackIdentity() -{ -nsresult rv; - - NS_WITH_SERVICE(nsIMsgAccountManager, accountManager, NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); - if (NS_FAILED(rv)) - { - printf("Failure on Mail Session Init!\n"); - return nsnull; - } - - nsCOMPtr account; - rv = accountManager->GetDefaultAccount(getter_AddRefs(account)); - if (NS_FAILED(rv)) return nsnull; - - nsCOMPtr identities; - rv = account->GetIdentities(getter_AddRefs(identities)); - - nsCOMPtr identity = nsnull; - rv = identities->QueryElementAt(0, NS_GET_IID(nsIMsgIdentity), - (void **)getter_AddRefs(identity)); - if (NS_FAILED(rv)) - { - printf("Failure getting Identity!\n"); - return nsnull; - } - - return identity; -} - -// -// This is a test stub for the send web page interface. -// -int -main(int argc, char *argv[]) -{ - nsIMsgCompFields *pMsgCompFields; - nsIMsgSend *pMsgSend; - nsresult rv = NS_OK; - - // Before anything, do some sanity checking :-) - if (argc < 4) - { - printf("Usage: %s \n", argv[0]); - exit(0); - } - SetupRegistry(); - - // Create the Event Queue for this thread... - NS_WITH_SERVICE(nsIEventQueueService, pEventQService, kEventQueueServiceCID, &rv); - if (NS_FAILED(rv)) - { - printf("Failed to get event queue\n"); - return rv; - } - - rv = pEventQService->CreateThreadEventQueue(); - if (NS_FAILED(rv)) - { - printf("Failed to create event queue\n"); - return rv; - } - - // make sure prefs get initialized and loaded.. - NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv); - if (NS_FAILED(rv) || (!prefs)) - { - printf("Failed on prefs service!\n"); - exit(rv); - } - if (NS_FAILED(prefs->ReadUserPrefs())) - { - printf("Failed on reading user prefs!\n"); - exit(rv); - } - - - rv = nsComponentManager::CreateInstance(kMsgSendCID, NULL, NS_GET_IID(nsIMsgSend), (void **) &pMsgSend); - if (NS_SUCCEEDED(rv) && pMsgSend) - { - printf("We succesfully obtained a nsIMsgSend interface....\n"); - rv = nsComponentManager::CreateInstance(kMsgCompFieldsCID, NULL, NS_GET_IID(nsIMsgCompFields), - (void **) &pMsgCompFields); - if (NS_SUCCEEDED(rv) && pMsgCompFields) - if (rv == NS_OK && pMsgCompFields) - { - nsIMsgIdentity *ident = GetHackIdentity(); - char *email = nsnull; - - if (ident) - ident->GetEmail(&email); - - if (!email) - email = "rhp@netscape.com"; - - pMsgCompFields->SetFrom(NS_ConvertASCIItoUCS2(email).GetUnicode()); - pMsgCompFields->SetTo(NS_ConvertASCIItoUCS2(argv[1]).GetUnicode()); - - pMsgCompFields->SetSubject(NS_ConvertASCIItoUCS2(argv[3]).GetUnicode()); - pMsgCompFields->SetBody(NS_ConvertASCIItoUCS2(argv[2]).GetUnicode()); - - nsIURI *url; - char *ptr = argv[2]; - while (*ptr) - { - if (*ptr == '\\') - *ptr = '/'; - ++ptr; - } - - nsMsgNewURL(&url, argv[2]); - if (!url) - { - printf("Error creating new URL object.\n"); - return -1; - } - - // Create the listener for the send operation... - SendOperationListener *mSendListener = new SendOperationListener(); - if (!mSendListener) - { - return NS_ERROR_FAILURE; - } - - // set this object for use on completion... - nsIMsgSendListener **tArray = CreateListenerArray(mSendListener); - if (!tArray) - { - printf("Error creating listener array.\n"); - return NS_ERROR_FAILURE; - } - - pMsgSend->SendWebPage(ident, pMsgCompFields, url, nsIMsgSend::nsMsgDeliverNow, tArray, 2); - } - } - -#if defined(XP_PC) && !defined(XP_OS2) - printf("Sitting in an event processing loop ...Hit Cntl-C to exit..."); - while (keepOnRunning) - { - MSG msg; - if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } -#endif - - printf("Releasing the interface now...\n"); - if (pMsgSend) - pMsgSend->Release(); - if (pMsgCompFields) - pMsgCompFields->Release(); - - return 0; -} - diff --git a/mailnews/compose/tests/sendpage/makefile.win b/mailnews/compose/tests/sendpage/makefile.win deleted file mode 100644 index bb99e2c5342f..000000000000 --- a/mailnews/compose/tests/sendpage/makefile.win +++ /dev/null @@ -1,92 +0,0 @@ -# The contents of this file are subject to the Netscape Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/NPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): - -#//------------------------------------------------------------------------ -#// -# New build system where zip dll is build indepenant of java stubs. -#// -#//------------------------------------------------------------------------ -MODULE =sendpage -#EXPORTS = \ -# $(NULL) - - -#//------------------------------------------------------------------------ -#// -#// Specify the depth of the current directory relative to the -#// root of NS -#// -#//------------------------------------------------------------------------ -DEPTH= ..\..\..\.. - -MAKE_OBJ_TYPE=EXE -#//------------------------------------------------------------------------ -#// -#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) -#// -#//------------------------------------------------------------------------ -EXENAME=sendpage -PDBFILE=sendpage.pdb -MAPFILE=sendpage.map - -#//------------------------------------------------------------------------ -#// -#// Define the files necessary to build the target (ie. OBJS) -#// -#//------------------------------------------------------------------------ -OBJS= \ - .\$(OBJDIR)\test.obj \ - $(NULL) -#//------------------------------------------------------------------------ -#// -#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...) -#// (these must be defined before the common makefiles are included) -#// -#//------------------------------------------------------------------------ - -PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE - - -#//------------------------------------------------------------------------ -#// -#// Define any local options for the make tools -#// (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS) -#// -#//------------------------------------------------------------------------ -LCFLAGS=-DNETSCAPE -WIN_LIBS= ole32.lib -LLIBS= \ - $(DIST)\lib\xpcom.lib \ - $(LIBNSPR) \ - -# clobber and clobber_all will remove the following garbage: -GARBAGE = $(GARBAGE) _gen - -#//------------------------------------------------------------------------ -#// -#// Include the common makefile rules -#// -#//------------------------------------------------------------------------ -include <$(DEPTH)/config/rules.mak> - -install:: $(PROGRAM) - $(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin\ - -clobber:: - rm -f $(EXENAME).exe