diff options
Diffstat (limited to 'cpp/test/FreezeScript/dbmap')
68 files changed, 0 insertions, 5085 deletions
diff --git a/cpp/test/FreezeScript/dbmap/.depend.mak b/cpp/test/FreezeScript/dbmap/.depend.mak deleted file mode 100755 index a1e2b5f67f4..00000000000 --- a/cpp/test/FreezeScript/dbmap/.depend.mak +++ /dev/null @@ -1,360 +0,0 @@ - -TestOld.h: \ - TestOld.ice - -TestOld.obj: \ - TestOld.cpp \ - "TestOld.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Outgoing.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - -IntSMap.obj: \ - IntSMap.cpp \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\IceUtil\StringUtil.h" \ - "IntSMap.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "TestOld.h" \ - -makedb.obj: \ - makedb.cpp \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\AbstractMutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\Cache.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\CountDownLatch.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Freeze\Freeze.h" \ - "$(includedir)\Freeze\Initialize.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\DeprecatedStringConverter.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Freeze\EvictorF.h" \ - "$(includedir)\Freeze\ConnectionF.h" \ - "$(includedir)\Freeze\Index.h" \ - "$(includedir)\Freeze\DB.h" \ - "$(includedir)\Freeze\Transaction.h" \ - "$(includedir)\Freeze\BackgroundSaveEvictor.h" \ - "$(includedir)\Freeze\Evictor.h" \ - "$(includedir)\Freeze\Exception.h" \ - "$(includedir)\Freeze\TransactionalEvictor.h" \ - "$(includedir)\Freeze\Map.h" \ - "$(includedir)\Freeze\Connection.h" \ - "$(includedir)\Freeze\TransactionHolder.h" \ - "$(includedir)\Freeze\Catalog.h" \ - "$(includedir)\Freeze\CatalogData.h" \ - "IntSMap.h" \ - "TestOld.h" \ diff --git a/cpp/test/FreezeScript/dbmap/.gitignore b/cpp/test/FreezeScript/dbmap/.gitignore deleted file mode 100644 index 2e986d77bf8..00000000000 --- a/cpp/test/FreezeScript/dbmap/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -makedb -TestOld.cpp -TestOld.h -IntSMap.h -IntSMap.cpp -db/* -db_init -db_check -db_tmp diff --git a/cpp/test/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile deleted file mode 100644 index 51ddcf7ad33..00000000000 --- a/cpp/test/FreezeScript/dbmap/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 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 = makedb - -TARGETS = $(CLIENT) - -SLICE_OBJS = TestOld.o - -OBJS = $(SLICE_OBJS) \ - makedb.o \ - IntSMap.o - -all:: IntSMap.cpp - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - -# The slice2freeze rules are structured like this to avoid issues with -# parallel make. -IntSMap.h: IntSMap.cpp -IntSMap.cpp: TestOld.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) - rm -f IntSMap.h IntSMap.cpp - $(SLICE2FREEZE) -I. --dict IntSMap,int,::Test::S IntSMap TestOld.ice - -clean:: - -rm -f IntSMap.h IntSMap.cpp - -rm -rf db/* db_init db_check db_tmp diff --git a/cpp/test/FreezeScript/dbmap/Makefile.mak b/cpp/test/FreezeScript/dbmap/Makefile.mak deleted file mode 100644 index 662a9214da4..00000000000 --- a/cpp/test/FreezeScript/dbmap/Makefile.mak +++ /dev/null @@ -1,52 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 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 = makedb.exe - -TARGETS = $(CLIENT) - -SLICE_OBJS = .\TestOld.obj - -OBJS = $(SLICE_OBJS) \ - .\IntSMap.obj \ - .\makedb.obj - -all:: IntSMap.cpp IntSMap.h - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN - -!if "$(GENERATE_PDB)" == "yes" -PDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) -!endif - -$(CLIENT): $(OBJS) - $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -IntSMap.h IntSMap.cpp: TestOld.ice "$(SLICE2FREEZE)" "$(SLICEPARSERLIB)" - del /q IntSMap.h IntSMap.cpp - "$(SLICE2FREEZE)" -I. --dict IntSMap,int,::Test::S IntSMap TestOld.ice - -clean:: - del /q IntSMap.h IntSMap.cpp - -clean:: - del /q TestOld.cpp TestOld.h - -clean:: - if exist db\__Freeze rmdir /s /q db\__Freeze - del /q db\*.db db\log.* db\__catalog db\__catalogIndexList - if exist db_init rmdir /s /q db_init - if exist db_check rmdir /s /q db_check - if exist db_tmp rmdir /s /q db_tmp diff --git a/cpp/test/FreezeScript/dbmap/TestNew.ice b/cpp/test/FreezeScript/dbmap/TestNew.ice deleted file mode 100644 index 9d47f303b1f..00000000000 --- a/cpp/test/FreezeScript/dbmap/TestNew.ice +++ /dev/null @@ -1,236 +0,0 @@ -module Test -{ - -enum E { E3, E1, E2 }; - -sequence<string> BoolStringSeq; - -sequence<byte> ByteByteSeq; -sequence<short> ByteShortSeq; -sequence<int> ByteIntSeq; -sequence<long> ByteLongSeq; -sequence<string> ByteStringSeq; - -sequence<byte> ShortByteSeq; -sequence<short> ShortShortSeq; -sequence<int> ShortIntSeq; -sequence<long> ShortLongSeq; -sequence<string> ShortStringSeq; - -sequence<byte> IntByteSeq; -sequence<short> IntShortSeq; -sequence<int> IntIntSeq; -sequence<long> IntLongSeq; -sequence<string> IntStringSeq; - -sequence<byte> LongByteSeq; -sequence<short> LongShortSeq; -sequence<int> LongIntSeq; -sequence<long> LongLongSeq; -sequence<string> LongStringSeq; - -sequence<float> FloatFloatSeq; -sequence<double> FloatDoubleSeq; -sequence<string> FloatStringSeq; - -sequence<float> DoubleFloatSeq; -sequence<double> DoubleDoubleSeq; -sequence<string> DoubleStringSeq; - -sequence<bool> StringBoolSeq; -sequence<byte> StringByteSeq; -sequence<short> StringShortSeq; -sequence<int> StringIntSeq; -sequence<long> StringLongSeq; -sequence<float> StringFloatSeq; -sequence<double> StringDoubleSeq; -sequence<string> StringStringSeq; -sequence<E> StringEnumSeq; -sequence<Object*> StringProxySeq; - -dictionary<int, string> BoolStringDict; - -dictionary<int, byte> LongByteDict; -dictionary<int, short> LongShortDict; -dictionary<int, int> LongIntDict; -dictionary<int, string> LongStringDict; - -dictionary<int, float> DoubleFloatDict; -dictionary<int, string> DoubleStringDict; - -dictionary<int, bool> StringBoolDict; -dictionary<int, long> StringLongDict; -dictionary<int, double> StringDoubleDict; -dictionary<int, E> StringEnumDict; - -class C -{ - BoolStringDict boolToStringDict; -}; - -class D extends C -{ - StringByteSeq stringToByteSeq; - Object obj; -}; - -class F -{ - StringEnumSeq stringToEnumSeq; -}; - -class Small1 -{ - byte b; - string intToString; -}; -sequence<Small1> Small1Seq; -dictionary<int, Small1> IntSmall1Dict; - -struct Small2 -{ - Small1Seq seq; -}; -sequence<Small2> Small2Seq; -dictionary<int, Small2> IntSmall2Dict; - -class Small3(100) -{ - string name; -}; - -struct S -{ - // - // Primitive transformations. - // - string boolToString; - - byte byteToByte; - short byteToShort; - int byteToInt; - long byteToLong; - string byteToString; - - byte shortToByte; - short shortToShort; - int shortToInt; - long shortToLong; - string shortToString; - - byte intToByte; - short intToShort; - int intToInt; - long intToLong; - string intToString; - - byte longToByte; - short longToShort; - int longToInt; - long longToLong; - string longToString; - - float floatToFloat; - double floatToDouble; - string floatToString; - - float doubleToFloat; - double doubleToDouble; - string doubleToString; - - bool stringToBool; - byte stringToByte; - short stringToShort; - int stringToInt; - long stringToLong; - float stringToFloat; - double stringToDouble; - string stringToString; - E stringToEnum; - Object* stringToProxy; - - // - // Sequence transformations. - // - BoolStringSeq boolSeqToStringSeq; - - ByteByteSeq byteSeqToByteSeq; - ByteShortSeq byteSeqToShortSeq; - ByteIntSeq byteSeqToIntSeq; - ByteLongSeq byteSeqToLongSeq; - ByteStringSeq byteSeqToStringSeq; - - ShortByteSeq shortSeqToByteSeq; - ShortShortSeq shortSeqToShortSeq; - ShortIntSeq shortSeqToIntSeq; - ShortLongSeq shortSeqToLongSeq; - ShortStringSeq shortSeqToStringSeq; - - IntByteSeq intSeqToByteSeq; - IntShortSeq intSeqToShortSeq; - IntIntSeq intSeqToIntSeq; - IntLongSeq intSeqToLongSeq; - IntStringSeq intSeqToStringSeq; - - LongByteSeq longSeqToByteSeq; - LongShortSeq longSeqToShortSeq; - LongIntSeq longSeqToIntSeq; - LongLongSeq longSeqToLongSeq; - LongStringSeq longSeqToStringSeq; - - FloatFloatSeq floatSeqToFloatSeq; - FloatDoubleSeq floatSeqToDoubleSeq; - FloatStringSeq floatSeqToStringSeq; - - DoubleFloatSeq doubleSeqToFloatSeq; - DoubleDoubleSeq doubleSeqToDoubleSeq; - DoubleStringSeq doubleSeqToStringSeq; - - StringBoolSeq stringSeqToBoolSeq; - StringByteSeq stringSeqToByteSeq; - StringShortSeq stringSeqToShortSeq; - StringIntSeq stringSeqToIntSeq; - StringLongSeq stringSeqToLongSeq; - StringFloatSeq stringSeqToFloatSeq; - StringDoubleSeq stringSeqToDoubleSeq; - StringStringSeq stringSeqToStringSeq; - StringEnumSeq stringSeqToEnumSeq; - StringProxySeq stringSeqToProxySeq; - - // - // Dictionary transformations. - // - BoolStringDict boolToStringDict; - - LongByteDict longToByteDict; - LongShortDict longToShortDict; - LongIntDict longToIntDict; - LongStringDict longToStringDict; - - DoubleFloatDict doubleToFloatDict; - DoubleStringDict doubleToStringDict; - - StringBoolDict stringToBoolDict; - StringLongDict stringToLongDict; - StringDoubleDict stringToDoubleDict; - StringEnumDict stringToEnumDict; - - // - // Struct<->class transformations. - // - Small2Seq classToStructSeq; - IntSmall1Dict small1Dict; - IntSmall2Dict small2Dict; - - // - // Object transformations. - // - Object nilObject; - Object baseObject; - C cObject; - C dAsCObject; - D dObject; - Small3 compactObject; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/TestOld.ice b/cpp/test/FreezeScript/dbmap/TestOld.ice deleted file mode 100644 index 52ac93e3136..00000000000 --- a/cpp/test/FreezeScript/dbmap/TestOld.ice +++ /dev/null @@ -1,236 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -sequence<bool> BoolStringSeq; - -sequence<byte> ByteByteSeq; -sequence<byte> ByteShortSeq; -sequence<byte> ByteIntSeq; -sequence<byte> ByteLongSeq; -sequence<byte> ByteStringSeq; - -sequence<short> ShortByteSeq; -sequence<short> ShortShortSeq; -sequence<short> ShortIntSeq; -sequence<short> ShortLongSeq; -sequence<short> ShortStringSeq; - -sequence<int> IntByteSeq; -sequence<int> IntShortSeq; -sequence<int> IntIntSeq; -sequence<int> IntLongSeq; -sequence<int> IntStringSeq; - -sequence<long> LongByteSeq; -sequence<long> LongShortSeq; -sequence<long> LongIntSeq; -sequence<long> LongLongSeq; -sequence<long> LongStringSeq; - -sequence<float> FloatFloatSeq; -sequence<float> FloatDoubleSeq; -sequence<float> FloatStringSeq; - -sequence<double> DoubleFloatSeq; -sequence<double> DoubleDoubleSeq; -sequence<double> DoubleStringSeq; - -sequence<string> StringBoolSeq; -sequence<string> StringByteSeq; -sequence<string> StringShortSeq; -sequence<string> StringIntSeq; -sequence<string> StringLongSeq; -sequence<string> StringFloatSeq; -sequence<string> StringDoubleSeq; -sequence<string> StringStringSeq; -sequence<string> StringEnumSeq; -sequence<string> StringProxySeq; - -dictionary<int, bool> BoolStringDict; - -dictionary<int, long> LongByteDict; -dictionary<int, long> LongShortDict; -dictionary<int, long> LongIntDict; -dictionary<int, long> LongStringDict; - -dictionary<int, double> DoubleFloatDict; -dictionary<int, double> DoubleStringDict; - -dictionary<int, string> StringBoolDict; -dictionary<int, string> StringLongDict; -dictionary<int, string> StringDoubleDict; -dictionary<int, string> StringEnumDict; - -class C -{ - BoolStringDict boolToStringDict; -}; - -class D extends C -{ - StringByteSeq stringToByteSeq; - Object obj; -}; - -class F -{ - StringEnumSeq stringToEnumSeq; -}; - -struct Small1 -{ - byte b; - int intToString; -}; -sequence<Small1> Small1Seq; -dictionary<int, Small1> IntSmall1Dict; - -class Small2 -{ - Small1Seq seq; -}; -sequence<Small2> Small2Seq; -dictionary<int, Small2> IntSmall2Dict; - -class Small3(99) -{ - string name; -}; - -struct S -{ - // - // Primitive transformations. - // - bool boolToString; - - byte byteToByte; - byte byteToShort; - byte byteToInt; - byte byteToLong; - byte byteToString; - - short shortToByte; - short shortToShort; - short shortToInt; - short shortToLong; - short shortToString; - - int intToByte; - int intToShort; - int intToInt; - int intToLong; - int intToString; - - long longToByte; - long longToShort; - long longToInt; - long longToLong; - long longToString; - - float floatToFloat; - float floatToDouble; - float floatToString; - - double doubleToFloat; - double doubleToDouble; - double doubleToString; - - string stringToBool; - string stringToByte; - string stringToShort; - string stringToInt; - string stringToLong; - string stringToFloat; - string stringToDouble; - string stringToString; - string stringToEnum; - string stringToProxy; - - // - // Sequence transformations. - // - BoolStringSeq boolSeqToStringSeq; - - ByteByteSeq byteSeqToByteSeq; - ByteShortSeq byteSeqToShortSeq; - ByteIntSeq byteSeqToIntSeq; - ByteLongSeq byteSeqToLongSeq; - ByteStringSeq byteSeqToStringSeq; - - ShortByteSeq shortSeqToByteSeq; - ShortShortSeq shortSeqToShortSeq; - ShortIntSeq shortSeqToIntSeq; - ShortLongSeq shortSeqToLongSeq; - ShortStringSeq shortSeqToStringSeq; - - IntByteSeq intSeqToByteSeq; - IntShortSeq intSeqToShortSeq; - IntIntSeq intSeqToIntSeq; - IntLongSeq intSeqToLongSeq; - IntStringSeq intSeqToStringSeq; - - LongByteSeq longSeqToByteSeq; - LongShortSeq longSeqToShortSeq; - LongIntSeq longSeqToIntSeq; - LongLongSeq longSeqToLongSeq; - LongStringSeq longSeqToStringSeq; - - FloatFloatSeq floatSeqToFloatSeq; - FloatDoubleSeq floatSeqToDoubleSeq; - FloatStringSeq floatSeqToStringSeq; - - DoubleFloatSeq doubleSeqToFloatSeq; - DoubleDoubleSeq doubleSeqToDoubleSeq; - DoubleStringSeq doubleSeqToStringSeq; - - StringBoolSeq stringSeqToBoolSeq; - StringByteSeq stringSeqToByteSeq; - StringShortSeq stringSeqToShortSeq; - StringIntSeq stringSeqToIntSeq; - StringLongSeq stringSeqToLongSeq; - StringFloatSeq stringSeqToFloatSeq; - StringDoubleSeq stringSeqToDoubleSeq; - StringStringSeq stringSeqToStringSeq; - StringEnumSeq stringSeqToEnumSeq; - StringProxySeq stringSeqToProxySeq; - - // - // Dictionary transformations. - // - BoolStringDict boolToStringDict; - - LongByteDict longToByteDict; - LongShortDict longToShortDict; - LongIntDict longToIntDict; - LongStringDict longToStringDict; - - DoubleFloatDict doubleToFloatDict; - DoubleStringDict doubleToStringDict; - - StringBoolDict stringToBoolDict; - StringLongDict stringToLongDict; - StringDoubleDict stringToDoubleDict; - StringEnumDict stringToEnumDict; - - // - // Struct<->class transformations. - // - Small2Seq classToStructSeq; - IntSmall1Dict small1Dict; - IntSmall2Dict small2Dict; - - // - // Object transformations. - // - Object nilObject; - Object baseObject; - C cObject; - C dAsCObject; - D dObject; - Small3 compactObject; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/check.xml b/cpp/test/FreezeScript/dbmap/check.xml deleted file mode 100644 index 7c7040a0b04..00000000000 --- a/cpp/test/FreezeScript/dbmap/check.xml +++ /dev/null @@ -1,362 +0,0 @@ -<transformdb> - <database key="int" value="::Test::S"> - <record> - </record> - </database> - - <!-- enum ::E --> - <transform type="::Test::E"/> - - <!-- struct ::S --> - <transform type="::Test::S"> - - <!-- Primitives --> - - <fail test="new.boolToString != 'true'"/> - - <fail test="new.byteToByte != 255"/> - <fail test="new.byteToShort != 255"/> - <fail test="new.byteToInt != 255"/> - <fail test="new.byteToLong != 255"/> - <fail test="new.byteToString != '255'"/> - - <fail test="new.shortToByte != 0"/> - <fail test="new.shortToShort != 32767"/> - <fail test="new.shortToInt != -32768"/> - <fail test="new.shortToLong != 32767"/> - <fail test="new.shortToString != '255'"/> - - <fail test="new.intToByte != 0"/> - <fail test="new.intToShort != 0"/> - <fail test="new.intToInt != 2147483647"/> - <fail test="new.intToLong != -2147483648"/> - <fail test="new.intToString != '255'"/> - - <fail test="new.longToByte != 0"/> - <fail test="new.longToShort != 0"/> - <fail test="new.longToInt != 0"/> - <fail test="new.longToLong != 9223372036854775807"/> - <fail test="new.longToString != '255'"/> - - <fail test="new.floatToFloat - 2920.1 > 0.001"/> - <fail test="new.floatToDouble - 2920.1 > 0.001"/> - <fail test="new.floatToString != '2920.1'"/> - - <fail test="new.doubleToFloat - 9290.9 > 0.001"/> - <fail test="new.doubleToDouble - 9290.9 > 0.001"/> - <fail test="new.doubleToString != '9290.9'"/> - - <fail test="new.stringToBool != false"/> - <fail test="new.stringToByte != 255"/> - <fail test="new.stringToShort != 32767"/> - <fail test="new.stringToInt != 2147483647"/> - <fail test="new.stringToLong != 9223372036854775807"/> - <fail test="new.stringToFloat - 2920.1 > 0.001"/> - <fail test="new.stringToDouble - 9290.9 > 0.001"/> - <fail test="new.stringToString != 'hello world'"/> - <fail test="new.stringToString.length != 11"/> - <fail test="new.stringToString.replace(new.stringToString.length, 0, '!') != 'hello world!'"/> - <fail test="new.stringToString.replace(0, 6, '') != 'world'"/> - <fail test="'hello' + 'world' != 'helloworld'"/> - <fail test="new.stringToEnum != ::New::Test::E1"/> - - <!-- Sequences --> - - <fail test="new.boolSeqToStringSeq.length != 2"/> - <fail test="new.boolSeqToStringSeq[0] != 'false'"/> - <fail test="new.boolSeqToStringSeq[1] != 'true'"/> - - <fail test="new.byteSeqToByteSeq.length != 2"/> - <fail test="new.byteSeqToByteSeq[0] != 0"/> - <fail test="new.byteSeqToByteSeq[1] != 255"/> - - <fail test="new.byteSeqToShortSeq.length != 2"/> - <fail test="new.byteSeqToShortSeq[0] != 0"/> - <fail test="new.byteSeqToShortSeq[1] != 255"/> - - <fail test="new.byteSeqToIntSeq.length != 2"/> - <fail test="new.byteSeqToIntSeq[0] != 0"/> - <fail test="new.byteSeqToIntSeq[1] != 255"/> - - <fail test="new.byteSeqToLongSeq.length != 2"/> - <fail test="new.byteSeqToLongSeq[0] != 0"/> - <fail test="new.byteSeqToLongSeq[1] != 255"/> - - <fail test="new.byteSeqToStringSeq.length != 2"/> - <fail test="new.byteSeqToStringSeq[0] != '0'"/> - <fail test="new.byteSeqToStringSeq[1] != '255'"/> - - <fail test="new.shortSeqToByteSeq.length != 4"/> - <fail test="new.shortSeqToByteSeq[0] != 0"/> - <fail test="new.shortSeqToByteSeq[1] != 255"/> - <fail test="new.shortSeqToByteSeq[2] != 0"/> - <fail test="new.shortSeqToByteSeq[3] != 0"/> - - <fail test="new.shortSeqToShortSeq.length != 2"/> - <fail test="new.shortSeqToShortSeq[0] != -32768"/> - <fail test="new.shortSeqToShortSeq[1] != 32767"/> - - <fail test="new.shortSeqToIntSeq.length != 2"/> - <fail test="new.shortSeqToIntSeq[0] != -32768"/> - <fail test="new.shortSeqToIntSeq[1] != 32767"/> - - <fail test="new.shortSeqToLongSeq.length != 2"/> - <fail test="new.shortSeqToLongSeq[0] != -32768"/> - <fail test="new.shortSeqToLongSeq[1] != 32767"/> - - <fail test="new.shortSeqToStringSeq.length != 2"/> - <fail test="new.shortSeqToStringSeq[0] != '-32768'"/> - <fail test="new.shortSeqToStringSeq[1] != '32767'"/> - - <fail test="new.intSeqToByteSeq.length != 4"/> - <fail test="new.intSeqToByteSeq[0] != 0"/> - <fail test="new.intSeqToByteSeq[1] != 255"/> - <fail test="new.intSeqToByteSeq[2] != 0"/> - <fail test="new.intSeqToByteSeq[3] != 0"/> - - <fail test="new.intSeqToShortSeq.length != 4"/> - <fail test="new.intSeqToShortSeq[0] != -32768"/> - <fail test="new.intSeqToShortSeq[1] != 32767"/> - <fail test="new.intSeqToShortSeq[2] != 0"/> - <fail test="new.intSeqToShortSeq[3] != 0"/> - - <fail test="new.intSeqToIntSeq.length != 2"/> - <fail test="new.intSeqToIntSeq[0] != -2147483648"/> - <fail test="new.intSeqToIntSeq[1] != 2147483647"/> - - <fail test="new.intSeqToLongSeq.length != 2"/> - <fail test="new.intSeqToLongSeq[0] != -2147483648"/> - <fail test="new.intSeqToLongSeq[1] != 2147483647"/> - - <fail test="new.intSeqToStringSeq.length != 2"/> - <fail test="new.intSeqToStringSeq[0] != '-2147483648'"/> - <fail test="new.intSeqToStringSeq[1] != '2147483647'"/> - - <fail test="new.longSeqToByteSeq.length != 4"/> - <fail test="new.longSeqToByteSeq[0] != 0"/> - <fail test="new.longSeqToByteSeq[1] != 255"/> - <fail test="new.longSeqToByteSeq[2] != 0"/> - <fail test="new.longSeqToByteSeq[3] != 0"/> - - <fail test="new.longSeqToShortSeq.length != 4"/> - <fail test="new.longSeqToShortSeq[0] != -32768"/> - <fail test="new.longSeqToShortSeq[1] != 32767"/> - <fail test="new.longSeqToShortSeq[2] != 0"/> - <fail test="new.longSeqToShortSeq[3] != 0"/> - - <fail test="new.longSeqToIntSeq.length != 4"/> - <fail test="new.longSeqToIntSeq[0] != -2147483648"/> - <fail test="new.longSeqToIntSeq[1] != 2147483647"/> - <fail test="new.longSeqToIntSeq[2] != 0"/> - <fail test="new.longSeqToIntSeq[3] != 0"/> - - <fail test="new.longSeqToLongSeq.length != 2"/> - <fail test="new.longSeqToLongSeq[0] != -9223372036854775808"/> - <fail test="new.longSeqToLongSeq[1] != 9223372036854775807"/> - - <fail test="new.longSeqToStringSeq.length != 2"/> - <fail test="new.longSeqToStringSeq[0] != '-9223372036854775808'"/> - <fail test="new.longSeqToStringSeq[1] != '9223372036854775807'"/> - - <fail test="new.floatSeqToFloatSeq.length != 2"/> - <fail test="new.floatSeqToFloatSeq[0] - 2920.1 > 0.001"/> - <fail test="new.floatSeqToFloatSeq[1] - 2920.2 > 0.001"/> - - <fail test="new.floatSeqToDoubleSeq.length != 2"/> - <fail test="new.floatSeqToDoubleSeq[0] - 2920.1 > 0.001"/> - <fail test="new.floatSeqToDoubleSeq[1] - 2920.2 > 0.001"/> - - <fail test="new.floatSeqToStringSeq.length != 2"/> - <fail test="new.floatSeqToStringSeq[0] != '2920.1'"/> - <fail test="new.floatSeqToStringSeq[1] != '2920.2'"/> - - <fail test="new.doubleSeqToFloatSeq.length != 2"/> - <fail test="new.doubleSeqToFloatSeq[0] - 9290.8 > 0.001"/> - <fail test="new.doubleSeqToFloatSeq[1] - 9290.9 > 0.001"/> - - <fail test="new.doubleSeqToDoubleSeq.length != 2"/> - <fail test="new.doubleSeqToDoubleSeq[0] - 9290.8 > 0.001"/> - <fail test="new.doubleSeqToDoubleSeq[1] - 9290.9 > 0.001"/> - - <fail test="new.doubleSeqToStringSeq.length != 2"/> - <fail test="new.doubleSeqToStringSeq[0] != '9290.8'"/> - <fail test="new.doubleSeqToStringSeq[1] != '9290.9'"/> - - <fail test="new.stringSeqToBoolSeq.length != 2"/> - <fail test="new.stringSeqToBoolSeq[0] != false"/> - <fail test="new.stringSeqToBoolSeq[1] != true"/> - - <fail test="new.stringSeqToByteSeq.length != 4"/> - <fail test="new.stringSeqToByteSeq[0] != 0"/> - <fail test="new.stringSeqToByteSeq[1] != 255"/> - <fail test="new.stringSeqToByteSeq[2] != 0"/> - <fail test="new.stringSeqToByteSeq[3] != 0"/> - - <fail test="new.stringSeqToShortSeq.length != 4"/> - <fail test="new.stringSeqToShortSeq[0] != -32768"/> - <fail test="new.stringSeqToShortSeq[1] != 32767"/> - <fail test="new.stringSeqToShortSeq[2] != 0"/> - <fail test="new.stringSeqToShortSeq[3] != 0"/> - - <fail test="new.stringSeqToIntSeq.length != 4"/> - <fail test="new.stringSeqToIntSeq[0] != -2147483648"/> - <fail test="new.stringSeqToIntSeq[1] != 2147483647"/> - <fail test="new.stringSeqToIntSeq[2] != 0"/> - <fail test="new.stringSeqToIntSeq[3] != 0"/> - - <fail test="new.stringSeqToLongSeq.length != 2"/> - <fail test="new.stringSeqToLongSeq[0] != -9223372036854775808"/> - <fail test="new.stringSeqToLongSeq[1] != 9223372036854775807"/> - - <fail test="new.stringSeqToFloatSeq.length != 2"/> - <fail test="new.stringSeqToFloatSeq[0] - 2920.1 > 0.001"/> - <fail test="new.stringSeqToFloatSeq[1] - 2920.2 > 0.001"/> - - <fail test="new.stringSeqToDoubleSeq.length != 2"/> - <fail test="new.stringSeqToDoubleSeq[0] - 9290.8 > 0.001"/> - <fail test="new.stringSeqToDoubleSeq[1] - 9290.9 > 0.001"/> - - <fail test="new.stringSeqToStringSeq.length != 2"/> - <fail test="new.stringSeqToStringSeq[0] != 'hello'"/> - <fail test="new.stringSeqToStringSeq[1] != 'world'"/> - - <fail test="new.stringSeqToEnumSeq.length != 2"/> - <fail test="new.stringSeqToEnumSeq[0] != ::New::Test::E2"/> - <fail test="new.stringSeqToEnumSeq[1] != ::New::Test::E3"/> - - <!-- Dictionaries --> - - <fail test="new.boolToStringDict.length != 2"/> - <fail test="new.boolToStringDict[0] != 'false'"/> - <fail test="new.boolToStringDict[1] != 'true'"/> - - <fail test="new.longToByteDict.length != 4"/> - <fail test="new.longToByteDict[0] != 0"/> - <fail test="new.longToByteDict[1] != 255"/> - <fail test="new.longToByteDict[2] != 0"/> - <fail test="new.longToByteDict[3] != 0"/> - - <fail test="new.longToShortDict.length != 4"/> - <fail test="new.longToShortDict[0] != -32768"/> - <fail test="new.longToShortDict[1] != 32767"/> - <fail test="new.longToShortDict[2] != 0"/> - <fail test="new.longToShortDict[3] != 0"/> - - <fail test="new.longToIntDict.length != 4"/> - <fail test="new.longToIntDict[0] != -2147483648"/> - <fail test="new.longToIntDict[1] != 2147483647"/> - <fail test="new.longToIntDict[2] != 0"/> - <fail test="new.longToIntDict[3] != 0"/> - - <fail test="new.longToStringDict.length != 2"/> - <fail test="new.longToStringDict[0] != '-9223372036854775808'"/> - <fail test="new.longToStringDict[1] != '9223372036854775807'"/> - - <fail test="new.doubleToFloatDict.length != 2"/> - <fail test="new.doubleToFloatDict[0] - 9290.8 > 0.001"/> - <fail test="new.doubleToFloatDict[1] - 9290.9 > 0.001"/> - - <fail test="new.doubleToStringDict.length != 2"/> - <fail test="new.doubleToStringDict[0] != '9290.8'"/> - <fail test="new.doubleToStringDict[1] != '9290.9'"/> - - <fail test="new.stringToBoolDict.length != 2"/> - <fail test="new.stringToBoolDict[0] != false"/> - <fail test="new.stringToBoolDict[1] != true"/> - - <fail test="new.stringToLongDict.length != 2"/> - <fail test="new.stringToLongDict[0] != -9223372036854775808"/> - <fail test="new.stringToLongDict[1] != 9223372036854775807"/> - - <fail test="new.stringToDoubleDict.length != 2"/> - <fail test="new.stringToDoubleDict[0] - 9290.8 > 0.001"/> - <fail test="new.stringToDoubleDict[1] - 9290.9 > 0.001"/> - - <fail test="new.stringToEnumDict.length != 2"/> - <fail test="new.stringToEnumDict[0] != ::New::Test::E2"/> - <fail test="new.stringToEnumDict[1] != ::New::Test::E3"/> - - <!-- Struct <-> class transformations --> - - <fail test="new.classToStructSeq.length != 3"/> - <fail test="new.classToStructSeq[0].seq.length != 2"/> - <fail test="new.classToStructSeq[0].seq[0].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[0].seq[0].b != 100"/> - <fail test="new.classToStructSeq[0].seq[0].intToString != '101'"/> - <fail test="new.classToStructSeq[0].seq[1].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[0].seq[1].b != 102"/> - <fail test="new.classToStructSeq[0].seq[1].intToString != '103'"/> - <fail test="new.classToStructSeq[1].seq.length != 2"/> - <fail test="new.classToStructSeq[1].seq[0].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[1].seq[0].b != 110"/> - <fail test="new.classToStructSeq[1].seq[0].intToString != '111'"/> - <fail test="new.classToStructSeq[1].seq[1].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[1].seq[1].b != 112"/> - <fail test="new.classToStructSeq[1].seq[1].intToString != '113'"/> - <fail test="new.classToStructSeq[2].seq.length != 2"/> - <fail test="new.classToStructSeq[2].seq[0].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[2].seq[0].b != 120"/> - <fail test="new.classToStructSeq[2].seq[0].intToString != '121'"/> - <fail test="new.classToStructSeq[2].seq[1].ice_id != '::Test::Small1'"/> - <fail test="new.classToStructSeq[2].seq[1].b != 122"/> - <fail test="new.classToStructSeq[2].seq[1].intToString != '123'"/> - - <fail test="new.small1Dict.length != 3"/> - <fail test="new.small1Dict[0].ice_id != '::Test::Small1'"/> - <fail test="new.small1Dict[0].b != 120"/> - <fail test="new.small1Dict[0].intToString != '121'"/> - <fail test="new.small1Dict[10].ice_id != '::Test::Small1'"/> - <fail test="new.small1Dict[10].b != 122"/> - <fail test="new.small1Dict[10].intToString != '123'"/> - <fail test="new.small1Dict[100].ice_id != '::Test::Small1'"/> - <fail test="new.small1Dict[100].b != 124"/> - <fail test="new.small1Dict[100].intToString != '125'"/> - - <fail test="new.small2Dict.length != 3"/> - <fail test="new.small2Dict[0].seq.length != 1"/> - <fail test="new.small2Dict[0].seq[0].b != 220"/> - <fail test="new.small2Dict[0].seq[0].intToString != '221'"/> - <fail test="new.small2Dict[10].seq.length != 1"/> - <fail test="new.small2Dict[10].seq[0].b != 222"/> - <fail test="new.small2Dict[10].seq[0].intToString != '223'"/> - <fail test="new.small2Dict[100].seq.length != 1"/> - <fail test="new.small2Dict[100].seq[0].b != 224"/> - <fail test="new.small2Dict[100].seq[0].intToString != '225'"/> - - <!-- Objects --> - - <fail test="new.nilObject != nil"/> - - <fail test="new.baseObject.ice_id != '::Test::F'"/> - <fail test="new.baseObject.stringToEnumSeq.length != 2"/> - <fail test="new.baseObject.stringToEnumSeq[0] != ::New::Test::E1"/> - <fail test="new.baseObject.stringToEnumSeq[1] != ::New::Test::E3"/> - - <fail test="new.cObject.ice_id != '::Test::C'"/> - <fail test="new.cObject.boolToStringDict.length != 2"/> - <fail test="new.cObject.boolToStringDict[0] != 'false'"/> - <fail test="new.cObject.boolToStringDict[1] != 'true'"/> - - <fail test="new.dAsCObject.ice_id != '::Test::D'"/> - <fail test="new.dAsCObject.boolToStringDict.length != 2"/> - <fail test="new.dAsCObject.boolToStringDict[0] != 'false'"/> - <fail test="new.dAsCObject.boolToStringDict[1] != 'true'"/> - <fail test="new.dAsCObject.stringToByteSeq.length != 2"/> - <fail test="new.dAsCObject.stringToByteSeq[0] != 0"/> - <fail test="new.dAsCObject.stringToByteSeq[1] != 255"/> - <fail test="new.dAsCObject.obj.ice_id != '::Test::F'"/> - - <fail test="new.dObject.ice_id != '::Test::D'"/> - <fail test="new.dObject.boolToStringDict.length != 2"/> - <fail test="new.dObject.boolToStringDict[0] != 'false'"/> - <fail test="new.dObject.boolToStringDict[1] != 'true'"/> - <fail test="new.dObject.stringToByteSeq.length != 2"/> - <fail test="new.dObject.stringToByteSeq[0] != 0"/> - <fail test="new.dObject.stringToByteSeq[1] != 255"/> - <fail test="new.dObject.obj.ice_id != '::Test::C'"/> - - <fail test="new.compactObject.ice_id != '::Test::Small3'"/> - <fail test="new.compactObject.name != 'compactObject'"/> - - </transform> -</transformdb> diff --git a/cpp/test/FreezeScript/dbmap/db/.gitignore b/cpp/test/FreezeScript/dbmap/db/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/cpp/test/FreezeScript/dbmap/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/cpp/test/FreezeScript/dbmap/fail/01.err b/cpp/test/FreezeScript/dbmap/fail/01.err deleted file mode 100644 index 1249c9b14d4..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/01.err +++ /dev/null @@ -1,44 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::Test::D1 value type from bool to byte -transformdb: unsupported type change in c1m2 from bool to byte -transformdb: unsupported type change in c1m3 from bool to short -transformdb: unsupported type change in c1m4 from bool to int -transformdb: unsupported type change in c1m5 from bool to long -transformdb: unsupported type change in c1m6 from bool to float -transformdb: unsupported type change in c1m7 from bool to double -transformdb: unsupported type change in c1m9 from bool to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from bool to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from bool to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from bool to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from bool to Object* -transformdb: unsupported type change in c1m14 from bool to Object -transformdb: unsupported type change in c1m15 from bool to ::Test::C1* -transformdb: unsupported type change in c1m16 from bool to class ::Test::C1 -transformdb: unsupported type change in c2m2 from bool to byte -transformdb: unsupported type change in c2m3 from bool to short -transformdb: unsupported type change in c2m4 from bool to int -transformdb: unsupported type change in c2m5 from bool to long -transformdb: unsupported type change in c2m6 from bool to float -transformdb: unsupported type change in c2m7 from bool to double -transformdb: unsupported type change in c2m9 from bool to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from bool to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from bool to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from bool to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from bool to Object* -transformdb: unsupported type change in c2m14 from bool to Object -transformdb: unsupported type change in c2m15 from bool to ::Test::C1* -transformdb: unsupported type change in c2m16 from bool to class ::Test::C1 -transformdb: unsupported type change in m2 from bool to byte -transformdb: unsupported type change in m3 from bool to short -transformdb: unsupported type change in m4 from bool to int -transformdb: unsupported type change in m5 from bool to long -transformdb: unsupported type change in m6 from bool to float -transformdb: unsupported type change in m7 from bool to double -transformdb: unsupported type change in m9 from bool to enumeration ::Test::E -transformdb: unsupported type change in m10 from bool to struct ::Test::S1 -transformdb: unsupported type change in m11 from bool to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from bool to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from bool to Object* -transformdb: unsupported type change in m14 from bool to Object -transformdb: unsupported type change in m15 from bool to ::Test::C1* -transformdb: unsupported type change in m16 from bool to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/01_new.ice b/cpp/test/FreezeScript/dbmap/fail/01_new.ice deleted file mode 100644 index 1d8f02a9946..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/01_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/01_old.ice b/cpp/test/FreezeScript/dbmap/fail/01_old.ice deleted file mode 100644 index 547335926a7..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/01_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; -dictionary<byte, bool> D1; - -interface I {}; - -class C1 implements I -{ - bool c1m1; - bool c1m2; - bool c1m3; - bool c1m4; - bool c1m5; - bool c1m6; - bool c1m7; - bool c1m8; - bool c1m9; - bool c1m10; - bool c1m11; - bool c1m12; - bool c1m13; - bool c1m14; - bool c1m15; - bool c1m16; -}; - -class C2 extends C1 -{ - bool c2m1; - bool c2m2; - bool c2m3; - bool c2m4; - bool c2m5; - bool c2m6; - bool c2m7; - bool c2m8; - bool c2m9; - bool c2m10; - bool c2m11; - bool c2m12; - bool c2m13; - bool c2m14; - bool c2m15; - bool c2m16; -}; - -struct S2 -{ - bool m1; - bool m2; - bool m3; - bool m4; - bool m5; - bool m6; - bool m7; - bool m8; - bool m9; - bool m10; - bool m11; - bool m12; - bool m13; - bool m14; - bool m15; - bool m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/02.err b/cpp/test/FreezeScript/dbmap/fail/02.err deleted file mode 100644 index 67d9d397708..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/02.err +++ /dev/null @@ -1,35 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from byte to bool -transformdb: unsupported type change in ::Test::D1 value type from byte to bool -transformdb: unsupported type change in c1m1 from byte to bool -transformdb: unsupported type change in c1m6 from byte to float -transformdb: unsupported type change in c1m7 from byte to double -transformdb: unsupported type change in c1m9 from byte to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from byte to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from byte to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from byte to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from byte to Object* -transformdb: unsupported type change in c1m14 from byte to Object -transformdb: unsupported type change in c1m15 from byte to ::Test::C1* -transformdb: unsupported type change in c1m16 from byte to class ::Test::C1 -transformdb: unsupported type change in c2m1 from byte to bool -transformdb: unsupported type change in c2m6 from byte to float -transformdb: unsupported type change in c2m7 from byte to double -transformdb: unsupported type change in c2m9 from byte to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from byte to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from byte to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from byte to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from byte to Object* -transformdb: unsupported type change in c2m14 from byte to Object -transformdb: unsupported type change in c2m15 from byte to ::Test::C1* -transformdb: unsupported type change in c2m16 from byte to class ::Test::C1 -transformdb: unsupported type change in m1 from byte to bool -transformdb: unsupported type change in m6 from byte to float -transformdb: unsupported type change in m7 from byte to double -transformdb: unsupported type change in m9 from byte to enumeration ::Test::E -transformdb: unsupported type change in m10 from byte to struct ::Test::S1 -transformdb: unsupported type change in m11 from byte to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from byte to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from byte to Object* -transformdb: unsupported type change in m14 from byte to Object -transformdb: unsupported type change in m15 from byte to ::Test::C1* -transformdb: unsupported type change in m16 from byte to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/02_new.ice b/cpp/test/FreezeScript/dbmap/fail/02_new.ice deleted file mode 100644 index a558a573d28..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/02_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; // FAIL -dictionary<int, bool> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; - short c1m3; - int c1m4; - long c1m5; - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; - short c2m3; - int c2m4; - long c2m5; - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; - short m3; - int m4; - long m5; - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/02_old.ice b/cpp/test/FreezeScript/dbmap/fail/02_old.ice deleted file mode 100644 index 516c2c4ed6b..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/02_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; -dictionary<byte, byte> D1; - -interface I {}; - -class C1 implements I -{ - byte c1m1; - byte c1m2; - byte c1m3; - byte c1m4; - byte c1m5; - byte c1m6; - byte c1m7; - byte c1m8; - byte c1m9; - byte c1m10; - byte c1m11; - byte c1m12; - byte c1m13; - byte c1m14; - byte c1m15; - byte c1m16; -}; - -class C2 extends C1 -{ - byte c2m1; - byte c2m2; - byte c2m3; - byte c2m4; - byte c2m5; - byte c2m6; - byte c2m7; - byte c2m8; - byte c2m9; - byte c2m10; - byte c2m11; - byte c2m12; - byte c2m13; - byte c2m14; - byte c2m15; - byte c2m16; -}; - -struct S2 -{ - byte m1; - byte m2; - byte m3; - byte m4; - byte m5; - byte m6; - byte m7; - byte m8; - byte m9; - byte m10; - byte m11; - byte m12; - byte m13; - byte m14; - byte m15; - byte m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/03.err b/cpp/test/FreezeScript/dbmap/fail/03.err deleted file mode 100644 index 7d7bfd7c595..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/03.err +++ /dev/null @@ -1,35 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from short to struct ::Test::S1 -transformdb: unsupported type change in ::Test::D1 value type from short to struct ::Test::S1 -transformdb: unsupported type change in c1m1 from short to bool -transformdb: unsupported type change in c1m6 from short to float -transformdb: unsupported type change in c1m7 from short to double -transformdb: unsupported type change in c1m9 from short to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from short to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from short to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from short to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from short to Object* -transformdb: unsupported type change in c1m14 from short to Object -transformdb: unsupported type change in c1m15 from short to ::Test::C1* -transformdb: unsupported type change in c1m16 from short to class ::Test::C1 -transformdb: unsupported type change in c2m1 from short to bool -transformdb: unsupported type change in c2m6 from short to float -transformdb: unsupported type change in c2m7 from short to double -transformdb: unsupported type change in c2m9 from short to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from short to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from short to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from short to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from short to Object* -transformdb: unsupported type change in c2m14 from short to Object -transformdb: unsupported type change in c2m15 from short to ::Test::C1* -transformdb: unsupported type change in c2m16 from short to class ::Test::C1 -transformdb: unsupported type change in m1 from short to bool -transformdb: unsupported type change in m6 from short to float -transformdb: unsupported type change in m7 from short to double -transformdb: unsupported type change in m9 from short to enumeration ::Test::E -transformdb: unsupported type change in m10 from short to struct ::Test::S1 -transformdb: unsupported type change in m11 from short to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from short to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from short to Object* -transformdb: unsupported type change in m14 from short to Object -transformdb: unsupported type change in m15 from short to ::Test::C1* -transformdb: unsupported type change in m16 from short to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/03_new.ice b/cpp/test/FreezeScript/dbmap/fail/03_new.ice deleted file mode 100644 index 9ef0b7f7b5a..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/03_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<S1> Seq1; // FAIL -dictionary<short, S1> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; - short c1m3; - int c1m4; - long c1m5; - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; - short c2m3; - int c2m4; - long c2m5; - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; - short m3; - int m4; - long m5; - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/03_old.ice b/cpp/test/FreezeScript/dbmap/fail/03_old.ice deleted file mode 100644 index 4c3a877c0fd..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/03_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<short> Seq1; -dictionary<string, short> D1; - -interface I {}; - -class C1 implements I -{ - short c1m1; - short c1m2; - short c1m3; - short c1m4; - short c1m5; - short c1m6; - short c1m7; - short c1m8; - short c1m9; - short c1m10; - short c1m11; - short c1m12; - short c1m13; - short c1m14; - short c1m15; - short c1m16; -}; - -class C2 extends C1 -{ - short c2m1; - short c2m2; - short c2m3; - short c2m4; - short c2m5; - short c2m6; - short c2m7; - short c2m8; - short c2m9; - short c2m10; - short c2m11; - short c2m12; - short c2m13; - short c2m14; - short c2m15; - short c2m16; -}; - -struct S2 -{ - short m1; - short m2; - short m3; - short m4; - short m5; - short m6; - short m7; - short m8; - short m9; - short m10; - short m11; - short m12; - short m13; - short m14; - short m15; - short m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/04.err b/cpp/test/FreezeScript/dbmap/fail/04.err deleted file mode 100644 index b969d55d395..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/04.err +++ /dev/null @@ -1,34 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from int to float -transformdb: unsupported type change in c1m1 from int to bool -transformdb: unsupported type change in c1m6 from int to float -transformdb: unsupported type change in c1m7 from int to double -transformdb: unsupported type change in c1m9 from int to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from int to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from int to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from int to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from int to Object* -transformdb: unsupported type change in c1m14 from int to Object -transformdb: unsupported type change in c1m15 from int to ::Test::C1* -transformdb: unsupported type change in c1m16 from int to class ::Test::C1 -transformdb: unsupported type change in c2m1 from int to bool -transformdb: unsupported type change in c2m6 from int to float -transformdb: unsupported type change in c2m7 from int to double -transformdb: unsupported type change in c2m9 from int to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from int to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from int to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from int to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from int to Object* -transformdb: unsupported type change in c2m14 from int to Object -transformdb: unsupported type change in c2m15 from int to ::Test::C1* -transformdb: unsupported type change in c2m16 from int to class ::Test::C1 -transformdb: unsupported type change in m1 from int to bool -transformdb: unsupported type change in m6 from int to float -transformdb: unsupported type change in m7 from int to double -transformdb: unsupported type change in m9 from int to enumeration ::Test::E -transformdb: unsupported type change in m10 from int to struct ::Test::S1 -transformdb: unsupported type change in m11 from int to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from int to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from int to Object* -transformdb: unsupported type change in m14 from int to Object -transformdb: unsupported type change in m15 from int to ::Test::C1* -transformdb: unsupported type change in m16 from int to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/04_new.ice b/cpp/test/FreezeScript/dbmap/fail/04_new.ice deleted file mode 100644 index 154d617593b..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/04_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<float> Seq1; // FAIL -dictionary<short, string> D1; - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; - short c1m3; - int c1m4; - long c1m5; - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; - short c2m3; - int c2m4; - long c2m5; - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; - short m3; - int m4; - long m5; - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/04_old.ice b/cpp/test/FreezeScript/dbmap/fail/04_old.ice deleted file mode 100644 index 31eedb0409d..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/04_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<int> Seq1; -dictionary<byte, int> D1; - -interface I {}; - -class C1 implements I -{ - int c1m1; - int c1m2; - int c1m3; - int c1m4; - int c1m5; - int c1m6; - int c1m7; - int c1m8; - int c1m9; - int c1m10; - int c1m11; - int c1m12; - int c1m13; - int c1m14; - int c1m15; - int c1m16; -}; - -class C2 extends C1 -{ - int c2m1; - int c2m2; - int c2m3; - int c2m4; - int c2m5; - int c2m6; - int c2m7; - int c2m8; - int c2m9; - int c2m10; - int c2m11; - int c2m12; - int c2m13; - int c2m14; - int c2m15; - int c2m16; -}; - -struct S2 -{ - int m1; - int m2; - int m3; - int m4; - int m5; - int m6; - int m7; - int m8; - int m9; - int m10; - int m11; - int m12; - int m13; - int m14; - int m15; - int m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/05.err b/cpp/test/FreezeScript/dbmap/fail/05.err deleted file mode 100644 index ebd2b6ee32d..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/05.err +++ /dev/null @@ -1,35 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from long to enumeration ::Test::E -transformdb: unsupported type change in ::Test::D1 value type from long to enumeration ::Test::E -transformdb: unsupported type change in c1m1 from long to bool -transformdb: unsupported type change in c1m6 from long to float -transformdb: unsupported type change in c1m7 from long to double -transformdb: unsupported type change in c1m9 from long to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from long to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from long to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from long to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from long to Object* -transformdb: unsupported type change in c1m14 from long to Object -transformdb: unsupported type change in c1m15 from long to ::Test::C1* -transformdb: unsupported type change in c1m16 from long to class ::Test::C1 -transformdb: unsupported type change in c2m1 from long to bool -transformdb: unsupported type change in c2m6 from long to float -transformdb: unsupported type change in c2m7 from long to double -transformdb: unsupported type change in c2m9 from long to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from long to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from long to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from long to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from long to Object* -transformdb: unsupported type change in c2m14 from long to Object -transformdb: unsupported type change in c2m15 from long to ::Test::C1* -transformdb: unsupported type change in c2m16 from long to class ::Test::C1 -transformdb: unsupported type change in m1 from long to bool -transformdb: unsupported type change in m6 from long to float -transformdb: unsupported type change in m7 from long to double -transformdb: unsupported type change in m9 from long to enumeration ::Test::E -transformdb: unsupported type change in m10 from long to struct ::Test::S1 -transformdb: unsupported type change in m11 from long to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from long to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from long to Object* -transformdb: unsupported type change in m14 from long to Object -transformdb: unsupported type change in m15 from long to ::Test::C1* -transformdb: unsupported type change in m16 from long to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/05_new.ice b/cpp/test/FreezeScript/dbmap/fail/05_new.ice deleted file mode 100644 index 51bfa043e9f..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/05_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<E> Seq1; // FAIL -dictionary<short, E> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; - short c1m3; - int c1m4; - long c1m5; - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; - short c2m3; - int c2m4; - long c2m5; - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; - short m3; - int m4; - long m5; - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/05_old.ice b/cpp/test/FreezeScript/dbmap/fail/05_old.ice deleted file mode 100644 index 2afcb8233d7..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/05_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<long> Seq1; -dictionary<int, long> D1; - -interface I {}; - -class C1 implements I -{ - long c1m1; - long c1m2; - long c1m3; - long c1m4; - long c1m5; - long c1m6; - long c1m7; - long c1m8; - long c1m9; - long c1m10; - long c1m11; - long c1m12; - long c1m13; - long c1m14; - long c1m15; - long c1m16; -}; - -class C2 extends C1 -{ - long c2m1; - long c2m2; - long c2m3; - long c2m4; - long c2m5; - long c2m6; - long c2m7; - long c2m8; - long c2m9; - long c2m10; - long c2m11; - long c2m12; - long c2m13; - long c2m14; - long c2m15; - long c2m16; -}; - -struct S2 -{ - long m1; - long m2; - long m3; - long m4; - long m5; - long m6; - long m7; - long m8; - long m9; - long m10; - long m11; - long m12; - long m13; - long m14; - long m15; - long m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/06.err b/cpp/test/FreezeScript/dbmap/fail/06.err deleted file mode 100644 index 43eb0059c1f..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/06.err +++ /dev/null @@ -1,41 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from float to byte -transformdb: unsupported type change in ::Test::D1 value type from float to byte -transformdb: unsupported type change in c1m1 from float to bool -transformdb: unsupported type change in c1m2 from float to byte -transformdb: unsupported type change in c1m3 from float to short -transformdb: unsupported type change in c1m4 from float to int -transformdb: unsupported type change in c1m5 from float to long -transformdb: unsupported type change in c1m9 from float to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from float to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from float to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from float to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from float to Object* -transformdb: unsupported type change in c1m14 from float to Object -transformdb: unsupported type change in c1m15 from float to ::Test::C1* -transformdb: unsupported type change in c1m16 from float to class ::Test::C1 -transformdb: unsupported type change in c2m1 from float to bool -transformdb: unsupported type change in c2m2 from float to byte -transformdb: unsupported type change in c2m3 from float to short -transformdb: unsupported type change in c2m4 from float to int -transformdb: unsupported type change in c2m5 from float to long -transformdb: unsupported type change in c2m9 from float to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from float to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from float to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from float to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from float to Object* -transformdb: unsupported type change in c2m14 from float to Object -transformdb: unsupported type change in c2m15 from float to ::Test::C1* -transformdb: unsupported type change in c2m16 from float to class ::Test::C1 -transformdb: unsupported type change in m1 from float to bool -transformdb: unsupported type change in m2 from float to byte -transformdb: unsupported type change in m3 from float to short -transformdb: unsupported type change in m4 from float to int -transformdb: unsupported type change in m5 from float to long -transformdb: unsupported type change in m9 from float to enumeration ::Test::E -transformdb: unsupported type change in m10 from float to struct ::Test::S1 -transformdb: unsupported type change in m11 from float to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from float to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from float to Object* -transformdb: unsupported type change in m14 from float to Object -transformdb: unsupported type change in m15 from float to ::Test::C1* -transformdb: unsupported type change in m16 from float to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/06_new.ice b/cpp/test/FreezeScript/dbmap/fail/06_new.ice deleted file mode 100644 index 54f29f94c83..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/06_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; - double c1m7; - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; - double c2m7; - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; - double m7; - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/06_old.ice b/cpp/test/FreezeScript/dbmap/fail/06_old.ice deleted file mode 100644 index 0dd9413081e..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/06_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<float> Seq1; -dictionary<byte, float> D1; - -interface I {}; - -class C1 implements I -{ - float c1m1; - float c1m2; - float c1m3; - float c1m4; - float c1m5; - float c1m6; - float c1m7; - float c1m8; - float c1m9; - float c1m10; - float c1m11; - float c1m12; - float c1m13; - float c1m14; - float c1m15; - float c1m16; -}; - -class C2 extends C1 -{ - float c2m1; - float c2m2; - float c2m3; - float c2m4; - float c2m5; - float c2m6; - float c2m7; - float c2m8; - float c2m9; - float c2m10; - float c2m11; - float c2m12; - float c2m13; - float c2m14; - float c2m15; - float c2m16; -}; - -struct S2 -{ - float m1; - float m2; - float m3; - float m4; - float m5; - float m6; - float m7; - float m8; - float m9; - float m10; - float m11; - float m12; - float m13; - float m14; - float m15; - float m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/07.err b/cpp/test/FreezeScript/dbmap/fail/07.err deleted file mode 100644 index 9e14990bb14..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/07.err +++ /dev/null @@ -1,41 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from double to struct ::Test::S1 -transformdb: unsupported type change in ::Test::D1 value type from double to byte -transformdb: unsupported type change in c1m1 from double to bool -transformdb: unsupported type change in c1m2 from double to byte -transformdb: unsupported type change in c1m3 from double to short -transformdb: unsupported type change in c1m4 from double to int -transformdb: unsupported type change in c1m5 from double to long -transformdb: unsupported type change in c1m9 from double to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from double to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from double to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from double to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from double to Object* -transformdb: unsupported type change in c1m14 from double to Object -transformdb: unsupported type change in c1m15 from double to ::Test::C1* -transformdb: unsupported type change in c1m16 from double to class ::Test::C1 -transformdb: unsupported type change in c2m1 from double to bool -transformdb: unsupported type change in c2m2 from double to byte -transformdb: unsupported type change in c2m3 from double to short -transformdb: unsupported type change in c2m4 from double to int -transformdb: unsupported type change in c2m5 from double to long -transformdb: unsupported type change in c2m9 from double to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from double to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from double to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from double to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from double to Object* -transformdb: unsupported type change in c2m14 from double to Object -transformdb: unsupported type change in c2m15 from double to ::Test::C1* -transformdb: unsupported type change in c2m16 from double to class ::Test::C1 -transformdb: unsupported type change in m1 from double to bool -transformdb: unsupported type change in m2 from double to byte -transformdb: unsupported type change in m3 from double to short -transformdb: unsupported type change in m4 from double to int -transformdb: unsupported type change in m5 from double to long -transformdb: unsupported type change in m9 from double to enumeration ::Test::E -transformdb: unsupported type change in m10 from double to struct ::Test::S1 -transformdb: unsupported type change in m11 from double to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from double to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from double to Object* -transformdb: unsupported type change in m14 from double to Object -transformdb: unsupported type change in m15 from double to ::Test::C1* -transformdb: unsupported type change in m16 from double to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/07_new.ice b/cpp/test/FreezeScript/dbmap/fail/07_new.ice deleted file mode 100644 index 61727809723..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/07_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<S1> Seq1; // FAIL -dictionary<string, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; - double c1m7; - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; - double c2m7; - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; - double m7; - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/07_old.ice b/cpp/test/FreezeScript/dbmap/fail/07_old.ice deleted file mode 100644 index 83b79f3ed7a..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/07_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<double> Seq1; -dictionary<byte, double> D1; - -interface I {}; - -class C1 implements I -{ - double c1m1; - double c1m2; - double c1m3; - double c1m4; - double c1m5; - double c1m6; - double c1m7; - double c1m8; - double c1m9; - double c1m10; - double c1m11; - double c1m12; - double c1m13; - double c1m14; - double c1m15; - double c1m16; -}; - -class C2 extends C1 -{ - double c2m1; - double c2m2; - double c2m3; - double c2m4; - double c2m5; - double c2m6; - double c2m7; - double c2m8; - double c2m9; - double c2m10; - double c2m11; - double c2m12; - double c2m13; - double c2m14; - double c2m15; - double c2m16; -}; - -struct S2 -{ - double m1; - double m2; - double m3; - double m4; - double m5; - double m6; - double m7; - double m8; - double m9; - double m10; - double m11; - double m12; - double m13; - double m14; - double m15; - double m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/08.err b/cpp/test/FreezeScript/dbmap/fail/08.err deleted file mode 100644 index 3f0853d4e93..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/08.err +++ /dev/null @@ -1,17 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from string to struct ::Test::S1 -transformdb: unsupported type change in ::Test::D1 value type from string to struct ::Test::S1 -transformdb: unsupported type change in c1m10 from string to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from string to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from string to dictionary ::Test::D1 -transformdb: unsupported type change in c1m14 from string to Object -transformdb: unsupported type change in c1m16 from string to class ::Test::C1 -transformdb: unsupported type change in c2m10 from string to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from string to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from string to dictionary ::Test::D1 -transformdb: unsupported type change in c2m14 from string to Object -transformdb: unsupported type change in c2m16 from string to class ::Test::C1 -transformdb: unsupported type change in m10 from string to struct ::Test::S1 -transformdb: unsupported type change in m11 from string to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from string to dictionary ::Test::D1 -transformdb: unsupported type change in m14 from string to Object -transformdb: unsupported type change in m16 from string to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/08_new.ice b/cpp/test/FreezeScript/dbmap/fail/08_new.ice deleted file mode 100644 index 5255ff12862..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/08_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<S1> Seq1; // FAIL -dictionary<short, S1> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; - byte c1m2; - short c1m3; - int c1m4; - long c1m5; - float c1m6; - double c1m7; - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; - Object c1m14; // FAIL - C1* c1m15; - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; - byte c2m2; - short c2m3; - int c2m4; - long c2m5; - float c2m6; - double c2m7; - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; - Object c2m14; // FAIL - C1* c2m15; - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; - byte m2; - short m3; - int m4; - long m5; - float m6; - double m7; - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; - Object m14; // FAIL - C1* m15; - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/08_old.ice b/cpp/test/FreezeScript/dbmap/fail/08_old.ice deleted file mode 100644 index 7b0052eef79..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/08_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<string> Seq1; -dictionary<byte, string> D1; - -interface I {}; - -class C1 implements I -{ - string c1m1; - string c1m2; - string c1m3; - string c1m4; - string c1m5; - string c1m6; - string c1m7; - string c1m8; - string c1m9; - string c1m10; - string c1m11; - string c1m12; - string c1m13; - string c1m14; - string c1m15; - string c1m16; -}; - -class C2 extends C1 -{ - string c2m1; - string c2m2; - string c2m3; - string c2m4; - string c2m5; - string c2m6; - string c2m7; - string c2m8; - string c2m9; - string c2m10; - string c2m11; - string c2m12; - string c2m13; - string c2m14; - string c2m15; - string c2m16; -}; - -struct S2 -{ - string m1; - string m2; - string m3; - string m4; - string m5; - string m6; - string m7; - string m8; - string m9; - string m10; - string m11; - string m12; - string m13; - string m14; - string m15; - string m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/09.err b/cpp/test/FreezeScript/dbmap/fail/09.err deleted file mode 100644 index 65eaeba3209..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/09.err +++ /dev/null @@ -1,44 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from enumeration ::Test::E to byte -transformdb: unsupported type change in ::Test::D1 value type from enumeration ::Test::E to byte -transformdb: unsupported type change in c1m1 from enumeration ::Test::E to bool -transformdb: unsupported type change in c1m2 from enumeration ::Test::E to byte -transformdb: unsupported type change in c1m3 from enumeration ::Test::E to short -transformdb: unsupported type change in c1m4 from enumeration ::Test::E to int -transformdb: unsupported type change in c1m5 from enumeration ::Test::E to long -transformdb: unsupported type change in c1m6 from enumeration ::Test::E to float -transformdb: unsupported type change in c1m7 from enumeration ::Test::E to double -transformdb: unsupported type change in c1m10 from enumeration ::Test::E to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from enumeration ::Test::E to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from enumeration ::Test::E to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from enumeration ::Test::E to Object* -transformdb: unsupported type change in c1m14 from enumeration ::Test::E to Object -transformdb: unsupported type change in c1m15 from enumeration ::Test::E to ::Test::C1* -transformdb: unsupported type change in c1m16 from enumeration ::Test::E to class ::Test::C1 -transformdb: unsupported type change in c2m1 from enumeration ::Test::E to bool -transformdb: unsupported type change in c2m2 from enumeration ::Test::E to byte -transformdb: unsupported type change in c2m3 from enumeration ::Test::E to short -transformdb: unsupported type change in c2m4 from enumeration ::Test::E to int -transformdb: unsupported type change in c2m5 from enumeration ::Test::E to long -transformdb: unsupported type change in c2m6 from enumeration ::Test::E to float -transformdb: unsupported type change in c2m7 from enumeration ::Test::E to double -transformdb: unsupported type change in c2m10 from enumeration ::Test::E to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from enumeration ::Test::E to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from enumeration ::Test::E to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from enumeration ::Test::E to Object* -transformdb: unsupported type change in c2m14 from enumeration ::Test::E to Object -transformdb: unsupported type change in c2m15 from enumeration ::Test::E to ::Test::C1* -transformdb: unsupported type change in c2m16 from enumeration ::Test::E to class ::Test::C1 -transformdb: unsupported type change in m1 from enumeration ::Test::E to bool -transformdb: unsupported type change in m2 from enumeration ::Test::E to byte -transformdb: unsupported type change in m3 from enumeration ::Test::E to short -transformdb: unsupported type change in m4 from enumeration ::Test::E to int -transformdb: unsupported type change in m5 from enumeration ::Test::E to long -transformdb: unsupported type change in m6 from enumeration ::Test::E to float -transformdb: unsupported type change in m7 from enumeration ::Test::E to double -transformdb: unsupported type change in m10 from enumeration ::Test::E to struct ::Test::S1 -transformdb: unsupported type change in m11 from enumeration ::Test::E to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from enumeration ::Test::E to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from enumeration ::Test::E to Object* -transformdb: unsupported type change in m14 from enumeration ::Test::E to Object -transformdb: unsupported type change in m15 from enumeration ::Test::E to ::Test::C1* -transformdb: unsupported type change in m16 from enumeration ::Test::E to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/09_new.ice b/cpp/test/FreezeScript/dbmap/fail/09_new.ice deleted file mode 100644 index aaabe65fc70..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/09_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/09_old.ice b/cpp/test/FreezeScript/dbmap/fail/09_old.ice deleted file mode 100644 index d90ba6f4ad4..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/09_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<E> Seq1; -dictionary<byte, E> D1; - -interface I {}; - -class C1 implements I -{ - E c1m1; - E c1m2; - E c1m3; - E c1m4; - E c1m5; - E c1m6; - E c1m7; - E c1m8; - E c1m9; - E c1m10; - E c1m11; - E c1m12; - E c1m13; - E c1m14; - E c1m15; - E c1m16; -}; - -class C2 extends C1 -{ - E c2m1; - E c2m2; - E c2m3; - E c2m4; - E c2m5; - E c2m6; - E c2m7; - E c2m8; - E c2m9; - E c2m10; - E c2m11; - E c2m12; - E c2m13; - E c2m14; - E c2m15; - E c2m16; -}; - -struct S2 -{ - E m1; - E m2; - E m3; - E m4; - E m5; - E m6; - E m7; - E m8; - E m9; - E m10; - E m11; - E m12; - E m13; - E m14; - E m15; - E m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/10.err b/cpp/test/FreezeScript/dbmap/fail/10.err deleted file mode 100644 index 107746d757a..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/10.err +++ /dev/null @@ -1,44 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from struct ::Test::S1 to bool -transformdb: unsupported type change in ::Test::D1 value type from struct ::Test::S1 to bool -transformdb: unsupported type change in c1m1 from struct ::Test::S1 to bool -transformdb: unsupported type change in c1m2 from struct ::Test::S1 to byte -transformdb: unsupported type change in c1m3 from struct ::Test::S1 to short -transformdb: unsupported type change in c1m4 from struct ::Test::S1 to int -transformdb: unsupported type change in c1m5 from struct ::Test::S1 to long -transformdb: unsupported type change in c1m6 from struct ::Test::S1 to float -transformdb: unsupported type change in c1m7 from struct ::Test::S1 to double -transformdb: unsupported type change in c1m8 from struct ::Test::S1 to string -transformdb: unsupported type change in c1m9 from struct ::Test::S1 to enumeration ::Test::E -transformdb: unsupported type change in c1m11 from struct ::Test::S1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from struct ::Test::S1 to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from struct ::Test::S1 to Object* -transformdb: unsupported type change in c1m14 from struct ::Test::S1 to Object -transformdb: unsupported type change in c1m15 from struct ::Test::S1 to ::Test::C1* -transformdb: unsupported type change in c2m1 from struct ::Test::S1 to bool -transformdb: unsupported type change in c2m2 from struct ::Test::S1 to byte -transformdb: unsupported type change in c2m3 from struct ::Test::S1 to short -transformdb: unsupported type change in c2m4 from struct ::Test::S1 to int -transformdb: unsupported type change in c2m5 from struct ::Test::S1 to long -transformdb: unsupported type change in c2m6 from struct ::Test::S1 to float -transformdb: unsupported type change in c2m7 from struct ::Test::S1 to double -transformdb: unsupported type change in c2m8 from struct ::Test::S1 to string -transformdb: unsupported type change in c2m9 from struct ::Test::S1 to enumeration ::Test::E -transformdb: unsupported type change in c2m11 from struct ::Test::S1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from struct ::Test::S1 to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from struct ::Test::S1 to Object* -transformdb: unsupported type change in c2m14 from struct ::Test::S1 to Object -transformdb: unsupported type change in c2m15 from struct ::Test::S1 to ::Test::C1* -transformdb: unsupported type change in m1 from struct ::Test::S1 to bool -transformdb: unsupported type change in m2 from struct ::Test::S1 to byte -transformdb: unsupported type change in m3 from struct ::Test::S1 to short -transformdb: unsupported type change in m4 from struct ::Test::S1 to int -transformdb: unsupported type change in m5 from struct ::Test::S1 to long -transformdb: unsupported type change in m6 from struct ::Test::S1 to float -transformdb: unsupported type change in m7 from struct ::Test::S1 to double -transformdb: unsupported type change in m8 from struct ::Test::S1 to string -transformdb: unsupported type change in m9 from struct ::Test::S1 to enumeration ::Test::E -transformdb: unsupported type change in m11 from struct ::Test::S1 to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from struct ::Test::S1 to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from struct ::Test::S1 to Object* -transformdb: unsupported type change in m14 from struct ::Test::S1 to Object -transformdb: unsupported type change in m15 from struct ::Test::S1 to ::Test::C1* diff --git a/cpp/test/FreezeScript/dbmap/fail/10_new.ice b/cpp/test/FreezeScript/dbmap/fail/10_new.ice deleted file mode 100644 index 7aaed40a5c3..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/10_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; // FAIL -dictionary<short, bool> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; // FAIL - E c1m9; // FAIL - S1 c1m10; - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; // FAIL - E c2m9; // FAIL - S1 c2m10; - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; // FAIL - E m9; // FAIL - S1 m10; - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/10_old.ice b/cpp/test/FreezeScript/dbmap/fail/10_old.ice deleted file mode 100644 index a50f3bd94b7..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/10_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<S1> Seq1; -dictionary<byte, S1> D1; - -interface I {}; - -class C1 implements I -{ - S1 c1m1; - S1 c1m2; - S1 c1m3; - S1 c1m4; - S1 c1m5; - S1 c1m6; - S1 c1m7; - S1 c1m8; - S1 c1m9; - S1 c1m10; - S1 c1m11; - S1 c1m12; - S1 c1m13; - S1 c1m14; - S1 c1m15; - S1 c1m16; -}; - -class C2 extends C1 -{ - S1 c2m1; - S1 c2m2; - S1 c2m3; - S1 c2m4; - S1 c2m5; - S1 c2m6; - S1 c2m7; - S1 c2m8; - S1 c2m9; - S1 c2m10; - S1 c2m11; - S1 c2m12; - S1 c2m13; - S1 c2m14; - S1 c2m15; - S1 c2m16; -}; - -struct S2 -{ - S1 m1; - S1 m2; - S1 m3; - S1 m4; - S1 m5; - S1 m6; - S1 m7; - S1 m8; - S1 m9; - S1 m10; - S1 m11; - S1 m12; - S1 m13; - S1 m14; - S1 m15; - S1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/11.err b/cpp/test/FreezeScript/dbmap/fail/11.err deleted file mode 100644 index 2b22dc60fd5..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/11.err +++ /dev/null @@ -1,46 +0,0 @@ -transformdb: unsupported type change in ::Test::D1 value type from sequence ::Test::Seq1 to string -transformdb: unsupported type change in c1m1 from sequence ::Test::Seq1 to bool -transformdb: unsupported type change in c1m2 from sequence ::Test::Seq1 to byte -transformdb: unsupported type change in c1m3 from sequence ::Test::Seq1 to short -transformdb: unsupported type change in c1m4 from sequence ::Test::Seq1 to int -transformdb: unsupported type change in c1m5 from sequence ::Test::Seq1 to long -transformdb: unsupported type change in c1m6 from sequence ::Test::Seq1 to float -transformdb: unsupported type change in c1m7 from sequence ::Test::Seq1 to double -transformdb: unsupported type change in c1m8 from sequence ::Test::Seq1 to string -transformdb: unsupported type change in c1m9 from sequence ::Test::Seq1 to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from sequence ::Test::Seq1 to struct ::Test::S1 -transformdb: unsupported type change in c1m12 from sequence ::Test::Seq1 to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from sequence ::Test::Seq1 to Object* -transformdb: unsupported type change in c1m14 from sequence ::Test::Seq1 to Object -transformdb: unsupported type change in c1m15 from sequence ::Test::Seq1 to ::Test::C1* -transformdb: unsupported type change in c1m16 from sequence ::Test::Seq1 to class ::Test::C1 -transformdb: unsupported type change in c2m1 from sequence ::Test::Seq1 to bool -transformdb: unsupported type change in c2m2 from sequence ::Test::Seq1 to byte -transformdb: unsupported type change in c2m3 from sequence ::Test::Seq1 to short -transformdb: unsupported type change in c2m4 from sequence ::Test::Seq1 to int -transformdb: unsupported type change in c2m5 from sequence ::Test::Seq1 to long -transformdb: unsupported type change in c2m6 from sequence ::Test::Seq1 to float -transformdb: unsupported type change in c2m7 from sequence ::Test::Seq1 to double -transformdb: unsupported type change in c2m8 from sequence ::Test::Seq1 to string -transformdb: unsupported type change in c2m9 from sequence ::Test::Seq1 to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from sequence ::Test::Seq1 to struct ::Test::S1 -transformdb: unsupported type change in c2m12 from sequence ::Test::Seq1 to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from sequence ::Test::Seq1 to Object* -transformdb: unsupported type change in c2m14 from sequence ::Test::Seq1 to Object -transformdb: unsupported type change in c2m15 from sequence ::Test::Seq1 to ::Test::C1* -transformdb: unsupported type change in c2m16 from sequence ::Test::Seq1 to class ::Test::C1 -transformdb: unsupported type change in m1 from sequence ::Test::Seq1 to bool -transformdb: unsupported type change in m2 from sequence ::Test::Seq1 to byte -transformdb: unsupported type change in m3 from sequence ::Test::Seq1 to short -transformdb: unsupported type change in m4 from sequence ::Test::Seq1 to int -transformdb: unsupported type change in m5 from sequence ::Test::Seq1 to long -transformdb: unsupported type change in m6 from sequence ::Test::Seq1 to float -transformdb: unsupported type change in m7 from sequence ::Test::Seq1 to double -transformdb: unsupported type change in m8 from sequence ::Test::Seq1 to string -transformdb: unsupported type change in m9 from sequence ::Test::Seq1 to enumeration ::Test::E -transformdb: unsupported type change in m10 from sequence ::Test::Seq1 to struct ::Test::S1 -transformdb: unsupported type change in m12 from sequence ::Test::Seq1 to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from sequence ::Test::Seq1 to Object* -transformdb: unsupported type change in m14 from sequence ::Test::Seq1 to Object -transformdb: unsupported type change in m15 from sequence ::Test::Seq1 to ::Test::C1* -transformdb: unsupported type change in m16 from sequence ::Test::Seq1 to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/11_new.ice b/cpp/test/FreezeScript/dbmap/fail/11_new.ice deleted file mode 100644 index 3c77ad44d07..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/11_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<E> Seq1; -dictionary<short, string> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; // FAIL - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; // FAIL - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; // FAIL - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/11_old.ice b/cpp/test/FreezeScript/dbmap/fail/11_old.ice deleted file mode 100644 index 1a4fa770d08..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/11_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<string> Seq1; -dictionary<byte, Seq1> D1; - -interface I {}; - -class C1 implements I -{ - Seq1 c1m1; - Seq1 c1m2; - Seq1 c1m3; - Seq1 c1m4; - Seq1 c1m5; - Seq1 c1m6; - Seq1 c1m7; - Seq1 c1m8; - Seq1 c1m9; - Seq1 c1m10; - Seq1 c1m11; - Seq1 c1m12; - Seq1 c1m13; - Seq1 c1m14; - Seq1 c1m15; - Seq1 c1m16; -}; - -class C2 extends C1 -{ - Seq1 c2m1; - Seq1 c2m2; - Seq1 c2m3; - Seq1 c2m4; - Seq1 c2m5; - Seq1 c2m6; - Seq1 c2m7; - Seq1 c2m8; - Seq1 c2m9; - Seq1 c2m10; - Seq1 c2m11; - Seq1 c2m12; - Seq1 c2m13; - Seq1 c2m14; - Seq1 c2m15; - Seq1 c2m16; -}; - -struct S2 -{ - Seq1 m1; - Seq1 m2; - Seq1 m3; - Seq1 m4; - Seq1 m5; - Seq1 m6; - Seq1 m7; - Seq1 m8; - Seq1 m9; - Seq1 m10; - Seq1 m11; - Seq1 m12; - Seq1 m13; - Seq1 m14; - Seq1 m15; - Seq1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/12.err b/cpp/test/FreezeScript/dbmap/fail/12.err deleted file mode 100644 index 6cbc47fb7ed..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/12.err +++ /dev/null @@ -1,47 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::Test::D1 value type from bool to byte -transformdb: unsupported type change in c1m1 from dictionary ::Test::D1 to bool -transformdb: unsupported type change in c1m2 from dictionary ::Test::D1 to byte -transformdb: unsupported type change in c1m3 from dictionary ::Test::D1 to short -transformdb: unsupported type change in c1m4 from dictionary ::Test::D1 to int -transformdb: unsupported type change in c1m5 from dictionary ::Test::D1 to long -transformdb: unsupported type change in c1m6 from dictionary ::Test::D1 to float -transformdb: unsupported type change in c1m7 from dictionary ::Test::D1 to double -transformdb: unsupported type change in c1m8 from dictionary ::Test::D1 to string -transformdb: unsupported type change in c1m9 from dictionary ::Test::D1 to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from dictionary ::Test::D1 to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from dictionary ::Test::D1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m13 from dictionary ::Test::D1 to Object* -transformdb: unsupported type change in c1m14 from dictionary ::Test::D1 to Object -transformdb: unsupported type change in c1m15 from dictionary ::Test::D1 to ::Test::C1* -transformdb: unsupported type change in c1m16 from dictionary ::Test::D1 to class ::Test::C1 -transformdb: unsupported type change in c2m1 from dictionary ::Test::D1 to bool -transformdb: unsupported type change in c2m2 from dictionary ::Test::D1 to byte -transformdb: unsupported type change in c2m3 from dictionary ::Test::D1 to short -transformdb: unsupported type change in c2m4 from dictionary ::Test::D1 to int -transformdb: unsupported type change in c2m5 from dictionary ::Test::D1 to long -transformdb: unsupported type change in c2m6 from dictionary ::Test::D1 to float -transformdb: unsupported type change in c2m7 from dictionary ::Test::D1 to double -transformdb: unsupported type change in c2m8 from dictionary ::Test::D1 to string -transformdb: unsupported type change in c2m9 from dictionary ::Test::D1 to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from dictionary ::Test::D1 to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from dictionary ::Test::D1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m13 from dictionary ::Test::D1 to Object* -transformdb: unsupported type change in c2m14 from dictionary ::Test::D1 to Object -transformdb: unsupported type change in c2m15 from dictionary ::Test::D1 to ::Test::C1* -transformdb: unsupported type change in c2m16 from dictionary ::Test::D1 to class ::Test::C1 -transformdb: unsupported type change in m1 from dictionary ::Test::D1 to bool -transformdb: unsupported type change in m2 from dictionary ::Test::D1 to byte -transformdb: unsupported type change in m3 from dictionary ::Test::D1 to short -transformdb: unsupported type change in m4 from dictionary ::Test::D1 to int -transformdb: unsupported type change in m5 from dictionary ::Test::D1 to long -transformdb: unsupported type change in m6 from dictionary ::Test::D1 to float -transformdb: unsupported type change in m7 from dictionary ::Test::D1 to double -transformdb: unsupported type change in m8 from dictionary ::Test::D1 to string -transformdb: unsupported type change in m9 from dictionary ::Test::D1 to enumeration ::Test::E -transformdb: unsupported type change in m10 from dictionary ::Test::D1 to struct ::Test::S1 -transformdb: unsupported type change in m11 from dictionary ::Test::D1 to sequence ::Test::Seq1 -transformdb: unsupported type change in m13 from dictionary ::Test::D1 to Object* -transformdb: unsupported type change in m14 from dictionary ::Test::D1 to Object -transformdb: unsupported type change in m15 from dictionary ::Test::D1 to ::Test::C1* -transformdb: unsupported type change in m16 from dictionary ::Test::D1 to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/12_new.ice b/cpp/test/FreezeScript/dbmap/fail/12_new.ice deleted file mode 100644 index 1ef129cb68c..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/12_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; // FAIL - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; - Object* c1m13; // FAIL - Object c1m14; // FAIL - C1* c1m15; // FAIL - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; // FAIL - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; - Object* c2m13; // FAIL - Object c2m14; // FAIL - C1* c2m15; // FAIL - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; // FAIL - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; - Object* m13; // FAIL - Object m14; // FAIL - C1* m15; // FAIL - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/12_old.ice b/cpp/test/FreezeScript/dbmap/fail/12_old.ice deleted file mode 100644 index 5800fa3aebf..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/12_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; -dictionary<byte, bool> D1; - -interface I {}; - -class C1 implements I -{ - D1 c1m1; - D1 c1m2; - D1 c1m3; - D1 c1m4; - D1 c1m5; - D1 c1m6; - D1 c1m7; - D1 c1m8; - D1 c1m9; - D1 c1m10; - D1 c1m11; - D1 c1m12; - D1 c1m13; - D1 c1m14; - D1 c1m15; - D1 c1m16; -}; - -class C2 extends C1 -{ - D1 c2m1; - D1 c2m2; - D1 c2m3; - D1 c2m4; - D1 c2m5; - D1 c2m6; - D1 c2m7; - D1 c2m8; - D1 c2m9; - D1 c2m10; - D1 c2m11; - D1 c2m12; - D1 c2m13; - D1 c2m14; - D1 c2m15; - D1 c2m16; -}; - -struct S2 -{ - D1 m1; - D1 m2; - D1 m3; - D1 m4; - D1 m5; - D1 m6; - D1 m7; - D1 m8; - D1 m9; - D1 m10; - D1 m11; - D1 m12; - D1 m13; - D1 m14; - D1 m15; - D1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/13.err b/cpp/test/FreezeScript/dbmap/fail/13.err deleted file mode 100644 index ca23c5d18a1..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/13.err +++ /dev/null @@ -1,39 +0,0 @@ -transformdb: unsupported type change in c1m1 from Object* to bool -transformdb: unsupported type change in c1m2 from Object* to byte -transformdb: unsupported type change in c1m3 from Object* to short -transformdb: unsupported type change in c1m4 from Object* to int -transformdb: unsupported type change in c1m5 from Object* to long -transformdb: unsupported type change in c1m6 from Object* to float -transformdb: unsupported type change in c1m7 from Object* to double -transformdb: unsupported type change in c1m9 from Object* to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from Object* to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from Object* to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from Object* to dictionary ::Test::D1 -transformdb: unsupported type change in c1m14 from Object* to Object -transformdb: unsupported type change in c1m16 from Object* to class ::Test::C1 -transformdb: unsupported type change in c2m1 from Object* to bool -transformdb: unsupported type change in c2m2 from Object* to byte -transformdb: unsupported type change in c2m3 from Object* to short -transformdb: unsupported type change in c2m4 from Object* to int -transformdb: unsupported type change in c2m5 from Object* to long -transformdb: unsupported type change in c2m6 from Object* to float -transformdb: unsupported type change in c2m7 from Object* to double -transformdb: unsupported type change in c2m9 from Object* to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from Object* to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from Object* to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from Object* to dictionary ::Test::D1 -transformdb: unsupported type change in c2m14 from Object* to Object -transformdb: unsupported type change in c2m16 from Object* to class ::Test::C1 -transformdb: unsupported type change in m1 from Object* to bool -transformdb: unsupported type change in m2 from Object* to byte -transformdb: unsupported type change in m3 from Object* to short -transformdb: unsupported type change in m4 from Object* to int -transformdb: unsupported type change in m5 from Object* to long -transformdb: unsupported type change in m6 from Object* to float -transformdb: unsupported type change in m7 from Object* to double -transformdb: unsupported type change in m9 from Object* to enumeration ::Test::E -transformdb: unsupported type change in m10 from Object* to struct ::Test::S1 -transformdb: unsupported type change in m11 from Object* to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from Object* to dictionary ::Test::D1 -transformdb: unsupported type change in m14 from Object* to Object -transformdb: unsupported type change in m16 from Object* to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/13_new.ice b/cpp/test/FreezeScript/dbmap/fail/13_new.ice deleted file mode 100644 index 904702a48cd..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/13_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<string> Seq1; -dictionary<short, string> D1; - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; - Object c1m14; // FAIL - C1* c1m15; - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; - Object c2m14; // FAIL - C1* c2m15; - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; - Object m14; // FAIL - C1* m15; - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/13_old.ice b/cpp/test/FreezeScript/dbmap/fail/13_old.ice deleted file mode 100644 index 6acd628d942..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/13_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<Object*> Seq1; -dictionary<byte, Object*> D1; - -interface I {}; - -class C1 implements I -{ - Object* c1m1; - Object* c1m2; - Object* c1m3; - Object* c1m4; - Object* c1m5; - Object* c1m6; - Object* c1m7; - Object* c1m8; - Object* c1m9; - Object* c1m10; - Object* c1m11; - Object* c1m12; - Object* c1m13; - Object* c1m14; - Object* c1m15; - Object* c1m16; -}; - -class C2 extends C1 -{ - Object* c2m1; - Object* c2m2; - Object* c2m3; - Object* c2m4; - Object* c2m5; - Object* c2m6; - Object* c2m7; - Object* c2m8; - Object* c2m9; - Object* c2m10; - Object* c2m11; - Object* c2m12; - Object* c2m13; - Object* c2m14; - Object* c2m15; - Object* c2m16; -}; - -struct S2 -{ - Object* m1; - Object* m2; - Object* m3; - Object* m4; - Object* m5; - Object* m6; - Object* m7; - Object* m8; - Object* m9; - Object* m10; - Object* m11; - Object* m12; - Object* m13; - Object* m14; - Object* m15; - Object* m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/14.err b/cpp/test/FreezeScript/dbmap/fail/14.err deleted file mode 100644 index 58cddc7461b..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/14.err +++ /dev/null @@ -1,44 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from Object to byte -transformdb: unsupported type change in ::Test::D1 value type from Object to byte -transformdb: unsupported type change in c1m1 from Object to bool -transformdb: unsupported type change in c1m2 from Object to byte -transformdb: unsupported type change in c1m3 from Object to short -transformdb: unsupported type change in c1m4 from Object to int -transformdb: unsupported type change in c1m5 from Object to long -transformdb: unsupported type change in c1m6 from Object to float -transformdb: unsupported type change in c1m7 from Object to double -transformdb: unsupported type change in c1m8 from Object to string -transformdb: unsupported type change in c1m9 from Object to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from Object to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from Object to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from Object to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from Object to Object* -transformdb: unsupported type change in c1m15 from Object to ::Test::C1* -transformdb: unsupported type change in c2m1 from Object to bool -transformdb: unsupported type change in c2m2 from Object to byte -transformdb: unsupported type change in c2m3 from Object to short -transformdb: unsupported type change in c2m4 from Object to int -transformdb: unsupported type change in c2m5 from Object to long -transformdb: unsupported type change in c2m6 from Object to float -transformdb: unsupported type change in c2m7 from Object to double -transformdb: unsupported type change in c2m8 from Object to string -transformdb: unsupported type change in c2m9 from Object to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from Object to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from Object to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from Object to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from Object to Object* -transformdb: unsupported type change in c2m15 from Object to ::Test::C1* -transformdb: unsupported type change in m1 from Object to bool -transformdb: unsupported type change in m2 from Object to byte -transformdb: unsupported type change in m3 from Object to short -transformdb: unsupported type change in m4 from Object to int -transformdb: unsupported type change in m5 from Object to long -transformdb: unsupported type change in m6 from Object to float -transformdb: unsupported type change in m7 from Object to double -transformdb: unsupported type change in m8 from Object to string -transformdb: unsupported type change in m9 from Object to enumeration ::Test::E -transformdb: unsupported type change in m10 from Object to struct ::Test::S1 -transformdb: unsupported type change in m11 from Object to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from Object to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from Object to Object* -transformdb: unsupported type change in m15 from Object to ::Test::C1* diff --git a/cpp/test/FreezeScript/dbmap/fail/14_new.ice b/cpp/test/FreezeScript/dbmap/fail/14_new.ice deleted file mode 100644 index c4a2aa6ab2f..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/14_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; // FAIL - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; - C1* c1m15; // FAIL - C1 c1m16; -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; // FAIL - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; - C1* c2m15; // FAIL - C1 c2m16; -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; // FAIL - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; - C1* m15; // FAIL - C1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/14_old.ice b/cpp/test/FreezeScript/dbmap/fail/14_old.ice deleted file mode 100644 index a34384f82eb..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/14_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<Object> Seq1; -dictionary<byte, Object> D1; - -interface I {}; - -class C1 implements I -{ - Object c1m1; - Object c1m2; - Object c1m3; - Object c1m4; - Object c1m5; - Object c1m6; - Object c1m7; - Object c1m8; - Object c1m9; - Object c1m10; - Object c1m11; - Object c1m12; - Object c1m13; - Object c1m14; - Object c1m15; - Object c1m16; -}; - -class C2 extends C1 -{ - Object c2m1; - Object c2m2; - Object c2m3; - Object c2m4; - Object c2m5; - Object c2m6; - Object c2m7; - Object c2m8; - Object c2m9; - Object c2m10; - Object c2m11; - Object c2m12; - Object c2m13; - Object c2m14; - Object c2m15; - Object c2m16; -}; - -struct S2 -{ - Object m1; - Object m2; - Object m3; - Object m4; - Object m5; - Object m6; - Object m7; - Object m8; - Object m9; - Object m10; - Object m11; - Object m12; - Object m13; - Object m14; - Object m15; - Object m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/15.err b/cpp/test/FreezeScript/dbmap/fail/15.err deleted file mode 100644 index 1cde3f2f390..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/15.err +++ /dev/null @@ -1,41 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::Test::D1 value type from bool to byte -transformdb: unsupported type change in c1m1 from ::Test::C1* to bool -transformdb: unsupported type change in c1m2 from ::Test::C1* to byte -transformdb: unsupported type change in c1m3 from ::Test::C1* to short -transformdb: unsupported type change in c1m4 from ::Test::C1* to int -transformdb: unsupported type change in c1m5 from ::Test::C1* to long -transformdb: unsupported type change in c1m6 from ::Test::C1* to float -transformdb: unsupported type change in c1m7 from ::Test::C1* to double -transformdb: unsupported type change in c1m9 from ::Test::C1* to enumeration ::Test::E -transformdb: unsupported type change in c1m10 from ::Test::C1* to struct ::Test::S1 -transformdb: unsupported type change in c1m11 from ::Test::C1* to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from ::Test::C1* to dictionary ::Test::D1 -transformdb: unsupported type change in c1m14 from ::Test::C1* to Object -transformdb: unsupported type change in c1m16 from ::Test::C1* to class ::Test::C1 -transformdb: unsupported type change in c2m1 from ::Test::C1* to bool -transformdb: unsupported type change in c2m2 from ::Test::C1* to byte -transformdb: unsupported type change in c2m3 from ::Test::C1* to short -transformdb: unsupported type change in c2m4 from ::Test::C1* to int -transformdb: unsupported type change in c2m5 from ::Test::C1* to long -transformdb: unsupported type change in c2m6 from ::Test::C1* to float -transformdb: unsupported type change in c2m7 from ::Test::C1* to double -transformdb: unsupported type change in c2m9 from ::Test::C1* to enumeration ::Test::E -transformdb: unsupported type change in c2m10 from ::Test::C1* to struct ::Test::S1 -transformdb: unsupported type change in c2m11 from ::Test::C1* to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from ::Test::C1* to dictionary ::Test::D1 -transformdb: unsupported type change in c2m14 from ::Test::C1* to Object -transformdb: unsupported type change in c2m16 from ::Test::C1* to class ::Test::C1 -transformdb: unsupported type change in m1 from ::Test::C1* to bool -transformdb: unsupported type change in m2 from ::Test::C1* to byte -transformdb: unsupported type change in m3 from ::Test::C1* to short -transformdb: unsupported type change in m4 from ::Test::C1* to int -transformdb: unsupported type change in m5 from ::Test::C1* to long -transformdb: unsupported type change in m6 from ::Test::C1* to float -transformdb: unsupported type change in m7 from ::Test::C1* to double -transformdb: unsupported type change in m9 from ::Test::C1* to enumeration ::Test::E -transformdb: unsupported type change in m10 from ::Test::C1* to struct ::Test::S1 -transformdb: unsupported type change in m11 from ::Test::C1* to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from ::Test::C1* to dictionary ::Test::D1 -transformdb: unsupported type change in m14 from ::Test::C1* to Object -transformdb: unsupported type change in m16 from ::Test::C1* to class ::Test::C1 diff --git a/cpp/test/FreezeScript/dbmap/fail/15_new.ice b/cpp/test/FreezeScript/dbmap/fail/15_new.ice deleted file mode 100644 index e82c9ca9485..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/15_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; - Object c1m14; // FAIL - C1* c1m15; - C1 c1m16; // FAIL -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; - Object c2m14; // FAIL - C1* c2m15; - C1 c2m16; // FAIL -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; - Object m14; // FAIL - C1* m15; - C1 m16; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/15_old.ice b/cpp/test/FreezeScript/dbmap/fail/15_old.ice deleted file mode 100644 index d4ff7d1ab74..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/15_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; -dictionary<byte, bool> D1; - -interface I {}; - -class C1 implements I -{ - C1* c1m1; - C1* c1m2; - C1* c1m3; - C1* c1m4; - C1* c1m5; - C1* c1m6; - C1* c1m7; - C1* c1m8; - C1* c1m9; - C1* c1m10; - C1* c1m11; - C1* c1m12; - C1* c1m13; - C1* c1m14; - C1* c1m15; - C1* c1m16; -}; - -class C2 extends C1 -{ - C1* c2m1; - C1* c2m2; - C1* c2m3; - C1* c2m4; - C1* c2m5; - C1* c2m6; - C1* c2m7; - C1* c2m8; - C1* c2m9; - C1* c2m10; - C1* c2m11; - C1* c2m12; - C1* c2m13; - C1* c2m14; - C1* c2m15; - C1* c2m16; -}; - -struct S2 -{ - C1* m1; - C1* m2; - C1* m3; - C1* m4; - C1* m5; - C1* m6; - C1* m7; - C1* m8; - C1* m9; - C1* m10; - C1* m11; - C1* m12; - C1* m13; - C1* m14; - C1* m15; - C1* m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/16.err b/cpp/test/FreezeScript/dbmap/fail/16.err deleted file mode 100644 index 219d0d6c90e..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/16.err +++ /dev/null @@ -1,41 +0,0 @@ -transformdb: unsupported type change in ::Test::Seq1 sequence type from bool to byte -transformdb: unsupported type change in ::Test::D1 value type from bool to byte -transformdb: unsupported type change in c1m1 from class ::Test::C1 to bool -transformdb: unsupported type change in c1m2 from class ::Test::C1 to byte -transformdb: unsupported type change in c1m3 from class ::Test::C1 to short -transformdb: unsupported type change in c1m4 from class ::Test::C1 to int -transformdb: unsupported type change in c1m5 from class ::Test::C1 to long -transformdb: unsupported type change in c1m6 from class ::Test::C1 to float -transformdb: unsupported type change in c1m7 from class ::Test::C1 to double -transformdb: unsupported type change in c1m8 from class ::Test::C1 to string -transformdb: unsupported type change in c1m9 from class ::Test::C1 to enumeration ::Test::E -transformdb: unsupported type change in c1m11 from class ::Test::C1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c1m12 from class ::Test::C1 to dictionary ::Test::D1 -transformdb: unsupported type change in c1m13 from class ::Test::C1 to Object* -transformdb: unsupported type change in c1m15 from class ::Test::C1 to ::Test::C1* -transformdb: unsupported type change in c2m1 from class ::Test::C1 to bool -transformdb: unsupported type change in c2m2 from class ::Test::C1 to byte -transformdb: unsupported type change in c2m3 from class ::Test::C1 to short -transformdb: unsupported type change in c2m4 from class ::Test::C1 to int -transformdb: unsupported type change in c2m5 from class ::Test::C1 to long -transformdb: unsupported type change in c2m6 from class ::Test::C1 to float -transformdb: unsupported type change in c2m7 from class ::Test::C1 to double -transformdb: unsupported type change in c2m8 from class ::Test::C1 to string -transformdb: unsupported type change in c2m9 from class ::Test::C1 to enumeration ::Test::E -transformdb: unsupported type change in c2m11 from class ::Test::C1 to sequence ::Test::Seq1 -transformdb: unsupported type change in c2m12 from class ::Test::C1 to dictionary ::Test::D1 -transformdb: unsupported type change in c2m13 from class ::Test::C1 to Object* -transformdb: unsupported type change in c2m15 from class ::Test::C1 to ::Test::C1* -transformdb: unsupported type change in m1 from class ::Test::C1 to bool -transformdb: unsupported type change in m2 from class ::Test::C1 to byte -transformdb: unsupported type change in m3 from class ::Test::C1 to short -transformdb: unsupported type change in m4 from class ::Test::C1 to int -transformdb: unsupported type change in m5 from class ::Test::C1 to long -transformdb: unsupported type change in m6 from class ::Test::C1 to float -transformdb: unsupported type change in m7 from class ::Test::C1 to double -transformdb: unsupported type change in m8 from class ::Test::C1 to string -transformdb: unsupported type change in m9 from class ::Test::C1 to enumeration ::Test::E -transformdb: unsupported type change in m11 from class ::Test::C1 to sequence ::Test::Seq1 -transformdb: unsupported type change in m12 from class ::Test::C1 to dictionary ::Test::D1 -transformdb: unsupported type change in m13 from class ::Test::C1 to Object* -transformdb: unsupported type change in m15 from class ::Test::C1 to ::Test::C1* diff --git a/cpp/test/FreezeScript/dbmap/fail/16_new.ice b/cpp/test/FreezeScript/dbmap/fail/16_new.ice deleted file mode 100644 index c4a2aa6ab2f..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/16_new.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<byte> Seq1; // FAIL -dictionary<short, byte> D1; // FAIL - -interface I {}; - -class C1 implements I -{ - bool c1m1; // FAIL - byte c1m2; // FAIL - short c1m3; // FAIL - int c1m4; // FAIL - long c1m5; // FAIL - float c1m6; // FAIL - double c1m7; // FAIL - string c1m8; // FAIL - E c1m9; // FAIL - S1 c1m10; // FAIL - Seq1 c1m11; // FAIL - D1 c1m12; // FAIL - Object* c1m13; // FAIL - Object c1m14; - C1* c1m15; // FAIL - C1 c1m16; -}; - -class C2 extends C1 -{ - bool c2m1; // FAIL - byte c2m2; // FAIL - short c2m3; // FAIL - int c2m4; // FAIL - long c2m5; // FAIL - float c2m6; // FAIL - double c2m7; // FAIL - string c2m8; // FAIL - E c2m9; // FAIL - S1 c2m10; // FAIL - Seq1 c2m11; // FAIL - D1 c2m12; // FAIL - Object* c2m13; // FAIL - Object c2m14; - C1* c2m15; // FAIL - C1 c2m16; -}; - -struct S2 -{ - bool m1; // FAIL - byte m2; // FAIL - short m3; // FAIL - int m4; // FAIL - long m5; // FAIL - float m6; // FAIL - double m7; // FAIL - string m8; // FAIL - E m9; // FAIL - S1 m10; // FAIL - Seq1 m11; // FAIL - D1 m12; // FAIL - Object* m13; // FAIL - Object m14; - C1* m15; // FAIL - C1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/16_old.ice b/cpp/test/FreezeScript/dbmap/fail/16_old.ice deleted file mode 100644 index 072f9d2a84d..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/16_old.ice +++ /dev/null @@ -1,79 +0,0 @@ -module Test -{ - -enum E { E1, E2, E3 }; - -struct S1 -{ - float m1; - long m2; - string m3; - E m4; -}; - -sequence<bool> Seq1; -dictionary<byte, bool> D1; - -interface I {}; - -class C1 implements I -{ - C1 c1m1; - C1 c1m2; - C1 c1m3; - C1 c1m4; - C1 c1m5; - C1 c1m6; - C1 c1m7; - C1 c1m8; - C1 c1m9; - C1 c1m10; - C1 c1m11; - C1 c1m12; - C1 c1m13; - C1 c1m14; - C1 c1m15; - C1 c1m16; -}; - -class C2 extends C1 -{ - C1 c2m1; - C1 c2m2; - C1 c2m3; - C1 c2m4; - C1 c2m5; - C1 c2m6; - C1 c2m7; - C1 c2m8; - C1 c2m9; - C1 c2m10; - C1 c2m11; - C1 c2m12; - C1 c2m13; - C1 c2m14; - C1 c2m15; - C1 c2m16; -}; - -struct S2 -{ - C1 m1; - C1 m2; - C1 m3; - C1 m4; - C1 m5; - C1 m6; - C1 m7; - C1 m8; - C1 m9; - C1 m10; - C1 m11; - C1 m12; - C1 m13; - C1 m14; - C1 m15; - C1 m16; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/17.err b/cpp/test/FreezeScript/dbmap/fail/17.err deleted file mode 100644 index 9a02673a722..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/17.err +++ /dev/null @@ -1,4 +0,0 @@ -transformdb: class ::Test::C declared but not defined - -The following types had no matching definitions in the new Slice: - ::Test::C diff --git a/cpp/test/FreezeScript/dbmap/fail/17_new.ice b/cpp/test/FreezeScript/dbmap/fail/17_new.ice deleted file mode 100644 index 528d8cc0dde..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/17_new.ice +++ /dev/null @@ -1,11 +0,0 @@ -module Test -{ - -class C; - -struct S -{ - C m1; // FAIL -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/17_old.ice b/cpp/test/FreezeScript/dbmap/fail/17_old.ice deleted file mode 100644 index 05ade822347..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/17_old.ice +++ /dev/null @@ -1,11 +0,0 @@ -module Test -{ - -class C {}; - -struct S -{ - C m1; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/18.err b/cpp/test/FreezeScript/dbmap/fail/18.err deleted file mode 100644 index 7ff719dba42..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/18.err +++ /dev/null @@ -1 +0,0 @@ -transformdb: unsupported type change in m2 from class ::Test::C1 to class ::Test::C2 diff --git a/cpp/test/FreezeScript/dbmap/fail/18_new.ice b/cpp/test/FreezeScript/dbmap/fail/18_new.ice deleted file mode 100644 index dfad7f8981b..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/18_new.ice +++ /dev/null @@ -1,16 +0,0 @@ -module Test -{ - -class C1 {}; -class C2 extends C1 {}; -class C3 {}; - -struct S -{ - C3 m1; - C2 m2; // FAIL - C1 m3; - Object m4; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/18_old.ice b/cpp/test/FreezeScript/dbmap/fail/18_old.ice deleted file mode 100644 index 6ed6b829dd5..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/18_old.ice +++ /dev/null @@ -1,16 +0,0 @@ -module Test -{ - -class C1 {}; -class C2 extends C1 {}; -class C3 {}; - -struct S -{ - Object m1; - C1 m2; - C2 m3; - C3 m4; -}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/19.err b/cpp/test/FreezeScript/dbmap/fail/19.err deleted file mode 100644 index 66b6adb11bc..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/19.err +++ /dev/null @@ -1 +0,0 @@ -transformdb: database value has changed to a local type diff --git a/cpp/test/FreezeScript/dbmap/fail/19_new.ice b/cpp/test/FreezeScript/dbmap/fail/19_new.ice deleted file mode 100644 index 4c3bebb60c8..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/19_new.ice +++ /dev/null @@ -1,6 +0,0 @@ -module Test -{ - -local class C {}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/fail/19_old.ice b/cpp/test/FreezeScript/dbmap/fail/19_old.ice deleted file mode 100644 index f52e8c9f09f..00000000000 --- a/cpp/test/FreezeScript/dbmap/fail/19_old.ice +++ /dev/null @@ -1,6 +0,0 @@ -module Test -{ - -class C {}; - -}; diff --git a/cpp/test/FreezeScript/dbmap/init.xml b/cpp/test/FreezeScript/dbmap/init.xml deleted file mode 100644 index 994d75b0a23..00000000000 --- a/cpp/test/FreezeScript/dbmap/init.xml +++ /dev/null @@ -1,345 +0,0 @@ -<transformdb> - <database key="int" value="::Test::S"> - <record> - </record> - </database> - - <!-- enum ::E --> - <transform type="::Test::E"/> - - <!-- struct ::S --> - <transform type="::Test::S"> - - <!-- Primitives --> - - <set target="new.boolToString" value="true"/> - - <set target="new.byteToByte" value="255"/> - <set target="new.byteToShort" value="255"/> - <set target="new.byteToInt" value="255"/> - <set target="new.byteToLong" value="255"/> - <set target="new.byteToString" value="255"/> - - <set target="new.shortToByte" value="256"/> - <set target="new.shortToShort" value="32767"/> - <set target="new.shortToInt" value="-32768"/> - <set target="new.shortToLong" value="32767"/> - <set target="new.shortToString" value="255"/> - - <set target="new.intToByte" value="256"/> - <set target="new.intToShort" value="32768"/> - <set target="new.intToInt" value="2147483647"/> - <set target="new.intToLong" value="-2147483648"/> - <set target="new.intToString" value="255"/> - - <set target="new.longToByte" value="256"/> - <set target="new.longToShort" value="32768"/> - <set target="new.longToInt" value="2147483648"/> - <set target="new.longToLong" value="9223372036854775807"/> - <set target="new.longToString" value="255"/> - - <set target="new.floatToFloat" value="2920.1"/> - <set target="new.floatToDouble" value="2920.1"/> - <set target="new.floatToString" value="2920.1"/> - - <set target="new.doubleToFloat" value="9290.9"/> - <set target="new.doubleToDouble" value="9290.9"/> - <set target="new.doubleToString" value="9290.9"/> - - <set target="new.stringToBool" value="'false'"/> - <set target="new.stringToByte" value="'255'"/> - <set target="new.stringToShort" value="'32767'"/> - <set target="new.stringToInt" value="'2147483647'"/> - <set target="new.stringToLong" value="'9223372036854775807'"/> - <set target="new.stringToFloat" value="'2920.1'"/> - <set target="new.stringToDouble" value="'9290.9'"/> - <set target="new.stringToString" value="'hello world'"/> - <set target="new.stringToEnum" value="'E1'"/> - <set target="new.stringToProxy" value="'foo:tcp -p 1000'"/> - - <!-- Sequences --> - - <set target="new.boolSeqToStringSeq" length="2"/> - <set target="new.boolSeqToStringSeq[0]" value="false"/> - <set target="new.boolSeqToStringSeq[1]" value="true"/> - - <set target="new.byteSeqToByteSeq" length="2"/> - <set target="new.byteSeqToByteSeq[0]" value="0"/> - <set target="new.byteSeqToByteSeq[1]" value="255"/> - - <set target="new.byteSeqToShortSeq" length="2"/> - <set target="new.byteSeqToShortSeq[0]" value="0"/> - <set target="new.byteSeqToShortSeq[1]" value="255"/> - - <set target="new.byteSeqToIntSeq" length="2"/> - <set target="new.byteSeqToIntSeq[0]" value="0"/> - <set target="new.byteSeqToIntSeq[1]" value="255"/> - - <set target="new.byteSeqToLongSeq" length="2"/> - <set target="new.byteSeqToLongSeq[0]" value="0"/> - <set target="new.byteSeqToLongSeq[1]" value="255"/> - - <set target="new.byteSeqToStringSeq" length="2"/> - <set target="new.byteSeqToStringSeq[0]" value="0"/> - <set target="new.byteSeqToStringSeq[1]" value="255"/> - - <set target="new.shortSeqToByteSeq" length="4"/> - <set target="new.shortSeqToByteSeq[0]" value="0"/> - <set target="new.shortSeqToByteSeq[1]" value="255"/> - <set target="new.shortSeqToByteSeq[2]" value="256"/> - <set target="new.shortSeqToByteSeq[3]" value="-127"/> - - <set target="new.shortSeqToShortSeq" length="2"/> - <set target="new.shortSeqToShortSeq[0]" value="-32768"/> - <set target="new.shortSeqToShortSeq[1]" value="32767"/> - - <set target="new.shortSeqToIntSeq" length="2"/> - <set target="new.shortSeqToIntSeq[0]" value="-32768"/> - <set target="new.shortSeqToIntSeq[1]" value="32767"/> - - <set target="new.shortSeqToLongSeq" length="2"/> - <set target="new.shortSeqToLongSeq[0]" value="-32768"/> - <set target="new.shortSeqToLongSeq[1]" value="32767"/> - - <set target="new.shortSeqToStringSeq" length="2"/> - <set target="new.shortSeqToStringSeq[0]" value="-32768"/> - <set target="new.shortSeqToStringSeq[1]" value="32767"/> - - <set target="new.intSeqToByteSeq" length="4"/> - <set target="new.intSeqToByteSeq[0]" value="0"/> - <set target="new.intSeqToByteSeq[1]" value="255"/> - <set target="new.intSeqToByteSeq[2]" value="256"/> - <set target="new.intSeqToByteSeq[3]" value="-127"/> - - <set target="new.intSeqToShortSeq" length="4"/> - <set target="new.intSeqToShortSeq[0]" value="-32768"/> - <set target="new.intSeqToShortSeq[1]" value="32767"/> - <set target="new.intSeqToShortSeq[2]" value="-32769"/> - <set target="new.intSeqToShortSeq[3]" value="32768"/> - - <set target="new.intSeqToIntSeq" length="2"/> - <set target="new.intSeqToIntSeq[0]" value="-2147483648"/> - <set target="new.intSeqToIntSeq[1]" value="2147483647"/> - - <set target="new.intSeqToLongSeq" length="2"/> - <set target="new.intSeqToLongSeq[0]" value="-2147483648"/> - <set target="new.intSeqToLongSeq[1]" value="2147483647"/> - - <set target="new.intSeqToStringSeq" length="2"/> - <set target="new.intSeqToStringSeq[0]" value="-2147483648"/> - <set target="new.intSeqToStringSeq[1]" value="2147483647"/> - - <set target="new.longSeqToByteSeq" length="4"/> - <set target="new.longSeqToByteSeq[0]" value="0"/> - <set target="new.longSeqToByteSeq[1]" value="255"/> - <set target="new.longSeqToByteSeq[2]" value="256"/> - <set target="new.longSeqToByteSeq[3]" value="-127"/> - - <set target="new.longSeqToShortSeq" length="4"/> - <set target="new.longSeqToShortSeq[0]" value="-32768"/> - <set target="new.longSeqToShortSeq[1]" value="32767"/> - <set target="new.longSeqToShortSeq[2]" value="-32769"/> - <set target="new.longSeqToShortSeq[3]" value="32768"/> - - <set target="new.longSeqToIntSeq" length="4"/> - <set target="new.longSeqToIntSeq[0]" value="-2147483648"/> - <set target="new.longSeqToIntSeq[1]" value="2147483647"/> - <set target="new.longSeqToIntSeq[2]" value="-2147483649"/> - <set target="new.longSeqToIntSeq[3]" value="2147483648"/> - - <set target="new.longSeqToLongSeq" length="2"/> - <set target="new.longSeqToLongSeq[0]" value="-9223372036854775808"/> - <set target="new.longSeqToLongSeq[1]" value="9223372036854775807"/> - - <set target="new.longSeqToStringSeq" length="2"/> - <set target="new.longSeqToStringSeq[0]" value="-9223372036854775808"/> - <set target="new.longSeqToStringSeq[1]" value="9223372036854775807"/> - - <set target="new.floatSeqToFloatSeq" length="2"/> - <set target="new.floatSeqToFloatSeq[0]" value="2920.1"/> - <set target="new.floatSeqToFloatSeq[1]" value="2920.2"/> - - <set target="new.floatSeqToDoubleSeq" length="2"/> - <set target="new.floatSeqToDoubleSeq[0]" value="2920.1"/> - <set target="new.floatSeqToDoubleSeq[1]" value="2920.2"/> - - <set target="new.floatSeqToStringSeq" length="2"/> - <set target="new.floatSeqToStringSeq[0]" value="2920.1"/> - <set target="new.floatSeqToStringSeq[1]" value="2920.2"/> - - <set target="new.doubleSeqToFloatSeq" length="2"/> - <set target="new.doubleSeqToFloatSeq[0]" value="9290.8"/> - <set target="new.doubleSeqToFloatSeq[1]" value="9290.9"/> - - <set target="new.doubleSeqToDoubleSeq" length="2"/> - <set target="new.doubleSeqToDoubleSeq[0]" value="9290.8"/> - <set target="new.doubleSeqToDoubleSeq[1]" value="9290.9"/> - - <set target="new.doubleSeqToStringSeq" length="2"/> - <set target="new.doubleSeqToStringSeq[0]" value="9290.8"/> - <set target="new.doubleSeqToStringSeq[1]" value="9290.9"/> - - <set target="new.stringSeqToBoolSeq" length="2"/> - <set target="new.stringSeqToBoolSeq[0]" value="'false'"/> - <set target="new.stringSeqToBoolSeq[1]" value="'true'"/> - - <set target="new.stringSeqToByteSeq" length="4"/> - <set target="new.stringSeqToByteSeq[0]" value="'0'"/> - <set target="new.stringSeqToByteSeq[1]" value="'255'"/> - <set target="new.stringSeqToByteSeq[2]" value="'256'"/> - <set target="new.stringSeqToByteSeq[3]" value="'-127'"/> - - <set target="new.stringSeqToShortSeq" length="4"/> - <set target="new.stringSeqToShortSeq[0]" value="'-32768'"/> - <set target="new.stringSeqToShortSeq[1]" value="'32767'"/> - <set target="new.stringSeqToShortSeq[2]" value="'-32769'"/> - <set target="new.stringSeqToShortSeq[3]" value="'32768'"/> - - <set target="new.stringSeqToIntSeq" length="4"/> - <set target="new.stringSeqToIntSeq[0]" value="'-2147483648'"/> - <set target="new.stringSeqToIntSeq[1]" value="'2147483647'"/> - <set target="new.stringSeqToIntSeq[2]" value="'-2147483649'"/> - <set target="new.stringSeqToIntSeq[3]" value="'2147483648'"/> - - <set target="new.stringSeqToLongSeq" length="2"/> - <set target="new.stringSeqToLongSeq[0]" value="'-9223372036854775808'"/> - <set target="new.stringSeqToLongSeq[1]" value="'9223372036854775807'"/> - - <set target="new.stringSeqToFloatSeq" length="2"/> - <set target="new.stringSeqToFloatSeq[0]" value="'2920.1'"/> - <set target="new.stringSeqToFloatSeq[1]" value="'2920.2'"/> - - <set target="new.stringSeqToDoubleSeq" length="2"/> - <set target="new.stringSeqToDoubleSeq[0]" value="'9290.8'"/> - <set target="new.stringSeqToDoubleSeq[1]" value="'9290.9'"/> - - <set target="new.stringSeqToStringSeq" length="2"/> - <set target="new.stringSeqToStringSeq[0]" value="'hello'"/> - <set target="new.stringSeqToStringSeq[1]" value="'world'"/> - - <set target="new.stringSeqToEnumSeq" length="2"/> - <set target="new.stringSeqToEnumSeq[0]" value="'E2'"/> - <set target="new.stringSeqToEnumSeq[1]" value="'E3'"/> - - <set target="new.stringSeqToProxySeq" length="2"/> - <set target="new.stringSeqToProxySeq[0]" value="'foo1:tcp -p 1000'"/> - <set target="new.stringSeqToProxySeq[1]" value="'foo2:tcp -p 1001'"/> - - <!-- Dictionaries --> - - <add target="new.boolToStringDict" key="0" value="false"/> - <add target="new.boolToStringDict" key="1" value="true"/> - - <add target="new.longToByteDict" key="0" value="0"/> - <add target="new.longToByteDict" key="1" value="255"/> - <add target="new.longToByteDict" key="2" value="256"/> - <add target="new.longToByteDict" key="3" value="-127"/> - - <add target="new.longToShortDict" key="0" value="-32768"/> - <add target="new.longToShortDict" key="1" value="32767"/> - <add target="new.longToShortDict" key="2" value="-32769"/> - <add target="new.longToShortDict" key="3" value="32768"/> - - <add target="new.longToIntDict" key="0" value="-2147483648"/> - <add target="new.longToIntDict" key="1" value="2147483647"/> - <add target="new.longToIntDict" key="2" value="-2147483649"/> - <add target="new.longToIntDict" key="3" value="2147483648"/> - - <add target="new.longToStringDict" key="0" value="-9223372036854775808"/> - <add target="new.longToStringDict" key="1" value="9223372036854775807"/> - - <add target="new.doubleToFloatDict" key="0" value="9290.8"/> - <add target="new.doubleToFloatDict" key="1" value="9290.9"/> - - <add target="new.doubleToStringDict" key="0" value="9290.8"/> - <add target="new.doubleToStringDict" key="1" value="9290.9"/> - - <add target="new.stringToBoolDict" key="0" value="'false'"/> - <add target="new.stringToBoolDict" key="1" value="'true'"/> - - <add target="new.stringToLongDict" key="0" value="'-9223372036854775808'"/> - <add target="new.stringToLongDict" key="1" value="'9223372036854775807'"/> - - <add target="new.stringToDoubleDict" key="0" value="'9290.8'"/> - <add target="new.stringToDoubleDict" key="1" value="'9290.9'"/> - - <add target="new.stringToEnumDict" key="0" value="'E2'"/> - <add target="new.stringToEnumDict" key="1" value="'E3'"/> - - <!-- Struct <-> class transformations --> - - <set target="new.classToStructSeq" length="3"/> - <set target="new.classToStructSeq[0]" type="::Test::Small2"/> - <set target="new.classToStructSeq[0].seq" length="2"/> - <set target="new.classToStructSeq[0].seq[0].b" value="100"/> - <set target="new.classToStructSeq[0].seq[0].intToString" value="101"/> - <set target="new.classToStructSeq[0].seq[1].b" value="102"/> - <set target="new.classToStructSeq[0].seq[1].intToString" value="103"/> - <set target="new.classToStructSeq[1]" type="::Test::Small2"/> - <set target="new.classToStructSeq[1].seq" length="2"/> - <set target="new.classToStructSeq[1].seq[0].b" value="110"/> - <set target="new.classToStructSeq[1].seq[0].intToString" value="111"/> - <set target="new.classToStructSeq[1].seq[1].b" value="112"/> - <set target="new.classToStructSeq[1].seq[1].intToString" value="113"/> - <set target="new.classToStructSeq[2]" type="::Test::Small2"/> - <set target="new.classToStructSeq[2].seq" length="2"/> - <set target="new.classToStructSeq[2].seq[0].b" value="120"/> - <set target="new.classToStructSeq[2].seq[0].intToString" value="121"/> - <set target="new.classToStructSeq[2].seq[1].b" value="122"/> - <set target="new.classToStructSeq[2].seq[1].intToString" value="123"/> - - <add target="new.small1Dict" key="0"/> - <set target="new.small1Dict[0].b" value="120"/> - <set target="new.small1Dict[0].intToString" value="121"/> - <add target="new.small1Dict" key="10"/> - <set target="new.small1Dict[10].b" value="122"/> - <set target="new.small1Dict[10].intToString" value="123"/> - <add target="new.small1Dict" key="100"/> - <set target="new.small1Dict[100].b" value="124"/> - <set target="new.small1Dict[100].intToString" value="125"/> - - <add target="new.small2Dict" key="0" type="::Test::Small2"/> - <set target="new.small2Dict[0].seq" length="1"/> - <set target="new.small2Dict[0].seq[0].b" value="220"/> - <set target="new.small2Dict[0].seq[0].intToString" value="221"/> - <add target="new.small2Dict" key="10" type="::Test::Small2"/> - <set target="new.small2Dict[10].seq" length="1"/> - <set target="new.small2Dict[10].seq[0].b" value="222"/> - <set target="new.small2Dict[10].seq[0].intToString" value="223"/> - <add target="new.small2Dict" key="100" type="::Test::Small2"/> - <set target="new.small2Dict[100].seq" length="1"/> - <set target="new.small2Dict[100].seq[0].b" value="224"/> - <set target="new.small2Dict[100].seq[0].intToString" value="225"/> - - <!-- Objects --> - - <set target="new.baseObject" type="::Test::F"/> - <set target="new.baseObject.stringToEnumSeq" length="2"/> - <set target="new.baseObject.stringToEnumSeq[0]" value="'E1'"/> - <set target="new.baseObject.stringToEnumSeq[1]" value="'E3'"/> - - <set target="new.cObject" type="::Test::C"/> - <add target="new.cObject.boolToStringDict" key="0" value="false"/> - <add target="new.cObject.boolToStringDict" key="1" value="true"/> - - <set target="new.dAsCObject" type="::Test::D"/> - <add target="new.dAsCObject.boolToStringDict" key="0" value="false"/> - <add target="new.dAsCObject.boolToStringDict" key="1" value="true"/> - <set target="new.dAsCObject.stringToByteSeq" length="2"/> - <set target="new.dAsCObject.stringToByteSeq[0]" value="'0'"/> - <set target="new.dAsCObject.stringToByteSeq[1]" value="'255'"/> - <set target="new.dAsCObject.obj" type="::Test::F"/> - - <set target="new.dObject" type="::Test::D"/> - <add target="new.dObject.boolToStringDict" key="0" value="false"/> - <add target="new.dObject.boolToStringDict" key="1" value="true"/> - <set target="new.dObject.stringToByteSeq" length="2"/> - <set target="new.dObject.stringToByteSeq[0]" value="'0'"/> - <set target="new.dObject.stringToByteSeq[1]" value="'255'"/> - <set target="new.dObject.obj" value="new.cObject"/> - - <set target="new.compactObject" type="::Test::Small3"/> - <set target="new.compactObject.name" value="'compactObject'"/> - - </transform> -</transformdb> diff --git a/cpp/test/FreezeScript/dbmap/makedb.cpp b/cpp/test/FreezeScript/dbmap/makedb.cpp deleted file mode 100644 index 894bf134a62..00000000000 --- a/cpp/test/FreezeScript/dbmap/makedb.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 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 <IceUtil/IceUtil.h> -#include <Freeze/Freeze.h> -#include <IntSMap.h> - -using namespace std; -using namespace Ice; -using namespace Freeze; -using namespace Test; - -int -run(const CommunicatorPtr& communicator, const string& envName, const string& dbName) -{ - Freeze::ConnectionPtr connection = createConnection(communicator, envName); - IntSMap m(connection, dbName); - - m.put(IntSMap::value_type(0, S())); - - return EXIT_SUCCESS; -} - -int -main(int argc, char* argv[]) -{ - int status; - Ice::CommunicatorPtr communicator; - - string envName = "db"; - - try - { - communicator = Ice::initialize(argc, argv); - if(argc != 1) - { - envName = argv[1]; - envName += "/"; - envName += "db"; - } - - status = run(communicator, envName, "default.db"); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - try - { - communicator->destroy(); - } - catch(const Ice::Exception& ex) - { - cerr << ex << endl; - status = EXIT_FAILURE; - } - - return status; -} diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py deleted file mode 100755 index e2fdcbb72cb..00000000000 --- a/cpp/test/FreezeScript/dbmap/run.py +++ /dev/null @@ -1,145 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2015 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. -# -# ********************************************************************** - -import os, sys, re, shutil - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -transformdb = '%s' % os.path.join(TestUtil.getCppBinDir(), "transformdb") - -if TestUtil.appverifier: - TestUtil.setAppVerifierSettings([transformdb]) - -dbdir = os.path.join(os.getcwd(), "db") -TestUtil.cleanDbDir(dbdir) - -init_dbdir = os.path.join(os.getcwd(), "db_init") -if os.path.exists(init_dbdir): - shutil.rmtree(init_dbdir) -os.mkdir(init_dbdir) - -check_dbdir = os.path.join(os.getcwd(), "db_check") -if os.path.exists(check_dbdir): - shutil.rmtree(check_dbdir) -os.mkdir(check_dbdir) - -tmp_dbdir = os.path.join(os.getcwd(), "db_tmp") -if os.path.exists(tmp_dbdir): - shutil.rmtree(tmp_dbdir) -os.mkdir(tmp_dbdir) - -regex1 = re.compile(r"_old\.ice$", re.IGNORECASE) -files = [] -for file in os.listdir(os.path.join(os.getcwd(), "fail")): - if(regex1.search(file)): - files.append(file) - -regex2 = re.compile(r"^.*transf(ormdb|~1)(\.exe)?", re.IGNORECASE) - -sys.stdout.write("testing error detection... ") -sys.stdout.flush() -if TestUtil.debug: - sys.stdout.write("\n") - -files.sort() -for oldfile in files: - - newfile = oldfile.replace("old", "new") - - if oldfile.find("19") == 0: - value = "::Test::C" - else: - value = "int" - - command = '"' + transformdb + '" --old "' + os.path.join(os.getcwd(), "fail", oldfile) + '" --new "' + \ - os.path.join(os.getcwd(), "fail", newfile) + '" -o tmp.xml --key string --value ' + value - - if TestUtil.debug: - print(command) - - p = TestUtil.runCommand(command) - (stdin, stdout, stderr) = (p.stdin, p.stdout, p.stderr) - - lines1 = stderr.readlines() - lines2 = open(os.path.join(os.getcwd(), "fail", oldfile.replace("_old.ice", ".err")), "r").readlines() - if len(lines1) != len(lines2): - print("failed! (1)") - sys.exit(1) - - i = 0 - while i < len(lines1): - if sys.version_info[0] == 2: - line1 = regex2.sub("", lines1[i]).strip() - line2 = regex2.sub("", lines2[i]).strip() - else: - line1 = regex2.sub("", lines1[i].decode("utf-8")).strip() - line2 = regex2.sub("", lines2[i]).strip() - if line1 != line2: - print("failed! (2)") - print("line1 = " + line1) - print("line2 = " + line2) - # sys.exit(1) - i = i + 1 - -print("ok") - -sys.stdout.write("creating test database... ") -sys.stdout.flush() - -makedb = '"%s" "%s"'% (os.path.join(os.getcwd(), "makedb"), os.getcwd()) -proc = TestUtil.spawn(makedb) -proc.waitTestSuccess() -print("ok") - -testold = os.path.join(os.getcwd(), "TestOld.ice") -testnew = os.path.join(os.getcwd(), "TestNew.ice") -initxml = os.path.join(os.getcwd(), "init.xml") -checkxml = os.path.join(os.getcwd(), "check.xml") - -sys.stdout.write("initializing test database... ") -sys.stdout.flush() - -command = '"' + transformdb + '" --old "' + testold + '" --new "' + testold + '" -f "' + initxml + '" "' + dbdir + \ - '" default.db "' + init_dbdir + '" ' - -TestUtil.spawn(command).waitTestSuccess() - -print("ok") - -sys.stdout.write("executing default transformations... ") -sys.stdout.flush() - -command = '"' + transformdb + '" --old "' + testold + '" --new "' + testnew + '" --key int --value ::Test::S "' + \ - init_dbdir + '" default.db "' + check_dbdir + '" ' - -TestUtil.spawn(command).waitTestSuccess() - -print("ok") - -sys.stdout.write("validating database... ") -sys.stdout.flush() - -command = '"' + transformdb + '" --old "' + testnew + '" --new "' + testnew + '" -f "' + checkxml + '" "' + \ - check_dbdir + '" default.db "' + tmp_dbdir + '" ' - -TestUtil.spawn(command).waitTestSuccess() - -print("ok") - -if TestUtil.appverifier: - TestUtil.appVerifierAfterTestEnd([transformdb]) |