diff options
Diffstat (limited to 'cppe/test')
182 files changed, 0 insertions, 14179 deletions
diff --git a/cppe/test/Common/.depend b/cppe/test/Common/.depend deleted file mode 100644 index 6d835238958..00000000000 --- a/cppe/test/Common/.depend +++ /dev/null @@ -1 +0,0 @@ -TestCommon$(OBJEXT): TestCommon.cpp ../../include/IceE/DisableWarnings.h ../include/TestCommon.h ../../include/IceE/Config.h ../../include/IceE/IceE.h ../../include/IceE/Initialize.h ../../include/IceE/CommunicatorF.h ../../include/IceE/Handle.h ../../include/IceE/ExceptionBase.h ../../include/IceE/Shared.h ../../include/IceE/PropertiesF.h ../../include/IceE/LoggerF.h ../../include/IceE/InstanceF.h ../../include/IceE/BuiltinSequences.h ../../include/IceE/ProxyF.h ../../include/IceE/ProxyHandle.h ../../include/IceE/ObjectF.h ../../include/IceE/Exception.h ../../include/IceE/ScopedArray.h ../../include/IceE/Proxy.h ../../include/IceE/ProxyFactoryF.h ../../include/IceE/ConnectionF.h ../../include/IceE/ReferenceF.h ../../include/IceE/Mutex.h ../../include/IceE/Lock.h ../../include/IceE/ThreadException.h ../../include/IceE/Identity.h ../../include/IceE/UndefSysMacros.h ../../include/IceE/OperationMode.h ../../include/IceE/Outgoing.h ../../include/IceE/BasicStream.h ../../include/IceE/Buffer.h ../../include/IceE/Protocol.h ../../include/IceE/StringConverter.h ../../include/IceE/LocalException.h ../../include/IceE/Properties.h ../../include/IceE/Logger.h ../../include/IceE/LoggerUtil.h ../../include/IceE/Communicator.h ../../include/IceE/RecMutex.h ../../include/IceE/ObjectAdapter.h ../../include/IceE/ObjectAdapterF.h ../../include/IceE/ObjectAdapterFactoryF.h ../../include/IceE/IncomingConnectionFactoryF.h ../../include/IceE/ServantManagerF.h ../../include/IceE/EndpointF.h ../../include/IceE/RouterF.h ../../include/IceE/Object.h ../../include/IceE/Current.h ../../include/IceE/RouterInfoF.h ../../include/IceE/LocatorF.h ../../include/IceE/LocatorInfoF.h ../../include/IceE/Monitor.h ../../include/IceE/Cond.h ../../include/IceE/Time.h ../../include/IceE/UUID.h ../../include/IceE/Connection.h ../../include/IceE/OutgoingConnectionFactoryF.h ../../include/IceE/TransceiverF.h ../../include/IceE/TraceLevelsF.h ../../include/IceE/Incoming.h ../../include/IceE/Thread.h ../../include/IceE/Functional.h ../../include/IceE/Unicode.h ../../include/IceE/SafeStdio.h ../include/TestApplication.h ../../include/IceE/StaticMutex.h diff --git a/cppe/test/Common/Makefile b/cppe/test/Common/Makefile deleted file mode 100644 index 2ea22857fb7..00000000000 --- a/cppe/test/Common/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -LIBFILENAME = $(call mklibfilename,TestCommon,$(VERSION)) -SONAME = $(call mksoname,TestCommon,$(SOVERSION)) -LIBNAME = $(call mklibname,TestCommon) - -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) - -OBJS = TestCommon.o - -SRCS = $(OBJS:.o=.cpp) - -HDIR = $(includedir)/Ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I../include $(CPPFLAGS) -DICE_TEST_COMMON_API_EXPORTS -LINKWITH := -lIceE - -ifeq ($(STATICLIBS),yes) -$(libdir)/$(LIBNAME): $(OBJS) - rm -f $@ - $(call mklib,$@,$(OBJS)) -else -$(libdir)/$(LIBFILENAME): $(OBJS) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)/$(LIBNAME): $(libdir)/$(SONAME) - rm -f $@ - ln -s $(SONAME) $@ -endif - -include .depend diff --git a/cppe/test/Common/Makefile.mak b/cppe/test/Common/Makefile.mak deleted file mode 100644 index 634ca4bf0a2..00000000000 --- a/cppe/test/Common/Makefile.mak +++ /dev/null @@ -1,63 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..
-
-LIBNAME = $(top_srcdir)\lib\testcommon$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\testcommon$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS = $(LIBNAME) $(DLLNAME)
-
-OBJS = TestCommon.obj
-
-SRCS = $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS = -I..\include $(CPPFLAGS) -DICE_TEST_COMMON_API_EXPORTS
-
-!if "$(STATICLIBS)" != "yes" && "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-!if "$(EMBEDDED_DEVICE)" != ""
-LIBS = $(LIBS)
-!endif
-
-!if "$(STATICLIBS)" == "yes"
-
-$(DLLNAME):
-
-$(LIBNAME): $(OBJS)
- $(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) /out:$(LIBNAME)
-
-!else
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS)
- $(LINK) $(LDFLAGS) /dll $(PDBFLAGS) $(OBJS) /out:$(DLLNAME) $(LIBS)
- move $(DLLNAME:.dll=.lib) $(LIBNAME)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
- @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-!endif
-
-clean::
- del /q $(LIBNAME:.dll=.*)
-
-!if "$(STATICLIBS)" != "yes"
-
-clean::
- del /q $(DLLNAME:.dll=.*)
-
-!endif
-
-!include .depend
diff --git a/cppe/test/Common/TestCommon.cpp b/cppe/test/Common/TestCommon.cpp deleted file mode 100644 index 3e452ed61a1..00000000000 --- a/cppe/test/Common/TestCommon.cpp +++ /dev/null @@ -1,522 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/DisableWarnings.h> -#include <TestCommon.h> -#include <TestApplication.h> - -#include <IceE/StaticMutex.h> -#include <IceE/Thread.h> -#include <IceE/Time.h> - -#include <stdarg.h> - -using namespace std; -using namespace Ice; - -static IceUtil::StaticMutex globalMutex = ICE_STATIC_MUTEX_INITIALIZER; - -class LoggerI : public Logger -{ -public: - - virtual void - print(const string& message) - { - IceUtil::StaticMutex::Lock sync(globalMutex); - tprintf("%s\n", message.c_str()); - } - - virtual void - trace(const string& category, const string& message) - { - IceUtil::StaticMutex::Lock sync(globalMutex); - string s = "[ "; - { - char buf[1024]; -#ifdef _WIN32 - sprintf(buf, "%ld", GetTickCount()); -#else - sprintf(buf, "%lu", (long)IceUtil::Time::now().toMilliSeconds()); -#endif - s += buf; - } - s += ' '; - - if(!category.empty()) - { - s += category + ": "; - } - s += message + " ]"; - - string::size_type idx = 0; - while((idx = s.find("\n", idx)) != string::npos) - { - s.insert(idx + 1, " "); - ++idx; - } - tprintf("%s\n", s.c_str()); - } - - virtual void - warning(const string& message) - { - IceUtil::StaticMutex::Lock sync(globalMutex); - tprintf("warning: %s\n", message.c_str()); - } - - virtual void - error(const string& message) - { - IceUtil::StaticMutex::Lock sync(globalMutex); - tprintf("error: %s\n", message.c_str()); - } -}; - -static IceUtil::StaticMutex terminatedMutex = ICE_STATIC_MUTEX_INITIALIZER; -static bool appTerminated= false; - -#ifdef _WIN32_WCE - -const TCHAR windowClassName[] = L"Test Driver"; - -#define IDC_MAIN_EDIT 101 - -class TestSuiteFailed -{ -public: -}; - -static FILE* _tprintfp = 0; -static HWND hEdit; -static HWND mainWnd; -static IceUtil::ThreadControl mainThread; - -void -tprintf(const char* fmt, ...) -{ - va_list va; - va_start(va, fmt); - char buf[1024]; - _vsnprintf(buf, sizeof(buf)-1, fmt, va); - buf[sizeof(buf)-1] = '\0'; - va_end(va); - - if(_tprintfp) - { - fwrite(buf, strlen(buf), 1, _tprintfp); - fflush(_tprintfp); - return; - } - - char* start = buf; - const char* end = start + strlen(start); - char* curr = start; - while(curr < end) - { - bool nl = false; - while(curr < end && *curr != '\n') - { - // Not designed to handle \r - assert(*curr != '\r'); - ++curr; - } - if(*curr == '\n') - { - nl = true; - } - *curr = '\0'; - static TCHAR nlStr[] = L"\r\n"; - - // - // If the thread is not the main thread we have to post a message - // to the main thread to do the EM_REPLACESEL. Calling SendMessage - // from a thread other than main is not permitted. - // - if(IceUtil::ThreadControl() != mainThread) - { - wchar_t* wtext = new wchar_t[sizeof(wchar_t) * (curr - start)+1]; - mbstowcs(wtext, start, (curr - start) + 1); - ::PostMessage(mainWnd, WM_USER, (WPARAM)FALSE, (LPARAM)wtext); - if(nl) - { - wchar_t* wtext = new wchar_t[sizeof(nlStr)]; - wcscpy(wtext, nlStr); - ::PostMessage(mainWnd, WM_USER, (WPARAM)FALSE, (LPARAM)wtext); - } - } - else - { - TCHAR wtext[1024]; - mbstowcs(wtext, start, (curr - start) + 1); - ::SendMessage(hEdit, EM_REPLACESEL, (WPARAM)FALSE, (LPARAM)wtext); - if(nl) - { - ::SendMessage(hEdit, EM_REPLACESEL, (WPARAM)FALSE, (LPARAM)nlStr); - } - } - ++curr; - start = curr; - } - - // - // Process pending events. - // - if(IceUtil::ThreadControl() == mainThread) - { - MSG Msg; - while(PeekMessage(&Msg, NULL, 0, 0, PM_REMOVE)) - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - } -} - -static LRESULT CALLBACK -WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch(msg) - { - case WM_USER: - { - // tprint from a thread other than main. lParam holds a pointer to the text. - ::SendMessage(hEdit, EM_REPLACESEL, (WPARAM)wParam, (LPARAM)lParam); - wchar_t* text = (wchar_t*)lParam; - delete[] text; - } - break; - - case WM_CREATE: - { - RECT rcClient; - GetClientRect(hWnd, &rcClient); - hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, L"EDIT", L"", - WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_MULTILINE, - 0, 0, rcClient.right - rcClient.left, rcClient.bottom - rcClient.top, - hWnd, (HMENU)IDC_MAIN_EDIT, GetModuleHandle(NULL), NULL); - assert(hEdit != NULL); - } - break; - - case WM_SIZE: - { - RECT rcClient; - GetClientRect(hWnd, &rcClient); - SetWindowPos(hEdit, NULL, 0, 0, rcClient.right, rcClient.bottom, SWP_NOZORDER); - } - break; - - case WM_CLOSE: - { - DestroyWindow(hWnd); - break; - } - - case WM_QUIT: - case WM_DESTROY: - { - PostQuitMessage(0); - IceUtil::StaticMutex::Lock sync(terminatedMutex); - appTerminated = true; - break; - } - - default: - return DefWindowProc(hWnd, msg, wParam, lParam); - } - return 0; -} - -int -TestApplication::main(HINSTANCE hInstance) -{ - WNDCLASS wc; - - wc.style = CS_HREDRAW|CS_VREDRAW; - wc.lpfnWndProc = (WNDPROC)WndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon(NULL, 0); - wc.hCursor = 0; - wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH); - wc.lpszMenuName = NULL; - wc.lpszClassName = windowClassName; - - if(!RegisterClass(&wc)) - { - MessageBox(NULL, L"Window Registration Failed!", L"Error!", MB_ICONEXCLAMATION | MB_OK); - return 0; - } - - wchar_t wName[1024] = L"Test"; - if(_name.size() > 0) - { - int len = _name.size(); - if(len > 1023) - { - len = 1023; - } - mbstowcs(wName, _name.c_str(), len); - wName[len] = L'\0'; - } - - RECT rect; - GetClientRect(GetDesktopWindow(), &rect); - int width = rect.right - rect.left; - if(width > 320) - { - width = 320; - } - int height = rect.bottom - rect.top; - if(height > 200) - { - height = 200; - } - mainWnd = CreateWindow(windowClassName, wName, WS_VISIBLE|WS_OVERLAPPED|WS_SYSMENU|WS_SIZEBOX, - CW_USEDEFAULT, CW_USEDEFAULT, width, height, - NULL, NULL, hInstance, NULL); - if(mainWnd == NULL) - { - MessageBox(NULL, L"Window Creation Failed!", L"Error!", MB_ICONEXCLAMATION | MB_OK); - return 0; - } - - ShowWindow(mainWnd, SW_SHOW); - UpdateWindow(mainWnd); - int status = EXIT_SUCCESS; - - try - { - extern int __argc; - extern char **__argv; - status = run(__argc, __argv); - } - catch(const TestSuiteFailed&) - { - tprintf("test failed\n"); - } - catch(const Exception& ex) - { - tprintf("%s\n", ex.toString().c_str()); - status = EXIT_FAILURE; - } - catch(const std::exception& ex) - { - tprintf("std::exception: %s\n", ex.what()); - status = EXIT_FAILURE; - } - catch(const string& msg) - { - tprintf("std::string: %s\n", msg.c_str()); - status = EXIT_FAILURE; - } - catch(const char* msg) - { - tprintf("const char*: %s\n", msg); - status = EXIT_FAILURE; - } - catch(...) - { - tprintf("unknown exception\n"); - status = EXIT_FAILURE; - } - - MSG Msg; - while(GetMessage(&Msg, NULL, 0, 0) > 0) - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - - if(_communicator) - { - try - { - _communicator->destroy(); - } - catch(const Exception& ex) - { - tprintf("communicator::destroy() failed: %s\n", ex.toString().c_str()); - status = EXIT_FAILURE; - } - _communicator = 0; - } - - return status; -} - -void -TestApplication::loadConfig(const PropertiesPtr& properties) -{ - // - // COMPILERBUG: For some unknown reason the simple approach - // doesn't work under WinCE if you compile with optimization. It - // looks like a compiler bug to me. - // - string config = "config"; - WIN32_FIND_DATA data; - HANDLE h = FindFirstFile(L"config", &data); - if(h == INVALID_HANDLE_VALUE) - { - config = "config.txt"; - HANDLE h = FindFirstFile(L"config.txt", &data); - if(h == INVALID_HANDLE_VALUE) - { - return; - } - } - FindClose(h); - - try - { - properties->load(config); - } - catch(const FileException&) - { - } -} -#else - -static IceUtil::StaticMutex tprintMutex = ICE_STATIC_MUTEX_INITIALIZER; - -void -tprintf(const char* fmt, ...) -{ - IceUtil::StaticMutex::Lock sync(tprintMutex); - - va_list va; - va_start(va, fmt); - char buf[1024]; - vprintf(fmt, va); - buf[sizeof(buf)-1] = '\0'; - va_end(va); - fflush(stdout); -} - -int -TestApplication::main(int ac, char* av[]) -{ - int status; - try - { - status = run(ac, av); - } - catch(const Exception& ex) - { - tprintf("%s\n", ex.toString().c_str()); - status = EXIT_FAILURE; - } - catch(const std::exception& ex) - { - tprintf("std::exception: %s\n", ex.what()); - status = EXIT_FAILURE; - } - catch(const string& msg) - { - tprintf("std::string: %s\n", msg.c_str()); - status = EXIT_FAILURE; - } - catch(const char* msg) - { - tprintf("const char*: %s\n", msg); - status = EXIT_FAILURE; - } - catch(...) - { - tprintf("unknown exception\n"); - status = EXIT_FAILURE; - } - if(_communicator) - { - try - { - _communicator->destroy(); - } - catch(const Exception& ex) - { - tprintf("communicator::destroy() failed: %s\n", ex.toString().c_str()); - status = EXIT_FAILURE; - } - _communicator = 0; - } - - return status; -} - -void -TestApplication::loadConfig(const PropertiesPtr& properties) -{ - try - { - properties->load("config"); - } - catch(const FileException&) - { - try - { - properties->load("config.txt"); - } - catch(const FileException&) - { - } - } -} - -#endif - -TestApplication::TestApplication(const std::string& name) - : _name(name) -{ -} - -LoggerPtr -TestApplication::getLogger() -{ - return new LoggerI(); -} - -void -TestApplication::setCommunicator(const CommunicatorPtr& communicator) -{ - _communicator = communicator; -#ifdef _WIN32_WCE - if(communicator->getProperties()->getPropertyWithDefault("LogToFile", "0") != "0") - { - _tprintfp = fopen(("log-" + _name + ".txt").c_str(), "w"); - } -#endif - -} - -CommunicatorPtr -TestApplication::communicator() -{ - return _communicator; -} - -bool -TestApplication::terminated() const -{ - IceUtil::StaticMutex::Lock sync(terminatedMutex); - return appTerminated; -} - -void -testFailed(const char* expr, const char* file, unsigned int line) -{ - tprintf("failed!\n"); - tprintf("%s:%u: assertion `%s' failed\n", file, line, expr); -#ifdef _WIN32_WCE - throw TestSuiteFailed(); -#else - abort(); -#endif -} diff --git a/cppe/test/IceE/Makefile b/cppe/test/IceE/Makefile deleted file mode 100644 index 126d9837eaf..00000000000 --- a/cppe/test/IceE/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = proxy \ - operations \ - exceptions \ - inheritance \ - facets \ - faultTolerance \ - location \ - adapterDeactivation \ - slicing \ - custom \ - retry \ - thread \ - uuid - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cppe/test/IceE/Makefile.mak b/cppe/test/IceE/Makefile.mak deleted file mode 100644 index 833bcb97cb8..00000000000 --- a/cppe/test/IceE/Makefile.mak +++ /dev/null @@ -1,35 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-SUBDIRS = proxy \
- operations \
- exceptions \
- inheritance \
- facets \
- location \
- slicing \
- custom \
- retry \
- thread \
- uuid
-
-!if "$(EMBEDDED_DEVICE)" == ""
-SUBDIRS = $(SUBDIRS) \
- faultTolerance \
- adapterDeactivation \
-!endif
-
-$(EVERYTHING)::
- @for %i in ( $(SUBDIRS) ) do \
- @echo "making $@ in %i" && \
- cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cppe/test/IceE/adapterDeactivation/.depend b/cppe/test/IceE/adapterDeactivation/.depend deleted file mode 100644 index 0bc2634552d..00000000000 --- a/cppe/test/IceE/adapterDeactivation/.depend +++ /dev/null @@ -1,9 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./TestI.h ./Test.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./Test.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./TestI.h ./Test.h -Collocated$(OBJEXT): Collocated.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -Test.cpp: Test.ice diff --git a/cppe/test/IceE/adapterDeactivation/.gitignore b/cppe/test/IceE/adapterDeactivation/.gitignore deleted file mode 100644 index d00d2864558..00000000000 --- a/cppe/test/IceE/adapterDeactivation/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -collocated -Test.cpp -Test.h diff --git a/cppe/test/IceE/adapterDeactivation/AllTests.cpp b/cppe/test/IceE/adapterDeactivation/AllTests.cpp deleted file mode 100644 index a0dc4e206fa..00000000000 --- a/cppe/test/IceE/adapterDeactivation/AllTests.cpp +++ /dev/null @@ -1,71 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <Test.h> - -using namespace std; -using namespace Ice; -using namespace Test; - -TestIntfPrx -allTests(const CommunicatorPtr& communicator) -{ - printf("testing stringToProxy..."); - string ref = communicator->getProperties()->getPropertyWithDefault("Test.Proxy", "test:default -p 12010 -t 10000"); - ObjectPrx base = communicator->stringToProxy(ref); - test(base); - printf("ok\n"); - - printf("testing checked cast..."); - TestIntfPrx obj = TestIntfPrx::checkedCast(base); - test(obj); - test(obj == base); - printf("ok\n"); - - { - printf("creating/destroying/recreating object adapter..."); - ObjectAdapterPtr adapter = - communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999"); - try - { - communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998"); - test(false); - } - catch(const AlreadyRegisteredException&) - { - } - adapter->destroy(); - adapter = communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999"); - adapter->destroy(); - printf("ok\n"); - } - - printf("creating/activating/deactivating object adapter in one operation..."); - obj->transient(); - printf("ok\n"); - - printf("deactivating object adapter in the server..."); - obj->deactivate(); - printf("ok\n"); - - printf("testing whether server is gone..."); - try - { - obj->ice_ping(); - test(false); - } - catch(const LocalException&) - { - printf("ok\n"); - } - - return obj; -} diff --git a/cppe/test/IceE/adapterDeactivation/Client.cpp b/cppe/test/IceE/adapterDeactivation/Client.cpp deleted file mode 100644 index 82319956283..00000000000 --- a/cppe/test/IceE/adapterDeactivation/Client.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <Test.h> - -using namespace std; -using namespace Ice; -using namespace Test; - -class AdapterDeactivationTestApplication : public TestApplication -{ -public: - - AdapterDeactivationTestApplication() - : TestApplication("adapter deactivation client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - TestIntfPrx allTests(const CommunicatorPtr&); - TestIntfPrx obj = allTests(communicator()); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - AdapterDeactivationTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - AdapterDeactivationTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/adapterDeactivation/Collocated.cpp b/cppe/test/IceE/adapterDeactivation/Collocated.cpp deleted file mode 100644 index a5df269f725..00000000000 --- a/cppe/test/IceE/adapterDeactivation/Collocated.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; -using namespace Ice; -using namespace Test; - -class AdapterDeactivationTestApplication : public TestApplication -{ -public: - - AdapterDeactivationTestApplication() - : TestApplication("adapter deactivation collocated") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new TestI; - adapter->add(object, communicator()->stringToIdentity("test")); - adapter->activate(); - - TestIntfPrx allTests(const CommunicatorPtr&); - allTests(communicator()); - - adapter->waitForDeactivate(); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - AdapterDeactivationTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - AdapterDeactivationTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/adapterDeactivation/Makefile b/cppe/test/IceE/adapterDeactivation/Makefile deleted file mode 100644 index f49c606c5ae..00000000000 --- a/cppe/test/IceE/adapterDeactivation/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -COLLOCATED = collocated - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -OBJS = Test.o \ - -COBJS = Client.o \ - AllTests.o - -SOBJS = TestI.o \ - Server.o - -COLOBJS = TestI.o \ - Collocated.o \ - AllTests.o - -SRCS = $(OBJS:.o=.cpp) \ - $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) \ - $(COLOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(TESTLIBS) - -$(SERVER): $(OBJS) $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(TESTLIBS) - -$(COLLOCATED): $(OBJS) $(COLOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/adapterDeactivation/Makefile.mak b/cppe/test/IceE/adapterDeactivation/Makefile.mak deleted file mode 100644 index 197e390a001..00000000000 --- a/cppe/test/IceE/adapterDeactivation/Makefile.mak +++ /dev/null @@ -1,63 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-COLLOCATED = collocated.exe
-
-TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS = Test.obj \
- Client.obj \
- AllTests.obj
-
-SOBJS = Test.obj \
- TestI.obj \
- Server.obj
-
-COLOBJS = Test.obj \
- TestI.obj \
- Collocated.obj \
- AllTests.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp) \
- $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
- $(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
-
-!include .depend
diff --git a/cppe/test/IceE/adapterDeactivation/Server.cpp b/cppe/test/IceE/adapterDeactivation/Server.cpp deleted file mode 100644 index c3a7d21d039..00000000000 --- a/cppe/test/IceE/adapterDeactivation/Server.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; -using namespace Ice; -using namespace Test; - -class AdapterDeactivationTestApplication : public TestApplication -{ -public: - - AdapterDeactivationTestApplication() - : TestApplication("adapter deactivation server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new TestI; - adapter->add(object, communicator()->stringToIdentity("test")); - adapter->activate(); - adapter->waitForDeactivate(); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - AdapterDeactivationTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - AdapterDeactivationTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/adapterDeactivation/Test.ice b/cppe/test/IceE/adapterDeactivation/Test.ice deleted file mode 100644 index a1b8d6f8ca7..00000000000 --- a/cppe/test/IceE/adapterDeactivation/Test.ice +++ /dev/null @@ -1,25 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -module Test -{ - -interface TestIntf -{ - void transient(); - - void deactivate(); -}; - -}; - -#endif diff --git a/cppe/test/IceE/adapterDeactivation/TestI.cpp b/cppe/test/IceE/adapterDeactivation/TestI.cpp deleted file mode 100644 index 6ec35fbac26..00000000000 --- a/cppe/test/IceE/adapterDeactivation/TestI.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestI.h> - -using namespace std; -using namespace Ice; - -void -TestI::transient(const Current& current) -{ - CommunicatorPtr communicator = current.adapter->getCommunicator(); - - ObjectAdapterPtr adapter = - communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999"); - adapter->activate(); - adapter->deactivate(); - adapter->waitForDeactivate(); -} - -void -TestI::deactivate(const Current& current) -{ - current.adapter->deactivate(); - IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(1)); -} diff --git a/cppe/test/IceE/adapterDeactivation/TestI.h b/cppe/test/IceE/adapterDeactivation/TestI.h deleted file mode 100644 index 5a3967562c7..00000000000 --- a/cppe/test/IceE/adapterDeactivation/TestI.h +++ /dev/null @@ -1,23 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_I_H -#define TEST_I_H - -#include <Test.h> - -class TestI : public Test::TestIntf -{ -public: - - virtual void transient(const Ice::Current&); - virtual void deactivate(const Ice::Current&); -}; - -#endif diff --git a/cppe/test/IceE/adapterDeactivation/run.py b/cppe/test/IceE/adapterDeactivation/run.py deleted file mode 100755 index 7408cefcab8..00000000000 --- a/cppe/test/IceE/adapterDeactivation/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "adapterDeactivation") - -TestUtil.clientServerTest(name) -TestUtil.collocatedTest(name) -sys.exit(0) diff --git a/cppe/test/IceE/custom/.depend b/cppe/test/IceE/custom/.depend deleted file mode 100644 index ee7382d93a7..00000000000 --- a/cppe/test/IceE/custom/.depend +++ /dev/null @@ -1,23 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./MyByteSeq.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Wstring$(OBJEXT): Wstring.cpp ./Wstring.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./Test.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./MyByteSeq.h ./StringConverterI.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../../include/IceE/Locator.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../include/TestCommon.h ./Test.h ./MyByteSeq.h ./Wstring.h -MyByteSeq$(OBJEXT): MyByteSeq.cpp ./MyByteSeq.h ../../../include/IceE/Config.h -StringConverterI$(OBJEXT): StringConverterI.cpp ../../../include/IceE/Config.h ./StringConverterI.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Exception.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Handle.h ../../../include/IceE/Shared.h ../../../include/IceE/Unicode.h -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./MyByteSeq.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -TestI$(OBJEXT): TestI.cpp ./TestI.h ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./MyByteSeq.h ../../include/TestCommon.h ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h -Wstring$(OBJEXT): Wstring.cpp ./Wstring.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -WstringI$(OBJEXT): WstringI.cpp ../../../include/IceE/Config.h ./WstringI.h ./Wstring.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./TestI.h ./Test.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./MyByteSeq.h ./WstringI.h ./Wstring.h ../../../include/IceE/UserExceptionFactory.h ./StringConverterI.h -MyByteSeq$(OBJEXT): MyByteSeq.cpp ./MyByteSeq.h ../../../include/IceE/Config.h -StringConverterI$(OBJEXT): StringConverterI.cpp ../../../include/IceE/Config.h ./StringConverterI.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Exception.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Handle.h ../../../include/IceE/Shared.h ../../../include/IceE/Unicode.h -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./MyByteSeq.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -TestI$(OBJEXT): TestI.cpp ./TestI.h ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./MyByteSeq.h ../../include/TestCommon.h ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h -Wstring$(OBJEXT): Wstring.cpp ./Wstring.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -WstringI$(OBJEXT): WstringI.cpp ../../../include/IceE/Config.h ./WstringI.h ./Wstring.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -Collocated$(OBJEXT): Collocated.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./TestI.h ./Test.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./MyByteSeq.h ./WstringI.h ./Wstring.h ../../../include/IceE/UserExceptionFactory.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../../include/IceE/Locator.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../include/TestCommon.h ./Test.h ./MyByteSeq.h ./Wstring.h -MyByteSeq$(OBJEXT): MyByteSeq.cpp ./MyByteSeq.h ../../../include/IceE/Config.h -StringConverterI$(OBJEXT): StringConverterI.cpp ../../../include/IceE/Config.h ./StringConverterI.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Exception.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Handle.h ../../../include/IceE/Shared.h ../../../include/IceE/Unicode.h -Test.cpp: Test.ice -Wstring.cpp: Wstring.ice diff --git a/cppe/test/IceE/custom/.gitignore b/cppe/test/IceE/custom/.gitignore deleted file mode 100644 index 396b1d158c3..00000000000 --- a/cppe/test/IceE/custom/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -collocated -Test.cpp -Wstring.cpp -Test.h -Wstring.h diff --git a/cppe/test/IceE/custom/AllTests.cpp b/cppe/test/IceE/custom/AllTests.cpp deleted file mode 100644 index b20aa745431..00000000000 --- a/cppe/test/IceE/custom/AllTests.cpp +++ /dev/null @@ -1,539 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <IceE/Locator.h> -#include <TestCommon.h> -#include <Test.h> -#include <Wstring.h> - -using namespace std; - -Test::TestIntfPrx -allTests(const Ice::CommunicatorPtr& communicator) -{ - tprintf("testing stringToProxy... "); - string ref = communicator->getProperties()->getPropertyWithDefault( - "Custom.Proxy", "test:default -p 12010 -t 10000"); - Ice::ObjectPrx base = communicator->stringToProxy(ref); - test(base); - tprintf("ok\n"); - - tprintf("testing checked cast... "); - Test::TestIntfPrx t = Test::TestIntfPrx::checkedCast(base); - test(t); - test(t == base); - tprintf("ok\n"); - - tprintf("testing alternate sequences... "); - - { - Test::BoolSeq in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - bool inArray[5]; - for(int i = 0; i < 5; ++i) - { - inArray[i] = in[i]; - } - pair<const bool*, const bool*> inPair(inArray, inArray + 5); - - Test::BoolSeq out; - Test::BoolSeq ret = t->opBoolArray(inPair, out); - test(out == in); - test(ret == in); - } - - { - Test::ByteList in; - Ice::Byte inArray[5]; - inArray[0] = '1'; - in.push_back(inArray[0]); - inArray[1] = '2'; - in.push_back(inArray[1]); - inArray[2] = '3'; - in.push_back(inArray[2]); - inArray[3] = '4'; - in.push_back(inArray[3]); - inArray[4] = '5'; - in.push_back(inArray[4]); - pair<const Ice::Byte*, const Ice::Byte*> inPair(inArray, inArray + 5); - - Test::ByteList out; - Test::ByteList ret = t->opByteArray(inPair, out); - test(out == in); - test(ret == in); - } - - { - Test::VariableList in; - Test::Variable inArray[5]; - inArray[0].s = "These"; - in.push_back(inArray[0]); - inArray[1].s = "are"; - in.push_back(inArray[1]); - inArray[2].s = "five"; - in.push_back(inArray[2]); - inArray[3].s = "short"; - in.push_back(inArray[3]); - inArray[4].s = "strings."; - in.push_back(inArray[4]); - pair<const Test::Variable*, const Test::Variable*> inPair(inArray, inArray + 5); - - Test::VariableList out; - Test::VariableList ret = t->opVariableArray(inPair, out); - test(out == in); - test(ret == in); - } - - { - Test::BoolSeq in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator> inPair(in.begin(), in.end()); - - Test::BoolSeq out; - Test::BoolSeq ret = t->opBoolRange(inPair, out); - test(out == in); - test(ret == in); - } - - { - Test::ByteList in; - in.push_back('1'); - in.push_back('2'); - in.push_back('3'); - in.push_back('4'); - in.push_back('5'); - pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> inPair(in.begin(), in.end()); - - Test::ByteList out; - Test::ByteList ret = t->opByteRange(inPair, out); - test(out == in); - test(ret == in); - } - - { - Test::VariableList in; - Test::Variable v; - v.s = "These"; - in.push_back(v); - v.s = "are"; - in.push_back(v); - v.s = "five"; - in.push_back(v); - v.s = "short"; - in.push_back(v); - v.s = "strings."; - in.push_back(v); - pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator> inPair(in.begin(), in.end()); - - Test::VariableList out; - Test::VariableList ret = t->opVariableRange(inPair, out); - test(out == in); - test(ret == in); - } - - { - Test::BoolSeq in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - bool inArray[5]; - for(int i = 0; i < 5; ++i) - { - inArray[i] = in[i]; - } - pair<const bool*, const bool*> inPair(inArray, inArray + 5); - - Test::BoolSeq out; - Test::BoolSeq ret = t->opBoolRangeType(inPair, out); - test(out == in); - test(ret == in); - } - - { - Test::ByteList in; - in.push_back('1'); - in.push_back('2'); - in.push_back('3'); - in.push_back('4'); - in.push_back('5'); - pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator> inPair(in.begin(), in.end()); - - Test::ByteList out; - Test::ByteList ret = t->opByteRangeType(inPair, out); - test(out == in); - test(ret == in); - } - - { - Test::VariableList in; - deque<Test::Variable> inSeq; - Test::Variable v; - v.s = "These"; - in.push_back(v); - inSeq.push_back(v); - v.s = "are"; - in.push_back(v); - inSeq.push_back(v); - v.s = "five"; - in.push_back(v); - inSeq.push_back(v); - v.s = "short"; - in.push_back(v); - inSeq.push_back(v); - v.s = "strings."; - in.push_back(v); - inSeq.push_back(v); - pair<deque<Test::Variable>::const_iterator, deque<Test::Variable>::const_iterator> - inPair(inSeq.begin(), inSeq.end()); - - Test::VariableList out; - Test::VariableList ret = t->opVariableRangeType(inPair, out); - test(out == in); - test(ret == in); - } - - { - deque<bool> in(5); - in[0] = false; - in[1] = true; - in[2] = true; - in[3] = false; - in[4] = true; - - deque<bool> out; - deque<bool> ret = t->opBoolSeq(in, out); - test(out == in); - test(ret == in); - } - - { - list<bool> in; - in.push_back(false); - in.push_back(true); - in.push_back(true); - in.push_back(false); - in.push_back(true); - - list<bool> out; - list<bool> ret = t->opBoolList(in, out); - test(out == in); - test(ret == in); - } - - { - deque< ::Ice::Byte> in(5); - in[0] = '1'; - in[1] = '2'; - in[2] = '3'; - in[3] = '4'; - in[4] = '5'; - - deque< ::Ice::Byte> out; - deque< ::Ice::Byte> ret = t->opByteSeq(in, out); - test(out == in); - test(ret == in); - } - - { - list< ::Ice::Byte> in; - in.push_back('1'); - in.push_back('2'); - in.push_back('3'); - in.push_back('4'); - in.push_back('5'); - - list< ::Ice::Byte> out; - list< ::Ice::Byte> ret = t->opByteList(in, out); - test(out == in); - test(ret == in); - } - - { - MyByteSeq in(5); - int i = 0; - for(MyByteSeq::iterator p = in.begin(); p != in.end(); ++p) - { - *p = '1' + i++; - } - - MyByteSeq out; - MyByteSeq ret = t->opMyByteSeq(in, out); - test(out == in); - test(ret == in); - } - - { - deque<string> in(5); - in[0] = "These"; - in[1] = "are"; - in[2] = "five"; - in[3] = "short"; - in[4] = "strings."; - - deque<string> out; - deque<string> ret = t->opStringSeq(in, out); - test(out == in); - test(ret == in); - } - - { - list<string> in; - in.push_back("These"); - in.push_back("are"); - in.push_back("five"); - in.push_back("short"); - in.push_back("strings."); - - list<string> out; - list<string> ret = t->opStringList(in, out); - test(out == in); - test(ret == in); - } - - { - deque<Test::Fixed> in(5); - in[0].s = 1; - in[1].s = 2; - in[2].s = 3; - in[3].s = 4; - in[4].s = 5; - - deque<Test::Fixed> out; - deque<Test::Fixed> ret = t->opFixedSeq(in, out); - test(out == in); - test(ret == in); - } - - { - list<Test::Fixed> in(5); - short num = 1; - for(list<Test::Fixed>::iterator p = in.begin(); p != in.end(); ++p) - { - (*p).s = num++; - } - - list<Test::Fixed> out; - list<Test::Fixed> ret = t->opFixedList(in, out); - test(out == in); - test(ret == in); - } - - { - deque<Test::Variable> in(5); - in[0].s = "These"; - in[1].s = "are"; - in[2].s = "five"; - in[3].s = "short"; - in[4].s = "strings."; - - deque<Test::Variable> out; - deque<Test::Variable> ret = t->opVariableSeq(in, out); - test(out == in); - test(ret == in); - } - - { - list<Test::Variable> in; - Test::Variable v; - v.s = "These"; - in.push_back(v); - v.s = "are"; - in.push_back(v); - v.s = "five"; - in.push_back(v); - v.s = "short"; - in.push_back(v); - v.s = "strings."; - in.push_back(v); - - list<Test::Variable> out; - list<Test::Variable> ret = t->opVariableList(in, out); - test(out == in); - test(ret == in); - } - - { - deque<Test::StringStringDict> in(5); - in[0]["A"] = "a"; - in[1]["B"] = "b"; - in[2]["C"] = "c"; - in[3]["D"] = "d"; - in[4]["E"] = "e"; - - deque<Test::StringStringDict> out; - deque<Test::StringStringDict> ret = t->opStringStringDictSeq(in, out); - test(out == in); - test(ret == in); - } - - { - list<Test::StringStringDict> in; - Test::StringStringDict ssd; - ssd["A"] = "a"; - in.push_back(ssd); - ssd["B"] = "b"; - in.push_back(ssd); - ssd["C"] = "c"; - in.push_back(ssd); - ssd["D"] = "d"; - in.push_back(ssd); - ssd["E"] = "e"; - in.push_back(ssd); - - list<Test::StringStringDict> out; - list<Test::StringStringDict> ret = t->opStringStringDictList(in, out); - test(out == in); - test(ret == in); - } - - { - deque<Test::E> in(5); - in[0] = Test::E1; - in[1] = Test::E2; - in[2] = Test::E3; - in[3] = Test::E1; - in[4] = Test::E3; - - deque<Test::E> out; - deque<Test::E> ret = t->opESeq(in, out); - test(out == in); - test(ret == in); - } - - { - list<Test::E> in; - in.push_back(Test::E1); - in.push_back(Test::E2); - in.push_back(Test::E3); - in.push_back(Test::E1); - in.push_back(Test::E3); - - list<Test::E> out; - list<Test::E> ret = t->opEList(in, out); - test(out == in); - test(ret == in); - } - - { - deque<Test::CPrx> in(5); - in[0] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000")); - in[1] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001")); - in[2] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002")); - in[3] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003")); - in[4] = Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004")); - - deque<Test::CPrx> out; - deque<Test::CPrx> ret = t->opCPrxSeq(in, out); - test(out == in); - test(ret == in); - } - - { - list<Test::CPrx> in; - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C1:default -p 12010 -t 10000"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C2:default -p 12010 -t 10001"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C3:default -p 12010 -t 10002"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C4:default -p 12010 -t 10003"))); - in.push_back(Test::CPrx::uncheckedCast(communicator->stringToProxy("C5:default -p 12010 -t 10004"))); - - list<Test::CPrx> out; - list<Test::CPrx> ret = t->opCPrxList(in, out); - test(out == in); - test(ret == in); - } - - tprintf("ok\n"); - -#ifdef ICEE_HAS_WSTRING - tprintf("testing wstring... "); - - Test1::WstringSeq wseq1; - wseq1.push_back(L"Wide String"); - - Test2::WstringSeq wseq2; - wseq2 = wseq1; - - Test1::WstringWStringDict wdict1; - wdict1[L"Key"] = L"Value"; - - Test2::WstringWStringDict wdict2; - wdict2 = wdict1; - - ref = communicator->getProperties()->getPropertyWithDefault( - "Custom.WstringProxy1", "wstring1:default -p 12010 -t 10000"); - base = communicator->stringToProxy(ref); - test(base); - Test1::WstringClassPrx wsc1 = Test1::WstringClassPrx::checkedCast(base); - test(t); - - ref = communicator->getProperties()->getPropertyWithDefault( - "Custom.WstringProxy2", "wstring2:default -p 12010 -t 10000"); - base = communicator->stringToProxy(ref); - test(base); - Test2::WstringClassPrx wsc2 = Test2::WstringClassPrx::checkedCast(base); - test(t); - - wstring wstr = L"A Wide String"; - wstring out; - wstring ret = wsc1->opString(wstr, out); - test(out == wstr); - test(ret == wstr); - - ret = wsc2->opString(wstr, out); - test(out == wstr); - test(ret == wstr); - - Test1::WstringStruct wss1; - wss1.s = wstr; - Test1::WstringStruct wss1out; - Test1::WstringStruct wss1ret = wsc1->opStruct(wss1, wss1out); - test(wss1out == wss1); - test(wss1ret == wss1); - - Test2::WstringStruct wss2; - wss2.s = wstr; - Test2::WstringStruct wss2out; - Test2::WstringStruct wss2ret = wsc2->opStruct(wss2, wss2out); - test(wss2out == wss2); - test(wss2ret == wss2); - - try - { - wsc1->throwExcept(wstr); - } - catch(const Test1::WstringException& ex) - { - test(ex.reason == wstr); - } - - try - { - wsc2->throwExcept(wstr); - } - catch(const Test2::WstringException& ex) - { - test(ex.reason == wstr); - } - - tprintf("ok\n"); -#endif - - return t; -} diff --git a/cppe/test/IceE/custom/Client.cpp b/cppe/test/IceE/custom/Client.cpp deleted file mode 100644 index 7afa380d5b0..00000000000 --- a/cppe/test/IceE/custom/Client.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <Test.h> -#include <StringConverterI.h> - -using namespace std; - -class CustomTestApplication : public TestApplication -{ -public: - - CustomTestApplication() : - TestApplication("custom client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); -#ifdef ICEE_HAS_WSTRING - initData.stringConverter = new Test::StringConverterI(); - initData.wstringConverter = new Test::WstringConverterI(); -#endif - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Test::TestIntfPrx allTests(const Ice::CommunicatorPtr&); - Test::TestIntfPrx test = allTests(communicator()); - test->shutdown(); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - CustomTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - CustomTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/custom/Collocated.cpp b/cppe/test/IceE/custom/Collocated.cpp deleted file mode 100644 index 56939344f73..00000000000 --- a/cppe/test/IceE/custom/Collocated.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <TestI.h> -#include <WstringI.h> - -using namespace std; - -class CustomTestApplication : public TestApplication -{ -public: - - CustomTestApplication() : - TestApplication("custom collocated") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - //initData.properties->setProperty("Ice.Trace.Network", "5"); - //initData.properties->setProperty("Ice.Trace.Protocol", "5"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - adapter->add(new TestIntfI(communicator()), communicator()->stringToIdentity("test")); -#ifdef ICEE_HAS_WSTRING - adapter->add(new Test1::WstringClassI, communicator()->stringToIdentity("wstring1")); - adapter->add(new Test2::WstringClassI, communicator()->stringToIdentity("wstring2")); -#endif - adapter->activate(); - - Test::TestIntfPrx allTests(const Ice::CommunicatorPtr&); - allTests(communicator()); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - CustomTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - CustomTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/custom/Makefile b/cppe/test/IceE/custom/Makefile deleted file mode 100644 index cd395edf2fa..00000000000 --- a/cppe/test/IceE/custom/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -COLLOCATED = collocated - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -COBJS = Test.o \ - Wstring.o \ - Client.o \ - AllTests.o \ - MyByteSeq.o \ - StringConverterI.o - -SOBJS = Test.o \ - TestI.o \ - Wstring.o \ - WstringI.o \ - Server.o \ - MyByteSeq.o \ - StringConverterI.o - -COLOBJS = Test.o \ - TestI.o \ - Wstring.o \ - WstringI.o \ - Collocated.o \ - AllTests.o \ - MyByteSeq.o \ - StringConverterI.o - -SRCS = $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) \ - $(COLOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice Wstring.ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -SLICE2CPPEFLAGS := $(SLICE2CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(TESTLIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(TESTLIBS) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COLOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/custom/Makefile.mak b/cppe/test/IceE/custom/Makefile.mak deleted file mode 100644 index 712f846660a..00000000000 --- a/cppe/test/IceE/custom/Makefile.mak +++ /dev/null @@ -1,76 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-COLLOCATED = collocated.exe
-
-TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS = Test.obj \
- Wstring.obj \
- Client.obj \
- AllTests.obj \
- MyByteSeq.obj \
- StringConverterI.obj
-
-SOBJS = Test.obj \
- Wstring.obj \
- TestI.obj \
- WstringI.obj \
- Server.obj \
- MyByteSeq.obj \
- StringConverterI.obj
-
-COLOBJS = Test.obj \
- Wstring.obj \
- TestI.obj \
- WstringI.obj \
- Collocated.obj \
- AllTests.obj \
- MyByteSeq.obj \
- StringConverterI.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp) \
- $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -Zm200 -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
- $(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
- del /q Wstring.cpp Wstring.h
- del /q WstringAMD.cpp WstringAMD.h
-
-!include .depend
diff --git a/cppe/test/IceE/custom/MyByteSeq.cpp b/cppe/test/IceE/custom/MyByteSeq.cpp deleted file mode 100644 index 9df5e556182..00000000000 --- a/cppe/test/IceE/custom/MyByteSeq.cpp +++ /dev/null @@ -1,104 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <MyByteSeq.h> -#include <cstdlib> - -MyByteSeq::MyByteSeq() - : _size(0), - _data(0) -{ -} - -MyByteSeq::MyByteSeq(size_t size) - : _size(size), - _data(0) -{ - if(_size != 0) - { - _data = (Ice::Byte*)malloc(_size); - } -} - -MyByteSeq::MyByteSeq(const MyByteSeq& seq) -{ - _size = seq._size; - if(_size != 0) - { - _data = (Ice::Byte*)malloc(_size); - memcpy(_data, seq._data, _size); - } - else - { - _data = 0; - } -} - -MyByteSeq::~MyByteSeq() -{ - if(_data != 0) - { - free(_data); - } -} - -size_t -MyByteSeq::size() const -{ - return _size; -} - -void -MyByteSeq::swap(MyByteSeq& seq) -{ - size_t tmpSize = seq._size; - Ice::Byte* tmpData = seq._data; - seq._size = _size; - seq._data = _data; - _size = tmpSize; - _data = tmpData; -} - -MyByteSeq::const_iterator -MyByteSeq::begin() const -{ - return _data; -} - -MyByteSeq::const_iterator -MyByteSeq::end() const -{ - return _data + _size; -} - -void -MyByteSeq::operator=(const MyByteSeq& rhs) -{ - if(_data != 0) - { - free(_data); - _data = 0; - } - _size = rhs._size; - if(_size != 0) - { - _data = (Ice::Byte*)malloc(_size); - memcpy(_data, rhs._data, _size); - } -} - -bool -MyByteSeq::operator==(const MyByteSeq& rhs) const -{ - if(_size != rhs._size) - { - return _size == rhs._size; - } - return memcmp(_data, rhs._data, _size) == 0; -} diff --git a/cppe/test/IceE/custom/MyByteSeq.h b/cppe/test/IceE/custom/MyByteSeq.h deleted file mode 100644 index 3ac58f7dd2c..00000000000 --- a/cppe/test/IceE/custom/MyByteSeq.h +++ /dev/null @@ -1,40 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_MY_BYTE_SEQ_H -#define TEST_MY_BYTE_SEQ_H - -#include <IceE/Config.h> - -class MyByteSeq -{ -public: - - typedef Ice::Byte* iterator; - typedef Ice::Byte* const_iterator; - - MyByteSeq(); - MyByteSeq(size_t); - MyByteSeq(const MyByteSeq&); - ~MyByteSeq(); - - size_t size() const; - void swap(MyByteSeq&); - const_iterator begin() const; - const_iterator end() const; - void operator=(const MyByteSeq&); - bool operator==(const MyByteSeq&) const; - -private: - - size_t _size; - Ice::Byte* _data; -}; - -#endif diff --git a/cppe/test/IceE/custom/Server.cpp b/cppe/test/IceE/custom/Server.cpp deleted file mode 100644 index be5a7c8f584..00000000000 --- a/cppe/test/IceE/custom/Server.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <TestI.h> -#include <WstringI.h> -#include <StringConverterI.h> - -using namespace std; - -class CustomTestApplication : public TestApplication -{ -public: - - CustomTestApplication() : - TestApplication("custom server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); -#ifdef ICEE_HAS_WSTRING - initData.stringConverter = new Test::StringConverterI(); - initData.wstringConverter = new Test::WstringConverterI(); -#endif - - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - //initData.properties->setProperty("Ice.Trace.Network", "5"); - //initData.properties->setProperty("Ice.Trace.Protocol", "5"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - adapter->add(new TestIntfI(communicator()), communicator()->stringToIdentity("test")); -#ifdef ICEE_HAS_WSTRING - adapter->add(new Test1::WstringClassI, communicator()->stringToIdentity("wstring1")); - adapter->add(new Test2::WstringClassI, communicator()->stringToIdentity("wstring2")); -#endif - adapter->activate(); - -#ifndef _WIN32_WCE - communicator()->waitForShutdown(); -#endif - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - CustomTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - CustomTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/custom/StringConverterI.cpp b/cppe/test/IceE/custom/StringConverterI.cpp deleted file mode 100644 index 3d4dfa54596..00000000000 --- a/cppe/test/IceE/custom/StringConverterI.cpp +++ /dev/null @@ -1,85 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/Config.h> - -#ifdef ICEE_HAS_WSTRING - -#include <StringConverterI.h> -#include <IceE/Unicode.h> - -using namespace std; - -Ice::Byte* -Test::StringConverterI::toUTF8(const char* sourceStart, const char* sourceEnd, Ice::UTF8Buffer& buffer) const -{ - size_t size = static_cast<size_t>(sourceEnd - sourceStart); - Ice::Byte* targetStart = buffer.getMoreBytes(size, 0); - Ice::Byte* targetEnd = targetStart + size; - - unsigned int j = size; - for(unsigned int i = 0; i < size; ++i) - { - targetStart[i] = sourceStart[--j]; - } - - return targetEnd; -} - -void -Test::StringConverterI::fromUTF8(const Ice::Byte* sourceStart, const Ice::Byte* sourceEnd, - string& target) const -{ - size_t size = static_cast<size_t>(sourceEnd - sourceStart); - target.resize(size); - - unsigned int j = size; - for(unsigned int i = 0; i < size; ++i) - { - target[i] = sourceStart[--j]; - } -} - - -Ice::Byte* -Test::WstringConverterI::toUTF8(const wchar_t* sourceStart, const wchar_t* sourceEnd, Ice::UTF8Buffer& buffer) const -{ - wstring ws(sourceStart, sourceEnd); - string s = IceUtil::wstringToString(ws); - - size_t size = s.size(); - Ice::Byte* targetStart = buffer.getMoreBytes(size, 0); - Ice::Byte* targetEnd = targetStart + size; - - unsigned int j = size; - for(unsigned int i = 0; i < size; ++i) - { - targetStart[i] = static_cast<Ice::Byte>(s[--j]); - } - return targetEnd; -} - -void -Test::WstringConverterI::fromUTF8(const Ice::Byte* sourceStart, const Ice::Byte* sourceEnd, - wstring& target) const -{ - size_t size = static_cast<size_t>(sourceEnd - sourceStart); - string s; - s.resize(size); - - unsigned int j = size; - for(unsigned int i = 0; i < size; ++i) - { - s[i] = sourceStart[--j]; - } - - target = IceUtil::stringToWstring(s); -} - -#endif diff --git a/cppe/test/IceE/custom/StringConverterI.h b/cppe/test/IceE/custom/StringConverterI.h deleted file mode 100644 index eacea6bc72b..00000000000 --- a/cppe/test/IceE/custom/StringConverterI.h +++ /dev/null @@ -1,49 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef STRING_CONVERTER_I_H -#define STRING_CONVERTER_I_H - -#include <IceE/Config.h> - -#ifdef ICEE_HAS_WSTRING - -#include <IceE/StringConverter.h> - -// -// Simple contrived string converters which simply reverse the order of the -// characters being sent. -// - -namespace Test -{ - -class StringConverterI : public Ice::StringConverter -{ -public: - - virtual Ice::Byte* toUTF8(const char*, const char*, Ice::UTF8Buffer&) const; - virtual void fromUTF8(const Ice::Byte* sourceStart, const Ice::Byte* sourceEnd, - std::string& target) const; -}; - -class WstringConverterI : public Ice::WstringConverter -{ -public: - - virtual Ice::Byte* toUTF8(const wchar_t*, const wchar_t*, Ice::UTF8Buffer&) const; - virtual void fromUTF8(const Ice::Byte* sourceStart, const Ice::Byte* sourceEnd, - std::wstring& target) const; -}; - -} - -#endif - -#endif diff --git a/cppe/test/IceE/custom/Test.ice b/cppe/test/IceE/custom/Test.ice deleted file mode 100644 index 2c2a014907d..00000000000 --- a/cppe/test/IceE/custom/Test.ice +++ /dev/null @@ -1,164 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -[["cpp:include:deque", "cpp:include:list", "cpp:include:MyByteSeq.h"]] - -module Test -{ - -sequence<bool> BoolSeq; -["cpp:type:std::list<bool>"] sequence<bool> BoolList; - -["cpp:type:std::list< ::Test::BoolList>"] sequence<BoolList> BoolListList; -sequence<BoolList> BoolListSeq; -["cpp:type:std::list< ::Test::BoolSeq>"] sequence<BoolSeq> BoolSeqList; - -sequence<byte> ByteSeq; -["cpp:type:std::list< ::Ice::Byte>"] sequence<byte> ByteList; - -["cpp:type:std::list< ::Test::ByteList>"] sequence<ByteList> ByteListList; -sequence<ByteList> ByteListSeq; -["cpp:type:std::list< ::Test::ByteSeq>"] sequence<ByteSeq> ByteSeqList; - -sequence<string> StringSeq; -["cpp:type:std::list<std::string>"] sequence<string> StringList; - -["cpp:type:std::list< ::Test::StringList>"] sequence<StringList> StringListList; -sequence<StringList> StringListSeq; -["cpp:type:std::list< ::Test::StringSeq>"] sequence<StringSeq> StringSeqList; - -struct Fixed -{ - short s; -}; - -sequence<Fixed> FixedSeq; -["cpp:type:std::list< ::Test::Fixed>"] sequence<Fixed> FixedList; - -["cpp:type:std::list< ::Test::FixedList>"] sequence<FixedList> FixedListList; -sequence<FixedList> FixedListSeq; -["cpp:type:std::list< ::Test::FixedSeq>"] sequence<FixedSeq> FixedSeqList; - -struct Variable -{ - string s; - BoolList bl; - ["cpp:type:std::list<std::string>"] StringSeq ss; -}; - -sequence<Variable> VariableSeq; -["cpp:type:std::list< ::Test::Variable>"] sequence<Variable> VariableList; - -["cpp:type:std::list< ::Test::VariableList>"] sequence<VariableList> VariableListList; -sequence<VariableList> VariableListSeq; -["cpp:type:std::list< ::Test::VariableSeq>"] sequence<VariableSeq> VariableSeqList; - -dictionary<string, string> StringStringDict; -sequence<StringStringDict> StringStringDictSeq; -["cpp:type:std::list< ::Test::StringStringDict>"] sequence<StringStringDict> StringStringDictList; - -["cpp:type:std::list< ::Test::StringStringDictList>"] sequence<StringStringDictList> StringStringDictListList; -sequence<StringStringDictList> StringStringDictListSeq; -["cpp:type:std::list< ::Test::StringStringDictSeq>"] sequence<StringStringDictSeq> StringStringDictSeqList; - -enum E { E1, E2, E3 }; -sequence<E> ESeq; -["cpp:type:std::list< ::Test::E>"] sequence<E> EList; - -["cpp:type:std::list< ::Test::EList>"] sequence<EList> EListList; -sequence<EList> EListSeq; -["cpp:type:std::list< ::Test::ESeq>"] sequence<ESeq> ESeqList; - -class C {}; -sequence<C*> CPrxSeq; -["cpp:type:std::list< ::Test::CPrx>"] sequence<C*> CPrxList; - -["cpp:type:std::list< ::Test::CPrxList>"] sequence<CPrxList> CPrxListList; -sequence<CPrxList> CPrxListSeq; -["cpp:type:std::list< ::Test::CPrxSeq>"] sequence<CPrxSeq> CPrxSeqList; - -class TestIntf -{ - BoolSeq opBoolArray(["cpp:array"] BoolSeq inSeq, out BoolSeq outSeq); - - ByteList opByteArray(["cpp:array"] ByteList inSeq, out ByteList outSeq); - - VariableList opVariableArray(["cpp:array"] VariableList inSeq, out VariableList outSeq); - - BoolSeq opBoolRange(["cpp:range"] BoolSeq inSeq, out BoolSeq outSeq); - - ByteList opByteRange(["cpp:range"] ByteList inSeq, out ByteList outSeq); - - VariableList opVariableRange(["cpp:range"] VariableList inSeq, out VariableList outSeq); - - BoolSeq opBoolRangeType(["cpp:range:array"] BoolSeq inSeq, out BoolSeq outSeq); - - ByteList opByteRangeType(["cpp:range:::Test::ByteList"] ByteList inSeq, out ByteList outSeq); - - VariableList - opVariableRangeType(["cpp:range:std::deque< ::Test::Variable>"] VariableList inSeq, out VariableList outSeq); - - ["cpp:type:std::deque<bool>"] BoolSeq - opBoolSeq(["cpp:type:std::deque<bool>"] BoolSeq inSeq, out ["cpp:type:std::deque<bool>"]BoolSeq outSeq); - - BoolList opBoolList(BoolList inSeq, out BoolList outSeq); - - ["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq - opByteSeq(["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq inSeq, - out ["cpp:type:std::deque< ::Ice::Byte>"] ByteSeq outSeq); - - ByteList opByteList(ByteList inSeq, out ByteList outSeq); - - ["cpp:type:MyByteSeq"] ByteSeq - opMyByteSeq(["cpp:type:MyByteSeq"] ByteSeq inSeq, out ["cpp:type:MyByteSeq"] ByteSeq outSeq); - - ["cpp:type:std::deque<std::string>"] StringSeq - opStringSeq(["cpp:type:std::deque<std::string>"] StringSeq inSeq, - out ["cpp:type:std::deque<std::string>"] StringSeq outSeq); - - StringList opStringList(StringList inSeq, out StringList outSeq); - - ["cpp:type:std::deque< ::Test::Fixed>"] FixedSeq - opFixedSeq(["cpp:type:std::deque< ::Test::Fixed>"] FixedSeq inSeq, - out ["cpp:type:std::deque< ::Test::Fixed>"] FixedSeq outSeq); - - FixedList opFixedList(FixedList inSeq, out FixedList outSeq); - - ["cpp:type:std::deque< ::Test::Variable>"] VariableSeq - opVariableSeq(["cpp:type:std::deque< ::Test::Variable>"] VariableSeq inSeq, - out ["cpp:type:std::deque< ::Test::Variable>"] VariableSeq outSeq); - - VariableList opVariableList(VariableList inSeq, out VariableList outSeq); - - ["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq - opStringStringDictSeq(["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq inSeq, - out ["cpp:type:std::deque< ::Test::StringStringDict>"] StringStringDictSeq outSeq); - - StringStringDictList opStringStringDictList(StringStringDictList inSeq, out StringStringDictList outSeq); - - ["cpp:type:std::deque< ::Test::E>"] ESeq - opESeq(["cpp:type:std::deque< ::Test::E>"] ESeq inSeq, out ["cpp:type:std::deque< ::Test::E>"] ESeq outSeq); - - EList opEList(EList inSeq, out EList outSeq); - - ["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq - opCPrxSeq(["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq inSeq, - out ["cpp:type:std::deque< ::Test::CPrx>"] CPrxSeq outSeq); - - CPrxList opCPrxList(CPrxList inSeq, out CPrxList outSeq); - - void shutdown(); -}; - -}; - -#endif diff --git a/cppe/test/IceE/custom/TestI.cpp b/cppe/test/IceE/custom/TestI.cpp deleted file mode 100644 index 01757278ab6..00000000000 --- a/cppe/test/IceE/custom/TestI.cpp +++ /dev/null @@ -1,261 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <TestI.h> -#include <TestCommon.h> - -TestIntfI::TestIntfI(const Ice::CommunicatorPtr& communicator) - : _communicator(communicator) -{ -} - -Test::BoolSeq -TestIntfI::opBoolArray(const std::pair<const bool*, const bool*>& inSeq, - Test::BoolSeq& outSeq, - const Ice::Current& current) -{ - Test::BoolSeq(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::ByteList -TestIntfI::opByteArray(const std::pair<const Ice::Byte*, const Ice::Byte*>& inSeq, - Test::ByteList& outSeq, - const Ice::Current& current) -{ - Test::ByteList(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::VariableList -TestIntfI::opVariableArray(const std::pair<const Test::Variable*, const Test::Variable*>& inSeq, - Test::VariableList& outSeq, - const Ice::Current& current) -{ - Test::VariableList(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::BoolSeq -TestIntfI::opBoolRange(const std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator>& inSeq, - Test::BoolSeq& outSeq, - const Ice::Current&) -{ - Test::BoolSeq(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::ByteList -TestIntfI::opByteRange(const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, - Test::ByteList& outSeq, - const Ice::Current&) -{ - Test::ByteList(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::VariableList -TestIntfI::opVariableRange( - const std::pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator>& inSeq, - Test::VariableList& outSeq, - const Ice::Current&) -{ - Test::VariableList(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::BoolSeq -TestIntfI::opBoolRangeType(const std::pair<const bool*, const bool*>& inSeq, - Test::BoolSeq& outSeq, - const Ice::Current&) -{ - Test::BoolSeq(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::ByteList -TestIntfI::opByteRangeType(const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, - Test::ByteList& outSeq, - const Ice::Current&) -{ - Test::ByteList(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -Test::VariableList -TestIntfI::opVariableRangeType( - const std::pair<std::deque<Test::Variable>::const_iterator, std::deque<Test::Variable>::const_iterator>& inSeq, - Test::VariableList& outSeq, - const Ice::Current&) -{ - Test::VariableList(inSeq.first, inSeq.second).swap(outSeq); - return outSeq; -} - -std::deque<bool> -TestIntfI::opBoolSeq(const std::deque<bool>& inSeq, - std::deque<bool>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::list<bool> -TestIntfI::opBoolList(const std::list<bool>& inSeq, - std::list<bool>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::deque< ::Ice::Byte> -TestIntfI::opByteSeq(const std::deque< ::Ice::Byte>& inSeq, - std::deque< ::Ice::Byte>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::list< ::Ice::Byte> -TestIntfI::opByteList(const std::list< ::Ice::Byte>& inSeq, - std::list< ::Ice::Byte>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -MyByteSeq -TestIntfI::opMyByteSeq(const MyByteSeq& inSeq, - MyByteSeq& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::deque< ::std::string> -TestIntfI::opStringSeq(const std::deque< ::std::string>& inSeq, - std::deque< ::std::string>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::list< ::std::string> -TestIntfI::opStringList(const std::list< ::std::string>& inSeq, - std::list< ::std::string>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::deque< ::Test::Fixed> -TestIntfI::opFixedSeq(const std::deque< ::Test::Fixed>& inSeq, - std::deque< ::Test::Fixed>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::list< ::Test::Fixed> -TestIntfI::opFixedList(const std::list< ::Test::Fixed>& inSeq, - std::list< ::Test::Fixed>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::deque< ::Test::Variable> -TestIntfI::opVariableSeq(const std::deque< ::Test::Variable>& inSeq, - std::deque< ::Test::Variable>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::list< ::Test::Variable> -TestIntfI::opVariableList(const std::list< ::Test::Variable>& inSeq, - std::list< ::Test::Variable>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::deque< ::Test::StringStringDict> -TestIntfI::opStringStringDictSeq(const std::deque< ::Test::StringStringDict>& inSeq, - std::deque< ::Test::StringStringDict>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::list< ::Test::StringStringDict> -TestIntfI::opStringStringDictList(const std::list< ::Test::StringStringDict>& inSeq, - std::list< ::Test::StringStringDict>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::deque< ::Test::E> -TestIntfI::opESeq(const std::deque< ::Test::E>& inSeq, - std::deque< ::Test::E>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::list< ::Test::E> -TestIntfI::opEList(const std::list< ::Test::E>& inSeq, - std::list< ::Test::E>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::deque< ::Test::CPrx> -TestIntfI::opCPrxSeq(const std::deque< ::Test::CPrx>& inSeq, - std::deque< ::Test::CPrx>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -std::list< ::Test::CPrx> -TestIntfI::opCPrxList(const std::list< ::Test::CPrx>& inSeq, - std::list< ::Test::CPrx>& outSeq, - const Ice::Current& current) -{ - outSeq = inSeq; - return inSeq; -} - -void -TestIntfI::shutdown(const Ice::Current& current) -{ - _communicator->shutdown(); -#ifdef _WIN32_WCE - tprintf("The server has shutdown, close the window to terminate the server."); -#endif -} diff --git a/cppe/test/IceE/custom/TestI.h b/cppe/test/IceE/custom/TestI.h deleted file mode 100644 index 3e5931e9691..00000000000 --- a/cppe/test/IceE/custom/TestI.h +++ /dev/null @@ -1,136 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_I_H -#define TEST_I_H - -#include <Test.h> - -class TestIntfI : virtual public Test::TestIntf -{ -public: - - TestIntfI(const Ice::CommunicatorPtr&); - - virtual Test::BoolSeq opBoolArray(const std::pair<const bool*, const bool*>&, - Test::BoolSeq&, - const Ice::Current&); - - virtual Test::ByteList opByteArray(const std::pair<const Ice::Byte*, const Ice::Byte*>&, - Test::ByteList&, - const Ice::Current&); - - virtual Test::VariableList opVariableArray(const std::pair<const Test::Variable*, const Test::Variable*>&, - Test::VariableList&, - const Ice::Current&); - - virtual Test::BoolSeq opBoolRange(const std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator>&, - Test::BoolSeq&, - const Ice::Current&); - - virtual Test::ByteList opByteRange(const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>&, - Test::ByteList&, - const Ice::Current&); - - virtual Test::VariableList - opVariableRange(const std::pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator>&, - Test::VariableList&, - const Ice::Current&); - - virtual Test::BoolSeq opBoolRangeType(const std::pair<const bool*, const bool*>&, - Test::BoolSeq&, - const Ice::Current&); - - virtual Test::ByteList opByteRangeType(const std::pair<Test::ByteList::const_iterator, - Test::ByteList::const_iterator>&, - Test::ByteList&, - const Ice::Current&); - - virtual Test::VariableList - opVariableRangeType(const std::pair<std::deque<Test::Variable>::const_iterator, - std::deque<Test::Variable>::const_iterator>&, - Test::VariableList&, - const Ice::Current&); - - virtual std::deque<bool> opBoolSeq(const std::deque<bool>&, - std::deque<bool>&, - const Ice::Current&); - - virtual std::list<bool> opBoolList(const std::list<bool>&, - std::list<bool>&, - const Ice::Current&); - - virtual std::deque< ::Ice::Byte> opByteSeq(const std::deque< ::Ice::Byte>&, - std::deque< ::Ice::Byte>&, - const Ice::Current&); - - virtual std::list< ::Ice::Byte> opByteList(const std::list< ::Ice::Byte>&, - std::list< ::Ice::Byte>&, - const Ice::Current&); - - virtual MyByteSeq opMyByteSeq(const MyByteSeq&, - MyByteSeq&, - const Ice::Current&); - - virtual std::deque< ::std::string> opStringSeq(const std::deque< ::std::string>&, - std::deque< ::std::string>&, - const Ice::Current&); - - virtual std::list< ::std::string> opStringList(const std::list< ::std::string>&, - std::list< ::std::string>&, - const Ice::Current&); - - virtual std::deque< ::Test::Fixed> opFixedSeq(const std::deque< ::Test::Fixed>&, - std::deque< ::Test::Fixed>&, - const Ice::Current&); - - virtual std::list< ::Test::Fixed> opFixedList(const std::list< ::Test::Fixed>&, - std::list< ::Test::Fixed>&, - const Ice::Current&); - - virtual std::deque< ::Test::Variable> opVariableSeq(const std::deque< ::Test::Variable>&, - std::deque< ::Test::Variable>&, - const Ice::Current&); - - virtual std::list< ::Test::Variable> opVariableList(const std::list< ::Test::Variable>&, - std::list< ::Test::Variable>&, - const Ice::Current&); - - virtual std::deque< ::Test::StringStringDict> opStringStringDictSeq(const std::deque< ::Test::StringStringDict>&, - std::deque< ::Test::StringStringDict>&, - const Ice::Current&); - - virtual std::list< ::Test::StringStringDict> opStringStringDictList(const std::list< ::Test::StringStringDict>&, - std::list< ::Test::StringStringDict>&, - const Ice::Current&); - - virtual std::deque< ::Test::E> opESeq(const std::deque< ::Test::E>&, - std::deque< ::Test::E>&, - const Ice::Current&); - - virtual std::list< ::Test::E> opEList(const std::list< ::Test::E>&, - std::list< ::Test::E>&, - const Ice::Current&); - - virtual std::deque< ::Test::CPrx> opCPrxSeq(const std::deque< ::Test::CPrx>&, - std::deque< ::Test::CPrx>&, - const Ice::Current&); - - virtual std::list< ::Test::CPrx> opCPrxList(const std::list< ::Test::CPrx>&, - std::list< ::Test::CPrx>&, - const Ice::Current&); - - virtual void shutdown(const Ice::Current&); - -private: - - Ice::CommunicatorPtr _communicator; -}; - -#endif diff --git a/cppe/test/IceE/custom/Wstring.ice b/cppe/test/IceE/custom/Wstring.ice deleted file mode 100644 index 5e9115f6595..00000000000 --- a/cppe/test/IceE/custom/Wstring.ice +++ /dev/null @@ -1,75 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef WSTRING_ICE -#define WSTRING_ICE - -["cpp:type:wstring"] module Test1 -{ - -sequence<string> WstringSeq; - -dictionary<string, string> WstringWStringDict; - -struct WstringStruct -{ - string s; -}; - -exception WstringException -{ - string reason; -}; - -class WstringClass -{ - string opString(string s1, out string s2); - - WstringStruct opStruct(WstringStruct s1, out WstringStruct s2); - - void throwExcept(string reason) - throws WstringException; - - string s; -}; - -}; - -module Test2 -{ - -sequence<["cpp:type:wstring"] string> WstringSeq; - -dictionary<["cpp:type:wstring"] string, ["cpp:type:wstring"] string> WstringWStringDict; - -["cpp:type:wstring"] struct WstringStruct -{ - string s; -}; - -["cpp:type:wstring"] exception WstringException -{ - string reason; -}; - -["cpp:type:wstring"] class WstringClass -{ - string opString(string s1, out string s2); - - WstringStruct opStruct(WstringStruct s1, out WstringStruct s2); - - void throwExcept(string reason) - throws WstringException; - - string s; -}; - -}; - -#endif diff --git a/cppe/test/IceE/custom/WstringI.cpp b/cppe/test/IceE/custom/WstringI.cpp deleted file mode 100644 index c8e5bc45677..00000000000 --- a/cppe/test/IceE/custom/WstringI.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/Config.h> - -#ifdef ICEE_HAS_WSTRING - -#include <WstringI.h> - -::std::wstring -Test1::WstringClassI::opString(const ::std::wstring& s1, - ::std::wstring& s2, - const Ice::Current& current) -{ - s2 = s1; - return s1; -} - -::Test1::WstringStruct -Test1::WstringClassI::opStruct(const ::Test1::WstringStruct& s1, - ::Test1::WstringStruct& s2, - const Ice::Current& current) -{ - s2 = s1; - return s1; -} - -void -Test1::WstringClassI::throwExcept(const ::std::wstring& reason, - const Ice::Current& current) -{ - Test1::WstringException ex; - ex.reason = reason; - throw ex; -} - -::std::wstring -Test2::WstringClassI::opString(const ::std::wstring& s1, - ::std::wstring& s2, - const Ice::Current& current) -{ - s2 = s1; - return s1; -} - -::Test2::WstringStruct -Test2::WstringClassI::opStruct(const ::Test2::WstringStruct& s1, - ::Test2::WstringStruct& s2, - const Ice::Current& current) -{ - s2 = s1; - return s1; -} - -void -Test2::WstringClassI::throwExcept(const ::std::wstring& reason, - const Ice::Current& current) -{ - Test2::WstringException ex; - ex.reason = reason; - throw ex; -} - -#endif diff --git a/cppe/test/IceE/custom/WstringI.h b/cppe/test/IceE/custom/WstringI.h deleted file mode 100644 index 6826c8a5f6f..00000000000 --- a/cppe/test/IceE/custom/WstringI.h +++ /dev/null @@ -1,63 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef WSTRING_I_H -#define WSTRING_I_H - -#include <IceE/Config.h> - -#ifdef ICEE_HAS_WSTRING - -#include <Wstring.h> - -namespace Test1 -{ - -class WstringClassI : virtual public WstringClass -{ -public: - - virtual ::std::wstring opString(const ::std::wstring&, - ::std::wstring&, - const Ice::Current&); - - virtual ::Test1::WstringStruct opStruct(const ::Test1::WstringStruct&, - ::Test1::WstringStruct&, - const Ice::Current&); - - virtual void throwExcept(const ::std::wstring&, - const Ice::Current&); -}; - -} - -namespace Test2 -{ - -class WstringClassI : virtual public WstringClass -{ -public: - - virtual ::std::wstring opString(const ::std::wstring&, - ::std::wstring&, - const Ice::Current&); - - virtual ::Test2::WstringStruct opStruct(const ::Test2::WstringStruct&, - ::Test2::WstringStruct&, - const Ice::Current&); - - virtual void throwExcept(const ::std::wstring&, - const Ice::Current&); -}; - -} - -#endif - -#endif diff --git a/cppe/test/IceE/custom/run.py b/cppe/test/IceE/custom/run.py deleted file mode 100755 index c3403057788..00000000000 --- a/cppe/test/IceE/custom/run.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "custom") - -print "tests with regular server." -TestUtil.clientServerTest(name) -print "tests with collocated server." -TestUtil.collocatedTest(name) -sys.exit(0) diff --git a/cppe/test/IceE/exceptions/.depend b/cppe/test/IceE/exceptions/.depend deleted file mode 100644 index 8c9ef0584ce..00000000000 --- a/cppe/test/IceE/exceptions/.depend +++ /dev/null @@ -1,11 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./Test.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./TestI.h ./Test.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./Test.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./TestI.h ./Test.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -Collocated$(OBJEXT): Collocated.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./Test.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -Test.cpp: Test.ice diff --git a/cppe/test/IceE/exceptions/.gitignore b/cppe/test/IceE/exceptions/.gitignore deleted file mode 100644 index d00d2864558..00000000000 --- a/cppe/test/IceE/exceptions/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -collocated -Test.cpp -Test.h diff --git a/cppe/test/IceE/exceptions/AllTests.cpp b/cppe/test/IceE/exceptions/AllTests.cpp deleted file mode 100644 index fd10dc105fa..00000000000 --- a/cppe/test/IceE/exceptions/AllTests.cpp +++ /dev/null @@ -1,516 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <Test.h> - -using namespace std; -using namespace Test; - -class EmptyI : virtual public Empty -{ -}; - -class CallbackBase : public IceUtil::Monitor<IceUtil::Mutex> -{ -public: - - CallbackBase() : - _called(false) - { - } - - virtual ~CallbackBase() - { - } - - bool check() - { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - while(!_called) - { - if(!timedWait(IceUtil::Time::seconds(5))) - { - return false; - } - } - _called = false; - return true; - } - -protected: - - void called() - { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - assert(!_called); - _called = true; - notify(); - } - -private: - - bool _called; -}; - -ThrowerPrx -allTests(const Ice::CommunicatorPtr& communicator) -{ - tprintf("testing toString()/what()... "); - { - A a; - string aMsg = "Test::A"; - - Ice::UnknownLocalException ule("thisFile", 99); - string uleMsg = "thisFile:99: Ice::UnknownLocalException:\nunknown local exception"; - - // - // Test toString(). - // - test(a.toString() == aMsg); - test(ule.toString() == uleMsg); - - // - // Test what(). (Called twice because of lazy initialization in what().) - // - test(aMsg == a.what()); - test(aMsg == a.what()); - - test(uleMsg == ule.what()); - test(uleMsg == ule.what()); - } - tprintf("ok\n"); - - tprintf("testing object adapter registration exceptions... "); - { - Ice::ObjectAdapterPtr first = communicator->createObjectAdapter("TestAdapter0"); - try - { - Ice::ObjectAdapterPtr second = communicator->createObjectAdapter("TestAdapter0"); - test(false); - } - catch(const Ice::AlreadyRegisteredException&) - { - // Expected - } - - communicator->getProperties()->setProperty("TestAdapter0.Endpoints", ""); - try - { - Ice::ObjectAdapterPtr second = - communicator->createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011 -t 10000"); - test(false); - } - catch(const Ice::AlreadyRegisteredException&) - { - // Expected. - } - // - // Properties must remain unaffected if an exception occurs. - // - test(communicator->getProperties()->getProperty("TestAdapter0.Endpoints") == ""); - first->deactivate(); - } - tprintf("ok\n"); - - tprintf("testing servant registration exceptions..."); - { - Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter1"); - Ice::ObjectPtr obj = new EmptyI; - adapter->add(obj, communicator->stringToIdentity("x")); - try - { - adapter->add(obj, communicator->stringToIdentity("x")); - test(false); - } - catch(const Ice::AlreadyRegisteredException&) - { - } - - adapter->remove(communicator->stringToIdentity("x")); - try - { - adapter->remove(communicator->stringToIdentity("x")); - test(false); - } - catch(const Ice::NotRegisteredException&) - { - } - - adapter->deactivate(); - } - tprintf("ok\n"); - - tprintf("testing stringToProxy..."); - string ref = communicator->getProperties()->getPropertyWithDefault( - "Exception.Proxy", "thrower:default -p 12010 -t 10000"); - Ice::ObjectPrx base = communicator->stringToProxy(ref); - test(base); - tprintf("ok\n"); - - tprintf("testing checked cast..."); - ThrowerPrx thrower = ThrowerPrx::checkedCast(base); - test(thrower); - test(thrower == base); - tprintf("ok\n"); - - tprintf("catching exact types..."); - - try - { - thrower->throwAasA(1); - test(false); - } - catch(const A& ex) - { - test(ex.aMem == 1); - } - catch(const Ice::Exception& ex) - { - tprintf("%s\n", ex.toString().c_str()); - test(false); - } - catch(...) - { - test(false); - } - - try - { - thrower->throwAorDasAorD(1); - test(false); - } - catch(const A& ex) - { - test(ex.aMem == 1); - } - catch(...) - { - test(false); - } - - try - { - thrower->throwAorDasAorD(-1); - test(false); - } - catch(const D& ex) - { - test(ex.dMem == -1); - } - catch(...) - { - test(false); - } - - try - { - thrower->throwBasB(1, 2); - test(false); - } - catch(const B& ex) - { - test(ex.aMem == 1); - test(ex.bMem == 2); - } - catch(...) - { - test(false); - } - - try - { - thrower->throwCasC(1, 2, 3); - test(false); - } - catch(const C& ex) - { - test(ex.aMem == 1); - test(ex.bMem == 2); - test(ex.cMem == 3); - } - catch(...) - { - test(false); - } - -#if (!defined(_MSC_VER) || _MSC_VER >= 1300) -// -// With VC6 SP5, there is no way to call ::A::__write from ::Mod::A -// - try - { - thrower->throwModA(1, 2); - test(false); - } - catch(const Mod::A& ex) - { - test(ex.aMem == 1); - test(ex.a2Mem == 2); - } - catch(const Ice::OperationNotExistException&) - { - // - // This operation is not supported in Java. - // - } - catch(...) - { - test(false); - } -#endif - - tprintf("ok\n"); - - tprintf("catching base types..."); - - try - { - thrower->throwBasB(1, 2); - test(false); - } - catch(const A& ex) - { - test(ex.aMem == 1); - } - catch(...) - { - test(false); - } - - try - { - thrower->throwCasC(1, 2, 3); - test(false); - } - catch(const B& ex) - { - test(ex.aMem == 1); - test(ex.bMem == 2); - } - catch(...) - { - test(false); - } - -#if (!defined(_MSC_VER) || _MSC_VER >= 1300) -// -// With VC6 SP5, there is no way to call ::A::__write from ::Mod::A -// - try - { - thrower->throwModA(1, 2); - test(false); - } - catch(const A& ex) - { - test(ex.aMem == 1); - } - catch(const Ice::OperationNotExistException&) - { - // - // This operation is not supported in Java. - // - } - catch(...) - { - test(false); - } -#endif - - tprintf("ok\n"); - - tprintf("catching derived types..."); - - try - { - thrower->throwBasA(1, 2); - test(false); - } - catch(const B& ex) - { - test(ex.aMem == 1); - test(ex.bMem == 2); - } - catch(...) - { - test(false); - } - - try - { - thrower->throwCasA(1, 2, 3); - test(false); - } - catch(const C& ex) - { - test(ex.aMem == 1); - test(ex.bMem == 2); - test(ex.cMem == 3); - } - catch(...) - { - test(false); - } - - try - { - thrower->throwCasB(1, 2, 3); - test(false); - } - catch(const C& ex) - { - test(ex.aMem == 1); - test(ex.bMem == 2); - test(ex.cMem == 3); - } - catch(...) - { - test(false); - } - - tprintf("ok\n"); - - if(thrower->supportsUndeclaredExceptions()) - { - tprintf("catching unknown user exception..."); - - try - { - thrower->throwUndeclaredA(1); - test(false); - } - catch(const Ice::UnknownUserException&) - { - } - catch(...) - { - test(false); - } - - try - { - thrower->throwUndeclaredB(1, 2); - test(false); - } - catch(const Ice::UnknownUserException&) - { - } - catch(...) - { - test(false); - } - - try - { - thrower->throwUndeclaredC(1, 2, 3); - test(false); - } - catch(const Ice::UnknownUserException&) - { - } - catch(...) - { - test(false); - } - - tprintf("ok\n"); - } - - tprintf("catching object not exist exception..."); - - Ice::Identity id = communicator->stringToIdentity("does not exist"); - try - { - ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_identity(id)); - thrower2->throwAasA(1); -// thrower2->ice_ping(); - test(false); - } - catch(const Ice::ObjectNotExistException& ex) - { - test(ex.id == id); - } - catch(...) - { - test(false); - } - - tprintf("ok\n"); - - tprintf("catching facet not exist exception..."); - - ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower, "no such facet"); - try - { - thrower2->ice_ping(); - test(false); - } - catch(const Ice::FacetNotExistException& ex) - { - test(ex.facet == "no such facet"); - } - tprintf("ok\n"); - - tprintf("catching operation not exist exception..."); - - try - { - WrongOperationPrx thrower2 = WrongOperationPrx::uncheckedCast(thrower); - thrower2->noSuchOperation(); - test(false); - } - catch(const Ice::OperationNotExistException& ex) - { - test(ex.operation == "noSuchOperation"); - } - catch(...) - { - test(false); - } - - tprintf("ok\n"); - - tprintf("catching unknown local exception..."); - - try - { - thrower->throwLocalException(); - test(false); - } - catch(const Ice::UnknownLocalException&) - { - } - catch(...) - { - test(false); - } - - tprintf("ok\n"); - - tprintf("catching unknown non-Ice exception..."); - - try - { - thrower->throwNonIceException(); - test(false); - } - catch(const Ice::UnknownException&) - { - } - catch(...) - { - assert(false); - } - - tprintf("ok\n"); - - return thrower; -} diff --git a/cppe/test/IceE/exceptions/Client.cpp b/cppe/test/IceE/exceptions/Client.cpp deleted file mode 100644 index cac3dbc7454..00000000000 --- a/cppe/test/IceE/exceptions/Client.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <Test.h> - -using namespace std; -using namespace Test; - -class ExceptionsTestApplication : public TestApplication -{ -public: - - ExceptionsTestApplication() : - TestApplication("exceptions client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - ThrowerPrx allTests(const Ice::CommunicatorPtr&); - ThrowerPrx thrower = allTests(communicator()); - thrower->shutdown(); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - ExceptionsTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - ExceptionsTestApplication app; - return app.main(argc, argv); -} - -#endif - diff --git a/cppe/test/IceE/exceptions/Collocated.cpp b/cppe/test/IceE/exceptions/Collocated.cpp deleted file mode 100644 index 96d22da15a7..00000000000 --- a/cppe/test/IceE/exceptions/Collocated.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; -using namespace Test; - -class ExceptionsTestApplication : public TestApplication -{ -public: - - ExceptionsTestApplication() : - TestApplication("exceptions collocated") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - initData.properties->setProperty("Ice.Warn.Dispatch", "0"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new ThrowerI(adapter); - adapter->add(object, communicator()->stringToIdentity("thrower")); - adapter->activate(); - - ThrowerPrx allTests(const Ice::CommunicatorPtr&); - allTests(communicator()); - - return EXIT_SUCCESS; - } - -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - ExceptionsTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - ExceptionsTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/exceptions/Makefile b/cppe/test/IceE/exceptions/Makefile deleted file mode 100644 index 0d65ff1be1f..00000000000 --- a/cppe/test/IceE/exceptions/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -COLLOCATED = collocated - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -COBJS = Test.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - TestI.o \ - Server.o - -COLOBJS = Test.o \ - TestI.o \ - Collocated.o \ - AllTests.o - -SRCS = $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) \ - $(COLOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(TESTLIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(TESTLIBS) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COLOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/exceptions/Makefile.mak b/cppe/test/IceE/exceptions/Makefile.mak deleted file mode 100644 index 197e390a001..00000000000 --- a/cppe/test/IceE/exceptions/Makefile.mak +++ /dev/null @@ -1,63 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-COLLOCATED = collocated.exe
-
-TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS = Test.obj \
- Client.obj \
- AllTests.obj
-
-SOBJS = Test.obj \
- TestI.obj \
- Server.obj
-
-COLOBJS = Test.obj \
- TestI.obj \
- Collocated.obj \
- AllTests.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp) \
- $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
- $(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
-
-!include .depend
diff --git a/cppe/test/IceE/exceptions/Server.cpp b/cppe/test/IceE/exceptions/Server.cpp deleted file mode 100644 index 8102bb62f3a..00000000000 --- a/cppe/test/IceE/exceptions/Server.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -class ExceptionsTestApplication : public TestApplication -{ -public: - - ExceptionsTestApplication() : - TestApplication("exceptions server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - initData.properties->setProperty("Ice.Warn.Dispatch", "0"); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new ThrowerI(adapter); - adapter->add(object, communicator()->stringToIdentity("thrower")); - adapter->activate(); - -#ifndef _WIN32_WCE - communicator()->waitForShutdown(); -#endif - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - ExceptionsTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - ExceptionsTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/exceptions/Test.ice b/cppe/test/IceE/exceptions/Test.ice deleted file mode 100644 index 9665ca7396a..00000000000 --- a/cppe/test/IceE/exceptions/Test.ice +++ /dev/null @@ -1,82 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -module Test -{ - -interface Empty -{ -}; - -interface Thrower; - -exception A -{ - int aMem; -}; - -exception B extends A -{ - int bMem; -}; - -exception C extends B -{ - int cMem; -}; - -exception D -{ - int dMem; -}; - -module Mod -{ - exception A extends ::Test::A - { - int a2Mem; - }; -}; - - -interface Thrower -{ - void shutdown(); - bool supportsUndeclaredExceptions(); - bool supportsAssertException(); - - void throwAasA(int a) throws A; - void throwAorDasAorD(int a) throws A, D; - void throwBasA(int a, int b) throws A; - void throwCasA(int a, int b, int c) throws A; - void throwBasB(int a, int b) throws B; - void throwCasB(int a, int b, int c) throws B; - void throwCasC(int a, int b, int c) throws C; - - void throwModA(int a, int a2) throws Mod::A; - - void throwUndeclaredA(int a); - void throwUndeclaredB(int a, int b); - void throwUndeclaredC(int a, int b, int c); - void throwLocalException(); - void throwNonIceException(); - void throwAssertException(); -}; - -interface WrongOperation -{ - void noSuchOperation(); -}; - -}; - -#endif diff --git a/cppe/test/IceE/exceptions/TestI.cpp b/cppe/test/IceE/exceptions/TestI.cpp deleted file mode 100644 index cf098b64ced..00000000000 --- a/cppe/test/IceE/exceptions/TestI.cpp +++ /dev/null @@ -1,156 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestI.h> - -using namespace Test; - -ThrowerI::ThrowerI(const Ice::ObjectAdapterPtr& adapter) : - _adapter(adapter) -{ -} - -void -ThrowerI::shutdown(const Ice::Current&) -{ - _adapter->getCommunicator()->shutdown(); -#ifdef _WIN32_WCE - tprintf("The server has shutdown, close the window to terminate the server."); -#endif -} - -bool -ThrowerI::supportsUndeclaredExceptions(const Ice::Current&) -{ - return true; -} - -bool -ThrowerI::supportsAssertException(const Ice::Current&) -{ - return false; -} - -void -ThrowerI::throwAasA(Ice::Int a, const Ice::Current&) -{ - A ex; - ex.aMem = a; - throw ex; -} - -void -ThrowerI::throwAorDasAorD(Ice::Int a, const Ice::Current&) -{ - if(a > 0) - { - A ex; - ex.aMem = a; - throw ex; - } - else - { - D ex; - ex.dMem = a; - throw ex; - } -} - -void -ThrowerI::throwBasA(Ice::Int a, Ice::Int b, const Ice::Current& current) -{ - throwBasB(a, b, current); -} - -void -ThrowerI::throwCasA(Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current& current) -{ - throwCasC(a, b, c, current); -} - -void -ThrowerI::throwBasB(Ice::Int a, Ice::Int b, const Ice::Current&) -{ - B ex; - ex.aMem = a; - ex.bMem = b; - throw ex; -} - -void -ThrowerI::throwCasB(Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current& current) -{ - throwCasC(a, b, c, current); -} - -void -ThrowerI::throwCasC(Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current&) -{ - C ex; - ex.aMem = a; - ex.bMem = b; - ex.cMem = c; - throw ex; -} - -void -ThrowerI::throwModA(Ice::Int a, Ice::Int a2, const Ice::Current&) -{ - Mod::A ex; - ex.aMem = a; - ex.a2Mem = a2; - throw ex; -} - -void -ThrowerI::throwUndeclaredA(Ice::Int a, const Ice::Current&) -{ - A ex; - ex.aMem = a; - throw ex; -} - -void -ThrowerI::throwUndeclaredB(Ice::Int a, Ice::Int b, const Ice::Current&) -{ - B ex; - ex.aMem = a; - ex.bMem = b; - throw ex; -} - -void -ThrowerI::throwUndeclaredC(Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current&) -{ - C ex; - ex.aMem = a; - ex.bMem = b; - ex.cMem = c; - throw ex; -} - -void -ThrowerI::throwLocalException(const Ice::Current&) -{ - throw Ice::TimeoutException(__FILE__, __LINE__); -} - -void -ThrowerI::throwNonIceException(const Ice::Current&) -{ - throw int(12345); -} - -void -ThrowerI::throwAssertException(const Ice::Current&) -{ - assert(false); // Not supported in C++. -} diff --git a/cppe/test/IceE/exceptions/TestI.h b/cppe/test/IceE/exceptions/TestI.h deleted file mode 100644 index 949bd005c4a..00000000000 --- a/cppe/test/IceE/exceptions/TestI.h +++ /dev/null @@ -1,47 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_I_H -#define TEST_I_H - -#include <Test.h> - -class ThrowerI : public Test::Thrower -{ -public: - - ThrowerI(const Ice::ObjectAdapterPtr&); - - virtual void shutdown(const Ice::Current&); - virtual bool supportsUndeclaredExceptions(const Ice::Current&); - virtual bool supportsAssertException(const Ice::Current&); - - virtual void throwAasA(Ice::Int, const Ice::Current&); - virtual void throwAorDasAorD(Ice::Int, const Ice::Current&); - virtual void throwBasA(Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwCasA(Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwBasB(Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwCasB(Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwCasC(Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - - virtual void throwModA(Ice::Int, Ice::Int, const Ice::Current&); - - virtual void throwUndeclaredA(Ice::Int, const Ice::Current&); - virtual void throwUndeclaredB(Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwUndeclaredC(Ice::Int, Ice::Int, Ice::Int, const Ice::Current&); - virtual void throwLocalException(const Ice::Current&); - virtual void throwNonIceException(const Ice::Current&); - virtual void throwAssertException(const Ice::Current&); - -private: - - Ice::ObjectAdapterPtr _adapter; -}; - -#endif diff --git a/cppe/test/IceE/exceptions/run.py b/cppe/test/IceE/exceptions/run.py deleted file mode 100755 index d38965da5e6..00000000000 --- a/cppe/test/IceE/exceptions/run.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "exceptions") - -print "tests with regular server." -TestUtil.clientServerTest(name) -print "tests with collocated server." -TestUtil.collocatedTest(name) -sys.exit(0) diff --git a/cppe/test/IceE/facets/.depend b/cppe/test/IceE/facets/.depend deleted file mode 100644 index 65d0eb6f73a..00000000000 --- a/cppe/test/IceE/facets/.depend +++ /dev/null @@ -1,9 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./TestI.h ./Test.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./Test.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./TestI.h ./Test.h -Collocated$(OBJEXT): Collocated.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -Test.cpp: Test.ice diff --git a/cppe/test/IceE/facets/.gitignore b/cppe/test/IceE/facets/.gitignore deleted file mode 100644 index d00d2864558..00000000000 --- a/cppe/test/IceE/facets/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -collocated -Test.cpp -Test.h diff --git a/cppe/test/IceE/facets/AllTests.cpp b/cppe/test/IceE/facets/AllTests.cpp deleted file mode 100644 index 1db86d5cf4c..00000000000 --- a/cppe/test/IceE/facets/AllTests.cpp +++ /dev/null @@ -1,162 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <Test.h> - -using namespace std; -using namespace Test; - -class EmptyI : virtual public Empty -{ -}; - -GPrx -allTests(const Ice::CommunicatorPtr& communicator) -{ - tprintf("testing facet registration exceptions... "); - Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("FacetExceptionTestAdapter"); - Ice::ObjectPtr obj = new EmptyI; - adapter->add(obj, communicator->stringToIdentity("d")); - adapter->addFacet(obj, communicator->stringToIdentity("d"), "facetABCD"); - try - { - adapter->addFacet(obj, communicator->stringToIdentity("d"), "facetABCD"); - test(false); - } - catch(Ice::AlreadyRegisteredException&) - { - } - adapter->removeFacet(communicator->stringToIdentity("d"), "facetABCD"); - try - { - adapter->removeFacet(communicator->stringToIdentity("d"), "facetABCD"); - test(false); - } - catch(Ice::NotRegisteredException&) - { - } - tprintf("ok\n"); - - tprintf("testing removeAllFacets... "); - Ice::ObjectPtr obj1 = new EmptyI; - Ice::ObjectPtr obj2 = new EmptyI; - adapter->addFacet(obj1, communicator->stringToIdentity("id1"), "f1"); - adapter->addFacet(obj2, communicator->stringToIdentity("id1"), "f2"); - Ice::ObjectPtr obj3 = new EmptyI; - adapter->addFacet(obj1, communicator->stringToIdentity("id2"), "f1"); - adapter->addFacet(obj2, communicator->stringToIdentity("id2"), "f2"); - adapter->addFacet(obj3, communicator->stringToIdentity("id2"), ""); - Ice::FacetMap fm = adapter->removeAllFacets(communicator->stringToIdentity("id1")); - test(fm.size() == 2); - test(fm["f1"] == obj1); - test(fm["f2"] == obj2); - try - { - adapter->removeAllFacets(communicator->stringToIdentity("id1")); - test(false); - } - catch(Ice::NotRegisteredException&) - { - } - fm = adapter->removeAllFacets(communicator->stringToIdentity("id2")); - test(fm.size() == 3); - test(fm["f1"] == obj1); - test(fm["f2"] == obj2); - test(fm[""] == obj3); - tprintf("ok\n"); - - adapter->deactivate(); - - tprintf("testing stringToProxy... "); - string ref = communicator->getProperties()->getPropertyWithDefault("Facets.Proxy", "d:default -p 12010 -t 10000"); - Ice::ObjectPrx db = communicator->stringToProxy(ref); - test(db); - tprintf("ok\n"); - - tprintf("testing unchecked cast... "); - Ice::ObjectPrx prx = Ice::ObjectPrx::uncheckedCast(db); - test(prx->ice_getFacet().empty()); - prx = Ice::ObjectPrx::uncheckedCast(db, "facetABCD"); - test(prx->ice_getFacet() == "facetABCD"); - Ice::ObjectPrx prx2 = Ice::ObjectPrx::uncheckedCast(prx); - test(prx2->ice_getFacet() == "facetABCD"); - Ice::ObjectPrx prx3 = Ice::ObjectPrx::uncheckedCast(prx, ""); - test(prx3->ice_getFacet().empty()); - DPrx d = Test::DPrx::uncheckedCast(db); - test(d->ice_getFacet().empty()); - DPrx df = Test::DPrx::uncheckedCast(db, "facetABCD"); - test(df->ice_getFacet() == "facetABCD"); - DPrx df2 = Test::DPrx::uncheckedCast(df); - test(df2->ice_getFacet() == "facetABCD"); - DPrx df3 = Test::DPrx::uncheckedCast(df, ""); - test(df3->ice_getFacet().empty()); - tprintf("ok\n"); - - tprintf("testing checked cast... "); - prx = Ice::ObjectPrx::checkedCast(db); - test(prx->ice_getFacet().empty()); - prx = Ice::ObjectPrx::checkedCast(db, "facetABCD"); - test(prx->ice_getFacet() == "facetABCD"); - prx2 = Ice::ObjectPrx::checkedCast(prx); - test(prx2->ice_getFacet() == "facetABCD"); - prx3 = Ice::ObjectPrx::checkedCast(prx, ""); - test(prx3->ice_getFacet().empty()); - d = Test::DPrx::checkedCast(db); - test(d->ice_getFacet().empty()); - df = Test::DPrx::checkedCast(db, "facetABCD"); - test(df->ice_getFacet() == "facetABCD"); - df2 = Test::DPrx::checkedCast(df); - test(df2->ice_getFacet() == "facetABCD"); - df3 = Test::DPrx::checkedCast(df, ""); - test(df3->ice_getFacet().empty()); - tprintf("ok\n"); - - tprintf("testing non-facets A, B, C, and D... "); - d = DPrx::checkedCast(db); - test(d); - test(d == db); - test(d->callA() == "A"); - test(d->callB() == "B"); - test(d->callC() == "C"); - test(d->callD() == "D"); - tprintf("ok\n"); - - tprintf("testing facets A, B, C, and D... "); - df = DPrx::checkedCast(d, "facetABCD"); - test(df); - test(df->callA() == "A"); - test(df->callB() == "B"); - test(df->callC() == "C"); - test(df->callD() == "D"); - tprintf("ok\n"); - - tprintf("testing facets E and F... "); - FPrx ff = FPrx::checkedCast(d, "facetEF"); - test(ff); - test(ff->callE() == "E"); - test(ff->callF() == "F"); - tprintf("ok\n"); - - tprintf("testing facet G... "); - GPrx gf = GPrx::checkedCast(ff, "facetGH"); - test(gf); - test(gf->callG() == "G"); - tprintf("ok\n"); - - tprintf("testing whether casting preserves the facet... "); - HPrx hf = HPrx::checkedCast(gf); - test(hf); - test(hf->callG() == "G"); - test(hf->callH() == "H"); - tprintf("ok\n"); - - return gf; -} diff --git a/cppe/test/IceE/facets/Client.cpp b/cppe/test/IceE/facets/Client.cpp deleted file mode 100644 index a386b41152d..00000000000 --- a/cppe/test/IceE/facets/Client.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <Test.h> - -using namespace std; -using namespace Test; - -class FacetsTestApplication : public TestApplication -{ -public: - - FacetsTestApplication() : - TestApplication("facets client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - GPrx allTests(const Ice::CommunicatorPtr&); - GPrx g = allTests(communicator()); - g->shutdown(); - - return EXIT_SUCCESS; - } - -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - FacetsTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - FacetsTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/facets/Collocated.cpp b/cppe/test/IceE/facets/Collocated.cpp deleted file mode 100644 index 3cfa8fe27cd..00000000000 --- a/cppe/test/IceE/facets/Collocated.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; -using namespace Test; - -class FacetsTestApplication : public TestApplication -{ -public: - - FacetsTestApplication() : - TestApplication("facets collocated") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr d = new DI; - adapter->add(d, communicator()->stringToIdentity("d")); - adapter->addFacet(d, communicator()->stringToIdentity("d"), "facetABCD"); - Ice::ObjectPtr f = new FI; - adapter->addFacet(f, communicator()->stringToIdentity("d"), "facetEF"); - Ice::ObjectPtr h = new HI(communicator()); - adapter->addFacet(h, communicator()->stringToIdentity("d"), "facetGH"); - adapter->activate(); - - GPrx allTests(const Ice::CommunicatorPtr&); - allTests(communicator()); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - FacetsTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - FacetsTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/facets/Makefile b/cppe/test/IceE/facets/Makefile deleted file mode 100644 index f49c606c5ae..00000000000 --- a/cppe/test/IceE/facets/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -COLLOCATED = collocated - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -OBJS = Test.o \ - -COBJS = Client.o \ - AllTests.o - -SOBJS = TestI.o \ - Server.o - -COLOBJS = TestI.o \ - Collocated.o \ - AllTests.o - -SRCS = $(OBJS:.o=.cpp) \ - $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) \ - $(COLOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(TESTLIBS) - -$(SERVER): $(OBJS) $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(TESTLIBS) - -$(COLLOCATED): $(OBJS) $(COLOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/facets/Makefile.mak b/cppe/test/IceE/facets/Makefile.mak deleted file mode 100644 index 197e390a001..00000000000 --- a/cppe/test/IceE/facets/Makefile.mak +++ /dev/null @@ -1,63 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-COLLOCATED = collocated.exe
-
-TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS = Test.obj \
- Client.obj \
- AllTests.obj
-
-SOBJS = Test.obj \
- TestI.obj \
- Server.obj
-
-COLOBJS = Test.obj \
- TestI.obj \
- Collocated.obj \
- AllTests.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp) \
- $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
- $(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
-
-!include .depend
diff --git a/cppe/test/IceE/facets/Server.cpp b/cppe/test/IceE/facets/Server.cpp deleted file mode 100644 index f12c84bc1a8..00000000000 --- a/cppe/test/IceE/facets/Server.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -class FacetsTestApplication : public TestApplication -{ -public: - - FacetsTestApplication() : - TestApplication("facets server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr d = new DI; - adapter->add(d, communicator()->stringToIdentity("d")); - adapter->addFacet(d, communicator()->stringToIdentity("d"), "facetABCD"); - Ice::ObjectPtr f = new FI; - adapter->addFacet(f, communicator()->stringToIdentity("d"), "facetEF"); - Ice::ObjectPtr h = new HI(communicator()); - adapter->addFacet(h, communicator()->stringToIdentity("d"), "facetGH"); - - adapter->activate(); - -#ifndef _WIN32_WCE - communicator()->waitForShutdown(); -#endif - - return EXIT_SUCCESS; - } - -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - FacetsTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - FacetsTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/facets/Test.ice b/cppe/test/IceE/facets/Test.ice deleted file mode 100644 index dfb515f5357..00000000000 --- a/cppe/test/IceE/facets/Test.ice +++ /dev/null @@ -1,63 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -module Test -{ - -interface Empty -{ -}; - -interface A -{ - string callA(); -}; - -interface B extends A -{ - string callB(); -}; - -interface C extends A -{ - string callC(); -}; - -interface D extends B, C -{ - string callD(); -}; - -interface E -{ - string callE(); -}; - -interface F extends E -{ - string callF(); -}; - -interface G -{ - void shutdown(); - string callG(); -}; - -interface H extends G -{ - string callH(); -}; - -}; - -#endif diff --git a/cppe/test/IceE/facets/TestI.cpp b/cppe/test/IceE/facets/TestI.cpp deleted file mode 100644 index f320c5e18b2..00000000000 --- a/cppe/test/IceE/facets/TestI.cpp +++ /dev/null @@ -1,79 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestI.h> - -std::string -AI::callA(const Ice::Current&) -{ - return "A"; -} - -std::string -BI::callB(const Ice::Current&) -{ - return "B"; -} - -std::string -CI::callC(const Ice::Current&) -{ - return "C"; -} - -std::string -DI::callD(const Ice::Current&) -{ - return "D"; -} - -std::string -EI::callE(const Ice::Current&) -{ - return "E"; -} - -std::string -FI::callF(const Ice::Current&) -{ - return "F"; -} - -GI::GI(const Ice::CommunicatorPtr& communicator) : - _communicator(communicator) -{ -} - -void -GI::shutdown(const Ice::Current&) -{ - _communicator->shutdown(); -#ifdef _WIN32_WCE - tprintf("The server has shutdown, close the window to terminate the server."); -#endif -} - -std::string -GI::callG(const Ice::Current&) -{ - return "G"; -} - -HI::HI(const Ice::CommunicatorPtr& communicator) : - GI(communicator) -{ -} - -std::string -HI::callH(const Ice::Current&) -{ - return "H"; -} diff --git a/cppe/test/IceE/facets/TestI.h b/cppe/test/IceE/facets/TestI.h deleted file mode 100644 index f1b98ec42c1..00000000000 --- a/cppe/test/IceE/facets/TestI.h +++ /dev/null @@ -1,78 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_I_H -#define TEST_I_H - -#include <Test.h> - -class AI : virtual public Test::A -{ -public: - - virtual std::string callA(const Ice::Current&); -}; - -class BI : virtual public Test::B, virtual public AI -{ -public: - - virtual std::string callB(const Ice::Current&); -}; - -class CI : virtual public Test::C, virtual public AI -{ -public: - - virtual std::string callC(const Ice::Current&); -}; - -class DI : virtual public Test::D, virtual public BI, virtual public CI -{ -public: - - virtual std::string callD(const Ice::Current&); -}; - -class EI : virtual public Test::E -{ -public: - - virtual std::string callE(const Ice::Current&); -}; - -class FI : virtual public Test::F, virtual public EI -{ -public: - - virtual std::string callF(const Ice::Current&); -}; - -class GI : virtual public Test::G -{ -public: - - GI(const Ice::CommunicatorPtr&); - virtual void shutdown(const Ice::Current&); - virtual std::string callG(const Ice::Current&); - -private: - - Ice::CommunicatorPtr _communicator; -}; - -class HI : virtual public Test::H, virtual public GI -{ -public: - - HI(const Ice::CommunicatorPtr&); - virtual std::string callH(const Ice::Current&); -}; - -#endif diff --git a/cppe/test/IceE/facets/run.py b/cppe/test/IceE/facets/run.py deleted file mode 100755 index ddcbc42e7c5..00000000000 --- a/cppe/test/IceE/facets/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "facets") - -TestUtil.clientServerTest(name) -TestUtil.collocatedTest(name) -sys.exit(0) diff --git a/cppe/test/IceE/faultTolerance/.depend b/cppe/test/IceE/faultTolerance/.depend deleted file mode 100644 index c0ad6c8e1fc..00000000000 --- a/cppe/test/IceE/faultTolerance/.depend +++ /dev/null @@ -1,6 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/DisableWarnings.h ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./TestI.h ./Test.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/DisableWarnings.h ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./Test.h -Test.cpp: Test.ice diff --git a/cppe/test/IceE/faultTolerance/.gitignore b/cppe/test/IceE/faultTolerance/.gitignore deleted file mode 100644 index 67872faa673..00000000000 --- a/cppe/test/IceE/faultTolerance/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -Test.cpp -Test.h diff --git a/cppe/test/IceE/faultTolerance/AllTests.cpp b/cppe/test/IceE/faultTolerance/AllTests.cpp deleted file mode 100644 index 5193f8f78dd..00000000000 --- a/cppe/test/IceE/faultTolerance/AllTests.cpp +++ /dev/null @@ -1,154 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/DisableWarnings.h> -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <Test.h> - -using namespace std; -using namespace Test; - -class CallbackBase : public IceUtil::Monitor<IceUtil::Mutex> -{ -public: - - CallbackBase() : - _called(false) - { - } - - virtual ~CallbackBase() - { - } - - bool check() - { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - while(!_called) - { - if(!timedWait(IceUtil::Time::seconds(30))) - { - return false; - } - } - _called = false; - return true; - } - -protected: - - void called() - { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - assert(!_called); - _called = true; - notify(); - } - -private: - - bool _called; -}; - -void -allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports) -{ - tprintf("testing stringToProxy..."); - string ref("test"); - - char buf[32]; - for(vector<int>::const_iterator p = ports.begin(); p != ports.end(); ++p) - { - sprintf(buf, ":default -t 60000 -p %d", *p); - ref += buf; - } - Ice::ObjectPrx base = communicator->stringToProxy(ref); - test(base); - tprintf("ok\n"); - - tprintf("testing checked cast..."); - TestIntfPrx obj = TestIntfPrx::checkedCast(base); - test(obj); - test(obj == base); - tprintf("ok\n"); - - int oldPid = 0; - for(unsigned int i = 1, j = 0; i <= ports.size(); ++i, ++j) - { - if(j > 3) - { - j = 0; - } - - tprintf("testing server #%d...", i); - int pid = obj->pid(); - test(pid != oldPid); - tprintf("ok\n"); - oldPid = pid; - - if(j == 0) - { - tprintf("shutting down server #%d...", i); - obj->shutdown(); - tprintf("ok\n"); - } - else if(j == 1 || i + 1 > ports.size()) - { - tprintf("aborting server #%d...", i); - try - { - obj->abort(); - test(false); - } - catch(const Ice::ConnectionLostException&) - { - tprintf("ok\n"); - } - catch(const Ice::ConnectFailedException&) - { - tprintf("ok\n"); - } - } - else if(j == 2 || j == 3) - { - tprintf("aborting server #%d and #%d with idempotent call...", i, i + 1); - try - { - obj->idempotentAbort(); - test(false); - } - catch(const Ice::ConnectionLostException&) - { - tprintf("ok\n"); - } - catch(const Ice::ConnectFailedException&) - { - tprintf("ok\n"); - } - - ++i; - } - else - { - assert(false); - } - } - - tprintf("testing whether all servers are gone..."); - try - { - obj->ice_ping(); - test(false); - } - catch(const Ice::LocalException&) - { - tprintf("ok\n"); - } -} diff --git a/cppe/test/IceE/faultTolerance/Client.cpp b/cppe/test/IceE/faultTolerance/Client.cpp deleted file mode 100644 index c977fe70e8d..00000000000 --- a/cppe/test/IceE/faultTolerance/Client.cpp +++ /dev/null @@ -1,84 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <Test.h> - -using namespace std; - -void -usage(const char* n) -{ - tprintf("Usage: %s port...\n", n); -} - -class FaultTestApplication : public TestApplication -{ -public: - - FaultTestApplication() : - TestApplication("fault client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - loadConfig(initData.properties); - - // - // This test aborts servers, so we don't want warnings. - // - setCommunicator(Ice::initialize(argc, argv, initData)); - communicator()->getProperties()->setProperty("Ice.Warn.Connections", "0"); - - vector<int> ports; - for(int i = 1; i < argc; ++i) - { - if(argv[i][0] == '-') - { - tprintf("%s: unknown option `%s'\n", argv[0], argv[i]); - usage(argv[0]); - return EXIT_FAILURE; - } - - ports.push_back(atoi(argv[i])); - } - - if(ports.empty()) - { - tprintf("%s: no ports specified\n", argv[0]); - usage(argv[0]); - return EXIT_FAILURE; - } - - try - { - void allTests(const Ice::CommunicatorPtr&, const vector<int>&); - allTests(communicator(), ports); - } - catch(const Ice::Exception& ex) - { - tprintf("%s\n", ex.toString().c_str()); - test(false); - } - - return EXIT_SUCCESS; - } -}; - -int -main(int argc, char** argv) -{ - FaultTestApplication app; - return app.main(argc, argv); -} diff --git a/cppe/test/IceE/faultTolerance/Makefile b/cppe/test/IceE/faultTolerance/Makefile deleted file mode 100644 index 7f84890036d..00000000000 --- a/cppe/test/IceE/faultTolerance/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Test.o \ - -COBJS = Client.o \ - AllTests.o - -SOBJS = TestI.o \ - Server.o - -SRCS = $(OBJS:.o=.cpp) \ - $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(TESTLIBS) - -$(SERVER): $(OBJS) $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/faultTolerance/Makefile.mak b/cppe/test/IceE/faultTolerance/Makefile.mak deleted file mode 100644 index f684dc5fe89..00000000000 --- a/cppe/test/IceE/faultTolerance/Makefile.mak +++ /dev/null @@ -1,50 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-
-TARGETS = $(CLIENT) $(SERVER)
-
-COBJS = Test.obj \
- Client.obj \
- AllTests.obj
-
-SOBJS = Test.obj \
- TestI.obj \
- Server.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
-
-!include .depend
diff --git a/cppe/test/IceE/faultTolerance/Server.cpp b/cppe/test/IceE/faultTolerance/Server.cpp deleted file mode 100644 index 7a862e58b1c..00000000000 --- a/cppe/test/IceE/faultTolerance/Server.cpp +++ /dev/null @@ -1,85 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/DisableWarnings.h> -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -void -usage(const char* n) -{ - tprintf("Usage: %s port\n", n); -} - -class FaultToleranceTestApplication : public TestApplication -{ -public: - - FaultToleranceTestApplication() : - TestApplication("fault server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - int port = 0; - for(int i = 1; i < argc; ++i) - { - if(argv[i][0] == '-') - { - tprintf("%s: unknown option `%s'\n", argv[0], argv[i]); - usage(argv[0]); - return EXIT_FAILURE; - } - - if(port > 0) - { - tprintf("%s: only one port can be specified\n", argv[0]); - usage(argv[0]); - return EXIT_FAILURE; - } - - port = atoi(argv[i]); - } - - if(port <= 0) - { - tprintf("%s: no port specified\n", argv[0]); - usage(argv[0]); - return EXIT_FAILURE; - } - - char buf[32]; - sprintf(buf, "default -p %d", port); - communicator()->getProperties()->setProperty("TestAdapter.Endpoints", buf); - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new TestI(adapter); - adapter->add(object, communicator()->stringToIdentity("test")); - adapter->activate(); - communicator()->waitForShutdown(); - return EXIT_SUCCESS; - } -}; - -int -main(int argc, char** argv) -{ - FaultToleranceTestApplication app; - return app.main(argc, argv); -} diff --git a/cppe/test/IceE/faultTolerance/Test.ice b/cppe/test/IceE/faultTolerance/Test.ice deleted file mode 100644 index 2db87bc81e5..00000000000 --- a/cppe/test/IceE/faultTolerance/Test.ice +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -module Test -{ - -interface TestIntf -{ - void shutdown(); - void abort(); - idempotent void idempotentAbort(); - idempotent int pid(); -}; - -}; - -#endif diff --git a/cppe/test/IceE/faultTolerance/TestI.cpp b/cppe/test/IceE/faultTolerance/TestI.cpp deleted file mode 100644 index 087f62396c7..00000000000 --- a/cppe/test/IceE/faultTolerance/TestI.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestI.h> - -TestI::TestI(const Ice::ObjectAdapterPtr& adapter) : - _adapter(adapter) -{ -} - -void -TestI::shutdown(const Ice::Current&) -{ - _adapter->getCommunicator()->shutdown(); -} - -void -TestI::abort(const Ice::Current&) -{ - exit(0); -} - -void -TestI::idempotentAbort(const Ice::Current&) -{ - exit(0); -} - -Ice::Int -TestI::pid(const Ice::Current&) -{ -#if defined(_WIN32) - return _getpid(); -#else - return getpid(); -#endif -} diff --git a/cppe/test/IceE/faultTolerance/TestI.h b/cppe/test/IceE/faultTolerance/TestI.h deleted file mode 100644 index 27ffc3a1d46..00000000000 --- a/cppe/test/IceE/faultTolerance/TestI.h +++ /dev/null @@ -1,31 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_I_H -#define TEST_I_H - -#include <Test.h> - -class TestI : public Test::TestIntf -{ -public: - - TestI(const Ice::ObjectAdapterPtr&); - - virtual void shutdown(const Ice::Current&); - virtual void abort(const Ice::Current&); - virtual void idempotentAbort(const Ice::Current&); - virtual Ice::Int pid(const Ice::Current&); - -private: - - Ice::ObjectAdapterPtr _adapter; -}; - -#endif diff --git a/cppe/test/IceE/faultTolerance/run.py b/cppe/test/IceE/faultTolerance/run.py deleted file mode 100755 index ee4eb872a7f..00000000000 --- a/cppe/test/IceE/faultTolerance/run.py +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "faultTolerance") -testdir = os.path.join(toplevel, "test", name) - -server = os.path.join(testdir, "server") -client = os.path.join(testdir, "client") - -num = 12 -base = 12340 - -serverPipes = { } -for i in range(0, num): - print "starting server #%d..." % (i + 1), - serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1") - TestUtil.getServerPid(serverPipes[i]) - TestUtil.getAdapterReady(serverPipes[i]) - print "ok" - -ports = "" -for i in range(0, num): - ports = "%s %d" % (ports, base + i) -print "starting client...", -clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports + " 2>&1") -print "ok" - -TestUtil.printOutputFromPipe(clientPipe) - -clientStatus = clientPipe.close() -serverStatus = None -for i in range(0, num): - serverStatus = serverStatus or serverPipes[i].close() - -if clientStatus: - TestUtil.killServers() - sys.exit(1) - -# -# Exit with status 0 even though some servers failed to shutdown -# properly. There's a problem which is occuring on Linux dual-processor -# machines, and which cause some servers to -# segfault and abort. It's not clear what the problem is, and it's -# almost impossible to debug with the very poor information we get -# from the core file (ulimit -c unlimited to enable core files on -# Linux). -# -if serverStatus: - TestUtil.killServers() - sys.exit(1) -# if TestUtil.isWin32(): -# sys.exit(1) -# else: -# sys.exit(0) - -sys.exit(0) diff --git a/cppe/test/IceE/inheritance/.depend b/cppe/test/IceE/inheritance/.depend deleted file mode 100644 index 65d0eb6f73a..00000000000 --- a/cppe/test/IceE/inheritance/.depend +++ /dev/null @@ -1,9 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./TestI.h ./Test.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./Test.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./TestI.h ./Test.h -Collocated$(OBJEXT): Collocated.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -Test.cpp: Test.ice diff --git a/cppe/test/IceE/inheritance/.gitignore b/cppe/test/IceE/inheritance/.gitignore deleted file mode 100644 index d00d2864558..00000000000 --- a/cppe/test/IceE/inheritance/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -collocated -Test.cpp -Test.h diff --git a/cppe/test/IceE/inheritance/AllTests.cpp b/cppe/test/IceE/inheritance/AllTests.cpp deleted file mode 100644 index 4e34616d7e8..00000000000 --- a/cppe/test/IceE/inheritance/AllTests.cpp +++ /dev/null @@ -1,225 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <Test.h> - -using namespace std; -using namespace Test; - -InitialPrx -allTests(const Ice::CommunicatorPtr& communicator) -{ - tprintf("testing stringToProxy..."); - string ref = communicator->getProperties()->getPropertyWithDefault( - "Inheritance.Proxy", "initial:default -p 12010 -t 10000"); - Ice::ObjectPrx base = communicator->stringToProxy(ref); - test(base); - tprintf("ok\n"); - - tprintf("testing checked cast..."); - InitialPrx initial = InitialPrx::checkedCast(base); - test(initial); - test(initial == base); - tprintf("ok\n"); - - tprintf("getting proxies for class hierarchy..."); - MA::CAPrx ca = initial->caop(); - MB::CBPrx cb = initial->cbop(); - MA::CCPrx cc = initial->ccop(); - MA::CDPrx cd = initial->cdop(); - test(ca != cb); - test(ca != cc); - test(ca != cd); - test(cb != cc); - test(cb != cd); - test(cc != cd); - tprintf("ok\n"); - - tprintf("getting proxies for interface hierarchy..."); - MA::IAPrx ia = initial->iaop(); - MB::IB1Prx ib1 = initial->ib1op(); - MB::IB2Prx ib2 = initial->ib2op(); - MA::ICPrx ic = initial->icop(); - test(ia != ib1); - test(ia != ib2); - test(ia != ic); - test(ib1 != ic); - test(ib2 != ic); - tprintf("ok\n"); - - tprintf("invoking proxy operations on class hierarchy..."); - MA::CAPrx cao; - MB::CBPrx cbo; - MA::CCPrx cco; - - cao = ca->caop(ca); - test(cao == ca); - cao = ca->caop(cb); - test(cao == cb); - cao = ca->caop(cc); - test(cao == cc); - cao = cb->caop(ca); - test(cao == ca); - cao = cb->caop(cb); - test(cao == cb); - cao = cb->caop(cc); - test(cao == cc); - cao = cc->caop(ca); - test(cao == ca); - cao = cc->caop(cb); - test(cao == cb); - cao = cc->caop(cc); - test(cao == cc); - - cao = cb->cbop(cb); - test(cao == cb); - cbo = cb->cbop(cb); - test(cbo == cb); - cao = cb->cbop(cc); - test(cao == cc); - cbo = cb->cbop(cc); - test(cbo == cc); - cao = cc->cbop(cb); - test(cao == cb); - cbo = cc->cbop(cb); - test(cbo == cb); - cao = cc->cbop(cc); - test(cao == cc); - cbo = cc->cbop(cc); - test(cbo == cc); - - cao = cc->ccop(cc); - test(cao == cc); - cbo = cc->ccop(cc); - test(cbo == cc); - cco = cc->ccop(cc); - test(cco == cc); - tprintf("ok\n"); - - tprintf("ditto, but for interface hierarchy..."); - MA::IAPrx iao; - MB::IB1Prx ib1o; - MB::IB2Prx ib2o; - MA::ICPrx ico; - - iao = ia->iaop(ia); - test(iao == ia); - iao = ia->iaop(ib1); - test(iao == ib1); - iao = ia->iaop(ib2); - test(iao == ib2); - iao = ia->iaop(ic); - test(iao == ic); - iao = ib1->iaop(ia); - test(iao == ia); - iao = ib1->iaop(ib1); - test(iao == ib1); - iao = ib1->iaop(ib2); - test(iao == ib2); - iao = ib1->iaop(ic); - test(iao == ic); - iao = ib2->iaop(ia); - test(iao == ia); - iao = ib2->iaop(ib1); - test(iao == ib1); - iao = ib2->iaop(ib2); - test(iao == ib2); - iao = ib2->iaop(ic); - test(iao == ic); - iao = ic->iaop(ia); - test(iao == ia); - iao = ic->iaop(ib1); - test(iao == ib1); - iao = ic->iaop(ib2); - test(iao == ib2); - iao = ic->iaop(ic); - test(iao == ic); - - iao = ib1->ib1op(ib1); - test(iao == ib1); - ib1o = ib1->ib1op(ib1); - test(ib1o == ib1); - iao = ib1->ib1op(ic); - test(iao == ic); - ib1o = ib1->ib1op(ic); - test(ib1o == ic); - iao = ic->ib1op(ib1); - test(iao == ib1); - ib1o = ic->ib1op(ib1); - test(ib1o == ib1); - iao = ic->ib1op(ic); - test(iao == ic); - ib1o = ic->ib1op(ic); - test(ib1o == ic); - - iao = ib2->ib2op(ib2); - test(iao == ib2); - ib2o = ib2->ib2op(ib2); - test(ib2o == ib2); - iao = ib2->ib2op(ic); - test(iao == ic); - ib2o = ib2->ib2op(ic); - test(ib2o == ic); - iao = ic->ib2op(ib2); - test(iao == ib2); - ib2o = ic->ib2op(ib2); - test(ib2o == ib2); - iao = ic->ib2op(ic); - test(iao == ic); - ib2o = ic->ib2op(ic); - test(ib2o == ic); - - iao = ic->icop(ic); - test(iao == ic); - ib1o = ic->icop(ic); - test(ib1o == ic); - ib2o = ic->icop(ic); - test(ib2o == ic); - ico = ic->icop(ic); - test(ico == ic); - - tprintf("ok\n"); - - tprintf("ditto, but for class implementing interfaces..."); - MA::CDPrx cdo; - - cao = cd->caop(cd); - test(cao == cd); - cbo = cd->cbop(cd); - test(cbo == cd); - cco = cd->ccop(cd); - test(cco == cd); - - iao = cd->iaop(cd); - test(iao == cd); - ib1o = cd->ib1op(cd); - test(ib1o == cd); - ib2o = cd->ib2op(cd); - test(ib2o == cd); - - cao = cd->cdop(cd); - test(cao == cd); - cbo = cd->cdop(cd); - test(cbo == cd); - cco = cd->cdop(cd); - test(cco == cd); - - iao = cd->cdop(cd); - test(iao == cd); - ib1o = cd->cdop(cd); - test(ib1o == cd); - ib2o = cd->cdop(cd); - test(ib2o == cd); - - tprintf("ok\n"); - - return initial; -} diff --git a/cppe/test/IceE/inheritance/Client.cpp b/cppe/test/IceE/inheritance/Client.cpp deleted file mode 100644 index f66f2dc86b9..00000000000 --- a/cppe/test/IceE/inheritance/Client.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <Test.h> - -using namespace std; -using namespace Test; - -class InheritanceTestApplication : public TestApplication -{ -public: - - InheritanceTestApplication() : - TestApplication("inheritance client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - InitialPrx allTests(const Ice::CommunicatorPtr&); - InitialPrx initial = allTests(communicator()); - initial->shutdown(); - - return EXIT_SUCCESS; - } - -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - InheritanceTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - InheritanceTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/inheritance/Collocated.cpp b/cppe/test/IceE/inheritance/Collocated.cpp deleted file mode 100644 index 938a27e8c92..00000000000 --- a/cppe/test/IceE/inheritance/Collocated.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; -using namespace Test; - -class InheritanceTestApplication : public TestApplication -{ -public: - - InheritanceTestApplication() : - TestApplication("inheritance collocated") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new InitialI(adapter); - adapter->add(object, communicator()->stringToIdentity("initial")); - adapter->activate(); - - InitialPrx allTests(const Ice::CommunicatorPtr&); - allTests(communicator()); - - return EXIT_SUCCESS; - } - -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - InheritanceTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - InheritanceTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/inheritance/Makefile b/cppe/test/IceE/inheritance/Makefile deleted file mode 100644 index f49c606c5ae..00000000000 --- a/cppe/test/IceE/inheritance/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -COLLOCATED = collocated - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -OBJS = Test.o \ - -COBJS = Client.o \ - AllTests.o - -SOBJS = TestI.o \ - Server.o - -COLOBJS = TestI.o \ - Collocated.o \ - AllTests.o - -SRCS = $(OBJS:.o=.cpp) \ - $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) \ - $(COLOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(TESTLIBS) - -$(SERVER): $(OBJS) $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(TESTLIBS) - -$(COLLOCATED): $(OBJS) $(COLOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/inheritance/Makefile.mak b/cppe/test/IceE/inheritance/Makefile.mak deleted file mode 100644 index 197e390a001..00000000000 --- a/cppe/test/IceE/inheritance/Makefile.mak +++ /dev/null @@ -1,63 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-COLLOCATED = collocated.exe
-
-TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS = Test.obj \
- Client.obj \
- AllTests.obj
-
-SOBJS = Test.obj \
- TestI.obj \
- Server.obj
-
-COLOBJS = Test.obj \
- TestI.obj \
- Collocated.obj \
- AllTests.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp) \
- $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
- $(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
-
-!include .depend
diff --git a/cppe/test/IceE/inheritance/Server.cpp b/cppe/test/IceE/inheritance/Server.cpp deleted file mode 100644 index 8292139dfb6..00000000000 --- a/cppe/test/IceE/inheritance/Server.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -class InheritanceTestApplication : public TestApplication -{ -public: - - InheritanceTestApplication() : - TestApplication("inheritance server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new InitialI(adapter); - adapter->add(object, communicator()->stringToIdentity("initial")); - adapter->activate(); - -#ifndef _WIN32_WCE - communicator()->waitForShutdown(); -#endif - - return EXIT_SUCCESS; - } - -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - InheritanceTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - InheritanceTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/inheritance/Test.ice b/cppe/test/IceE/inheritance/Test.ice deleted file mode 100644 index 1aaa5099e46..00000000000 --- a/cppe/test/IceE/inheritance/Test.ice +++ /dev/null @@ -1,86 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -module Test -{ - -module MA -{ - -interface IA -{ - IA* iaop(IA* p); -}; - -class CA -{ - CA* caop(CA* p); -}; - -}; - -module MB -{ - -interface IB1 extends MA::IA -{ - IB1* ib1op(IB1* p); -}; - -interface IB2 extends MA::IA -{ - IB2* ib2op(IB2* p); -}; - -class CB extends MA::CA -{ - CB* cbop(CB* p); -}; - -}; - -module MA -{ - -interface IC extends MB::IB1, MB::IB2 -{ - IC* icop(IC* p); -}; - -class CC extends MB::CB -{ - CC* ccop(CC* p); -}; - -class CD extends CC implements MB::IB1, MB::IB2 -{ - CD* cdop(CD* p); -}; - -}; - -interface Initial -{ - void shutdown(); - MA::CA* caop(); - MB::CB* cbop(); - MA::CC* ccop(); - MA::CD* cdop(); - MA::IA* iaop(); - MB::IB1* ib1op(); - MB::IB2* ib2op(); - MA::IC* icop(); -}; - -}; - -#endif diff --git a/cppe/test/IceE/inheritance/TestI.cpp b/cppe/test/IceE/inheritance/TestI.cpp deleted file mode 100644 index 90631c30944..00000000000 --- a/cppe/test/IceE/inheritance/TestI.cpp +++ /dev/null @@ -1,132 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestI.h> - -using namespace Test; - -MA::CAPrx -CAI_::caop(const MA::CAPrx& p, const Ice::Current&) -{ - return p; -} - -MB::CBPrx -CBI::cbop(const MB::CBPrx& p, const Ice::Current&) -{ - return p; -} - -MA::CCPrx -CCI::ccop(const MA::CCPrx& p, const Ice::Current&) -{ - return p; -} - -MA::CDPrx -CDI::cdop(const MA::CDPrx& p, const Ice::Current&) -{ - return p; -} - -MA::IAPrx -IAI::iaop(const MA::IAPrx& p, const Ice::Current&) -{ - return p; -} - -MB::IB1Prx -IB1I::ib1op(const MB::IB1Prx& p, const Ice::Current&) -{ - return p; -} - -MB::IB2Prx -IB2I::ib2op(const MB::IB2Prx& p, const Ice::Current&) -{ - return p; -} - -MA::ICPrx -ICI::icop(const MA::ICPrx& p, const Ice::Current&) -{ - return p; -} - -InitialI::InitialI(const Ice::ObjectAdapterPtr& adapter) : - _adapter(adapter) -{ - _ca = MA::CAPrx::uncheckedCast(_adapter->addWithUUID(new CAI_)); - _cb = MB::CBPrx::uncheckedCast(_adapter->addWithUUID(new CBI)); - _cc = MA::CCPrx::uncheckedCast(_adapter->addWithUUID(new CCI)); - _cd = MA::CDPrx::uncheckedCast(_adapter->addWithUUID(new CDI)); - _ia = MA::IAPrx::uncheckedCast(_adapter->addWithUUID(new IAI)); - _ib1 = MB::IB1Prx::uncheckedCast(_adapter->addWithUUID(new IB1I)); - _ib2 = MB::IB2Prx::uncheckedCast(_adapter->addWithUUID(new IB2I)); - _ic = MA::ICPrx::uncheckedCast(_adapter->addWithUUID(new ICI)); -} - -void -InitialI::shutdown(const Ice::Current&) -{ - _adapter->getCommunicator()->shutdown(); -#ifdef _WIN32_WCE - tprintf("The server has shutdown, close the window to terminate the server."); -#endif -} - -MA::CAPrx -InitialI::caop(const Ice::Current&) -{ - return _ca; -} - -MB::CBPrx -InitialI::cbop(const Ice::Current&) -{ - return _cb; -} - -MA::CCPrx -InitialI::ccop(const Ice::Current&) -{ - return _cc; -} - -MA::CDPrx -InitialI::cdop(const Ice::Current&) -{ - return _cd; -} - -MA::IAPrx -InitialI::iaop(const Ice::Current&) -{ - return _ia; -} - -MB::IB1Prx -InitialI::ib1op(const Ice::Current&) -{ - return _ib1; -} - -MB::IB2Prx -InitialI::ib2op(const Ice::Current&) -{ - return _ib2; -} - -MA::ICPrx -InitialI::icop(const Ice::Current&) -{ - return _ic; -} diff --git a/cppe/test/IceE/inheritance/TestI.h b/cppe/test/IceE/inheritance/TestI.h deleted file mode 100644 index 4aaa980aeb5..00000000000 --- a/cppe/test/IceE/inheritance/TestI.h +++ /dev/null @@ -1,101 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TESTI_H -#define TESTI_H - -#include <Test.h> - -class InitialI : public Test::Initial -{ -public: - - InitialI(const Ice::ObjectAdapterPtr&); - - virtual void shutdown(const Ice::Current&); - - virtual Test::MA::CAPrx caop(const Ice::Current&); - virtual Test::MB::CBPrx cbop(const Ice::Current&); - virtual Test::MA::CCPrx ccop(const Ice::Current&); - virtual Test::MA::CDPrx cdop(const Ice::Current&); - virtual Test::MA::IAPrx iaop(const Ice::Current&); - virtual Test::MB::IB1Prx ib1op(const Ice::Current&); - virtual Test::MB::IB2Prx ib2op(const Ice::Current&); - virtual Test::MA::ICPrx icop(const Ice::Current&); - -private: - - Ice::ObjectAdapterPtr _adapter; - Test::MA::CAPrx _ca; - Test::MB::CBPrx _cb; - Test::MA::CCPrx _cc; - Test::MA::CDPrx _cd; - Test::MA::IAPrx _ia; - Test::MB::IB1Prx _ib1; - Test::MB::IB2Prx _ib2; - Test::MA::ICPrx _ic; -}; - -class CAI_ : virtual public Test::MA::CA -{ -public: - - virtual Test::MA::CAPrx caop(const Test::MA::CAPrx&, const Ice::Current&); -}; - -class CBI : virtual public Test::MB::CB, virtual public CAI_ -{ -public: - - virtual Test::MB::CBPrx cbop(const Test::MB::CBPrx&, const Ice::Current&); -}; - -class CCI : virtual public Test::MA::CC, virtual public CBI -{ -public: - - virtual Test::MA::CCPrx ccop(const Test::MA::CCPrx&, const Ice::Current&); -}; - -class IAI : virtual public Test::MA::IA -{ -public: - - virtual Test::MA::IAPrx iaop(const Test::MA::IAPrx&, const Ice::Current&); -}; - -class IB1I : virtual public Test::MB::IB1, virtual public IAI -{ -public: - - virtual Test::MB::IB1Prx ib1op(const Test::MB::IB1Prx&, const Ice::Current&); -}; - -class IB2I : virtual public Test::MB::IB2, virtual public IAI -{ -public: - - virtual Test::MB::IB2Prx ib2op(const Test::MB::IB2Prx&, const Ice::Current&); -}; - -class ICI : virtual public Test::MA::IC, virtual public IB1I, virtual public IB2I -{ -public: - - virtual Test::MA::ICPrx icop(const Test::MA::ICPrx&, const Ice::Current&); -}; - -class CDI : virtual public Test::MA::CD, virtual public CCI, virtual public IB1I, virtual public IB2I -{ -public: - - virtual Test::MA::CDPrx cdop(const Test::MA::CDPrx&, const Ice::Current&); -}; - -#endif diff --git a/cppe/test/IceE/inheritance/run.py b/cppe/test/IceE/inheritance/run.py deleted file mode 100755 index 63ae546db37..00000000000 --- a/cppe/test/IceE/inheritance/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "inheritance") - -TestUtil.clientServerTest(name) -TestUtil.collocatedTest(name) -sys.exit(0) diff --git a/cppe/test/IceE/location/.depend b/cppe/test/IceE/location/.depend deleted file mode 100644 index 3fa7c0a1f71..00000000000 --- a/cppe/test/IceE/location/.depend +++ /dev/null @@ -1,7 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/Config.h ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../../include/IceE/Locator.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../include/TestCommon.h ./Test.h ../../../include/IceE/Router.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/Config.h ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../../include/IceE/Locator.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../include/TestCommon.h ./TestI.h ./Test.h ./ServerLocator.h -ServerLocator$(OBJEXT): ServerLocator.cpp ../../../include/IceE/Config.h ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./ServerLocator.h ../../../include/IceE/Locator.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./ServerLocator.h ../../../include/IceE/Locator.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./Test.h -Test.cpp: Test.ice diff --git a/cppe/test/IceE/location/.gitignore b/cppe/test/IceE/location/.gitignore deleted file mode 100644 index 67872faa673..00000000000 --- a/cppe/test/IceE/location/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -Test.cpp -Test.h diff --git a/cppe/test/IceE/location/AllTests.cpp b/cppe/test/IceE/location/AllTests.cpp deleted file mode 100644 index 755075f4dc8..00000000000 --- a/cppe/test/IceE/location/AllTests.cpp +++ /dev/null @@ -1,306 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/Config.h> - -#ifdef ICEE_HAS_LOCATOR - -#include <IceE/IceE.h> -#include <IceE/Locator.h> -#include <TestCommon.h> -#include <Test.h> - -#ifdef ICEE_HAS_ROUTER -# include <IceE/Router.h> -#endif - -using namespace std; -using namespace Test; - -void -allTests(const Ice::CommunicatorPtr& communicator) -{ - ServerManagerPrx manager = ServerManagerPrx::checkedCast( - communicator->stringToProxy( - communicator->getProperties()->getPropertyWithDefault( - "Location.Proxy", "ServerManager:default -p 12010 -t 10000"))); - Ice::LocatorPrx locator = Ice::LocatorPrx::uncheckedCast(communicator->getDefaultLocator()); - test(manager); - - tprintf("testing stringToProxy..."); - Ice::ObjectPrx base = communicator->stringToProxy("test @ TestAdapter"); - Ice::ObjectPrx base2 = communicator->stringToProxy("test @ TestAdapter"); - Ice::ObjectPrx base3 = communicator->stringToProxy("test"); - Ice::ObjectPrx base4 = communicator->stringToProxy("ServerManager"); - Ice::ObjectPrx base5 = communicator->stringToProxy("test2"); - Ice::ObjectPrx base6 = communicator->stringToProxy("test @ ReplicatedAdapter"); - tprintf("ok\n"); - - tprintf("testing ice_locator and ice_getLocator... "); - test(Ice::proxyIdentityEqual(base->ice_getLocator(), communicator->getDefaultLocator())); - Ice::LocatorPrx anotherLocator = Ice::LocatorPrx::uncheckedCast(communicator->stringToProxy("anotherLocator")); - base = base->ice_locator(anotherLocator); - test(Ice::proxyIdentityEqual(base->ice_getLocator(), anotherLocator)); - communicator->setDefaultLocator(0); - base = communicator->stringToProxy("test @ TestAdapter"); - test(!base->ice_getLocator()); - base = base->ice_locator(anotherLocator); - test(Ice::proxyIdentityEqual(base->ice_getLocator(), anotherLocator)); - communicator->setDefaultLocator(locator); - base = communicator->stringToProxy("test @ TestAdapter"); - test(Ice::proxyIdentityEqual(base->ice_getLocator(), communicator->getDefaultLocator())); - -#ifdef ICEE_HAS_ROUTER - // - // We also test ice_router/ice_getRouter (perhaps we should add a - // test/Ice/router test?) - // - test(!base->ice_getRouter()); - Ice::RouterPrx anotherRouter = Ice::RouterPrx::uncheckedCast(communicator->stringToProxy("anotherRouter")); - base = base->ice_router(anotherRouter); - test(Ice::proxyIdentityEqual(base->ice_getRouter(), anotherRouter)); - Ice::RouterPrx router = Ice::RouterPrx::uncheckedCast(communicator->stringToProxy("dummyrouter")); - communicator->setDefaultRouter(router); - base = communicator->stringToProxy("test @ TestAdapter"); - test(Ice::proxyIdentityEqual(base->ice_getRouter(), communicator->getDefaultRouter())); - communicator->setDefaultRouter(0); - base = communicator->stringToProxy("test @ TestAdapter"); - test(!base->ice_getRouter()); -#endif - tprintf("ok\n"); - - tprintf("starting server..."); - manager->startServer(); - tprintf("ok\n"); - - tprintf("testing checked cast..."); - TestIntfPrx obj = TestIntfPrx::checkedCast(base); - obj = TestIntfPrx::checkedCast(communicator->stringToProxy("test@TestAdapter")); - obj = TestIntfPrx::checkedCast(communicator->stringToProxy("test @TestAdapter")); - obj = TestIntfPrx::checkedCast(communicator->stringToProxy("test@ TestAdapter")); - test(obj); - TestIntfPrx obj2 = TestIntfPrx::checkedCast(base2); - test(obj2); - TestIntfPrx obj3 = TestIntfPrx::checkedCast(base3); - test(obj3); - ServerManagerPrx obj4 = ServerManagerPrx::checkedCast(base4); - test(obj4); - TestIntfPrx obj5 = TestIntfPrx::checkedCast(base5); - test(obj5); - TestIntfPrx obj6 = TestIntfPrx::checkedCast(base6); - test(obj6); - tprintf("ok\n"); - - tprintf("testing id@AdapterId indirect proxy..."); - obj->shutdown(); - manager->startServer(); - try - { - obj2 = TestIntfPrx::checkedCast(base2); - obj2->ice_ping(); - } - catch(const Ice::LocalException&) - { - test(false); - } - tprintf("ok\n"); - - tprintf("testing id@ReplicaGroupId indirect proxy..."); - obj->shutdown(); - manager->startServer(); - try - { - obj6 = TestIntfPrx::checkedCast(base6); - obj6->ice_ping(); - } - catch(const Ice::LocalException&) - { - test(false); - } - tprintf("ok\n"); - - tprintf("testing identity indirect proxy..."); - obj->shutdown(); - manager->startServer(); - try - { - obj3 = TestIntfPrx::checkedCast(base3); - obj3->ice_ping(); - } - catch(const Ice::LocalException&) - { - test(false); - } - try - { - obj2 = TestIntfPrx::checkedCast(base2); - obj2->ice_ping(); - } - catch(const Ice::LocalException&) - { - test(false); - } - obj->shutdown(); - manager->startServer(); - try - { - obj2 = TestIntfPrx::checkedCast(base2); - obj2->ice_ping(); - } - catch(const Ice::LocalException&) - { - test(false); - } - try - { - obj3 = TestIntfPrx::checkedCast(base3); - obj3->ice_ping(); - } - catch(const Ice::LocalException&) - { - test(false); - } - obj->shutdown(); - manager->startServer(); - - try - { - obj2 = TestIntfPrx::checkedCast(base2); - obj2->ice_ping(); - } - catch(const Ice::LocalException&) - { - test(false); - } - obj->shutdown(); - manager->startServer(); - try - { - obj3 = TestIntfPrx::checkedCast(base3); - obj3->ice_ping(); - } - catch(const Ice::LocalException&) - { - test(false); - } - obj->shutdown(); - manager->startServer(); - try - { - obj2 = TestIntfPrx::checkedCast(base2); - obj2->ice_ping(); - } - catch(const Ice::LocalException&) - { - test(false); - } - obj->shutdown(); - manager->startServer(); - - try - { - obj5 = TestIntfPrx::checkedCast(base5); - obj5->ice_ping(); - } - catch(const Ice::LocalException&) - { - test(false); - } - tprintf("ok\n"); - - tprintf("testing reference with unknown identity..."); - try - { - base = communicator->stringToProxy("unknown/unknown"); - base->ice_ping(); - test(false); - } - catch (const Ice::NotRegisteredException& ex) - { - test(ex.kindOfObject == "object"); - test(ex.id == "unknown/unknown"); - } - tprintf("ok\n"); - - tprintf("testing reference with unknown adapter..."); - try - { - base = communicator->stringToProxy("test @ TestAdapterUnknown"); - base->ice_ping(); - test(false); - } - catch (const Ice::NotRegisteredException& ex) - { - test(ex.kindOfObject == "object adapter"); - test(ex.id == "TestAdapterUnknown"); - } - tprintf("ok\n"); - - tprintf("testing object reference from server..."); - HelloPrx hello = obj->getHello(); - hello->sayHello(); - test(communicator->proxyToString(hello).find("TestAdapter") != string::npos); - hello = obj->getReplicatedHello(); - hello->sayHello(); - test(communicator->proxyToString(hello).find("ReplicatedAdapter") != string::npos); - tprintf("ok\n"); - - tprintf("testing object reference from server after shutdown..."); - obj->shutdown(); - manager->startServer(); - hello->sayHello(); - tprintf("ok\n"); - - tprintf("testing object migration..."); - hello = HelloPrx::checkedCast(communicator->stringToProxy("hello")); - obj->migrateHello(); - hello->sayHello(); - obj->migrateHello(); - hello->sayHello(); - obj->migrateHello(); - hello->sayHello(); - tprintf("ok\n"); - - tprintf("shutdown server..."); - obj->shutdown(); - tprintf("ok\n"); - - tprintf("testing whether server is gone..."); - try - { - obj2->ice_ping(); - test(false); - } - catch(const Ice::LocalException&) - { - } - try - { - obj3->ice_ping(); - test(false); - } - catch(const Ice::LocalException&) - { - } - try - { - obj5->ice_ping(); - test(false); - } - catch(const Ice::LocalException&) - { - } - tprintf("ok\n"); - - tprintf("shutdown server manager..."); - manager->shutdown(); - tprintf("ok\n"); -} - -#endif diff --git a/cppe/test/IceE/location/Client.cpp b/cppe/test/IceE/location/Client.cpp deleted file mode 100644 index c8f8048ecc3..00000000000 --- a/cppe/test/IceE/location/Client.cpp +++ /dev/null @@ -1,108 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> - -#ifdef ICEE_HAS_LOCATOR - -#include <TestApplication.h> -#include <Test.h> - -using namespace std; - -class LocationTestApplication : public TestApplication -{ -public: - - LocationTestApplication() : - TestApplication("location client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(argc, argv); - loadConfig(initData.properties); - - // - // For blocking client change retry interval from default. - // - if(initData.properties->getPropertyAsInt("Ice.Blocking") > 0) - { - initData.properties->setProperty("Ice.RetryIntervals", "0 0"); - initData.properties->setProperty("Ice.Warn.Connections", "0"); - } - - initData.properties->setProperty("Ice.Default.Locator", - initData.properties->getPropertyWithDefault("Location.Locator", "locator:default -p 12010")); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - void allTests(const Ice::CommunicatorPtr&); - allTests(communicator()); - - return EXIT_SUCCESS; - } - -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - LocationTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - LocationTestApplication app; - return app.main(argc, argv); -} - -#endif - -#else - -#include <TestCommon.h> - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - tprintf("Adapter Ready\n"); - - return 0; -} - -#else - -int -main(int argc, char* argv[]) -{ -#ifdef _WIN32 - tprintf("%d\n", _getpid()); -#else - tprintf("%d\n", getpid()); -#endif - tprintf("Adapter Ready\n"); - - return 0; -} - -#endif - -#endif diff --git a/cppe/test/IceE/location/Makefile b/cppe/test/IceE/location/Makefile deleted file mode 100644 index 9b316551595..00000000000 --- a/cppe/test/IceE/location/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -OBJS = Test.o \ - -COBJS = Client.o \ - AllTests.o - -SOBJS = TestI.o \ - ServerLocator.o \ - Server.o - -SRCS = $(OBJS:.o=.cpp) \ - $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(TESTLIBS) - -$(SERVER): $(OBJS) $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/location/Makefile.mak b/cppe/test/IceE/location/Makefile.mak deleted file mode 100644 index 97d7027769c..00000000000 --- a/cppe/test/IceE/location/Makefile.mak +++ /dev/null @@ -1,51 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-
-TARGETS = $(CLIENT) $(SERVER)
-
-COBJS = Test.obj \
- Client.obj \
- AllTests.obj
-
-SOBJS = Test.obj \
- TestI.obj \
- ServerLocator.obj \
- Server.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
-
-!include .depend
diff --git a/cppe/test/IceE/location/Server.cpp b/cppe/test/IceE/location/Server.cpp deleted file mode 100644 index 834043dda55..00000000000 --- a/cppe/test/IceE/location/Server.cpp +++ /dev/null @@ -1,147 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> - -#ifdef ICEE_HAS_LOCATOR - -#include <ServerLocator.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -class LocationTestApplication : public TestApplication -{ -public: - - LocationTestApplication() : - TestApplication("location server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("ServerManager.Endpoints", "default -p 12010"); - - loadConfig(initData.properties); - - // - // For blocking client test, set timeout so CloseConnection send will - // return quickly. Otherwise server will hang since client is not - // listening for these messages. - // - if(initData.properties->getPropertyAsInt("Ice.Blocking") > 0) - { - initData.properties->setProperty("Ice.Override.Timeout", "100"); - initData.properties->setProperty("Ice.Warn.Connections", "0"); - } - - // - // These properties cannot be overridden. The OAs started by - // the ServerManager must be local. - // - initData.properties->setProperty("TestAdapter.Endpoints", "default"); - initData.properties->setProperty("TestAdapter.AdapterId", "TestAdapter"); - initData.properties->setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter"); - initData.properties->setProperty("TestAdapter2.Endpoints", "default"); - initData.properties->setProperty("TestAdapter2.AdapterId", "TestAdapter2"); - - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - // - // Register the server manager. The server manager creates a - // new 'server' (a server isn't a different process, it's just - // a new communicator and object adapter). - // - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("ServerManager"); - - // - // We also register a sample server locator which implements - // the locator interface, this locator is used by the clients - // and the 'servers' created with the server manager - // interface. - // - ServerLocatorRegistryPtr registry = new ServerLocatorRegistry(); - registry->addObject(adapter->createProxy(communicator()->stringToIdentity("ServerManager"))); - Ice::ObjectPtr object = new ServerManagerI(adapter, registry, initData); - adapter->add(object, communicator()->stringToIdentity("ServerManager")); - - Ice::LocatorRegistryPrx registryPrx = - Ice::LocatorRegistryPrx::uncheckedCast(adapter->add(registry, communicator()->stringToIdentity("registry"))); - - Ice::LocatorPtr locator = new ServerLocator(registry, registryPrx); - adapter->add(locator, communicator()->stringToIdentity("locator")); - - adapter->activate(); - -#ifndef _WIN32_WCE - communicator()->waitForShutdown(); -#endif - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - LocationTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - LocationTestApplication app; - return app.main(argc, argv); -} - -#endif - -#else - -#include <TestCommon.h> - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - tprintf("Adapter Ready\n"); - - return 0; -} - -#else - -int -main(int argc, char* argv[]) -{ -#ifdef _WIN32 - tprintf("%d\n", _getpid()); -#else - tprintf("%d\n", getpid()); -#endif - tprintf("Adapter Ready\n"); - - return 0; -} - -#endif - -#endif diff --git a/cppe/test/IceE/location/ServerLocator.cpp b/cppe/test/IceE/location/ServerLocator.cpp deleted file mode 100644 index b55d6ea4536..00000000000 --- a/cppe/test/IceE/location/ServerLocator.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/Config.h> - -#ifdef ICEE_HAS_LOCATOR -#include <IceE/IceE.h> - -#include <IceE/BuiltinSequences.h> -#include <ServerLocator.h> - -using namespace std; - -ServerLocatorRegistry::ServerLocatorRegistry() -{ -} - -void -ServerLocatorRegistry::setAdapterDirectProxy(const ::std::string& adapter, const ::Ice::ObjectPrx& object, - const ::Ice::Current&) -{ - _adapters[adapter] = object; -} - -void -ServerLocatorRegistry::setReplicatedAdapterDirectProxy(const std::string& adapter, const std::string& replicaId, - const ::Ice::ObjectPrx& object, const ::Ice::Current&) -{ - _adapters[adapter] = object; - _adapters[replicaId] = object; -} - -Ice::ObjectPrx -ServerLocatorRegistry::getAdapter(const ::std::string& adapter) const -{ - ::std::map< string, ::Ice::ObjectPrx>::const_iterator p = _adapters.find(adapter); - if(_adapters.find(adapter) == _adapters.end()) - { - throw Ice::AdapterNotFoundException(); - } - return p->second; -} - -Ice::ObjectPrx -ServerLocatorRegistry::getObject(const ::Ice::Identity& id) const -{ - ::std::map< ::Ice::Identity, ::Ice::ObjectPrx>::const_iterator p = _objects.find(id); - if(p == _objects.end()) - { - throw Ice::ObjectNotFoundException(); - } - - return p->second; -} - -void -ServerLocatorRegistry::addObject(const Ice::ObjectPrx& object) -{ - _objects[object->ice_getIdentity()] = object; -} - -void -ServerLocatorRegistry::clear() -{ - _objects.clear(); - _adapters.clear(); -} - -ServerLocator::ServerLocator(const ServerLocatorRegistryPtr& registry, const ::Ice::LocatorRegistryPrx& registryPrx) : - _registry(registry), - _registryPrx(registryPrx) -{ -} - -Ice::ObjectPrx -ServerLocator::findObjectById(const Ice::Identity& id, const Ice::Current& current) const -{ - return _registry->getObject(id); -} - -Ice::ObjectPrx -ServerLocator::findAdapterById(const string& id, const Ice::Current& current) const -{ - return _registry->getAdapter(id); -} - -Ice::LocatorRegistryPrx -ServerLocator::getRegistry(const ::Ice::Current&) const -{ - return _registryPrx; -} - -#endif diff --git a/cppe/test/IceE/location/ServerLocator.h b/cppe/test/IceE/location/ServerLocator.h deleted file mode 100644 index 3ad8fca93ed..00000000000 --- a/cppe/test/IceE/location/ServerLocator.h +++ /dev/null @@ -1,66 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef SERVER_LOCATOR_H -#define SERVER_LOCATOR_H - -#include <IceE/Config.h> - -#ifdef ICEE_HAS_LOCATOR - -#include <IceE/Locator.h> -#include <IceE/ProxyF.h> - -class ServerLocatorRegistry : public Ice::LocatorRegistry -{ -public: - - ServerLocatorRegistry(); - - virtual void setAdapterDirectProxy(const ::std::string&, const ::Ice::ObjectPrx&, const ::Ice::Current&); - virtual void setReplicatedAdapterDirectProxy(const std::string&, const ::std::string&, const ::Ice::ObjectPrx&, - const ::Ice::Current&); - - // - // Internal method - // - ::Ice::ObjectPrx getAdapter(const ::std::string&) const; - ::Ice::ObjectPrx getObject(const ::Ice::Identity&) const; - void addObject(const ::Ice::ObjectPrx&); - void clear(); - -private: - - ::std::map< ::std::string, ::Ice::ObjectPrx> _adapters; - ::std::map< ::Ice::Identity, ::Ice::ObjectPrx> _objects; -}; - -typedef ::IceInternal::Handle< ServerLocatorRegistry> ServerLocatorRegistryPtr; - -class ServerLocator : public ::Ice::Locator -{ -public: - - ServerLocator(const ::ServerLocatorRegistryPtr&, const ::Ice::LocatorRegistryPrx&); - - virtual ::Ice::ObjectPrx findObjectById(const ::Ice::Identity&, const ::Ice::Current&) const; - - virtual ::Ice::ObjectPrx findAdapterById(const ::std::string&, const ::Ice::Current&) const; - - virtual ::Ice::LocatorRegistryPrx getRegistry(const ::Ice::Current&) const; - -private: - - ServerLocatorRegistryPtr _registry; - ::Ice::LocatorRegistryPrx _registryPrx; -}; - -#endif - -#endif diff --git a/cppe/test/IceE/location/Test.ice b/cppe/test/IceE/location/Test.ice deleted file mode 100644 index ed609438a17..00000000000 --- a/cppe/test/IceE/location/Test.ice +++ /dev/null @@ -1,40 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -module Test -{ - -interface ServerManager -{ - void startServer(); - void shutdown(); -}; - -interface Hello -{ - idempotent void sayHello(); -}; - -interface TestIntf -{ - void shutdown(); - - idempotent Hello* getHello(); - - idempotent Hello* getReplicatedHello(); - - void migrateHello(); -}; - -}; - -#endif diff --git a/cppe/test/IceE/location/TestI.cpp b/cppe/test/IceE/location/TestI.cpp deleted file mode 100644 index d4a6639cc0b..00000000000 --- a/cppe/test/IceE/location/TestI.cpp +++ /dev/null @@ -1,135 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/Config.h> - -#ifdef ICEE_HAS_LOCATOR - -#include <IceE/IceE.h> -#include <IceE/Locator.h> -#include <TestCommon.h> -#include <TestI.h> - -using namespace Test; - -ServerManagerI::ServerManagerI(const Ice::ObjectAdapterPtr& adapter, const ServerLocatorRegistryPtr& registry, - const Ice::InitializationData& initData) : - _adapter(adapter), _registry(registry), _initData(initData) -{ - - - -} - -void -ServerManagerI::startServer(const Ice::Current&) -{ - for(::std::vector<Ice::CommunicatorPtr>::const_iterator i = _communicators.begin(); i != _communicators.end(); ++i) - { - (*i)->waitForShutdown(); - (*i)->destroy(); - } - _communicators.clear(); - - // - // Simulate a server: create a new communicator and object - // adapter. The object adapter is started on a system allocated - // port. The configuration used here contains the Ice.Locator - // configuration variable. The new object adapter will register - // its endpoints with the locator and create references containing - // the adapter id instead of the endpoints. - // - Ice::CommunicatorPtr serverCommunicator = Ice::initialize(_initData); - _communicators.push_back(serverCommunicator); - - Ice::ObjectAdapterPtr adapter = serverCommunicator->createObjectAdapter("TestAdapter"); - Ice::ObjectAdapterPtr adapter2 = serverCommunicator->createObjectAdapter("TestAdapter2"); - - // Note that this assumes the server is running port 12010. - Ice::ObjectPrx locator = serverCommunicator->stringToProxy("locator:default -p 12010"); - - adapter->setLocator(Ice::LocatorPrx::uncheckedCast(locator)); - adapter2->setLocator(Ice::LocatorPrx::uncheckedCast(locator)); - - Ice::ObjectPtr object = new TestI(adapter, adapter2, _registry); - _registry->addObject(adapter->add(object, serverCommunicator->stringToIdentity("test"))); - _registry->addObject(adapter->add(object, serverCommunicator->stringToIdentity("test2"))); - - adapter->activate(); - adapter2->activate(); -} - -void -ServerManagerI::shutdown(const Ice::Current&) -{ - // - // Clear the registry. - // - _registry->clear(); - - // - // Destroy each of the communicators. - // - for(::std::vector<Ice::CommunicatorPtr>::const_iterator i = _communicators.begin(); i != _communicators.end(); ++i) - { - (*i)->destroy(); - } - _adapter->getCommunicator()->shutdown(); -#ifdef _WIN32_WCE - tprintf("The server has shutdown, close the window to terminate the server."); -#endif -} - -TestI::TestI(const Ice::ObjectAdapterPtr& adapter, - const Ice::ObjectAdapterPtr& adapter2, - const ServerLocatorRegistryPtr& registry) : - _adapter1(adapter), _adapter2(adapter2), _registry(registry) -{ - _registry->addObject(_adapter1->add(new HelloI(), _adapter1->getCommunicator()->stringToIdentity("hello"))); -} - -void -TestI::shutdown(const Ice::Current&) -{ - _adapter1->getCommunicator()->shutdown(); -} - -HelloPrx -TestI::getHello(const Ice::Current&) -{ - return HelloPrx::uncheckedCast(_adapter1->createIndirectProxy( - _adapter1->getCommunicator()->stringToIdentity("hello"))); -} - -HelloPrx -TestI::getReplicatedHello(const Ice::Current&) -{ - return HelloPrx::uncheckedCast(_adapter1->createProxy(_adapter1->getCommunicator()->stringToIdentity("hello"))); -} - -void -TestI::migrateHello(const Ice::Current&) -{ - const Ice::Identity id = _adapter1->getCommunicator()->stringToIdentity("hello"); - try - { - _registry->addObject(_adapter2->add(_adapter1->remove(id), id)); - } - catch(Ice::NotRegisteredException&) - { - _registry->addObject(_adapter1->add(_adapter2->remove(id), id)); - } -} - -void -HelloI::sayHello(const Ice::Current&) -{ -} - -#endif diff --git a/cppe/test/IceE/location/TestI.h b/cppe/test/IceE/location/TestI.h deleted file mode 100644 index 97aeafda2b6..00000000000 --- a/cppe/test/IceE/location/TestI.h +++ /dev/null @@ -1,67 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_I_H -#define TEST_I_H - -#include <IceE/Config.h> - -#ifdef ICEE_HAS_LOCATOR - -#include <Test.h> -#include <vector> -#include <ServerLocator.h> - -class ServerManagerI : public Test::ServerManager -{ -public: - - ServerManagerI(const Ice::ObjectAdapterPtr&, const ServerLocatorRegistryPtr&, - const Ice::InitializationData&); - - virtual void startServer(const Ice::Current&); - virtual void shutdown(const Ice::Current&); - -private: - - Ice::ObjectAdapterPtr _adapter; - ServerLocatorRegistryPtr _registry; - Ice::InitializationData _initData; - std::vector<Ice::CommunicatorPtr> _communicators; -}; - -class HelloI : public Test::Hello -{ -public: - - virtual void sayHello(const Ice::Current&); -}; - -class TestI : public Test::TestIntf -{ -public: - - TestI(const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, const ServerLocatorRegistryPtr&); - - virtual void shutdown(const Ice::Current&); - virtual ::Test::HelloPrx getHello(const Ice::Current&); - virtual ::Test::HelloPrx getReplicatedHello(const Ice::Current&); - virtual void migrateHello(const Ice::Current&); - -private: - - Ice::ObjectAdapterPtr _adapter1; - Ice::ObjectAdapterPtr _adapter2; - ServerLocatorRegistryPtr _registry; - -}; - -#endif - -#endif diff --git a/cppe/test/IceE/location/run.py b/cppe/test/IceE/location/run.py deleted file mode 100755 index 0ecb73d8819..00000000000 --- a/cppe/test/IceE/location/run.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "location") - -TestUtil.mixedClientServerTest(name) -sys.exit(0) diff --git a/cppe/test/IceE/operations/.depend b/cppe/test/IceE/operations/.depend deleted file mode 100644 index 98e65b2a37b..00000000000 --- a/cppe/test/IceE/operations/.depend +++ /dev/null @@ -1,15 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../../include/IceE/Locator.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../include/TestCommon.h ./Test.h -Twoways$(OBJEXT): Twoways.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -BatchOneways$(OBJEXT): BatchOneways.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./TestI.h ./Test.h ../../include/TestCommon.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./TestI.h ./Test.h -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./TestI.h ./Test.h ../../include/TestCommon.h -Collocated$(OBJEXT): Collocated.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./TestI.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../../include/IceE/Locator.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../include/TestCommon.h ./Test.h -Twoways$(OBJEXT): Twoways.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -BatchOneways$(OBJEXT): BatchOneways.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -Test.cpp: Test.ice diff --git a/cppe/test/IceE/operations/.gitignore b/cppe/test/IceE/operations/.gitignore deleted file mode 100644 index d00d2864558..00000000000 --- a/cppe/test/IceE/operations/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -collocated -Test.cpp -Test.h diff --git a/cppe/test/IceE/operations/AllTests.cpp b/cppe/test/IceE/operations/AllTests.cpp deleted file mode 100644 index fbf3f27de64..00000000000 --- a/cppe/test/IceE/operations/AllTests.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <IceE/Locator.h> -#include <TestCommon.h> -#include <Test.h> - -using namespace std; - -Test::MyClassPrx -allTests(const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData) -{ - string ref = communicator->getProperties()->getPropertyWithDefault( - "Operations.Proxy", "test:default -p 12010 -t 10000"); - Ice::ObjectPrx base = communicator->stringToProxy(ref); - Test::MyClassPrx cl = Test::MyClassPrx::checkedCast(base); - Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(cl); - - tprintf("testing timeout..."); - Test::MyClassPrx clTimeout = Test::MyClassPrx::uncheckedCast(cl->ice_timeout(500)); - try - { - clTimeout->opSleep(2000); - test(false); - } - catch(const Ice::TimeoutException&) - { - } - tprintf("ok\n"); - - tprintf("testing twoway operations... "); - void twoways(const Ice::CommunicatorPtr&, const Ice::InitializationData&, const Test::MyClassPrx&); - twoways(communicator, initData, cl); - twoways(communicator, initData, derived); - derived->opDerived(); - tprintf("ok\n"); - - tprintf("testing batch oneway operations... "); - void batchOneways(const Test::MyClassPrx&); - batchOneways(cl); - batchOneways(derived); - tprintf("ok\n"); - - return cl; -} diff --git a/cppe/test/IceE/operations/BatchOneways.cpp b/cppe/test/IceE/operations/BatchOneways.cpp deleted file mode 100644 index 3ed3df956e1..00000000000 --- a/cppe/test/IceE/operations/BatchOneways.cpp +++ /dev/null @@ -1,71 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <Test.h> - -using namespace std; - -void -batchOneways(const Test::MyClassPrx& p) -{ - const Test::ByteS bs1(10 * 1024, 0); - const Test::ByteS bs2(99 * 1024, 0); - const Test::ByteS bs3(100 * 1024, 0); - - try - { - p->opByteSOneway(bs1); - test(true); - } - catch(const Ice::MemoryLimitException&) - { - test(false); - } - - try - { - p->opByteSOneway(bs2); - test(true); - } - catch(const Ice::MemoryLimitException&) - { - test(false); - } - - try - { - p->opByteSOneway(bs3); - test(false); - } - catch(const Ice::MemoryLimitException&) - { - test(true); - } - - Test::MyClassPrx batch = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); - - int i; - - for(i = 0 ; i < 30 ; ++i) - { - try - { - batch->opByteSOneway(bs1); - test(true); - } - catch(const Ice::MemoryLimitException&) - { - test(false); - } - } - - batch->ice_getConnection()->flushBatchRequests(); -} diff --git a/cppe/test/IceE/operations/Client.cpp b/cppe/test/IceE/operations/Client.cpp deleted file mode 100644 index 6a64b0feb5e..00000000000 --- a/cppe/test/IceE/operations/Client.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <Test.h> - -using namespace std; - -class OperationsTestApplication : public TestApplication -{ -public: - - OperationsTestApplication() : - TestApplication("operations client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - // - // We must set MessageSizeMax to an explicit values, because - // we run tests to check whether Ice.MemoryLimitException is - // raised as expected. - // - initData.properties->setProperty("Ice.MessageSizeMax", "100"); - - loadConfig(initData.properties); - - // - // Now parse argc/argv into initData - // - initData.properties = Ice::createProperties(argc, argv, initData.properties); - - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - // - // We don't want connection warnings because of the timeout test. - // - communicator()->getProperties()->setProperty("Ice.Warn.Connections", "0"); - - Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, const Ice::InitializationData&); - Test::MyClassPrx myClass = allTests(communicator(), initData); - - tprintf("testing server shutdown... "); - myClass->shutdown(); - try - { - myClass->opVoid(); - test(false); - } - catch(const Ice::LocalException&) - { - tprintf("ok\n"); - } - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - OperationsTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - OperationsTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/operations/Collocated.cpp b/cppe/test/IceE/operations/Collocated.cpp deleted file mode 100644 index 8fef448ea54..00000000000 --- a/cppe/test/IceE/operations/Collocated.cpp +++ /dev/null @@ -1,79 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -class OperationsTestApplication : public TestApplication -{ -public: - - OperationsTestApplication() : - TestApplication("operations collocated") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - - // - // We must set MessageSizeMax to an explicit values, because - // we run tests to check whether Ice.MemoryLimitException is - // raised as expected. - // - initData.properties->setProperty("Ice.MessageSizeMax", "100"); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - - loadConfig(initData.properties); - - // - // Now parse argc/argv into initData.properties - // - initData.properties = Ice::createProperties(argc, argv, initData.properties); - - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - adapter->add(new MyDerivedClassI, communicator()->stringToIdentity("test")); - adapter->activate(); - - Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, const Ice::InitializationData&); - allTests(communicator(), initData); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - OperationsTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - OperationsTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/operations/Makefile b/cppe/test/IceE/operations/Makefile deleted file mode 100644 index a0e3a54d2cf..00000000000 --- a/cppe/test/IceE/operations/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -COLLOCATED = collocated - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -COBJS = Test.o \ - Client.o \ - AllTests.o \ - Twoways.o \ - BatchOneways.o - -SOBJS = Test.o \ - TestI.o \ - Server.o - -COLOBJS = Test.o \ - TestI.o \ - Collocated.o \ - AllTests.o \ - Twoways.o \ - BatchOneways.o - -SRCS = $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) \ - $(COLOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(TESTLIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(TESTLIBS) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COLOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/operations/Makefile.mak b/cppe/test/IceE/operations/Makefile.mak deleted file mode 100644 index fe771745f43..00000000000 --- a/cppe/test/IceE/operations/Makefile.mak +++ /dev/null @@ -1,67 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-COLLOCATED = collocated.exe
-
-TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS = Test.obj \
- Client.obj \
- AllTests.obj \
- Twoways.obj \
- BatchOneways.obj
-
-SOBJS = Test.obj \
- TestI.obj \
- Server.obj
-
-COLOBJS = Test.obj \
- TestI.obj \
- Collocated.obj \
- AllTests.obj \
- Twoways.obj \
- BatchOneways.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp) \
- $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
- $(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
-
-!include .depend
diff --git a/cppe/test/IceE/operations/Server.cpp b/cppe/test/IceE/operations/Server.cpp deleted file mode 100644 index 41feb4cbcb9..00000000000 --- a/cppe/test/IceE/operations/Server.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -class OperationsTestApplication : public TestApplication -{ -public: - - OperationsTestApplication() : - TestApplication("operations server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - //initData.properties->setProperty("Ice.Trace.Network", "5"); - //initData.properties->setProperty("Ice.Trace.Protocol", "5"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - adapter->add(new MyDerivedClassI, communicator()->stringToIdentity("test")); - adapter->activate(); - -#ifndef _WIN32_WCE - communicator()->waitForShutdown(); -#endif - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - OperationsTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - OperationsTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/operations/Test.ice b/cppe/test/IceE/operations/Test.ice deleted file mode 100644 index d867f5cf258..00000000000 --- a/cppe/test/IceE/operations/Test.ice +++ /dev/null @@ -1,162 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -module Test -{ - -enum MyEnum -{ - enum1, - enum2, - enum3 -}; - -class MyClass; - -struct AnotherStruct -{ - string s; -}; - -struct Structure -{ - MyClass* p; - MyEnum e; - AnotherStruct s; -}; - -sequence<byte> ByteS; -sequence<bool> BoolS; -sequence<short> ShortS; -sequence<int> IntS; -sequence<long> LongS; -sequence<float> FloatS; -sequence<double> DoubleS; -sequence<string> StringS; -sequence<MyEnum> MyEnumS; -sequence<MyClass*> MyClassS; - -sequence<ByteS> ByteSS; -sequence<BoolS> BoolSS; -sequence<ShortS> ShortSS; -sequence<IntS> IntSS; -sequence<LongS> LongSS; -sequence<FloatS> FloatSS; -sequence<DoubleS> DoubleSS; -sequence<StringS> StringSS; -sequence<MyEnumS> MyEnumSS; -sequence<MyClassS> MyClassSS; - -sequence<StringSS> StringSSS; - -dictionary<byte, bool> ByteBoolD; -dictionary<short, int> ShortIntD; -dictionary<long, float> LongFloatD; -dictionary<string, string> StringStringD; -dictionary<string, MyEnum> StringMyEnumD; - -class MyClass -{ - void shutdown(); - - void opVoid(); - - void opSleep(int duration); - - byte opByte(byte p1, byte p2, - out byte p3); - - bool opBool(bool p1, bool p2, - out bool p3); - - long opShortIntLong(short p1, int p2, long p3, - out short p4, out int p5, out long p6); - - double opFloatDouble(float p1, double p2, - out float p3, out double p4); - - string opString(string p1, string p2, - out string p3); - - MyEnum opMyEnum(MyEnum p1, out MyEnum p2); - - MyClass* opMyClass(MyClass* p1, out MyClass* p2, out MyClass* p3); - - Structure opStruct(Structure p1, Structure p2, - out Structure p3); - - ByteS opByteS(ByteS p1, ByteS p2, - out ByteS p3); - - BoolS opBoolS(BoolS p1, BoolS p2, - out BoolS p3); - - LongS opShortIntLongS(Test::ShortS p1, IntS p2, LongS p3, - out ::Test::ShortS p4, out IntS p5, out LongS p6); - - DoubleS opFloatDoubleS(FloatS p1, DoubleS p2, - out FloatS p3, out DoubleS p4); - - StringS opStringS(StringS p1, StringS p2, - out StringS p3); - - ByteSS opByteSS(ByteSS p1, ByteSS p2, - out ByteSS p3); - - BoolSS opBoolSS(BoolSS p1, BoolSS p2, - out BoolSS p3); - - LongSS opShortIntLongSS(ShortSS p1, IntSS p2, LongSS p3, - out ShortSS p4, out IntSS p5, out LongSS p6); - - - DoubleSS opFloatDoubleSS(FloatSS p1, DoubleSS p2, - out FloatSS p3, out DoubleSS p4); - - StringSS opStringSS(StringSS p1, StringSS p2, - out StringSS p3); - - StringSSS opStringSSS(StringSSS p1, StringSSS p2, - out StringSSS p3); - - ByteBoolD opByteBoolD(ByteBoolD p1, ByteBoolD p2, - out ByteBoolD p3); - - ShortIntD opShortIntD(ShortIntD p1, ShortIntD p2, - out ShortIntD p3); - - LongFloatD opLongFloatD(LongFloatD p1, LongFloatD p2, - out LongFloatD p3); - - StringStringD opStringStringD(StringStringD p1, StringStringD p2, - out StringStringD p3); - - StringMyEnumD opStringMyEnumD(StringMyEnumD p1, StringMyEnumD p2, - out StringMyEnumD p3); - - IntS opIntS(IntS s); - - void opByteSOneway(ByteS s); - - StringStringD opContext(); - - void opDoubleMarshaling(double p1, DoubleS p2); -}; - -class MyDerivedClass extends MyClass -{ - void opDerived(); -}; - -}; - -#endif diff --git a/cppe/test/IceE/operations/TestI.cpp b/cppe/test/IceE/operations/TestI.cpp deleted file mode 100644 index b4d18145f70..00000000000 --- a/cppe/test/IceE/operations/TestI.cpp +++ /dev/null @@ -1,381 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestI.h> -#include <TestCommon.h> -#include <functional> - -MyDerivedClassI::MyDerivedClassI() -{ -} - -void -MyDerivedClassI::shutdown(const Ice::Current& current) -{ - current.adapter->getCommunicator()->shutdown(); -#ifdef _WIN32_WCE - tprintf("The server has shutdown, close the window to terminate the server."); -#endif -} - -void -MyDerivedClassI::opVoid(const Ice::Current&) -{ -} - -void -MyDerivedClassI::opSleep(int duration, const Ice::Current&) -{ - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(duration)); -} - -Ice::Byte -MyDerivedClassI::opByte(Ice::Byte p1, - Ice::Byte p2, - Ice::Byte& p3, - const Ice::Current&) -{ - p3 = p1 ^ p2; - return p1; -} - -bool -MyDerivedClassI::opBool(bool p1, - bool p2, - bool& p3, - const Ice::Current&) -{ - p3 = p1; - return p2; -} - -Ice::Long -MyDerivedClassI::opShortIntLong(Ice::Short p1, - Ice::Int p2, - Ice::Long p3, - Ice::Short& p4, - Ice::Int& p5, - Ice::Long& p6, - const Ice::Current&) -{ - p4 = p1; - p5 = p2; - p6 = p3; - return p3; -} - -Ice::Double -MyDerivedClassI::opFloatDouble(Ice::Float p1, - Ice::Double p2, - Ice::Float& p3, - Ice::Double& p4, - const Ice::Current&) -{ - p3 = p1; - p4 = p2; - return p2; -} - -std::string -MyDerivedClassI::opString(const std::string& p1, - const std::string& p2, - std::string& p3, - const Ice::Current&) -{ - p3 = p2 + " " + p1; - return p1 + " " + p2; -} - -Test::MyEnum -MyDerivedClassI::opMyEnum(Test::MyEnum p1, - Test::MyEnum& p2, - const Ice::Current&) -{ - p2 = p1; - return Test::enum3; -} - -Test::MyClassPrx -MyDerivedClassI::opMyClass(const Test::MyClassPrx& p1, - Test::MyClassPrx& p2, - Test::MyClassPrx& p3, - const Ice::Current& current) -{ - p2 = p1; - p3 = Test::MyClassPrx::uncheckedCast(current.adapter->createProxy( - current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); - return Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(current.id)); -} - -Test::Structure -MyDerivedClassI::opStruct(const Test::Structure& p1, - const ::Test::Structure& p2, - ::Test::Structure& p3, - const Ice::Current&) -{ - p3 = p1; - p3.s.s = "a new string"; - return p2; -} - -Test::ByteS -MyDerivedClassI::opByteS(const Test::ByteS& p1, - const Test::ByteS& p2, - Test::ByteS& p3, - const Ice::Current&) -{ - p3.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), p3.begin()); - Test::ByteS r = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(r)); - return r; -} - -Test::BoolS -MyDerivedClassI::opBoolS(const Test::BoolS& p1, - const Test::BoolS& p2, - Test::BoolS& p3, - const Ice::Current&) -{ - p3 = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); - Test::BoolS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - return r; -} - -Test::LongS -MyDerivedClassI::opShortIntLongS(const Test::ShortS& p1, - const Test::IntS& p2, - const Test::LongS& p3, - Test::ShortS& p4, - Test::IntS& p5, - Test::LongS& p6, - const Ice::Current&) -{ - p4 = p1; - p5.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), p5.begin()); - p6 = p3; - std::copy(p3.begin(), p3.end(), std::back_inserter(p6)); - return p3; -} - -Test::DoubleS -MyDerivedClassI::opFloatDoubleS(const Test::FloatS& p1, - const Test::DoubleS& p2, - Test::FloatS& p3, - Test::DoubleS& p4, - const Ice::Current&) -{ - p3 = p1; - p4.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), p4.begin()); - Test::DoubleS r = p2; - std::copy(p1.begin(), p1.end(), std::back_inserter(r)); - return r; -} - -Test::StringS -MyDerivedClassI::opStringS(const Test::StringS& p1, - const Test::StringS& p2, - Test::StringS& p3, - const Ice::Current&) -{ - p3 = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); - Test::StringS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - return r; -} - -Test::ByteSS -MyDerivedClassI::opByteSS(const Test::ByteSS& p1, - const Test::ByteSS& p2, - Test::ByteSS& p3, - const Ice::Current&) -{ - p3.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), p3.begin()); - Test::ByteSS r = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(r)); - return r; -} - -Test::BoolSS -MyDerivedClassI::opBoolSS(const Test::BoolSS& p1, - const Test::BoolSS& p2, - Test::BoolSS& p3, - const Ice::Current&) -{ - p3 = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); - Test::BoolSS r; - r.resize(p1.size()); - std::reverse_copy(p1.begin(), p1.end(), r.begin()); - return r; -} - -Test::LongSS -MyDerivedClassI::opShortIntLongSS(const Test::ShortSS& p1, - const Test::IntSS& p2, - const Test::LongSS& p3, - Test::ShortSS& p4, - Test::IntSS& p5, - Test::LongSS& p6, - const Ice::Current&) -{ - p4 = p1; - p5.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), p5.begin()); - p6 = p3; - std::copy(p3.begin(), p3.end(), std::back_inserter(p6)); - return p3; -} - -Test::DoubleSS -MyDerivedClassI::opFloatDoubleSS(const Test::FloatSS& p1, - const Test::DoubleSS& p2, - Test::FloatSS& p3, - Test::DoubleSS& p4, - const Ice::Current&) -{ - p3 = p1; - p4.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), p4.begin()); - Test::DoubleSS r = p2; - std::copy(p2.begin(), p2.end(), std::back_inserter(r)); - return r; -} - -Test::StringSS -MyDerivedClassI::opStringSS(const Test::StringSS& p1, - const Test::StringSS& p2, - Test::StringSS& p3, - const Ice::Current&) -{ - p3 = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); - Test::StringSS r; - r.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), r.begin()); - return r; -} - -Test::StringSSS -MyDerivedClassI::opStringSSS(const Test::StringSSS& p1, - const Test::StringSSS& p2, - Test::StringSSS& p3, - const ::Ice::Current&) -{ - p3 = p1; - std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); - Test::StringSSS r; - r.resize(p2.size()); - std::reverse_copy(p2.begin(), p2.end(), r.begin()); - return r; -} - -Test::ByteBoolD -MyDerivedClassI::opByteBoolD(const Test::ByteBoolD& p1, - const Test::ByteBoolD& p2, - Test::ByteBoolD& p3, - const Ice::Current&) -{ - p3 = p1; - Test::ByteBoolD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - return r; -} - -Test::ShortIntD -MyDerivedClassI::opShortIntD(const Test::ShortIntD& p1, - const Test::ShortIntD& p2, - Test::ShortIntD& p3, - const Ice::Current&) -{ - p3 = p1; - Test::ShortIntD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - return r; -} - -Test::LongFloatD -MyDerivedClassI::opLongFloatD(const Test::LongFloatD& p1, - const Test::LongFloatD& p2, - Test::LongFloatD& p3, - const Ice::Current&) -{ - p3 = p1; - Test::LongFloatD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - return r; -} - -Test::StringStringD -MyDerivedClassI::opStringStringD(const Test::StringStringD& p1, - const Test::StringStringD& p2, - Test::StringStringD& p3, - const Ice::Current&) -{ - p3 = p1; - Test::StringStringD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - return r; -} - -Test::StringMyEnumD -MyDerivedClassI::opStringMyEnumD(const Test::StringMyEnumD& p1, - const Test::StringMyEnumD& p2, - Test::StringMyEnumD& p3, - const Ice::Current&) -{ - p3 = p1; - Test::StringMyEnumD r = p1; - std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); - return r; -} - -Test::IntS -MyDerivedClassI::opIntS(const Test::IntS& s, const Ice::Current&) -{ - Test::IntS r; - std::transform(s.begin(), s.end(), std::back_inserter(r), std::negate<int>()); - return r; -} - -void -MyDerivedClassI::opByteSOneway(const Test::ByteS&, const Ice::Current&) -{ -} - -Test::StringStringD -MyDerivedClassI::opContext(const Ice::Current& c) -{ - return c.ctx; -} - -void -MyDerivedClassI::opDoubleMarshaling(Ice::Double p1, const Test::DoubleS& p2, const Ice::Current&) -{ - Ice::Double d = 1278312346.0 / 13.0; - test(p1 == d); - for(unsigned int i = 0; i < p2.size(); ++i) - { - test(p2[i] == d); - } -} - -void -MyDerivedClassI::opDerived(const Ice::Current&) -{ -} diff --git a/cppe/test/IceE/operations/TestI.h b/cppe/test/IceE/operations/TestI.h deleted file mode 100644 index fc0b19fa84f..00000000000 --- a/cppe/test/IceE/operations/TestI.h +++ /dev/null @@ -1,162 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_I_H -#define TEST_I_H - -#include <Test.h> - -class MyDerivedClassI : public Test::MyDerivedClass -{ -public: - - MyDerivedClassI(); - - virtual void shutdown(const Ice::Current&); - - virtual void opVoid(const Ice::Current&); - - virtual void opSleep(int, const Ice::Current&); - - virtual Ice::Byte opByte(Ice::Byte, - Ice::Byte, - Ice::Byte&, - const Ice::Current&); - - virtual bool opBool(bool, - bool, - bool&, - const Ice::Current&); - - virtual Ice::Long opShortIntLong(Ice::Short, - Ice::Int, - Ice::Long, - Ice::Short&, - Ice::Int&, - Ice::Long&, - const Ice::Current&); - - virtual Ice::Double opFloatDouble(Ice::Float, - Ice::Double, - Ice::Float&, - Ice::Double&, - const Ice::Current&); - - virtual std::string opString(const std::string&, - const std::string&, - std::string&, - const Ice::Current&); - - virtual Test::MyEnum opMyEnum(Test::MyEnum, - Test::MyEnum&, - const Ice::Current&); - - virtual Test::MyClassPrx opMyClass(const Test::MyClassPrx&, - Test::MyClassPrx&, Test::MyClassPrx&, - const Ice::Current&); - - virtual Test::Structure opStruct(const Test::Structure&, const Test::Structure&, - Test::Structure&, - const Ice::Current&); - - virtual Test::ByteS opByteS(const Test::ByteS&, - const Test::ByteS&, - Test::ByteS&, - const Ice::Current&); - - virtual Test::BoolS opBoolS(const Test::BoolS&, - const Test::BoolS&, - Test::BoolS&, - const Ice::Current&); - - virtual Test::LongS opShortIntLongS(const Test::ShortS&, - const Test::IntS&, - const Test::LongS&, - Test::ShortS&, - Test::IntS&, - Test::LongS&, - const Ice::Current&); - - virtual Test::DoubleS opFloatDoubleS(const Test::FloatS&, - const Test::DoubleS&, - Test::FloatS&, - Test::DoubleS&, - const Ice::Current&); - - virtual Test::StringS opStringS(const Test::StringS&, - const Test::StringS&, - Test::StringS&, - const Ice::Current&); - - virtual Test::ByteSS opByteSS(const Test::ByteSS&, - const Test::ByteSS&, - Test::ByteSS&, - const Ice::Current&); - - virtual Test::BoolSS opBoolSS(const Test::BoolSS&, - const Test::BoolSS&, - Test::BoolSS&, - const Ice::Current&); - - virtual Test::LongSS opShortIntLongSS(const Test::ShortSS&, - const Test::IntSS&, - const Test::LongSS&, - Test::ShortSS&, - Test::IntSS&, - Test::LongSS&, - const Ice::Current&); - - virtual Test::DoubleSS opFloatDoubleSS(const Test::FloatSS&, - const Test::DoubleSS&, - Test::FloatSS&, - Test::DoubleSS&, - const Ice::Current&); - - virtual Test::StringSS opStringSS(const Test::StringSS&, - const Test::StringSS&, - Test::StringSS&, - const Ice::Current&); - - virtual Test::StringSSS opStringSSS(const Test::StringSSS&, - const Test::StringSSS&, - Test::StringSSS&, - const ::Ice::Current&); - - virtual Test::ByteBoolD opByteBoolD(const Test::ByteBoolD&, const Test::ByteBoolD&, - Test::ByteBoolD&, - const Ice::Current&); - - virtual Test::ShortIntD opShortIntD(const Test::ShortIntD&, const Test::ShortIntD&, - Test::ShortIntD&, - const Ice::Current&); - - virtual Test::LongFloatD opLongFloatD(const Test::LongFloatD&, const Test::LongFloatD&, - Test::LongFloatD&, - const Ice::Current&); - - virtual Test::StringStringD opStringStringD(const Test::StringStringD&, const Test::StringStringD&, - Test::StringStringD&, - const Ice::Current&); - - virtual Test::StringMyEnumD opStringMyEnumD(const Test::StringMyEnumD&, const Test::StringMyEnumD&, - Test::StringMyEnumD&, - const Ice::Current&); - - virtual Test::IntS opIntS(const Test::IntS&, const Ice::Current&); - - virtual void opByteSOneway(const Test::ByteS&, const Ice::Current&); - - virtual Ice::Context opContext(const Ice::Current&); - - virtual void opDoubleMarshaling(Ice::Double, const Test::DoubleS&, const Ice::Current&); - - virtual void opDerived(const Ice::Current&); -}; - -#endif diff --git a/cppe/test/IceE/operations/Twoways.cpp b/cppe/test/IceE/operations/Twoways.cpp deleted file mode 100644 index b06afaae507..00000000000 --- a/cppe/test/IceE/operations/Twoways.cpp +++ /dev/null @@ -1,670 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <Test.h> -#include <limits> - -// -// Visual C++ defines min and max as macros -// -#ifdef min -# undef min -#endif -#ifdef max -# undef max -#endif - -using namespace std; - -void -twoways(const Ice::CommunicatorPtr& communicator, - const Ice::InitializationData& initializationData, const Test::MyClassPrx& p) -{ - { - p->opVoid(); - } - - { - Ice::Byte b; - Ice::Byte r; - - r = p->opByte(Ice::Byte(0xff), Ice::Byte(0x0f), b); - test(b == Ice::Byte(0xf0)); - test(r == Ice::Byte(0xff)); - } - - { - bool b; - bool r; - - r = p->opBool(true, false, b); - test(b); - test(!r); - } - - { - Ice::Short s; - Ice::Int i; - Ice::Long l; - Ice::Long r; - - r = p->opShortIntLong(10, 11, 12, s, i, l); - test(s == 10); - test(i == 11); - test(l == 12); - test(r == 12); - - r = p->opShortIntLong(numeric_limits<Ice::Short>::min(), numeric_limits<Ice::Int>::min(), - numeric_limits<Ice::Long>::min(), s, i, l); - test(s == numeric_limits<Ice::Short>::min()); - test(i == numeric_limits<Ice::Int>::min()); - test(l == numeric_limits<Ice::Long>::min()); - test(r == numeric_limits<Ice::Long>::min()); - - r = p->opShortIntLong(numeric_limits<Ice::Short>::max(), numeric_limits<Ice::Int>::max(), - numeric_limits<Ice::Long>::max(), s, i, l); - test(s == numeric_limits<Ice::Short>::max()); - test(i == numeric_limits<Ice::Int>::max()); - test(l == numeric_limits<Ice::Long>::max()); - test(r == numeric_limits<Ice::Long>::max()); - } - - { - Ice::Float f; - Ice::Double d; - Ice::Double r; - - r = p->opFloatDouble(Ice::Float(3.14), Ice::Double(1.1E10), f, d); - test(f == Ice::Float(3.14)); - test(d == Ice::Double(1.1E10)); - test(r == Ice::Double(1.1E10)); - - r = p->opFloatDouble(numeric_limits<Ice::Float>::min(), numeric_limits<Ice::Double>::min(), f, d); - test(f == numeric_limits<Ice::Float>::min()); - test(d == numeric_limits<Ice::Double>::min()); - test(r == numeric_limits<Ice::Double>::min()); - - r = p->opFloatDouble(numeric_limits<Ice::Float>::max(), numeric_limits<Ice::Double>::max(), f, d); - test(f == numeric_limits<Ice::Float>::max()); - test(d == numeric_limits<Ice::Double>::max()); - test(r == numeric_limits<Ice::Double>::max()); - } - - { - string s; - string r; - - r = p->opString("hello", "world", s); - test(s == "world hello"); - test(r == "hello world"); - } - - { - Test::MyEnum e; - Test::MyEnum r; - - r = p->opMyEnum(Test::enum2, e); - test(e == Test::enum2); - test(r == Test::enum3); - } - - { - Test::MyClassPrx c1; - Test::MyClassPrx c2; - Test::MyClassPrx r; - - r = p->opMyClass(p, c1, c2); - test(Ice::proxyIdentityAndFacetEqual(c1, p)); - test(!Ice::proxyIdentityAndFacetEqual(c2, p)); - test(Ice::proxyIdentityAndFacetEqual(r, p)); - test(c1->ice_getIdentity() == communicator->stringToIdentity("test")); - test(c2->ice_getIdentity() == communicator->stringToIdentity("noSuchIdentity")); - test(r->ice_getIdentity() == communicator->stringToIdentity("test")); - r->opVoid(); - c1->opVoid(); - try - { - c2->opVoid(); - test(false); - } - catch(const Ice::ObjectNotExistException&) - { - } - - r = p->opMyClass(0, c1, c2); - test(c1 == 0); - test(c2 != 0); - test(Ice::proxyIdentityAndFacetEqual(r, p)); - r->opVoid(); - } - - - { - Test::Structure si1; - si1.p = p; - si1.e = Test::enum3; - si1.s.s = "abc"; - Test::Structure si2; - si2.p = 0; - si2.e = Test::enum2; - si2.s.s = "def"; - - Test::Structure so; - Test::Structure rso = p->opStruct(si1, si2, so); - test(rso.p == 0); - test(rso.e == Test::enum2); - test(rso.s.s == "def"); - test(so.p == p); - test(so.e == Test::enum3); - test(so.s.s == "a new string"); - so.p->opVoid(); - } - - { - Test::ByteS bsi1; - Test::ByteS bsi2; - - bsi1.push_back(Ice::Byte(0x01)); - bsi1.push_back(Ice::Byte(0x11)); - bsi1.push_back(Ice::Byte(0x12)); - bsi1.push_back(Ice::Byte(0x22)); - - bsi2.push_back(Ice::Byte(0xf1)); - bsi2.push_back(Ice::Byte(0xf2)); - bsi2.push_back(Ice::Byte(0xf3)); - bsi2.push_back(Ice::Byte(0xf4)); - - Test::ByteS bso; - Test::ByteS rso; - - rso = p->opByteS(bsi1, bsi2, bso); - test(bso.size() == 4); - test(bso[0] == Ice::Byte(0x22)); - test(bso[1] == Ice::Byte(0x12)); - test(bso[2] == Ice::Byte(0x11)); - test(bso[3] == Ice::Byte(0x01)); - test(rso.size() == 8); - test(rso[0] == Ice::Byte(0x01)); - test(rso[1] == Ice::Byte(0x11)); - test(rso[2] == Ice::Byte(0x12)); - test(rso[3] == Ice::Byte(0x22)); - test(rso[4] == Ice::Byte(0xf1)); - test(rso[5] == Ice::Byte(0xf2)); - test(rso[6] == Ice::Byte(0xf3)); - test(rso[7] == Ice::Byte(0xf4)); - } - - { - Test::BoolS bsi1; - Test::BoolS bsi2; - - bsi1.push_back(true); - bsi1.push_back(true); - bsi1.push_back(false); - - bsi2.push_back(false); - - Test::BoolS bso; - Test::BoolS rso; - - rso = p->opBoolS(bsi1, bsi2, bso); - test(bso.size() == 4); - test(bso[0]); - test(bso[1]); - test(!bso[2]); - test(!bso[3]); - test(rso.size() == 3); - test(!rso[0]); - test(rso[1]); - test(rso[2]); - } - - { - Test::ShortS ssi; - Test::IntS isi; - Test::LongS lsi; - - ssi.push_back(1); - ssi.push_back(2); - ssi.push_back(3); - - isi.push_back(5); - isi.push_back(6); - isi.push_back(7); - isi.push_back(8); - - lsi.push_back(10); - lsi.push_back(30); - lsi.push_back(20); - - Test::ShortS sso; - Test::IntS iso; - Test::LongS lso; - Test::LongS rso; - - rso = p->opShortIntLongS(ssi, isi, lsi, sso, iso, lso); - test(sso.size() == 3); - test(sso[0] == 1); - test(sso[1] == 2); - test(sso[2] == 3); - test(iso.size() == 4); - test(iso[0] == 8); - test(iso[1] == 7); - test(iso[2] == 6); - test(iso[3] == 5); - test(lso.size() == 6); - test(lso[0] == 10); - test(lso[1] == 30); - test(lso[2] == 20); - test(lso[3] == 10); - test(lso[4] == 30); - test(lso[5] == 20); - test(rso.size() == 3); - test(rso[0] == 10); - test(rso[1] == 30); - test(rso[2] == 20); - } - - { - Test::FloatS fsi; - Test::DoubleS dsi; - - fsi.push_back(Ice::Float(3.14)); - fsi.push_back(Ice::Float(1.11)); - - dsi.push_back(Ice::Double(1.1E10)); - dsi.push_back(Ice::Double(1.2E10)); - dsi.push_back(Ice::Double(1.3E10)); - - Test::FloatS fso; - Test::DoubleS dso; - Test::DoubleS rso; - - rso = p->opFloatDoubleS(fsi, dsi, fso, dso); - test(fso.size() == 2); - test(fso[0] == ::Ice::Float(3.14)); - test(fso[1] == ::Ice::Float(1.11)); - test(dso.size() == 3); - test(dso[0] == ::Ice::Double(1.3E10)); - test(dso[1] == ::Ice::Double(1.2E10)); - test(dso[2] == ::Ice::Double(1.1E10)); - test(rso.size() == 5); - test(rso[0] == ::Ice::Double(1.1E10)); - test(rso[1] == ::Ice::Double(1.2E10)); - test(rso[2] == ::Ice::Double(1.3E10)); - test(::Ice::Float(rso[3]) == ::Ice::Float(3.14)); - test(::Ice::Float(rso[4]) == ::Ice::Float(1.11)); - } - - { - Test::StringS ssi1; - Test::StringS ssi2; - - ssi1.push_back("abc"); - ssi1.push_back("de"); - ssi1.push_back("fghi"); - - ssi2.push_back("xyz"); - - Test::StringS sso; - Test::StringS rso; - - rso = p->opStringS(ssi1, ssi2, sso); - test(sso.size() == 4); - test(sso[0] == "abc"); - test(sso[1] == "de"); - test(sso[2] == "fghi"); - test(sso[3] == "xyz"); - test(rso.size() == 3); - test(rso[0] == "fghi"); - test(rso[1] == "de"); - test(rso[2] == "abc"); - } - - { - Test::ByteSS bsi1; - bsi1.resize(2); - Test::ByteSS bsi2; - bsi2.resize(2); - - bsi1[0].push_back(Ice::Byte(0x01)); - bsi1[0].push_back(Ice::Byte(0x11)); - bsi1[0].push_back(Ice::Byte(0x12)); - bsi1[1].push_back(Ice::Byte(0xff)); - - bsi2[0].push_back(Ice::Byte(0x0e)); - bsi2[1].push_back(Ice::Byte(0xf2)); - bsi2[1].push_back(Ice::Byte(0xf1)); - - Test::ByteSS bso; - Test::ByteSS rso; - - rso = p->opByteSS(bsi1, bsi2, bso); - test(bso.size() == 2); - test(bso[0].size() == 1); - test(bso[0][0] == Ice::Byte(0xff)); - test(bso[1].size() == 3); - test(bso[1][0] == Ice::Byte(0x01)); - test(bso[1][1] == Ice::Byte(0x11)); - test(bso[1][2] == Ice::Byte(0x12)); - test(rso.size() == 4); - test(rso[0].size() == 3); - test(rso[0][0] == Ice::Byte(0x01)); - test(rso[0][1] == Ice::Byte(0x11)); - test(rso[0][2] == Ice::Byte(0x12)); - test(rso[1].size() == 1); - test(rso[1][0] == Ice::Byte(0xff)); - test(rso[2].size() == 1); - test(rso[2][0] == Ice::Byte(0x0e)); - test(rso[3].size() == 2); - test(rso[3][0] == Ice::Byte(0xf2)); - test(rso[3][1] == Ice::Byte(0xf1)); - } - - { - Test::FloatSS fsi; - fsi.resize(3); - Test::DoubleSS dsi; - dsi.resize(1); - - fsi[0].push_back(Ice::Float(3.14)); - fsi[1].push_back(Ice::Float(1.11)); - - dsi[0].push_back(Ice::Double(1.1E10)); - dsi[0].push_back(Ice::Double(1.2E10)); - dsi[0].push_back(Ice::Double(1.3E10)); - - Test::FloatSS fso; - Test::DoubleSS dso; - Test::DoubleSS rso; - - rso = p->opFloatDoubleSS(fsi, dsi, fso, dso); - test(fso.size() == 3); - test(fso[0].size() == 1); - test(fso[0][0] == ::Ice::Float(3.14)); - test(fso[1].size() == 1); - test(fso[1][0] == ::Ice::Float(1.11)); - test(fso[2].size() == 0); - test(dso.size() == 1); - test(dso[0].size() == 3); - test(dso[0][0] == ::Ice::Double(1.1E10)); - test(dso[0][1] == ::Ice::Double(1.2E10)); - test(dso[0][2] == ::Ice::Double(1.3E10)); - test(rso.size() == 2); - test(rso[0].size() == 3); - test(rso[0][0] == ::Ice::Double(1.1E10)); - test(rso[0][1] == ::Ice::Double(1.2E10)); - test(rso[0][2] == ::Ice::Double(1.3E10)); - test(rso[1].size() == 3); - test(rso[1][0] == ::Ice::Double(1.1E10)); - test(rso[1][1] == ::Ice::Double(1.2E10)); - test(rso[1][2] == ::Ice::Double(1.3E10)); - } - - { - Test::StringSS ssi1; - ssi1.resize(2); - Test::StringSS ssi2; - ssi2.resize(3); - - ssi1[0].push_back("abc"); - ssi1[1].push_back("de"); - ssi1[1].push_back("fghi"); - - ssi2[2].push_back("xyz"); - - Test::StringSS sso; - Test::StringSS rso; - - rso = p->opStringSS(ssi1, ssi2, sso); - test(sso.size() == 5); - test(sso[0].size() == 1); - test(sso[0][0] == "abc"); - test(sso[1].size() == 2); - test(sso[1][0] == "de"); - test(sso[1][1] == "fghi"); - test(sso[2].size() == 0); - test(sso[3].size() == 0); - test(sso[4].size() == 1); - test(sso[4][0] == "xyz"); - test(rso.size() == 3); - test(rso[0].size() == 1); - test(rso[0][0] == "xyz"); - test(rso[1].size() == 0); - test(rso[2].size() == 0); - } - - { - Test::StringSSS sssi1; - sssi1.resize(2); - sssi1[0].resize(2); - sssi1[0][0].push_back("abc"); - sssi1[0][0].push_back("de"); - sssi1[0][1].push_back("xyz"); - sssi1[1].resize(1); - sssi1[1][0].push_back("hello"); - - Test::StringSSS sssi2; - sssi2.resize(3); - sssi2[0].resize(2); - sssi2[0][0].push_back(""); - sssi2[0][0].push_back(""); - sssi2[0][1].push_back("abcd"); - sssi2[1].resize(1); - sssi2[1][0].push_back(""); - - Test::StringSSS ssso; - Test::StringSSS rsso; - - rsso = p->opStringSSS(sssi1, sssi2, ssso); - test(ssso.size() == 5); - test(ssso[0].size() == 2); - test(ssso[0][0].size() == 2); - test(ssso[0][1].size() == 1); - test(ssso[1].size() == 1); - test(ssso[1][0].size() == 1); - test(ssso[2].size() == 2); - test(ssso[2][0].size() == 2); - test(ssso[2][1].size() == 1); - test(ssso[3].size() == 1); - test(ssso[3][0].size() == 1); - test(ssso[4].size() == 0); - test(ssso[0][0][0] == "abc"); - test(ssso[0][0][1] == "de"); - test(ssso[0][1][0] == "xyz"); - test(ssso[1][0][0] == "hello"); - test(ssso[2][0][0] == ""); - test(ssso[2][0][1] == ""); - test(ssso[2][1][0] == "abcd"); - test(ssso[3][0][0] == ""); - - test(rsso.size() == 3); - test(rsso[0].size() == 0); - test(rsso[1].size() == 1); - test(rsso[1][0].size() == 1); - test(rsso[2].size() == 2); - test(rsso[2][0].size() == 2); - test(rsso[2][1].size() == 1); - test(rsso[1][0][0] == ""); - test(rsso[2][0][0] == ""); - test(rsso[2][0][1] == ""); - test(rsso[2][1][0] == "abcd"); - } - - { - Test::ByteBoolD di1; - di1[10] = true; - di1[100] = false; - Test::ByteBoolD di2; - di2[10] = true; - di2[11] = false; - di2[101] = true; - - Test::ByteBoolD _do; - Test::ByteBoolD ro = p->opByteBoolD(di1, di2, _do); - - test(_do == di1); - test(ro.size() == 4); - test(ro[10] == true); - test(ro[11] == false); - test(ro[100] == false); - test(ro[101] == true); - } - - { - Test::ShortIntD di1; - di1[110] = -1; - di1[1100] = 123123; - Test::ShortIntD di2; - di2[110] = -1; - di2[111] = -100; - di2[1101] = 0; - - Test::ShortIntD _do; - Test::ShortIntD ro = p->opShortIntD(di1, di2, _do); - - test(_do == di1); - test(ro.size() == 4); - test(ro[110] == -1); - test(ro[111] == -100); - test(ro[1100] == 123123); - test(ro[1101] == 0); - } - - { - Test::LongFloatD di1; - di1[999999110] = Ice::Float(-1.1); - di1[999999111] = Ice::Float(123123.2); - Test::LongFloatD di2; - di2[999999110] = Ice::Float(-1.1); - di2[999999120] = Ice::Float(-100.4); - di2[999999130] = Ice::Float(0.5); - - Test::LongFloatD _do; - Test::LongFloatD ro = p->opLongFloatD(di1, di2, _do); - - test(_do == di1); - test(ro.size() == 4); - test(ro[999999110] == Ice::Float(-1.1)); - test(ro[999999120] == Ice::Float(-100.4)); - test(ro[999999111] == Ice::Float(123123.2)); - test(ro[999999130] == Ice::Float(0.5)); - } - - { - Test::StringStringD di1; - di1["foo"] = "abc -1.1"; - di1["bar"] = "abc 123123.2"; - Test::StringStringD di2; - di2["foo"] = "abc -1.1"; - di2["FOO"] = "abc -100.4"; - di2["BAR"] = "abc 0.5"; - - Test::StringStringD _do; - Test::StringStringD ro = p->opStringStringD(di1, di2, _do); - - test(_do == di1); - test(ro.size() == 4); - test(ro["foo"] == "abc -1.1"); - test(ro["FOO"] == "abc -100.4"); - test(ro["bar"] == "abc 123123.2"); - test(ro["BAR"] == "abc 0.5"); - } - - { - Test::StringMyEnumD di1; - di1["abc"] = Test::enum1; - di1[""] = Test::enum2; - Test::StringMyEnumD di2; - di2["abc"] = Test::enum1; - di2["qwerty"] = Test::enum3; - di2["Hello!!"] = Test::enum2; - - Test::StringMyEnumD _do; - Test::StringMyEnumD ro = p->opStringMyEnumD(di1, di2, _do); - - test(_do == di1); - test(ro.size() == 4); - test(ro["abc"] == Test::enum1); - test(ro["qwerty"] == Test::enum3); - test(ro[""] == Test::enum2); - test(ro["Hello!!"] == Test::enum2); - } - - { - const int lengths[] = { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 }; - - for(int l = 0; l != sizeof(lengths) / sizeof(*lengths); ++l) - { - Test::IntS s; - for(int i = 0; i < lengths[l]; ++i) - { - s.push_back(i); - } - Test::IntS r = p->opIntS(s); - test(r.size() == static_cast<size_t>(lengths[l])); - for(int j = 0; j < static_cast<int>(r.size()); ++j) - { - test(r[j] == -j); - } - } - } - - { - Ice::Context ctx; - ctx["one"] = "ONE"; - ctx["two"] = "TWO"; - ctx["three"] = "THREE"; - { - Test::StringStringD r = p->opContext(); - test(p->ice_getContext().empty()); - test(r != ctx); - } - { - Test::StringStringD r = p->opContext(ctx); - test(p->ice_getContext().empty()); - test(r == ctx); - } - { - Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_context(ctx)); - test(p2->ice_getContext() == ctx); - Test::StringStringD r = p2->opContext(); - test(r == ctx); - r = p2->opContext(ctx); - test(r == ctx); - } - - { - // - // Test proxy context - // - string ref = communicator->getProperties()->getPropertyWithDefault( - "Operations.Proxy", "test:default -p 12010 -t 10000"); - Test::MyClassPrx c = Test::MyClassPrx::checkedCast(communicator->stringToProxy(ref)); - - Ice::Context dflt; - dflt["a"] = "b"; - Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_context(dflt)); - test(c2->opContext()["a"] == "b"); - - dflt.clear(); - Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_context(dflt)); - Ice::Context tmp = c3->opContext(); - test(tmp.find("a") == tmp.end()); - } - } - - { - Ice::Double d = 1278312346.0 / 13.0; - Test::DoubleS ds(5, d); - p->opDoubleMarshaling(d, ds); - } -} diff --git a/cppe/test/IceE/operations/run.py b/cppe/test/IceE/operations/run.py deleted file mode 100755 index 4cb3eafd0b1..00000000000 --- a/cppe/test/IceE/operations/run.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "operations") - -print "tests with regular server." -TestUtil.clientServerTest(name) -print "tests with collocated server." -TestUtil.collocatedTest(name) -sys.exit(0) diff --git a/cppe/test/IceE/proxy/.depend b/cppe/test/IceE/proxy/.depend deleted file mode 100644 index 407bf7ea5c2..00000000000 --- a/cppe/test/IceE/proxy/.depend +++ /dev/null @@ -1,11 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../../include/IceE/Router.h ../../../include/IceE/Locator.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../include/TestCommon.h ./Test.h -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./TestI.h ./Test.h ../../include/TestCommon.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./TestI.h ./Test.h -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./TestI.h ./Test.h ../../include/TestCommon.h -Collocated$(OBJEXT): Collocated.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./TestI.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../../include/IceE/Router.h ../../../include/IceE/Locator.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../include/TestCommon.h ./Test.h -Test.cpp: Test.ice diff --git a/cppe/test/IceE/proxy/.gitignore b/cppe/test/IceE/proxy/.gitignore deleted file mode 100644 index d00d2864558..00000000000 --- a/cppe/test/IceE/proxy/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -collocated -Test.cpp -Test.h diff --git a/cppe/test/IceE/proxy/AllTests.cpp b/cppe/test/IceE/proxy/AllTests.cpp deleted file mode 100644 index 58a0a87bc26..00000000000 --- a/cppe/test/IceE/proxy/AllTests.cpp +++ /dev/null @@ -1,529 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#ifdef ICEE_HAS_ROUTER -#include <IceE/Router.h> -#endif -#ifdef ICEE_HAS_LOCATOR -#include <IceE/Locator.h> -#endif -#include <TestCommon.h> -#include <Test.h> - -using namespace std; - -Test::MyClassPrx -allTests(const Ice::CommunicatorPtr& communicator) -{ - tprintf("testing stringToProxy... "); - string ref = "test:default -p 12010 -t 10000"; - Ice::ObjectPrx base = communicator->stringToProxy(ref); - test(base); - - Ice::ObjectPrx b1 = communicator->stringToProxy("test:tcp"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet().empty()); - b1 = communicator->stringToProxy("test :tcp"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet().empty()); - b1 = communicator->stringToProxy(" test :tcp"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet().empty()); - b1 = communicator->stringToProxy(" test:tcp"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet().empty()); - b1 = communicator->stringToProxy("'test -f facet':tcp"); - test(b1->ice_getIdentity().name == "test -f facet" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet().empty()); - try - { - b1 = communicator->stringToProxy("\"test -f facet':tcp"); - test(false); - } - catch(const Ice::ProxyParseException&) - { - } - b1 = communicator->stringToProxy("\"test -f facet\":tcp"); - test(b1->ice_getIdentity().name == "test -f facet" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet().empty()); - b1 = communicator->stringToProxy("\"test -f facet@test\":tcp"); - test(b1->ice_getIdentity().name == "test -f facet@test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet().empty()); - b1 = communicator->stringToProxy("\"test -f facet@test @test\":tcp"); - test(b1->ice_getIdentity().name == "test -f facet@test @test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet().empty()); - try - { - b1 = communicator->stringToProxy("test test:tcp"); - test(false); - } - catch(const Ice::ProxyParseException&) - { - } - b1 = communicator->stringToProxy("test\\040test:tcp"); - test(b1->ice_getIdentity().name == "test test" && b1->ice_getIdentity().category.empty()); - try - { - b1 = communicator->stringToProxy("test\\777:tcp"); - test(false); - } - catch(const Ice::IdentityParseException&) - { - } - b1 = communicator->stringToProxy("test\\40test:tcp"); - test(b1->ice_getIdentity().name == "test test"); - - // Test some octal and hex corner cases. - b1 = communicator->stringToProxy("test\\4test:tcp"); - test(b1->ice_getIdentity().name == "test\4test"); - b1 = communicator->stringToProxy("test\\04test:tcp"); - test(b1->ice_getIdentity().name == "test\4test"); - b1 = communicator->stringToProxy("test\\004test:tcp"); - test(b1->ice_getIdentity().name == "test\4test"); - b1 = communicator->stringToProxy("test\\1114test:tcp"); - test(b1->ice_getIdentity().name == "test\1114test"); - - b1 = communicator->stringToProxy("test\\b\\f\\n\\r\\t\\'\\\"\\\\test:tcp"); - test(b1->ice_getIdentity().name == "test\b\f\n\r\t\'\"\\test" && b1->ice_getIdentity().category.empty()); - - b1 = communicator->stringToProxy("category/test:tcp"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category == "category"); - -#ifdef ICEE_HAS_LOCATOR - b1 = communicator->stringToProxy("test@adapter"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getAdapterId() == "adapter"); - try - { - b1 = communicator->stringToProxy("id@adapter test"); - test(false); - } - catch(const Ice::ProxyParseException&) - { - } - b1 = communicator->stringToProxy("category/test@adapter"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category == "category" && - b1->ice_getAdapterId() == "adapter"); - b1 = communicator->stringToProxy("category/test@adapter:tcp"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category == "category" && - b1->ice_getAdapterId() == "adapter:tcp"); - b1 = communicator->stringToProxy("'category 1/test'@adapter"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category == "category 1" && - b1->ice_getAdapterId() == "adapter"); - b1 = communicator->stringToProxy("'category/test 1'@adapter"); - test(b1->ice_getIdentity().name == "test 1" && b1->ice_getIdentity().category == "category" && - b1->ice_getAdapterId() == "adapter"); - b1 = communicator->stringToProxy("'category/test'@'adapter 1'"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category == "category" && - b1->ice_getAdapterId() == "adapter 1"); - b1 = communicator->stringToProxy("\"category \\/test@foo/test\"@adapter"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category == "category /test@foo" && - b1->ice_getAdapterId() == "adapter"); - b1 = communicator->stringToProxy("\"category \\/test@foo/test\"@\"adapter:tcp\""); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category == "category /test@foo" && - b1->ice_getAdapterId() == "adapter:tcp"); -#endif - - b1 = communicator->stringToProxy("id -f facet:tcp"); - test(b1->ice_getIdentity().name == "id" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet() == "facet"); - b1 = communicator->stringToProxy("id -f 'facet x':tcp"); - test(b1->ice_getIdentity().name == "id" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet() == "facet x"); - b1 = communicator->stringToProxy("id -f \"facet x\":tcp"); - test(b1->ice_getIdentity().name == "id" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet() == "facet x"); - try - { - b1 = communicator->stringToProxy("id -f \"facet x:tcp"); - test(false); - } - catch(const Ice::ProxyParseException&) - { - } - try - { - b1 = communicator->stringToProxy("id -f \'facet x:tcp"); - test(false); - } - catch(const Ice::ProxyParseException&) - { - } - b1 = communicator->stringToProxy("test -f facet:tcp"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet() == "facet"); - b1 = communicator->stringToProxy("test -f \"facet:tcp\":tcp"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet() == "facet:tcp"); -#ifdef ICEE_HAS_LOCATOR - b1 = communicator->stringToProxy("test -f facet@test"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet() == "facet" && b1->ice_getAdapterId() == "test"); - b1 = communicator->stringToProxy("test -f 'facet@test'"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet() == "facet@test" && b1->ice_getAdapterId().empty()); - b1 = communicator->stringToProxy("test -f 'facet@test'@test"); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet() == "facet@test" && b1->ice_getAdapterId() == "test"); - try - { - b1 = communicator->stringToProxy("test -f facet@test @test"); - test(false); - } - catch(const Ice::ProxyParseException&) - { - } -#endif - b1 = communicator->stringToProxy("test:tcp"); - test(b1->ice_isTwoway()); - b1 = communicator->stringToProxy("test -t:tcp"); - test(b1->ice_isTwoway()); - b1 = communicator->stringToProxy("test -o:tcp:tcp"); - test(b1->ice_isOneway()); - b1 = communicator->stringToProxy("test -O:tcp"); - test(b1->ice_isBatchOneway()); - b1 = communicator->stringToProxy("test -d:tcp"); - test(b1->ice_isDatagram()); - b1 = communicator->stringToProxy("test -D:tcp"); - test(b1->ice_isBatchDatagram()); - b1 = communicator->stringToProxy("test:tcp"); - test(!b1->ice_isSecure()); - b1 = communicator->stringToProxy("test -s:tcp"); - test(b1->ice_isSecure()); - - try - { - b1 = communicator->stringToProxy("test:tcp@adapterId"); - test(false); - } - catch(const Ice::EndpointParseException&) - { - } - // This is an unknown endpoint warning, not a parse exception. - // - //try - //{ - // b1 = communicator->stringToProxy("test -f the:facet:tcp"); - // test(false); - //} - //catch(const Ice::EndpointParseException&) - //{ - //} - try - { - b1 = communicator->stringToProxy("test::tcp"); - test(false); - } - catch(const Ice::EndpointParseException&) - { - } - tprintf("ok\n"); - - tprintf("testing propertyToProxy... "); - Ice::PropertiesPtr prop = communicator->getProperties(); - string propertyPrefix = "Foo.Proxy"; - prop->setProperty(propertyPrefix, "test:default -p 12010 -t 10000"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && - b1->ice_getFacet().empty()); - - string property; - - // These two properties don't do anything to direct proxies so - // first we test that. - /* - * Commented out because setting a locator or locator cache - * timeout on a direct proxy causes warning. - * -#ifdef ICEE_HAS_LOCATOR - string property = propertyPrefix + ".Locator"; - test(!b1->ice_getLocator()); - prop->setProperty(property, "locator:default -p 10000"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(!b1->ice_getLocator()); - prop->setProperty(property, ""); -#endif - - property = propertyPrefix + ".LocatorCacheTimeout"; - test(b1->ice_getLocatorCacheTimeout() == 0); - prop->setProperty(property, "1"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(b1->ice_getLocatorCacheTimeout() == 0); - prop->setProperty(property, ""); - */ - - // Now retest with an indirect proxy. -#ifdef ICEE_HAS_LOCATOR - prop->setProperty(propertyPrefix, "test"); - property = propertyPrefix + ".Locator"; - prop->setProperty(property, "locator:default -p 10000"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(b1->ice_getLocator() && b1->ice_getLocator()->ice_getIdentity().name == "locator"); - prop->setProperty(property, ""); -#endif - -/* - property = propertyPrefix + ".LocatorCacheTimeout"; - test(b1->ice_getLocatorCacheTimeout() == -1); - prop->setProperty(property, "1"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(b1->ice_getLocatorCacheTimeout() == 1); - prop->setProperty(property, ""); - */ - - // This cannot be tested so easily because the property is cached - // on communicator initialization. - // - //prop->setProperty("Ice.Default.LocatorCacheTimeout", "60"); - //b1 = communicator->propertyToProxy(propertyPrefix); - //test(b1->ice_getLocatorCacheTimeout() == 60); - //prop->setProperty("Ice.Default.LocatorCacheTimeout", ""); - - prop->setProperty(propertyPrefix, "test:default -p 12010 -t 10000"); - -#ifdef ICEE_HAS_ROUTER - property = propertyPrefix + ".Router"; - test(!b1->ice_getRouter()); - prop->setProperty(property, "router:default -p 10000"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(b1->ice_getRouter() && b1->ice_getRouter()->ice_getIdentity().name == "router"); - prop->setProperty(property, ""); -#endif - - /* - property = propertyPrefix + ".PreferSecure"; - test(!b1->ice_isPreferSecure()); - prop->setProperty(property, "1"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(b1->ice_isPreferSecure()); - prop->setProperty(property, ""); - - property = propertyPrefix + ".ConnectionCached"; - test(b1->ice_isConnectionCached()); - prop->setProperty(property, "0"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(!b1->ice_isConnectionCached()); - prop->setProperty(property, ""); - - property = propertyPrefix + ".EndpointSelection"; - test(b1->ice_getEndpointSelection() == Ice::Random); - prop->setProperty(property, "Random"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(b1->ice_getEndpointSelection() == Ice::Random); - prop->setProperty(property, "Ordered"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(b1->ice_getEndpointSelection() == Ice::Ordered); - prop->setProperty(property, ""); - - property = propertyPrefix + ".CollocationOptimization"; - test(b1->ice_isCollocationOptimized()); - prop->setProperty(property, "0"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(!b1->ice_isCollocationOptimized()); - prop->setProperty(property, ""); - - property = propertyPrefix + ".ThreadPerConnection"; - test(!b1->ice_isThreadPerConnection()); - prop->setProperty(property, "1"); - b1 = communicator->propertyToProxy(propertyPrefix); - test(b1->ice_isThreadPerConnection()); - prop->setProperty(property, ""); -*/ - - tprintf("ok\n"); - - tprintf("testing ice_getCommunicator... "); - test(base->ice_getCommunicator() == communicator); - tprintf("ok\n"); - - tprintf("testing proxy methods... "); - test(communicator->identityToString(base->ice_identity(communicator->stringToIdentity("other"))->ice_getIdentity()) - == "other"); - test(base->ice_facet("facet")->ice_getFacet() == "facet"); -#ifdef ICEE_HAS_LOCATOR - test(base->ice_adapterId("id")->ice_getAdapterId() == "id"); -#endif - test(base->ice_twoway()->ice_isTwoway()); - test(base->ice_oneway()->ice_isOneway()); - test(base->ice_batchOneway()->ice_isBatchOneway()); - test(base->ice_datagram()->ice_isDatagram()); - test(base->ice_batchDatagram()->ice_isBatchDatagram()); - test(base->ice_secure(true)->ice_isSecure()); - test(!base->ice_secure(false)->ice_isSecure()); - //test(base->ice_collocationOptimized(true)->ice_isCollocationOptimized()); - //test(!base->ice_collocationOptimized(false)->ice_isCollocationOptimized()); - tprintf("ok\n"); - - tprintf("testing proxy comparison... "); - - test(communicator->stringToProxy("foo:tcp") == communicator->stringToProxy("foo:tcp")); - test(communicator->stringToProxy("foo:tcp") != communicator->stringToProxy("foo2:tcp")); - test(communicator->stringToProxy("foo:tcp") < communicator->stringToProxy("foo2:tcp")); - test(!(communicator->stringToProxy("foo2:tcp") < communicator->stringToProxy("foo:tcp"))); - - Ice::ObjectPrx compObj = communicator->stringToProxy("foo:tcp"); - - test(compObj->ice_facet("facet") == compObj->ice_facet("facet")); - test(compObj->ice_facet("facet") != compObj->ice_facet("facet1")); - test(compObj->ice_facet("facet") < compObj->ice_facet("facet1")); - test(!(compObj->ice_facet("facet") < compObj->ice_facet("facet"))); - - test(compObj->ice_oneway() == compObj->ice_oneway()); - test(compObj->ice_oneway() != compObj->ice_twoway()); - test(compObj->ice_twoway() < compObj->ice_oneway()); - test(!(compObj->ice_oneway() < compObj->ice_twoway())); - - test(compObj->ice_secure(true) == compObj->ice_secure(true)); - test(compObj->ice_secure(false) != compObj->ice_secure(true)); - test(compObj->ice_secure(false) < compObj->ice_secure(true)); - test(!(compObj->ice_secure(true) < compObj->ice_secure(false))); - -/* - test(compObj->ice_collocationOptimized(true) == compObj->ice_collocationOptimized(true)); - test(compObj->ice_collocationOptimized(false) != compObj->ice_collocationOptimized(true)); - test(compObj->ice_collocationOptimized(false) < compObj->ice_collocationOptimized(true)); - test(!(compObj->ice_collocationOptimized(true) < compObj->ice_collocationOptimized(false))); - - test(compObj->ice_connectionCached(true) == compObj->ice_connectionCached(true)); - test(compObj->ice_connectionCached(false) != compObj->ice_connectionCached(true)); - test(compObj->ice_connectionCached(false) < compObj->ice_connectionCached(true)); - test(!(compObj->ice_connectionCached(true) < compObj->ice_connectionCached(false))); - - test(compObj->ice_endpointSelection(Ice::Random) == compObj->ice_endpointSelection(Ice::Random)); - test(compObj->ice_endpointSelection(Ice::Random) != compObj->ice_endpointSelection(Ice::Ordered)); - test(compObj->ice_endpointSelection(Ice::Random) < compObj->ice_endpointSelection(Ice::Ordered)); - test(!(compObj->ice_endpointSelection(Ice::Ordered) < compObj->ice_endpointSelection(Ice::Random))); - - test(compObj->ice_connectionId("id2") == compObj->ice_connectionId("id2")); - test(compObj->ice_connectionId("id1") != compObj->ice_connectionId("id2")); - test(compObj->ice_connectionId("id1") < compObj->ice_connectionId("id2")); - test(!(compObj->ice_connectionId("id2") < compObj->ice_connectionId("id1"))); - - test(compObj->ice_compress(true) == compObj->ice_compress(true)); - test(compObj->ice_compress(false) != compObj->ice_compress(true)); - test(compObj->ice_compress(false) < compObj->ice_compress(true)); - test(!(compObj->ice_compress(true) < compObj->ice_compress(false))); -*/ - - test(compObj->ice_timeout(20) == compObj->ice_timeout(20)); - test(compObj->ice_timeout(10) != compObj->ice_timeout(20)); - test(compObj->ice_timeout(10) < compObj->ice_timeout(20)); - test(!(compObj->ice_timeout(20) < compObj->ice_timeout(10))); - - Ice::ObjectPrx compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000"); - Ice::ObjectPrx compObj2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001"); - test(compObj1 != compObj2); - test(compObj1 < compObj2); - test(!(compObj2 < compObj1)); - -#ifdef ICEE_HAS_LOCATOR - compObj1 = communicator->stringToProxy("foo@MyAdapter1"); - compObj2 = communicator->stringToProxy("foo@MyAdapter2"); - test(compObj1 != compObj2); - test(compObj1 < compObj2); - test(!(compObj2 < compObj1)); -#endif - -/* - test(compObj1->ice_locatorCacheTimeout(20) == compObj1->ice_locatorCacheTimeout(20)); - test(compObj1->ice_locatorCacheTimeout(10) != compObj1->ice_locatorCacheTimeout(20)); - test(compObj1->ice_locatorCacheTimeout(10) < compObj1->ice_locatorCacheTimeout(20)); - test(!(compObj1->ice_locatorCacheTimeout(20) < compObj1->ice_locatorCacheTimeout(10))); -*/ - -#ifdef ICEE_HAS_LOCATOR - compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 1000"); - compObj2 = communicator->stringToProxy("foo@MyAdapter1"); - test(compObj1 != compObj2); - test(compObj1 < compObj2); - test(!(compObj2 < compObj1)); -#endif - - // - // TODO: Ideally we should also test comparison of fixed proxies. - // - - tprintf("ok\n"); - - tprintf("testing checked cast... "); - Test::MyClassPrx cl = Test::MyClassPrx::checkedCast(base); - test(cl); - - Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(cl); - test(derived); - test(cl == base); - test(derived == base); - test(cl == derived); - -#ifdef ICEE_HAS_LOCATOR - Ice::LocatorPrx loc = Ice::LocatorPrx::checkedCast(base); - test(loc == 0); -#endif - - // - // Upcasting - // - Test::MyClassPrx cl2 = Test::MyClassPrx::checkedCast(derived); - Ice::ObjectPrx obj = Ice::ObjectPrx::checkedCast(derived); - test(cl2); - test(obj); - test(cl2 == obj); - test(cl2 == derived); - - // - // Now with alternate API - // - cl = checkedCast<Test::MyClassPrx>(base); - test(cl); - derived = checkedCast<Test::MyDerivedClassPrx>(cl); - test(derived); - test(cl == base); - test(derived == base); - test(cl == derived); - -#ifdef ICEE_HAS_LOCATOR - loc = checkedCast<Ice::LocatorPrx>(base); - test(loc == 0); -#endif - - cl2 = checkedCast<Test::MyClassPrx>(derived); - obj = checkedCast<Ice::ObjectPrx>(derived); - test(cl2); - test(obj); - test(cl2 == obj); - test(cl2 == derived); - - tprintf("ok\n"); - - tprintf("testing checked cast with context... "); - Ice::Context c = cl->getContext(); - test(c.size() == 0); - - c["one"] = "hello"; - c["two"] = "world"; - cl = Test::MyClassPrx::checkedCast(base, c); - Ice::Context c2 = cl->getContext(); - test(c == c2); - - // - // Now with alternate API - // - cl = checkedCast<Test::MyClassPrx>(base); - c = cl->getContext(); - test(c.size() == 0); - - cl = checkedCast<Test::MyClassPrx>(base, c); - c2 = cl->getContext(); - test(c == c2); - - tprintf("ok\n"); - - return cl; -} diff --git a/cppe/test/IceE/proxy/Client.cpp b/cppe/test/IceE/proxy/Client.cpp deleted file mode 100644 index 29ac4493f94..00000000000 --- a/cppe/test/IceE/proxy/Client.cpp +++ /dev/null @@ -1,87 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <Test.h> - -using namespace std; - -class ProxyTestApplication : public TestApplication -{ -public: - - ProxyTestApplication() : - TestApplication("proxy client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - - // - // In this test, we need at least two threads in the - // client side thread pool for nested AMI. - // - initData.properties->setProperty("Ice.ThreadPool.Client.Size", "2"); - initData.properties->setProperty("Ice.ThreadPool.Client.SizeWarn", "0"); - - loadConfig(initData.properties); - - // - // Now parse argc/argv into initData - // - initData.properties = Ice::createProperties(argc, argv, initData.properties); - - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - // - // We don't want connection warnings because of the timeout test. - // - communicator()->getProperties()->setProperty("Ice.Warn.Connections", "0"); - - // - // Use a faster connection monitor timeout to test AMI - // timeouts. - // - communicator()->getProperties()->setProperty("Ice.MonitorConnections", "1"); - - Test::MyClassPrx allTests(const Ice::CommunicatorPtr&); - Test::MyClassPrx myClass = allTests(communicator()); - - myClass->shutdown(); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - ProxyTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - ProxyTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/proxy/Collocated.cpp b/cppe/test/IceE/proxy/Collocated.cpp deleted file mode 100644 index 34a066e4131..00000000000 --- a/cppe/test/IceE/proxy/Collocated.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -class ProxyTestApplication : public TestApplication -{ -public: - - ProxyTestApplication() : - TestApplication("proxy collocated") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - - loadConfig(initData.properties); - // - // Now parse argc/argv into initData.properties - // - initData.properties = Ice::createProperties(argc, argv, initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - adapter->add(new MyDerivedClassI, communicator()->stringToIdentity("test")); - adapter->activate(); - - Test::MyClassPrx allTests(const Ice::CommunicatorPtr&); - allTests(communicator()); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - ProxyTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - ProxyTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/proxy/Makefile b/cppe/test/IceE/proxy/Makefile deleted file mode 100644 index 0d65ff1be1f..00000000000 --- a/cppe/test/IceE/proxy/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -COLLOCATED = collocated - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -COBJS = Test.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - TestI.o \ - Server.o - -COLOBJS = Test.o \ - TestI.o \ - Collocated.o \ - AllTests.o - -SRCS = $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) \ - $(COLOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(TESTLIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(TESTLIBS) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COLOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/proxy/Makefile.mak b/cppe/test/IceE/proxy/Makefile.mak deleted file mode 100644 index 197e390a001..00000000000 --- a/cppe/test/IceE/proxy/Makefile.mak +++ /dev/null @@ -1,63 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-COLLOCATED = collocated.exe
-
-TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
-
-COBJS = Test.obj \
- Client.obj \
- AllTests.obj
-
-SOBJS = Test.obj \
- TestI.obj \
- Server.obj
-
-COLOBJS = Test.obj \
- TestI.obj \
- Collocated.obj \
- AllTests.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp) \
- $(COLOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS = /pdb:$(COLLOCATED:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(COLLOCATED): $(COLOBJS)
- $(LINK) $(LDFLAGS) $(COPDBFLAGS) $(COLOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
-
-!include .depend
diff --git a/cppe/test/IceE/proxy/Server.cpp b/cppe/test/IceE/proxy/Server.cpp deleted file mode 100644 index 307bbd3c870..00000000000 --- a/cppe/test/IceE/proxy/Server.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -class ProxyTestApplication : public TestApplication -{ -public: - - ProxyTestApplication() : - TestApplication("proxy server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - initData.properties->setProperty("Ice.Warn.Connections", "0"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - adapter->add(new MyDerivedClassI, communicator()->stringToIdentity("test")); - adapter->activate(); - -#ifndef _WIN32_WCE - communicator()->waitForShutdown(); -#endif - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - ProxyTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - ProxyTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/proxy/Test.ice b/cppe/test/IceE/proxy/Test.ice deleted file mode 100644 index 657adfbe99d..00000000000 --- a/cppe/test/IceE/proxy/Test.ice +++ /dev/null @@ -1,31 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -module Test -{ - -dictionary<string, string> Context; - -["ami"] class MyClass -{ - void shutdown(); - - Context getContext(); -}; - -["ami"] class MyDerivedClass extends MyClass -{ -}; - -}; - -#endif diff --git a/cppe/test/IceE/proxy/TestI.cpp b/cppe/test/IceE/proxy/TestI.cpp deleted file mode 100644 index be864b304e1..00000000000 --- a/cppe/test/IceE/proxy/TestI.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestI.h> -#include <TestCommon.h> - -MyDerivedClassI::MyDerivedClassI() -{ -} - -void -MyDerivedClassI::shutdown(const Ice::Current& c) -{ - c.adapter->getCommunicator()->shutdown(); -} - -Ice::Context -MyDerivedClassI::getContext(const Ice::Current& c) -{ - return _ctx; -} - -bool -MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const -{ - _ctx = current.ctx; -#ifdef __BCPLUSPLUS__ - return Test::MyDerivedClass::ice_isA(s, current); -#else - return MyDerivedClass::ice_isA(s, current); -#endif -} diff --git a/cppe/test/IceE/proxy/TestI.h b/cppe/test/IceE/proxy/TestI.h deleted file mode 100644 index a558e5b6823..00000000000 --- a/cppe/test/IceE/proxy/TestI.h +++ /dev/null @@ -1,30 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_I_H -#define TEST_I_H - -#include <Test.h> - -class MyDerivedClassI : public Test::MyDerivedClass -{ -public: - - MyDerivedClassI(); - - virtual void shutdown(const Ice::Current&); - virtual Ice::Context getContext(const Ice::Current&); - virtual bool ice_isA(const std::string&, const Ice::Current&) const; - -private: - - mutable Ice::Context _ctx; -}; - -#endif diff --git a/cppe/test/IceE/proxy/run.py b/cppe/test/IceE/proxy/run.py deleted file mode 100755 index 3ca8d4159d6..00000000000 --- a/cppe/test/IceE/proxy/run.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "proxy") - -print "tests with regular server." -TestUtil.clientServerTest(name) -print "tests with collocated server." -TestUtil.collocatedTest(name) -sys.exit(0) diff --git a/cppe/test/IceE/retry/.depend b/cppe/test/IceE/retry/.depend deleted file mode 100644 index 0cfa24c2ba7..00000000000 --- a/cppe/test/IceE/retry/.depend +++ /dev/null @@ -1,7 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./Test.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -TestI$(OBJEXT): TestI.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./TestI.h ./Test.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ../../include/TestApplication.h ./TestI.h ./Test.h -Test.cpp: Test.ice diff --git a/cppe/test/IceE/retry/.gitignore b/cppe/test/IceE/retry/.gitignore deleted file mode 100644 index 67872faa673..00000000000 --- a/cppe/test/IceE/retry/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -Test.cpp -Test.h diff --git a/cppe/test/IceE/retry/AllTests.cpp b/cppe/test/IceE/retry/AllTests.cpp deleted file mode 100644 index 70b39b678b2..00000000000 --- a/cppe/test/IceE/retry/AllTests.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <Test.h> - -using namespace std; -using namespace Test; - -RetryPrx -allTests(const Ice::CommunicatorPtr& communicator) -{ - tprintf("testing stringToProxy... "); - string ref = communicator->getProperties()->getPropertyWithDefault( - "Retry.Proxy", "retry:default -p 12010 -t 10000"); - Ice::ObjectPrx base1 = communicator->stringToProxy(ref); - test(base1); - Ice::ObjectPrx base2 = communicator->stringToProxy(ref); - test(base2); - tprintf("ok\n"); - - tprintf("testing checked cast... "); - RetryPrx retry1 = RetryPrx::checkedCast(base1); - test(retry1); - test(retry1 == base1); - RetryPrx retry2 = RetryPrx::checkedCast(base2); - test(retry2); - test(retry2 == base2); - tprintf("ok\n"); - - tprintf("calling regular operation with first proxy... "); - retry1->op(false); - tprintf("ok\n"); - - tprintf("calling operation to kill connection with second proxy... "); - try - { - retry2->op(true); - test(false); - } - catch(Ice::ConnectionLostException) - { - tprintf("ok\n"); - } - - tprintf("calling regular operation with first proxy again... "); - retry1->op(false); - tprintf("ok\n"); - - return retry1; -} diff --git a/cppe/test/IceE/retry/Client.cpp b/cppe/test/IceE/retry/Client.cpp deleted file mode 100644 index c3a6b08892a..00000000000 --- a/cppe/test/IceE/retry/Client.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <Test.h> - -using namespace std; - -class RetryTestApplication : public TestApplication -{ -public: - - RetryTestApplication() : - TestApplication("retry client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - //initData.properties->setProperty("Ice.Trace.Network", "5"); - //initData.properties->setProperty("Ice.Trace.Protocol", "5"); - - loadConfig(initData.properties); - - // - // For this test, we want to disable retries. - // - initData.properties->setProperty("Ice.RetryIntervals", "-1"); - - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - // - // This test kills connections, so we don't want warnings. - // - communicator()->getProperties()->setProperty("Ice.Warn.Connections", "0"); - - Test::RetryPrx allTests(const Ice::CommunicatorPtr&); - Test::RetryPrx retry = allTests(communicator()); - retry->shutdown(); - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - RetryTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - RetryTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/retry/Makefile b/cppe/test/IceE/retry/Makefile deleted file mode 100644 index 03e63a83758..00000000000 --- a/cppe/test/IceE/retry/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - TestI.o \ - Server.o - -SRCS = $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(TESTLIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/retry/Makefile.mak b/cppe/test/IceE/retry/Makefile.mak deleted file mode 100644 index f684dc5fe89..00000000000 --- a/cppe/test/IceE/retry/Makefile.mak +++ /dev/null @@ -1,50 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-
-TARGETS = $(CLIENT) $(SERVER)
-
-COBJS = Test.obj \
- Client.obj \
- AllTests.obj
-
-SOBJS = Test.obj \
- TestI.obj \
- Server.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
-
-!include .depend
diff --git a/cppe/test/IceE/retry/Server.cpp b/cppe/test/IceE/retry/Server.cpp deleted file mode 100644 index e9fa45d3cb3..00000000000 --- a/cppe/test/IceE/retry/Server.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -class RetryTestApplication : public TestApplication -{ -public: - - RetryTestApplication() : - TestApplication("retry server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); - //initData.properties->setProperty("Ice.Trace.Network", "5"); - //initData.properties->setProperty("Ice.Trace.Protocol", "5"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new RetryI; - adapter->add(object, communicator()->stringToIdentity("retry")); - adapter->activate(); - -#ifndef _WIN32_WCE - communicator()->waitForShutdown(); -#endif - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - RetryTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - RetryTestApplication app; - return app.main(argc, argv); -} - -#endif - diff --git a/cppe/test/IceE/retry/Test.ice b/cppe/test/IceE/retry/Test.ice deleted file mode 100644 index 57dc973a827..00000000000 --- a/cppe/test/IceE/retry/Test.ice +++ /dev/null @@ -1,24 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -module Test -{ - -interface Retry -{ - void op(bool kill); - void shutdown(); -}; - -}; - -#endif diff --git a/cppe/test/IceE/retry/TestI.cpp b/cppe/test/IceE/retry/TestI.cpp deleted file mode 100644 index 5cd3e0c043b..00000000000 --- a/cppe/test/IceE/retry/TestI.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <TestI.h> - -void -RetryI::op(bool kill, const Ice::Current& current) -{ - if(kill) - { - current.con->close(true); - } -} - -void -RetryI::shutdown(const Ice::Current& current) -{ - current.adapter->getCommunicator()->shutdown(); -#ifdef _WIN32_WCE - tprintf("The server has shutdown, close the window to terminate the server."); -#endif -} diff --git a/cppe/test/IceE/retry/TestI.h b/cppe/test/IceE/retry/TestI.h deleted file mode 100644 index a08537b6752..00000000000 --- a/cppe/test/IceE/retry/TestI.h +++ /dev/null @@ -1,21 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_I_H -#define TEST_I_H - -#include <Test.h> - -class RetryI : public Test::Retry -{ - virtual void op(bool, const Ice::Current&); - virtual void shutdown(const Ice::Current&); -}; - -#endif diff --git a/cppe/test/IceE/retry/run.py b/cppe/test/IceE/retry/run.py deleted file mode 100755 index 8c42efe3c29..00000000000 --- a/cppe/test/IceE/retry/run.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "retry") - -TestUtil.clientServerTest(name) -sys.exit(0) diff --git a/cppe/test/IceE/slicing/.depend b/cppe/test/IceE/slicing/.depend deleted file mode 100644 index 28cc0582fd1..00000000000 --- a/cppe/test/IceE/slicing/.depend +++ /dev/null @@ -1,9 +0,0 @@ -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./Test.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -AllTests$(OBJEXT): AllTests.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h ./Test.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h -Test$(OBJEXT): Test.cpp ./Test.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -ServerPrivate$(OBJEXT): ServerPrivate.cpp ./ServerPrivate.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./Test.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/LocalException.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/Iterator.h -TestI$(OBJEXT): TestI.cpp ./TestI.h ./ServerPrivate.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Shared.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/Incoming.h ../../../include/IceE/InstanceF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./Test.h ../../include/TestCommon.h ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h -Server$(OBJEXT): Server.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestI.h ./ServerPrivate.h ../../../include/IceE/UserExceptionFactory.h ../../../include/IceE/FactoryTable.h ../../../include/IceE/FactoryTableDef.h ../../../include/IceE/UserExceptionFactoryF.h ../../../include/IceE/StaticMutex.h ./Test.h -Test.cpp: Test.ice -ServerPrivate.cpp: ServerPrivate.ice Test.ice diff --git a/cppe/test/IceE/slicing/.gitignore b/cppe/test/IceE/slicing/.gitignore deleted file mode 100644 index 2f24b756b89..00000000000 --- a/cppe/test/IceE/slicing/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -Test.cpp -ServerPrivate.cpp -Test.h -ServerPrivate.h diff --git a/cppe/test/IceE/slicing/AllTests.cpp b/cppe/test/IceE/slicing/AllTests.cpp deleted file mode 100644 index 68ae271d526..00000000000 --- a/cppe/test/IceE/slicing/AllTests.cpp +++ /dev/null @@ -1,326 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestCommon.h> -#include <Test.h> - -using namespace std; -using namespace Test; - -class CallbackBase : public IceUtil::Monitor<IceUtil::Mutex> -{ -public: - - CallbackBase() : - _called(false) - { - } - - virtual ~CallbackBase() - { - } - - bool check() - { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - while(!_called) - { - if(!timedWait(IceUtil::Time::seconds(5))) - { - return false; - } - } - _called = false; - return true; - } - -protected: - - void called() - { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - assert(!_called); - _called = true; - notify(); - } - -private: - - bool _called; -}; - -TestIntfPrx -allTests(const Ice::CommunicatorPtr& communicator) -{ - string ref = communicator->getProperties()->getPropertyWithDefault("Slicing.Proxy", "Test:default -p 12010"); - Ice::ObjectPrx obj = communicator->stringToProxy(ref); - TestIntfPrx test = TestIntfPrx::checkedCast(obj); - - tprintf("base... "); fflush(stdout); - { - try - { - test->baseAsBase(); - test(false); - } - catch(const Base& b) - { - test(b.b == "Base.b"); - test(b.ice_name() =="Test::Base"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("slicing of unknown derived... "); fflush(stdout); - { - try - { - test->unknownDerivedAsBase(); - test(false); - } - catch(const Base& b) - { - test(b.b == "UnknownDerived.b"); - test(b.ice_name() =="Test::Base"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("non-slicing of known derived as base... "); fflush(stdout); - { - try - { - test->knownDerivedAsBase(); - test(false); - } - catch(const KnownDerived& k) - { - test(k.b == "KnownDerived.b"); - test(k.kd == "KnownDerived.kd"); - test(k.ice_name() =="Test::KnownDerived"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("non-slicing of known derived as derived... "); fflush(stdout); - { - try - { - test->knownDerivedAsKnownDerived(); - test(false); - } - catch(const KnownDerived& k) - { - test(k.b == "KnownDerived.b"); - test(k.kd == "KnownDerived.kd"); - test(k.ice_name() =="Test::KnownDerived"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("slicing of unknown intermediate as base... "); fflush(stdout); - { - try - { - test->unknownIntermediateAsBase(); - test(false); - } - catch(const Base& b) - { - test(b.b == "UnknownIntermediate.b"); - test(b.ice_name() =="Test::Base"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("slicing of known intermediate as base... "); fflush(stdout); - { - try - { - test->knownIntermediateAsBase(); - test(false); - } - catch(const KnownIntermediate& ki) - { - test(ki.b == "KnownIntermediate.b"); - test(ki.ki == "KnownIntermediate.ki"); - test(ki.ice_name() =="Test::KnownIntermediate"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("slicing of known most derived as base... "); fflush(stdout); - { - try - { - test->knownMostDerivedAsBase(); - test(false); - } - catch(const KnownMostDerived& kmd) - { - test(kmd.b == "KnownMostDerived.b"); - test(kmd.ki == "KnownMostDerived.ki"); - test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_name() =="Test::KnownMostDerived"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("non-slicing of known intermediate as intermediate... "); fflush(stdout); - { - try - { - test->knownIntermediateAsKnownIntermediate(); - test(false); - } - catch(const KnownIntermediate& ki) - { - test(ki.b == "KnownIntermediate.b"); - test(ki.ki == "KnownIntermediate.ki"); - test(ki.ice_name() =="Test::KnownIntermediate"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("non-slicing of known most derived exception as intermediate... "); fflush(stdout); - { - try - { - test->knownMostDerivedAsKnownIntermediate(); - test(false); - } - catch(const KnownMostDerived& kmd) - { - test(kmd.b == "KnownMostDerived.b"); - test(kmd.ki == "KnownMostDerived.ki"); - test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_name() =="Test::KnownMostDerived"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("non-slicing of known most derived as most derived... "); fflush(stdout); - { - try - { - test->knownMostDerivedAsKnownMostDerived(); - test(false); - } - catch(const KnownMostDerived& kmd) - { - test(kmd.b == "KnownMostDerived.b"); - test(kmd.ki == "KnownMostDerived.ki"); - test(kmd.kmd == "KnownMostDerived.kmd"); - test(kmd.ice_name() =="Test::KnownMostDerived"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("slicing of unknown most derived, known intermediate as base... "); fflush(stdout); - { - try - { - test->unknownMostDerived1AsBase(); - test(false); - } - catch(const KnownIntermediate& ki) - { - test(ki.b == "UnknownMostDerived1.b"); - test(ki.ki == "UnknownMostDerived1.ki"); - test(ki.ice_name() =="Test::KnownIntermediate"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("slicing of unknown most derived, known intermediate as intermediate... "); fflush(stdout); - { - try - { - test->unknownMostDerived1AsKnownIntermediate(); - test(false); - } - catch(const KnownIntermediate& ki) - { - test(ki.b == "UnknownMostDerived1.b"); - test(ki.ki == "UnknownMostDerived1.ki"); - test(ki.ice_name() =="Test::KnownIntermediate"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - tprintf("slicing of unknown most derived, unknown intermediate as base... "); fflush(stdout); - { - try - { - test->unknownMostDerived2AsBase(); - test(false); - } - catch(const Base& b) - { - test(b.b == "UnknownMostDerived2.b"); - test(b.ice_name() =="Test::Base"); - } - catch(...) - { - test(false); - } - } - tprintf("ok\n"); - - return test; -} diff --git a/cppe/test/IceE/slicing/Client.cpp b/cppe/test/IceE/slicing/Client.cpp deleted file mode 100644 index f4573f726fb..00000000000 --- a/cppe/test/IceE/slicing/Client.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <Test.h> - -using namespace std; -using namespace Test; - -class SlicingTestApplication : public TestApplication -{ -public: - - SlicingTestApplication() : - TestApplication("slicing client") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - TestIntfPrx allTests(const Ice::CommunicatorPtr&); - TestIntfPrx Test = allTests(communicator()); - Test->shutdown(); - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - SlicingTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - SlicingTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/slicing/Makefile b/cppe/test/IceE/slicing/Makefile deleted file mode 100644 index 1c7152568df..00000000000 --- a/cppe/test/IceE/slicing/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Test.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - ServerPrivate.o \ - TestI.o \ - Server.o - -SRCS = $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) - -SLICE_SRCS = Test.ice ServerPrivate.ice - -include $(top_srcdir)/config/Make.rules - -ICECPPFLAGS := -I. $(ICECPPFLAGS) - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(TESTLIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/slicing/Makefile.mak b/cppe/test/IceE/slicing/Makefile.mak deleted file mode 100644 index a79bc420c2b..00000000000 --- a/cppe/test/IceE/slicing/Makefile.mak +++ /dev/null @@ -1,53 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-
-TARGETS = $(CLIENT) $(SERVER)
-
-COBJS = Test.obj \
- Client.obj \
- AllTests.obj
-
-SOBJS = Test.obj \
- ServerPrivate.obj \
- TestI.obj \
- Server.obj
-
-SRCS = $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-SLICE2CPPEFLAGS = -I. $(SLICE2CPPEFLAGS)
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(COBJS)
- $(LINK) $(LDFLAGS) $(CPDBFLAGS) $(COBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-$(SERVER): $(SOBJS)
- $(LINK) $(LDFLAGS) $(SPDBFLAGS) $(SOBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-clean::
- del /q Test.cpp Test.h
- del /q ServerPrivate.cpp ServerPrivate.h
-
-!include .depend
diff --git a/cppe/test/IceE/slicing/Server.cpp b/cppe/test/IceE/slicing/Server.cpp deleted file mode 100644 index d14a7c8c3c3..00000000000 --- a/cppe/test/IceE/slicing/Server.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <TestApplication.h> -#include <TestI.h> - -using namespace std; - -class SlicingTestApplication : public TestApplication -{ -public: - - SlicingTestApplication() : - TestApplication("slicing server") - { - } - - virtual int - run(int argc, char* argv[]) - { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(); - initData.properties->setProperty("Ice.Warn.Dispatch", "0"); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); - - loadConfig(initData.properties); - initData.logger = getLogger(); - setCommunicator(Ice::initialize(argc, argv, initData)); - - Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new TestI(adapter); - adapter->add(object, communicator()->stringToIdentity("Test")); - adapter->activate(); - -#ifndef _WIN32_WCE - communicator()->waitForShutdown(); -#endif - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - SlicingTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - SlicingTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/slicing/ServerPrivate.ice b/cppe/test/IceE/slicing/ServerPrivate.ice deleted file mode 100644 index 81046facc3b..00000000000 --- a/cppe/test/IceE/slicing/ServerPrivate.ice +++ /dev/null @@ -1,40 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef SERVERPRIVATE_ICE -#define SERVERPRIVATE_ICE - -#include <Test.ice> - -module Test -{ - -exception UnknownDerived extends Base -{ - string ud; -}; - -exception UnknownIntermediate extends Base -{ - string ui; -}; - -exception UnknownMostDerived1 extends KnownIntermediate -{ - string umd1; -}; - -exception UnknownMostDerived2 extends UnknownIntermediate -{ - string umd2; -}; - -}; - -#endif diff --git a/cppe/test/IceE/slicing/Test.ice b/cppe/test/IceE/slicing/Test.ice deleted file mode 100644 index 9945a23c4a3..00000000000 --- a/cppe/test/IceE/slicing/Test.ice +++ /dev/null @@ -1,59 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_ICE -#define TEST_ICE - -module Test -{ - -exception Base -{ - string b; -}; - -exception KnownDerived extends Base -{ - string kd; -}; - -exception KnownIntermediate extends Base -{ - string ki; -}; - -exception KnownMostDerived extends KnownIntermediate -{ - string kmd; -}; - -interface TestIntf -{ - void baseAsBase() throws Base; - void unknownDerivedAsBase() throws Base; - void knownDerivedAsBase() throws Base; - void knownDerivedAsKnownDerived() throws KnownDerived; - - void unknownIntermediateAsBase() throws Base; - void knownIntermediateAsBase() throws Base; - void knownMostDerivedAsBase() throws Base; - void knownIntermediateAsKnownIntermediate() throws KnownIntermediate; - void knownMostDerivedAsKnownIntermediate() throws KnownIntermediate; - void knownMostDerivedAsKnownMostDerived() throws KnownMostDerived; - - void unknownMostDerived1AsBase() throws Base; - void unknownMostDerived1AsKnownIntermediate() throws KnownIntermediate; - void unknownMostDerived2AsBase() throws Base; - - void shutdown(); -}; - -}; - -#endif diff --git a/cppe/test/IceE/slicing/TestI.cpp b/cppe/test/IceE/slicing/TestI.cpp deleted file mode 100644 index cdae4a0e478..00000000000 --- a/cppe/test/IceE/slicing/TestI.cpp +++ /dev/null @@ -1,151 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <TestI.h> -#include <TestCommon.h> -#include <IceE/IceE.h> - -using namespace Test; - -TestI::TestI(const Ice::ObjectAdapterPtr& adapter) : - _adapter(adapter) -{ -} - -void -TestI::baseAsBase(const ::Ice::Current&) -{ - Base b; - b.b = "Base.b"; - throw b; -} - -void -TestI::unknownDerivedAsBase(const ::Ice::Current&) -{ - UnknownDerived d; - d.b = "UnknownDerived.b"; - d.ud = "UnknownDerived.ud"; - throw d; -} - -void -TestI::knownDerivedAsBase(const ::Ice::Current&) -{ - KnownDerived d; - d.b = "KnownDerived.b"; - d.kd = "KnownDerived.kd"; - throw d; -} - -void -TestI::knownDerivedAsKnownDerived(const ::Ice::Current&) -{ - KnownDerived d; - d.b = "KnownDerived.b"; - d.kd = "KnownDerived.kd"; - throw d; -} - -void -TestI::unknownIntermediateAsBase(const ::Ice::Current&) -{ - UnknownIntermediate ui; - ui.b = "UnknownIntermediate.b"; - ui.ui = "UnknownIntermediate.ui"; - throw ui; -} - -void -TestI::knownIntermediateAsBase(const ::Ice::Current&) -{ - KnownIntermediate ki; - ki.b = "KnownIntermediate.b"; - ki.ki = "KnownIntermediate.ki"; - throw ki; -} - -void -TestI::knownMostDerivedAsBase(const ::Ice::Current&) -{ - KnownMostDerived kmd; - kmd.b = "KnownMostDerived.b"; - kmd.ki = "KnownMostDerived.ki"; - kmd.kmd = "KnownMostDerived.kmd"; - throw kmd; -} - -void -TestI::knownIntermediateAsKnownIntermediate(const ::Ice::Current&) -{ - KnownIntermediate ki; - ki.b = "KnownIntermediate.b"; - ki.ki = "KnownIntermediate.ki"; - throw ki; -} - -void -TestI::knownMostDerivedAsKnownIntermediate(const ::Ice::Current&) -{ - KnownMostDerived kmd; - kmd.b = "KnownMostDerived.b"; - kmd.ki = "KnownMostDerived.ki"; - kmd.kmd = "KnownMostDerived.kmd"; - throw kmd; -} - -void -TestI:: -knownMostDerivedAsKnownMostDerived(const ::Ice::Current&) -{ - KnownMostDerived kmd; - kmd.b = "KnownMostDerived.b"; - kmd.ki = "KnownMostDerived.ki"; - kmd.kmd = "KnownMostDerived.kmd"; - throw kmd; -} - -void -TestI::unknownMostDerived1AsBase(const ::Ice::Current&) -{ - UnknownMostDerived1 umd1; - umd1.b = "UnknownMostDerived1.b"; - umd1.ki = "UnknownMostDerived1.ki"; - umd1.umd1 = "UnknownMostDerived1.umd1"; - throw umd1; -} - -void -TestI::unknownMostDerived1AsKnownIntermediate(const ::Ice::Current&) -{ - UnknownMostDerived1 umd1; - umd1.b = "UnknownMostDerived1.b"; - umd1.ki = "UnknownMostDerived1.ki"; - umd1.umd1 = "UnknownMostDerived1.umd1"; - throw umd1; -} - -void -TestI::unknownMostDerived2AsBase(const ::Ice::Current&) -{ - UnknownMostDerived2 umd2; - umd2.b = "UnknownMostDerived2.b"; - umd2.ui = "UnknownMostDerived2.ui"; - umd2.umd2 = "UnknownMostDerived2.umd2"; - throw umd2; -} - -void -TestI::shutdown(const ::Ice::Current&) -{ - _adapter->getCommunicator()->shutdown(); -#ifdef _WIN32_WCE - tprintf("The server has shutdown, close the window to terminate the server."); -#endif -} diff --git a/cppe/test/IceE/slicing/TestI.h b/cppe/test/IceE/slicing/TestI.h deleted file mode 100644 index 2d9332fbe55..00000000000 --- a/cppe/test/IceE/slicing/TestI.h +++ /dev/null @@ -1,43 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TESTI_H -#define TESTI_H - -#include <ServerPrivate.h> - -class TestI : virtual public Test::TestIntf -{ -public: - - TestI(const ::Ice::ObjectAdapterPtr&); - virtual void baseAsBase(const ::Ice::Current&); - virtual void unknownDerivedAsBase(const ::Ice::Current&); - virtual void knownDerivedAsBase(const ::Ice::Current&); - virtual void knownDerivedAsKnownDerived(const ::Ice::Current&); - - virtual void unknownIntermediateAsBase(const ::Ice::Current&); - virtual void knownIntermediateAsBase(const ::Ice::Current&); - virtual void knownMostDerivedAsBase(const ::Ice::Current&); - virtual void knownIntermediateAsKnownIntermediate(const ::Ice::Current&); - virtual void knownMostDerivedAsKnownIntermediate(const ::Ice::Current&); - virtual void knownMostDerivedAsKnownMostDerived(const ::Ice::Current&); - - virtual void unknownMostDerived1AsBase(const ::Ice::Current&); - virtual void unknownMostDerived1AsKnownIntermediate(const ::Ice::Current&); - virtual void unknownMostDerived2AsBase(const ::Ice::Current&); - - virtual void shutdown(const ::Ice::Current&); - -private: - - const ::Ice::ObjectAdapterPtr _adapter; -}; - -#endif diff --git a/cppe/test/IceE/slicing/run.py b/cppe/test/IceE/slicing/run.py deleted file mode 100755 index 1f757e46f77..00000000000 --- a/cppe/test/IceE/slicing/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "slicing") - -print "tests with regular server." -TestUtil.clientServerTest(name) -sys.exit(0) diff --git a/cppe/test/IceE/thread/.depend b/cppe/test/IceE/thread/.depend deleted file mode 100644 index 0da99931c9c..00000000000 --- a/cppe/test/IceE/thread/.depend +++ /dev/null @@ -1,11 +0,0 @@ -TestBase$(OBJEXT): TestBase.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./TestBase.h ../../include/TestCommon.h -CreateTest$(OBJEXT): CreateTest.cpp ../../../include/IceE/DisableWarnings.h ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./CreateTest.h ./TestBase.h ../../include/TestCommon.h -AliveTest$(OBJEXT): AliveTest.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./AliveTest.h ./TestBase.h ../../include/TestCommon.h -StartTest$(OBJEXT): StartTest.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./StartTest.h ./TestBase.h ../../include/TestCommon.h -RecMutexTest$(OBJEXT): RecMutexTest.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./RecMutexTest.h ./TestBase.h ../../include/TestCommon.h -StaticMutexTest$(OBJEXT): StaticMutexTest.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../../include/IceE/StaticMutex.h ./StaticMutexTest.h ./TestBase.h ../../include/TestCommon.h -MutexTest$(OBJEXT): MutexTest.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./MutexTest.h ./TestBase.h ../../include/TestCommon.h -MonitorMutexTest$(OBJEXT): MonitorMutexTest.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./MonitorMutexTest.h ./TestBase.h ../../include/TestCommon.h -MonitorRecMutexTest$(OBJEXT): MonitorRecMutexTest.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ./MonitorRecMutexTest.h ./TestBase.h ../../include/TestCommon.h -TestSuite$(OBJEXT): TestSuite.cpp ./TestSuite.h ./TestBase.h ../../../include/IceE/Shared.h ../../../include/IceE/Config.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ./MutexTest.h ./RecMutexTest.h ./StaticMutexTest.h ./CreateTest.h ./AliveTest.h ./StartTest.h ./MonitorMutexTest.h ./MonitorRecMutexTest.h -Client$(OBJEXT): Client.cpp ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/Handle.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Shared.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/Exception.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../../include/IceE/Time.h ../../../include/IceE/UUID.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Thread.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestApplication.h ../../include/TestCommon.h ./TestSuite.h ./TestBase.h diff --git a/cppe/test/IceE/thread/.gitignore b/cppe/test/IceE/thread/.gitignore deleted file mode 100644 index 1446b6586f5..00000000000 --- a/cppe/test/IceE/thread/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client diff --git a/cppe/test/IceE/thread/AliveTest.cpp b/cppe/test/IceE/thread/AliveTest.cpp deleted file mode 100644 index 76a6b0149c7..00000000000 --- a/cppe/test/IceE/thread/AliveTest.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <AliveTest.h> -#include <TestCommon.h> - -using namespace std; -using namespace IceUtil; - -static const string createTestName("thread alive"); - -class CondVar : public IceUtil::Monitor<IceUtil::RecMutex> -{ -public: - - CondVar() : - _done(false) - { - } - - void waitForSignal() - { - IceUtil::Monitor<IceUtil::RecMutex>::Lock lock(*this); - while(!_done) - { - wait(); - } - } - - void signal() - { - IceUtil::Monitor<IceUtil::RecMutex>::Lock lock(*this); - _done = true; - notify(); - } - -private: - - bool _done; -}; - -class AliveTestThread : public Thread -{ -public: - - AliveTestThread(CondVar& childCreated, CondVar& parentReady) : - _childCreated(childCreated), _parentReady(parentReady) - { - } - - virtual void run() - { - try - { - _childCreated.signal(); - _parentReady.waitForSignal(); - } - catch(IceUtil::ThreadLockedException &) - { - } - } - -private: - - CondVar& _childCreated; - CondVar& _parentReady; -}; - -typedef Handle<AliveTestThread> AliveTestThreadPtr; - -AliveTest::AliveTest() : - TestBase(createTestName) -{ -} - -void -AliveTest::run() -{ - // - // Check that calling isAlive() returns the correct result for alive and - // and dead threads. - // - CondVar childCreated; - CondVar parentReady; - AliveTestThreadPtr t = new AliveTestThread(childCreated, parentReady); - IceUtil::ThreadControl c = t->start(); - childCreated.waitForSignal(); - test(t->isAlive()); - parentReady.signal(); - c.join(); - test(!t->isAlive()); -} diff --git a/cppe/test/IceE/thread/AliveTest.h b/cppe/test/IceE/thread/AliveTest.h deleted file mode 100644 index 695b35c6785..00000000000 --- a/cppe/test/IceE/thread/AliveTest.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ALIVE_TEST_H -#define ALIVE_TEST_H - -#include <TestBase.h> - -class AliveTest : public TestBase -{ -public: - - AliveTest(); - -private: - - virtual void run(); -}; - -#endif diff --git a/cppe/test/IceE/thread/Client.cpp b/cppe/test/IceE/thread/Client.cpp deleted file mode 100644 index e36c2f5059c..00000000000 --- a/cppe/test/IceE/thread/Client.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> - -#include <stdlib.h> -#include <TestApplication.h> - -#include <TestSuite.h> - -using namespace std; - -class ThreadTestApplication : public TestApplication -{ -public: - - ThreadTestApplication() : - TestApplication("thread test") - { - } - - virtual int run(int argc, char* argv[]) - { - try - { - initializeTestSuite(); - - for(list<TestBasePtr>::const_iterator p = allTests.begin(); p != allTests.end(); ++p) - { - (*p)->start(); - } - } - catch(const TestFailed& e) - { - tprintf("test %s failed\n", e.name.c_str()); - return EXIT_FAILURE; - } - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - ThreadTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - ThreadTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/thread/CreateTest.cpp b/cppe/test/IceE/thread/CreateTest.cpp deleted file mode 100644 index c6ef0e58e6d..00000000000 --- a/cppe/test/IceE/thread/CreateTest.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/DisableWarnings.h> -#include <IceE/IceE.h> - -#include <stdio.h> - -#include <CreateTest.h> -#include <TestCommon.h> - -using namespace std; -using namespace IceUtil; - -static const string createTestName("thread create"); - -class CreateTestThread : public Thread -{ -public: - - CreateTestThread() : - threadran(false) - { - } - - virtual void run() - { - threadran = true; - } - - bool threadran; -}; - -typedef Handle<CreateTestThread> CreateTestThreadPtr; - -CreateTest::CreateTest() : - TestBase(createTestName) -{ -} - -void -CreateTest::run() -{ - int nthreads = 4096; -#ifdef _WIN32_WCE - // - // 4096 threads takes forever to start on the WinCe emulator. - // - nthreads = 512; -#endif - for(int i = 0; i < nthreads ; ++i) - { - CreateTestThreadPtr t = new CreateTestThread(); - ThreadControl control = t->start(); - control.join(); - test(t->threadran); -#ifdef _WIN32_WCE - if((i % 32) == 0) - { - tprintf("."); - } -#else - if((i % 256) == 0) - { - char buf[5]; - sprintf(buf, "%04d", i); - tprintf("%s", buf); - } -#endif - } -#ifndef _WIN32_WCE - tprintf(" "); -#endif -} diff --git a/cppe/test/IceE/thread/CreateTest.h b/cppe/test/IceE/thread/CreateTest.h deleted file mode 100644 index cbcf7aad705..00000000000 --- a/cppe/test/IceE/thread/CreateTest.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef CREATE_TEST_H -#define CREATE_TEST_H - -#include <TestBase.h> - -class CreateTest : public TestBase -{ -public: - - CreateTest(); - -private: - - virtual void run(); -}; - -#endif diff --git a/cppe/test/IceE/thread/Makefile b/cppe/test/IceE/thread/Makefile deleted file mode 100644 index 68491e454ae..00000000000 --- a/cppe/test/IceE/thread/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -TARGETS = $(CLIENT) - -OBJS = TestBase.o \ - CreateTest.o \ - AliveTest.o \ - StartTest.o \ - RecMutexTest.o \ - StaticMutexTest.o \ - MutexTest.o \ - MonitorMutexTest.o \ - MonitorRecMutexTest.o \ - TestSuite.o \ - Client.o - - -SRCS = $(OBJS:.o=.cpp) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/thread/Makefile.mak b/cppe/test/IceE/thread/Makefile.mak deleted file mode 100644 index e80670979e1..00000000000 --- a/cppe/test/IceE/thread/Makefile.mak +++ /dev/null @@ -1,43 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-
-TARGETS = $(CLIENT)
-
-OBJS = TestBase.obj \
- CreateTest.obj \
- AliveTest.obj \
- StartTest.obj \
- RecMutexTest.obj \
- StaticMutexTest.obj \
- MutexTest.obj \
- MonitorMutexTest.obj \
- MonitorRecMutexTest.obj \
- TestSuite.obj \
- Client.obj
-
-SRCS = $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-!endif
-
-$(CLIENT): $(OBJS)
- $(LINK) $(LDFLAGS) $(PDBFLAGS) $(OBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-!include .depend
diff --git a/cppe/test/IceE/thread/MonitorMutexTest.cpp b/cppe/test/IceE/thread/MonitorMutexTest.cpp deleted file mode 100644 index 4ed29cb86ee..00000000000 --- a/cppe/test/IceE/thread/MonitorMutexTest.cpp +++ /dev/null @@ -1,182 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> - -#include <MonitorMutexTest.h> -#include <TestCommon.h> - -using namespace std; -using namespace IceUtil; - -class MonitorMutexTestThread : public Thread -{ -public: - - MonitorMutexTestThread(Monitor<Mutex>& m) : - _monitor(m), - _tryLock(false) - { - } - - virtual void run() - { - Monitor<Mutex>::TryLock tlock(_monitor); - test(!tlock.acquired()); - - { - Mutex::Lock lock(_tryLockMutex); - _tryLock = true; - } - _tryLockCond.signal(); - - Monitor<Mutex>::Lock lock(_monitor); - } - - void - waitTryLock() - { - Mutex::Lock lock(_tryLockMutex); - while(!_tryLock) - { - _tryLockCond.wait(lock); - } - } - -private: - - Monitor<Mutex>& _monitor; - bool _tryLock; - // - // Use native Condition variable here, not Monitor. - // - Cond _tryLockCond; - Mutex _tryLockMutex; -}; - -typedef Handle<MonitorMutexTestThread> MonitorMutexTestThreadPtr; - -class MonitorMutexTestThread2 : public Thread -{ -public: - - MonitorMutexTestThread2(Monitor<Mutex>& monitor) : - finished(false), - _monitor(monitor) - { - } - - virtual void run() - { - Monitor<Mutex>::Lock lock(_monitor); - _monitor.wait(); - finished = true; - } - - bool finished; - -private: - - Monitor<Mutex>& _monitor; -}; - -typedef Handle<MonitorMutexTestThread2> MonitorMutexTestThread2Ptr; - -static const string monitorMutexTestName("monitor<mutex>"); - -MonitorMutexTest::MonitorMutexTest() : - TestBase(monitorMutexTestName) -{ -} - -void -MonitorMutexTest::run() -{ - Monitor<Mutex> monitor; - MonitorMutexTestThreadPtr t; - MonitorMutexTestThread2Ptr t2; - MonitorMutexTestThread2Ptr t3; - ThreadControl control; - ThreadControl control2; - - { - Monitor<Mutex>::Lock lock(monitor); - - try - { - Monitor<Mutex>::TryLock tlock(monitor); - test(!tlock.acquired()); - } - catch(const ThreadLockedException&) - { - } - - // TEST: Start thread, try to acquire the mutex. - t = new MonitorMutexTestThread(monitor); - control = t->start(); - - // TEST: Wait until the tryLock has been tested. - t->waitTryLock(); - } - - // - // TEST: Once the mutex has been released, the thread should - // acquire the mutex and then terminate. - // - control.join(); - - // TEST: notify() wakes one consumer. - t2 = new MonitorMutexTestThread2(monitor); - control = t2->start(); - t3 = new MonitorMutexTestThread2(monitor); - control2 = t3->start(); - - // Give the thread time to start waiting. - ThreadControl::sleep(Time::seconds(1)); - - { - Monitor<Mutex>::Lock lock(monitor); - monitor.notify(); - } - - // Give one thread time to terminate - ThreadControl::sleep(Time::seconds(1)); - - test((t2->finished && !t3->finished) || (t3->finished && !t2->finished)); - - { - Monitor<Mutex>::Lock lock(monitor); - monitor.notify(); - } - control.join(); - control2.join(); - - // TEST: notifyAll() wakes one consumer. - t2 = new MonitorMutexTestThread2(monitor); - control = t2->start(); - t3 = new MonitorMutexTestThread2(monitor); - control2 = t3->start(); - - // Give the threads time to start waiting. - ThreadControl::sleep(Time::seconds(1)); - - { - Monitor<Mutex>::Lock lock(monitor); - monitor.notifyAll(); - } - - control.join(); - control2.join(); - - // TEST: timedWait - { - Monitor<Mutex>::Lock lock(monitor); - test(!monitor.timedWait(Time::milliSeconds(500))); - } -} diff --git a/cppe/test/IceE/thread/MonitorMutexTest.h b/cppe/test/IceE/thread/MonitorMutexTest.h deleted file mode 100644 index 0bd1a528ca1..00000000000 --- a/cppe/test/IceE/thread/MonitorMutexTest.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef MONITOR_MUTEX_TEST_H -#define MONITOR_MUTEX_TEST_H - -#include <TestBase.h> - -class MonitorMutexTest : public TestBase -{ -public: - - MonitorMutexTest(); - -private: - - virtual void run(); -}; - -#endif diff --git a/cppe/test/IceE/thread/MonitorRecMutexTest.cpp b/cppe/test/IceE/thread/MonitorRecMutexTest.cpp deleted file mode 100644 index 126d53fa861..00000000000 --- a/cppe/test/IceE/thread/MonitorRecMutexTest.cpp +++ /dev/null @@ -1,183 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> - -#include <MonitorRecMutexTest.h> -#include <TestCommon.h> - -using namespace std; -using namespace IceUtil; - -class MonitorRecMutexTestThread : public Thread -{ -public: - - MonitorRecMutexTestThread(Monitor<RecMutex>& m) : - _monitor(m), - _tryLock(false) - { - } - - virtual void run() - { - - Monitor<RecMutex>::TryLock tlock(_monitor); - test(!tlock.acquired()); - - { - Mutex::Lock lock(_tryLockMutex); - _tryLock = true; - } - _tryLockCond.signal(); - - Monitor<RecMutex>::Lock lock(_monitor); - } - - void - waitTryLock() - { - Mutex::Lock lock(_tryLockMutex); - while(!_tryLock) - { - _tryLockCond.wait(lock); - } - } - -private: - - Monitor<RecMutex>& _monitor; - bool _tryLock; - // - // Use native Condition variable here, not Monitor. - // - Cond _tryLockCond; - Mutex _tryLockMutex; -}; - -typedef Handle<MonitorRecMutexTestThread> MonitorRecMutexTestThreadPtr; - -class MonitorRecMutexTestThread2 : public Thread, public Monitor<RecMutex> -{ -public: - - MonitorRecMutexTestThread2(Monitor<RecMutex>& monitor) : - finished(false), - _monitor(monitor) - { - } - - virtual void run() - { - Monitor<RecMutex>::Lock lock(_monitor); - _monitor.wait(); - finished = true; - } - - bool finished; - -private: - - Monitor<RecMutex>& _monitor; -}; - -typedef Handle<MonitorRecMutexTestThread2> MonitorRecMutexTestThread2Ptr; - -static const string monitorRecMutexTestName("monitor<recmutex>"); - -MonitorRecMutexTest::MonitorRecMutexTest() : - TestBase(monitorRecMutexTestName) -{ -} - -void -MonitorRecMutexTest::run() -{ - Monitor<RecMutex> monitor; - MonitorRecMutexTestThreadPtr t; - MonitorRecMutexTestThread2Ptr t2; - MonitorRecMutexTestThread2Ptr t3; - ThreadControl control; - ThreadControl control2; - - - { - Monitor<RecMutex>::Lock lock(monitor); - - Monitor<RecMutex>::TryLock lock2(monitor); - test(lock2.acquired()); - - // TEST: TryLock - - Monitor<RecMutex>::TryLock tlock(monitor); - test(tlock.acquired()); - - // TEST: Start thread, try to acquire the mutex. - t = new MonitorRecMutexTestThread(monitor); - control = t->start(); - - // TEST: Wait until the tryLock has been tested. - t->waitTryLock(); - } - - // - // TEST: Once the mutex has been released, the thread should - // acquire the mutex and then terminate. - // - control.join(); - - // TEST: notify() wakes one consumer. - t2 = new MonitorRecMutexTestThread2(monitor); - control = t2->start(); - t3 = new MonitorRecMutexTestThread2(monitor); - control2 = t3->start(); - - // Give the thread time to start waiting. - ThreadControl::sleep(Time::seconds(1)); - - { - Monitor<RecMutex>::Lock lock(monitor); - monitor.notify(); - } - - // Give one thread time to terminate - ThreadControl::sleep(Time::seconds(1)); - - test((t2->finished && !t3->finished) || (t3->finished && !t2->finished)); - - { - Monitor<RecMutex>::Lock lock(monitor); - monitor.notify(); - } - control.join(); - control2.join(); - - // TEST: notifyAll() wakes one consumer. - t2 = new MonitorRecMutexTestThread2(monitor); - control = t2->start(); - t3 = new MonitorRecMutexTestThread2(monitor); - control2 = t3->start(); - - // Give the threads time to start waiting. - ThreadControl::sleep(Time::seconds(1)); - - { - Monitor<RecMutex>::Lock lock(monitor); - monitor.notifyAll(); - } - - control.join(); - control2.join(); - - // TEST: timedWait - { - Monitor<RecMutex>::Lock lock(monitor); - test(!monitor.timedWait(Time::milliSeconds(500))); - } -} diff --git a/cppe/test/IceE/thread/MonitorRecMutexTest.h b/cppe/test/IceE/thread/MonitorRecMutexTest.h deleted file mode 100644 index c7209d4e553..00000000000 --- a/cppe/test/IceE/thread/MonitorRecMutexTest.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef MONITOR_REC_MUTEX_TEST_H -#define MONITOR_REC_MUTEX_TEST_H - -#include <TestBase.h> - -class MonitorRecMutexTest : public TestBase -{ -public: - - MonitorRecMutexTest(); - -private: - - virtual void run(); -}; - -#endif diff --git a/cppe/test/IceE/thread/MutexTest.cpp b/cppe/test/IceE/thread/MutexTest.cpp deleted file mode 100644 index dfca515c716..00000000000 --- a/cppe/test/IceE/thread/MutexTest.cpp +++ /dev/null @@ -1,160 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> - -#include <MutexTest.h> -#include <TestCommon.h> - -using namespace std; -using namespace IceUtil; - -static const string mutexTestName("mutex"); - -class MutexTestThread : public Thread -{ -public: - - MutexTestThread(Mutex& m) : - _mutex(m), - _tryLock(false) - { - } - - virtual void run() - { - Mutex::TryLock tlock(_mutex); - test(!tlock.acquired()); - - { - Mutex::Lock lock(_tryLockMutex); - _tryLock = true; - } - _tryLockCond.signal(); - - Mutex::Lock lock(_mutex); - } - - void - waitTryLock() - { - Mutex::Lock lock(_tryLockMutex); - while(!_tryLock) - { - _tryLockCond.wait(lock); - } - } - -private: - - Mutex& _mutex; - bool _tryLock; - // - // Use native Condition variable here, not Monitor. - // - Cond _tryLockCond; - Mutex _tryLockMutex; -}; - -typedef Handle<MutexTestThread> MutexTestThreadPtr; - -MutexTest::MutexTest() : - TestBase(mutexTestName) -{ -} - -void -MutexTest::run() -{ - Mutex mutex; - MutexTestThreadPtr t; - ThreadControl control; - - { - Mutex::Lock lock(mutex); - - // LockT testing: - // - - test(lock.acquired()); - - try - { - lock.acquire(); - test(false); - } - catch(const ThreadLockedException&) - { - // Expected - } - - try - { - lock.tryAcquire(); - test(false); - } - catch(const ThreadLockedException&) - { - // Expected - } - - test(lock.acquired()); - lock.release(); - test(!lock.acquired()); - - try - { - lock.release(); - test(false); - } - catch(const ThreadLockedException&) - { - // Expected - } - - Mutex::TryLock lock2(mutex); - try - { - test(lock.tryAcquire() == false); - } - catch(const IceUtil::ThreadLockedException&) - { - } - lock2.release(); - test(lock.tryAcquire() == true); - test(lock.acquired()); - - // Deadlock testing - // - -#if !defined(NDEBUG) && !defined(_WIN32) - try - { - Mutex::Lock lock3(mutex); - test(false); - } - catch(const ThreadLockedException&) - { - } -#endif - - // TEST: Start thread, try to acquire the mutex. - t = new MutexTestThread(mutex); - control = t->start(); - - // TEST: Wait until the tryLock has been tested. - t->waitTryLock(); - } - - // - // TEST: Once the mutex has been released, the thread should - // acquire the mutex and then terminate. - // - control.join(); -} diff --git a/cppe/test/IceE/thread/MutexTest.h b/cppe/test/IceE/thread/MutexTest.h deleted file mode 100644 index 99371dccc32..00000000000 --- a/cppe/test/IceE/thread/MutexTest.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef MUTEX_TEST_H -#define MUTEX_TEST_H - -#include <TestBase.h> - -class MutexTest : public TestBase -{ -public: - - MutexTest(); - -private: - - virtual void run(); -}; - -#endif diff --git a/cppe/test/IceE/thread/RecMutexTest.cpp b/cppe/test/IceE/thread/RecMutexTest.cpp deleted file mode 100644 index dddb1178f84..00000000000 --- a/cppe/test/IceE/thread/RecMutexTest.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> - -#include <RecMutexTest.h> -#include <TestCommon.h> - -using namespace std; -using namespace IceUtil; - -static const string recMutexTestName("recursive mutex"); - -class RecMutexTestThread : public Thread -{ -public: - - RecMutexTestThread(RecMutex& m) : - _mutex(m), - _tryLock(false) - { - } - - virtual void run() - { - - RecMutex::TryLock tlock(_mutex); - test(!tlock.acquired()); - - { - Mutex::Lock lock(_tryLockMutex); - _tryLock = true; - } - _tryLockCond.signal(); - - RecMutex::Lock lock(_mutex); - } - - void - waitTryLock() - { - Mutex::Lock lock(_tryLockMutex); - while(!_tryLock) - { - _tryLockCond.wait(lock); - } - } - -private: - - RecMutex& _mutex; - bool _tryLock; - // - // Use native Condition variable here, not Monitor. - // - Cond _tryLockCond; - Mutex _tryLockMutex; -}; - -typedef Handle<RecMutexTestThread> RecMutexTestThreadPtr; - -RecMutexTest::RecMutexTest() : - TestBase(recMutexTestName) -{ -} - -void -RecMutexTest::run() -{ - RecMutex mutex; - RecMutexTestThreadPtr t; - ThreadControl control; - - { - RecMutex::Lock lock(mutex); - - // TEST: lock twice - RecMutex::Lock lock2(mutex); - - // TEST: TryLock - RecMutex::TryLock lock3(mutex); - test(lock3.acquired()); - - // TEST: Start thread, try to acquire the mutex. - t = new RecMutexTestThread(mutex); - control = t->start(); - - // TEST: Wait until the tryLock has been tested. - t->waitTryLock(); - - } - - // - // TEST: Once the recursive mutex has been released, the thread - // should acquire the mutex and then terminate. - // - - control.join(); - -} diff --git a/cppe/test/IceE/thread/RecMutexTest.h b/cppe/test/IceE/thread/RecMutexTest.h deleted file mode 100644 index 04265a23fca..00000000000 --- a/cppe/test/IceE/thread/RecMutexTest.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef REC_MUTEX_TEST_H -#define REC_MUTEX_TEST_H - -#include <TestBase.h> - -class RecMutexTest : public TestBase -{ -public: - - RecMutexTest(); - -private: - - virtual void run(); -}; - -#endif diff --git a/cppe/test/IceE/thread/StartTest.cpp b/cppe/test/IceE/thread/StartTest.cpp deleted file mode 100644 index e28db0c263b..00000000000 --- a/cppe/test/IceE/thread/StartTest.cpp +++ /dev/null @@ -1,107 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> - -#include <stdio.h> - -#include <StartTest.h> -#include <TestCommon.h> - -using namespace std; -using namespace IceUtil; - -static const string createTestName("thread start"); - -static IceUtil::Mutex threadCountMutex; -static int threadCount = 0; - -class StartTestThread : public Thread -{ -public: - - StartTestThread() - { - } - - virtual void run() - { - IceUtil::Mutex::Lock sync(threadCountMutex); - --threadCount; - } -}; - -typedef Handle<StartTestThread> StartTestThreadPtr; - -StartTest::StartTest() : - TestBase(createTestName) -{ -} - -void -StartTest::run() -{ - // - // Check that calling start() more than once raises ThreadStartedException. - // - StartTestThreadPtr t = new StartTestThread(); - ThreadControl control = t->start(); - control.join(); - try - { - t->start(); - test(false); - } - catch(const ThreadStartedException&) - { - } - - threadCount = 0; - // - // Now let's create a bunch of short-lived threads - // -#ifdef _WIN32_WCE - for(int i = 0; i < 50; i++) - { - for(int j = 0; j < 5; j++) - { - { - IceUtil::Mutex::Lock sync(threadCountMutex); - ++threadCount; - } - Thread* t = new StartTestThread; - t->start().detach(); - } - - // Wait for the threads to all terminate. I don't want to use - // a monitor here, since monitor hasn't been tested yet. - while(true) - { - { - IceUtil::Mutex::Lock sync(threadCountMutex); - if(threadCount == 0) - { - break; - } - } - ThreadControl::sleep(Time::milliSeconds(5)); - } - } -#else - for(int i = 0; i < 50; i++) - { - for(int j = 0; j < 50; j++) - { - Thread* t = new StartTestThread; - t->start().detach(); - } - ThreadControl::sleep(Time::milliSeconds(5)); - } -#endif -} diff --git a/cppe/test/IceE/thread/StartTest.h b/cppe/test/IceE/thread/StartTest.h deleted file mode 100644 index 51199de5ebe..00000000000 --- a/cppe/test/IceE/thread/StartTest.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef START_TEST_H -#define START_TEST_H - -#include <TestBase.h> - -class StartTest : public TestBase -{ -public: - - StartTest(); - -private: - - virtual void run(); -}; - -#endif diff --git a/cppe/test/IceE/thread/StaticMutexTest.cpp b/cppe/test/IceE/thread/StaticMutexTest.cpp deleted file mode 100644 index 914bc20e109..00000000000 --- a/cppe/test/IceE/thread/StaticMutexTest.cpp +++ /dev/null @@ -1,151 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> -#include <IceE/StaticMutex.h> - -#include <StaticMutexTest.h> -#include <TestCommon.h> - -using namespace std; -using namespace IceUtil; - -static const string mutexTestName("static mutex"); - -static StaticMutex staticMutex = ICE_STATIC_MUTEX_INITIALIZER; - -class StaticMutexTestThread : public Thread -{ -public: - - StaticMutexTestThread() : - _tryLock(false) - { - } - - virtual void run() - { - StaticMutex::TryLock tlock(staticMutex); - test(!tlock.acquired()); - - { - Mutex::Lock lock(_tryLockMutex); - _tryLock = true; - } - _tryLockCond.signal(); - - StaticMutex::Lock lock(staticMutex); - } - - void - waitTryLock() - { - Mutex::Lock lock(_tryLockMutex); - while(!_tryLock) - { - _tryLockCond.wait(lock); - } - } - -private: - - bool _tryLock; - // - // Use native Condition variable here, not Monitor. - // - Cond _tryLockCond; - Mutex _tryLockMutex; -}; - -typedef Handle<StaticMutexTestThread> StaticMutexTestThreadPtr; - -StaticMutexTest::StaticMutexTest() : - TestBase(mutexTestName) -{ -} - -void -StaticMutexTest::run() -{ - StaticMutexTestThreadPtr t; - ThreadControl control; - - { - StaticMutex::Lock lock(staticMutex); - - // LockT testing: - // - - test(lock.acquired()); - - try - { - lock.acquire(); - test(false); - } - catch(const ThreadLockedException&) - { - // Expected - } - - try - { - lock.tryAcquire(); - test(false); - } - catch(const ThreadLockedException&) - { - // Expected - } - - test(lock.acquired()); - lock.release(); - test(!lock.acquired()); - - try - { - lock.release(); - test(false); - } - catch(const ThreadLockedException&) - { - // Expected - } - - StaticMutex::TryLock lock2(staticMutex); - // - // Under WinCE tryAcquire() does not do recursion checks. - // -#ifndef _WIN32_WCE - try - { - test(lock.tryAcquire() == false); - } - catch(const IceUtil::ThreadLockedException&) - { - } - lock2.release(); - test(lock.tryAcquire() == true); - test(lock.acquired()); -#endif - - // TEST: Start thread, try to acquire the mutex. - t = new StaticMutexTestThread; - control = t->start(); - - // TEST: Wait until the tryLock has been tested. - t->waitTryLock(); - } - - // - // TEST: Once the mutex has been released, the thread should - // acquire the mutex and then terminate. - // - control.join(); -} diff --git a/cppe/test/IceE/thread/StaticMutexTest.h b/cppe/test/IceE/thread/StaticMutexTest.h deleted file mode 100644 index dd4e1f9a3c5..00000000000 --- a/cppe/test/IceE/thread/StaticMutexTest.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef STATIC_MUTEX_TEST_H -#define STATIC_MUTEX_TEST_H - -#include <TestBase.h> - -class StaticMutexTest : public TestBase -{ -public: - - StaticMutexTest(); - -private: - - virtual void run(); -}; - -#endif diff --git a/cppe/test/IceE/thread/TestBase.cpp b/cppe/test/IceE/thread/TestBase.cpp deleted file mode 100644 index 7ef6b95fd36..00000000000 --- a/cppe/test/IceE/thread/TestBase.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/IceE.h> - -#include <TestBase.h> -#include <TestCommon.h> - -#include <stdio.h> - -using namespace std; - -TestFailed::TestFailed(const std::string& n) : - name(n) -{ -} - -TestBase::TestBase(const std::string& n) : - _name(n) -{ -} - -string -TestBase::name() const -{ - return _name; -} - -void -TestBase::start() -{ - tprintf("running %s test... ", _name.c_str()); - try - { - run(); - } - catch(const IceUtil::Exception& e) - { - tprintf("%s failed\n", e.toString().c_str()); - throw TestFailed(_name); - } - tprintf("ok\n"); -} diff --git a/cppe/test/IceE/thread/TestBase.h b/cppe/test/IceE/thread/TestBase.h deleted file mode 100644 index 10eb17560ac..00000000000 --- a/cppe/test/IceE/thread/TestBase.h +++ /dev/null @@ -1,43 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_BASE_H -#define TEST_BASE_H - -#include <IceE/Shared.h> -#include <IceE/Handle.h> - -class TestFailed -{ -public: - - TestFailed(const std::string&); - - const std::string name; -}; - -class TestBase : public IceUtil::Shared -{ -public: - - TestBase(const std::string&); - - std::string name() const; - void start(); - -protected: - - virtual void run() = 0; - - const std::string _name; -}; - -typedef IceUtil::Handle<TestBase> TestBasePtr; - -#endif diff --git a/cppe/test/IceE/thread/TestSuite.cpp b/cppe/test/IceE/thread/TestSuite.cpp deleted file mode 100644 index 0abc507ae16..00000000000 --- a/cppe/test/IceE/thread/TestSuite.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <TestSuite.h> -#include <MutexTest.h> -#include <RecMutexTest.h> -#include <StaticMutexTest.h> -#include <CreateTest.h> -#include <AliveTest.h> -#include <StartTest.h> -#include <MonitorMutexTest.h> -#include <MonitorRecMutexTest.h> - -std::list<TestBasePtr> allTests; - -void -initializeTestSuite() -{ - allTests.push_back(new MutexTest); - allTests.push_back(new StartTest); - allTests.push_back(new CreateTest); - allTests.push_back(new AliveTest); - allTests.push_back(new RecMutexTest); - allTests.push_back(new StaticMutexTest); - allTests.push_back(new MonitorMutexTest); - allTests.push_back(new MonitorRecMutexTest); -} diff --git a/cppe/test/IceE/thread/TestSuite.h b/cppe/test/IceE/thread/TestSuite.h deleted file mode 100644 index f656677cdaf..00000000000 --- a/cppe/test/IceE/thread/TestSuite.h +++ /dev/null @@ -1,21 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_SUITE_H -#define TEST_SUITE_H - -#include <TestBase.h> -#include <list> - -extern std::list<TestBasePtr> allTests; - -void initializeTestSuite(); - -#endif - diff --git a/cppe/test/IceE/thread/run.py b/cppe/test/IceE/thread/run.py deleted file mode 100755 index 22d927c0bfd..00000000000 --- a/cppe/test/IceE/thread/run.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "thread") -testdir = os.path.join(toplevel, "test", name) - -client = os.path.join(testdir, "client") -clientOptions = ' ' + testdir; - -print "starting client...", -clientPipe = os.popen(client + clientOptions + " 2>&1") -print "ok" - -TestUtil.printOutputFromPipe(clientPipe); - -clientStatus = clientPipe.close() - -if clientStatus: - sys.exit(1) - -sys.exit(0) diff --git a/cppe/test/IceE/uuid/.depend b/cppe/test/IceE/uuid/.depend deleted file mode 100644 index fbfa4302004..00000000000 --- a/cppe/test/IceE/uuid/.depend +++ /dev/null @@ -1 +0,0 @@ -Client$(OBJEXT): Client.cpp ../../../include/IceE/UUID.h ../../../include/IceE/Exception.h ../../../include/IceE/ExceptionBase.h ../../../include/IceE/Config.h ../../../include/IceE/Handle.h ../../../include/IceE/Time.h ../../../include/IceE/Thread.h ../../../include/IceE/Shared.h ../../../include/IceE/Mutex.h ../../../include/IceE/Lock.h ../../../include/IceE/ThreadException.h ../../../include/IceE/StaticMutex.h ../../../include/IceE/Monitor.h ../../../include/IceE/Cond.h ../../include/TestApplication.h ../../../include/IceE/IceE.h ../../../include/IceE/Initialize.h ../../../include/IceE/CommunicatorF.h ../../../include/IceE/PropertiesF.h ../../../include/IceE/LoggerF.h ../../../include/IceE/InstanceF.h ../../../include/IceE/BuiltinSequences.h ../../../include/IceE/ProxyF.h ../../../include/IceE/ProxyHandle.h ../../../include/IceE/ObjectF.h ../../../include/IceE/ScopedArray.h ../../../include/IceE/Proxy.h ../../../include/IceE/ProxyFactoryF.h ../../../include/IceE/ConnectionF.h ../../../include/IceE/ReferenceF.h ../../../include/IceE/Identity.h ../../../include/IceE/UndefSysMacros.h ../../../include/IceE/OperationMode.h ../../../include/IceE/Outgoing.h ../../../include/IceE/BasicStream.h ../../../include/IceE/Buffer.h ../../../include/IceE/Protocol.h ../../../include/IceE/StringConverter.h ../../../include/IceE/LocalException.h ../../../include/IceE/Properties.h ../../../include/IceE/Logger.h ../../../include/IceE/LoggerUtil.h ../../../include/IceE/Communicator.h ../../../include/IceE/RecMutex.h ../../../include/IceE/ObjectAdapter.h ../../../include/IceE/ObjectAdapterF.h ../../../include/IceE/ObjectAdapterFactoryF.h ../../../include/IceE/IncomingConnectionFactoryF.h ../../../include/IceE/ServantManagerF.h ../../../include/IceE/EndpointF.h ../../../include/IceE/RouterF.h ../../../include/IceE/Object.h ../../../include/IceE/Current.h ../../../include/IceE/RouterInfoF.h ../../../include/IceE/LocatorF.h ../../../include/IceE/LocatorInfoF.h ../../../include/IceE/Connection.h ../../../include/IceE/OutgoingConnectionFactoryF.h ../../../include/IceE/TransceiverF.h ../../../include/IceE/TraceLevelsF.h ../../../include/IceE/Incoming.h ../../../include/IceE/Functional.h ../../../include/IceE/Unicode.h ../../../include/IceE/SafeStdio.h ../../include/TestCommon.h diff --git a/cppe/test/IceE/uuid/.gitignore b/cppe/test/IceE/uuid/.gitignore deleted file mode 100644 index 1446b6586f5..00000000000 --- a/cppe/test/IceE/uuid/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client diff --git a/cppe/test/IceE/uuid/Client.cpp b/cppe/test/IceE/uuid/Client.cpp deleted file mode 100644 index 52199e95295..00000000000 --- a/cppe/test/IceE/uuid/Client.cpp +++ /dev/null @@ -1,331 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceE/UUID.h> -#include <IceE/Time.h> -#include <IceE/Thread.h> -#include <IceE/StaticMutex.h> -#include <IceE/Monitor.h> -#include <TestApplication.h> -#include <set> -#include <vector> - -using namespace IceUtil; -using namespace std; - -static StaticMutex staticMutex = ICE_STATIC_MUTEX_INITIALIZER; - -inline void usage(const char* myName) -{ - tprintf("Usage: %s [number of UUIDs to generate] [number of threads]\n", myName); -} - -class CountedBarrier : public Shared, public Monitor<Mutex> -{ -public: - - CountedBarrier(int count) : - _count(count) - { - } - - void - decrement() - { - Lock sync(*this); - --_count; - if(_count == 0) - { - notifyAll(); - } - } - - void - waitZero() - { - Lock sync(*this); - while(_count != 0) - { - wait(); - } - } - - bool - isZero() const - { - Lock sync(*this); - return _count == 0; - } - -private: - - int _count; -}; -typedef Handle<CountedBarrier> CountedBarrierPtr; - -class InsertThread : public Thread, public Mutex -{ -public: - - InsertThread(const CountedBarrierPtr& start, const CountedBarrierPtr& stop, int threadId, set<string>& uuidSet, long howMany, bool verbose) - : _start(start), _stop(stop), _threadId(threadId), _uuidSet(uuidSet), _howMany(howMany), _verbose(verbose), _destroyed(false) - { - } - - virtual void - run() - { - _start->decrement(); - _start->waitZero(); - - for(long i = 0; i < _howMany && !destroyed(); i++) - { - string uuid = generateUUID(); - { - StaticMutex::Lock lock(staticMutex); - pair<set<string>::iterator, bool> ok = _uuidSet.insert(uuid); - if(!ok.second) - { - tprintf("******* iteration %d\n", i); - tprintf("******* Duplicate UUID: %s\n", (*ok.first).c_str()); - } - - test(ok.second); - } - -#ifdef _WIN32_WCE - if(i > 0 && (i % 100) == 0) - { - tprintf("."); - } -#else - if(_verbose && i > 0 && (i % 100000 == 0)) - { - tprintf("Thread %d: generated %d UUIDs.\n", _threadId, i); - } -#endif - } - - _stop->decrement(); -#ifdef _WIN32_WCE - // This will cause the main thread to wake. - tprintf("."); -#endif - } - - void - destroy() - { - Lock sync(*this); - _destroyed = true; - } - - bool - destroyed() const - { - Lock sync(*this); - return _destroyed; - } - private: - - const CountedBarrierPtr _start; - const CountedBarrierPtr _stop; - const int _threadId; - set<string>& _uuidSet; - const long _howMany; - const bool _verbose; - bool _destroyed; -}; -typedef Handle<InsertThread> InsertThreadPtr; - -class UuidTestApplication : public TestApplication -{ -public: - - UuidTestApplication() : - TestApplication("uuid test") - { - } - - virtual int - run(int argc, char* argv[]) - { -#ifdef _WIN32_WCE - long howMany = 3000; -#else - long howMany = 300000; -#endif - int threadCount = 3; - bool verbose = false; - - if(argc > 3) - { - usage(argv[0]); - return EXIT_FAILURE; - } - else if(argc == 3) - { - howMany = atol(argv[1]); - if (howMany == 0) - { - usage(argv[0]); - return EXIT_FAILURE; - } - threadCount = atoi(argv[2]); - if(threadCount <= 0) - { - usage(argv[0]); - return EXIT_FAILURE; - } - verbose = true; - } - else if(argc == 2) - { - howMany = atol(argv[1]); - if (howMany == 0) - { - usage(argv[0]); - return EXIT_FAILURE; - } - } - - tprintf("Generating %d UUIDs", howMany); - tprintf("... "); - - if(verbose) - { - tprintf("\n"); - } - // - // First measure raw time to produce UUIDs. - // - Time startTime = Time::now(); - long i; - for(i = 0; i < howMany; i++) - { - generateUUID(); - } -#ifdef _WIN32_WCE - if(terminated()) - { - return EXIT_SUCCESS; - } -#endif - - Time finish = Time::now(); - - tprintf("ok\n"); - -#ifndef _WIN32_WCE - if(verbose) -#endif - { - tprintf("Each UUID took an average of %.04f ms to generate and insert into a set<string>.\n", - ((double) ((finish - startTime).toMilliSeconds())) / howMany); - } - - tprintf("Generating %d UUIDs using %d thread", howMany, threadCount); - if(threadCount > 1) - { - tprintf("s"); - } - tprintf("... "); - - if(verbose) - { - tprintf("\n"); - } - - set<string> uuidSet; - - startTime = Time::now(); - vector<InsertThreadPtr> threads; - - CountedBarrierPtr stop = new CountedBarrier(threadCount); - CountedBarrierPtr start = new CountedBarrier(threadCount); - for(i = 0; i < threadCount; i++) - { - InsertThreadPtr t = new InsertThread(start, stop, i, uuidSet, howMany / threadCount, verbose); - t->start(); - threads.push_back(t); - } - - vector<InsertThreadPtr>::iterator p; - -#ifdef _WIN32_WCE - while(!stop->isZero() && !terminated()) - { - MSG Msg; - if(GetMessage(&Msg, NULL, 0, 0)) - { - // - // Process all pending events. - // - do - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - while(PeekMessage(&Msg, NULL, 0, 0, PM_REMOVE)); - } - } - - // - // If the user terminated the app, the destroy all the - // threads. This loop will end once all the threads have gone. - // - if(terminated()) - { - for(p = threads.begin(); p != threads.end(); ++p) - { - (*p)->destroy(); - } - } -#endif - stop->waitZero(); - finish = Time::now(); - - for(p = threads.begin(); p != threads.end(); ++p) - { - (*p)->getThreadControl().join(); - } - - tprintf("ok\n"); - -#ifndef _WIN32_WCE - if(verbose) -#endif - { - tprintf("Each UUID took an average of %.04f ms to generate and insert into a set<string>.\n", - ((double) ((finish - startTime).toMilliSeconds())) / howMany); - } - - return EXIT_SUCCESS; - } -}; - -#ifdef _WIN32_WCE - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - UuidTestApplication app; - return app.main(hInstance); -} - -#else - -int -main(int argc, char** argv) -{ - UuidTestApplication app; - return app.main(argc, argv); -} - -#endif diff --git a/cppe/test/IceE/uuid/Makefile b/cppe/test/IceE/uuid/Makefile deleted file mode 100644 index b3fd6476e21..00000000000 --- a/cppe/test/IceE/uuid/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -TARGETS = $(CLIENT) - -OBJS = Client.o - - -SRCS = $(OBJS:.o=.cpp) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(TESTLIBS) - -include .depend diff --git a/cppe/test/IceE/uuid/Makefile.mak b/cppe/test/IceE/uuid/Makefile.mak deleted file mode 100644 index d748371ff93..00000000000 --- a/cppe/test/IceE/uuid/Makefile.mak +++ /dev/null @@ -1,33 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..\..\..
-
-CLIENT = client.exe
-
-TARGETS = $(CLIENT)
-
-OBJS = Client.obj
-
-SRCS = $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. -I../../include $(CPPFLAGS) -WX -DWIN32_LEAN_AND_MEAN
-
-!if "$(OPTIMIZE_SPEED)" != "yes" && "$(OPTIMIZE_SIZE)" != "yes"
-PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-!endif
-
-$(CLIENT): $(OBJS)
- $(LINK) $(LDFLAGS) $(PDBFLAGS) $(OBJS) /out:$@ $(TESTLIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-
-!include .depend
diff --git a/cppe/test/IceE/uuid/run.py b/cppe/test/IceE/uuid/run.py deleted file mode 100755 index fe66ca2694c..00000000000 --- a/cppe/test/IceE/uuid/run.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - toplevel = os.path.normpath(toplevel) - if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): - break -else: - raise "can't find toplevel directory!" - -sys.path.append(os.path.join(toplevel, "config")) -import TestUtil -TestUtil.processCmdLine() - -name = os.path.join("IceE", "uuid") -testdir = os.path.join(toplevel, "test", name) - -client = os.path.join(testdir, "client") - -print "starting client...", -clientPipe = os.popen(client + " 2>&1") -print "ok" - -TestUtil.printOutputFromPipe(clientPipe); - -clientStatus = clientPipe.close() - -if clientStatus: - sys.exit(1) - -sys.exit(0) diff --git a/cppe/test/Makefile b/cppe/test/Makefile deleted file mode 100644 index 25f82a5d6b8..00000000000 --- a/cppe/test/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -# -# This copy of Ice-E is licensed to you under the terms described in the -# ICEE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = Common \ - IceE - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cppe/test/Makefile.mak b/cppe/test/Makefile.mak deleted file mode 100644 index a39b70e86ac..00000000000 --- a/cppe/test/Makefile.mak +++ /dev/null @@ -1,20 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir = ..
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-SUBDIRS = Common \
- IceE
-
-$(EVERYTHING)::
- @for %i in ( $(SUBDIRS) ) do \
- @echo "making $@ in %i" && \
- cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cppe/test/include/TestApplication.h b/cppe/test/include/TestApplication.h deleted file mode 100644 index 755ddd299bf..00000000000 --- a/cppe/test/include/TestApplication.h +++ /dev/null @@ -1,55 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_APPLICATION_H -#define TEST_APPLICATION_H - -#include <IceE/Config.h> -#include <IceE/IceE.h> -#include <IceE/Mutex.h> - -// -// XXX: For ICE_TEST_COMMON_API. We could create a TestConfig.h later, or -// perhaps make Test/... subdirectory. -// -#include <TestCommon.h> - -class ICE_TEST_COMMON_API TestApplication -{ -public: - - TestApplication(const std::string& = ""); - virtual ~TestApplication() - { - } - -#ifdef _WIN32_WCE - int main(HINSTANCE); -#else - int main(int, char*[]); -#endif - - virtual int run(int, char*[]) = 0; - - Ice::LoggerPtr getLogger(); - - void setCommunicator(const Ice::CommunicatorPtr&); - Ice::CommunicatorPtr communicator(); - - bool terminated() const; - - void loadConfig(const Ice::PropertiesPtr&); - -private: - - const std::string _name; - Ice::CommunicatorPtr _communicator; -}; - -#endif diff --git a/cppe/test/include/TestCommon.h b/cppe/test/include/TestCommon.h deleted file mode 100644 index 0fe249dc591..00000000000 --- a/cppe/test/include/TestCommon.h +++ /dev/null @@ -1,28 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice-E is licensed to you under the terms described in the -// ICEE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_COMMON_H -#define TEST_COMMON_H - -#include <IceE/Config.h> -#include <IceE/IceE.h> - -#ifdef ICE_TEST_COMMON_API_EXPORTS -# define ICE_TEST_COMMON_API ICE_DECLSPEC_EXPORT -#else -# define ICE_TEST_COMMON_API ICE_DECLSPEC_IMPORT -#endif - -ICE_TEST_COMMON_API void tprintf(const char* fmt, ...); - -ICE_TEST_COMMON_API void testFailed(const char*, const char*, unsigned int); - -#define test(ex) ((ex) ? ((void)0) : testFailed(#ex, __FILE__, __LINE__)) - -#endif |