[Joafip-svn] SF.net SVN: joafip:[2933] trunk
Brought to you by:
luc_peuvrier
Menu
▾
▴
[Joafip-svn] SF.net SVN: joafip:[2933] trunk
|
From: <luc...@us...> - 2011-10-21 01:41:05
|
Revision: 2933
http://joafip.svn.sourceforge.net/joafip/?rev=2933&view=rev
Author: luc_peuvrier
Date: 2011-10-21 01:40:53 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
storage annotation check added in tests
Modified Paths:
--------------
trunk/joafip/src/test/java/net/sf/joafip/entity/TestFilePersistenceProperties.java
trunk/joafip/src/test/java/net/sf/joafip/entity/rel400/BobASDelegatingListenDelegate.java
trunk/joafip/src/test/java/net/sf/joafip/ograph/OGraphTest.java
trunk/joafip/src/test/java/net/sf/joafip/service/AbstractCopyRuntime.java
trunk/joafip/src/test/java/net/sf/joafip/service/AbstractTestCustomObjectIO.java
trunk/joafip/src/test/java/net/sf/joafip/service/AbstractTestFilePersistence.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestBobSerializeStackOverflow.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestClear.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestCrashSafe.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithBob1Custom.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithSerializer.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithSerializerZipper.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceOpenClose.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceWithG.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestMultipleFilePersistenceInstance.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestVersion.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestBugChangeLog.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestGarbageModeError.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestRootObjectMapAutoSave.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestSaveUnloaded.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/java/util/TestPArrayList.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/primitive/TestPrimitiveIO.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistence.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistenceMemory.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestClassLoaderPersistence.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestImport222NotLazy.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestThisInConstructor.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestUseRuntime222NotLazy.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel301/TestUseRuntime300NotLazy.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel310/TestUseRuntime301NotLazyConversionA.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel310/TestUseRuntime301NotLazyConversionB.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestAutoSave.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestConstructEntrySetIteratorOfPMapKeyNavigableSet.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestProxyTestList.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestSaveInExclusiveDataAccessSession.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractDataManagerTestCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractGarbageTestCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestGarbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStoreMemoryLeak.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestGarbageForegroundFile.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestGarbageForegroundMemory.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestGarbageInBackground.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestObjectReferenceLinkInMemory.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestStoreMemoryLeakCacheNoGarbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestStoreMemoryLeakNoCacheGarbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestStoreMemoryLeakNoCacheNoGarbage.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestStoreOpenClose.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/TestStoreOpenCloseNoG.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/Test16BitsConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/Test32BitsConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/Test64BitsConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/Test8BitsConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestBooleanConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestBooleanNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestByteConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestByteNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestCharConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestCharNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestDoubleConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestDoubleNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestFloatConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestFloatNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestIntegerConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestIntegerNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestLongConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestLongNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestReferenceConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestReferenceNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestShortConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/binary/TestShortNullableConverter.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/bytecode/TestForTransform.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/bytecode/TestPersistableCodeGeneratorInner.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/bytecode/agent/TestPackageMgr.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/bytecode/proxy/TestCheckMethodVisitor.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/classinfo/TestClassInfoFactory.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/classinfo/TestClassReplacement.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/collection/nosubs/TestStoreCollectionHashMapNosubsNoG.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/collection/nosubs/TestStoreCollectionHashMapNosubsWithG.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/collection/nosubs/TestStoreCollectionHashTableNosubsNoG.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/collection/nosubs/TestStoreCollectionHashTableNosubsWithG.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/collection/nosubs/TestStoreCollectionTreeMapNosubsNoG.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/collection/nosubs/TestStoreCollectionTreeMapNosubsWithG.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/collection/nosubs/TestStoreCollectionTroveHashMapNosubsNoG.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/collection/nosubs/TestStoreCollectionTroveHashMapNosubsWithG.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/collection/nosubs/TestStoreCollectionVectorNosubsWithG.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/conversion/TestConvertionDefinitionReader.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/conversion/TestReplacementDefMap.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/AbstractTestDeepCopier.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/TestDeepCopier.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/TestProxyDeepCopier.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/TestLinkManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/TestReferenceLinkGraph.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/TestStoreGarbager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/AbstractGarbageManagerTestCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/TestGarbageCandidateRecordManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/TestLinkRecordManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/garbage/recordmgr/TestToGarbageRecordManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/heaprecordable/TestHeapRecordableManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/TestClassNameManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/AbstractBinaryDump.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/AbstractTestIoManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/TestObjectIOManagerGenericCases.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/TestObjectIOManagerSerializeCase.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/manager/TestSerializerObjectIOManager.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/AbstractObjectIOTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/AbstractSerializeTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/ObjectIOBasicTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/ObjectIOWithSerialPersistenceFieldsTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/ObjectIOWithSerialPersistenceFieldsUnsharedTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/ObjectIOWithSerializeCycleTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/objectio/serialize/ObjectIOWithSerializeMethodTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/AbstractObjectIoManagerForProxyTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/ProxyCallBackForTest.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyCreation.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyCreationConstructed.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/proxy/TestProxyManager2.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/synchronizer/TestHashsetSynchronizer.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/synchronizer/TestLinkedListSynchronizer.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/synchronizer/TestMapSynchronizer.java
trunk/joafip-collection/src/main/java/net/sf/joafip/java/util/support/tree/TreeSupport.java
trunk/joafip-collection/src/test/java/net/sf/joafip/java/util/TestIterPArrayList.java
trunk/joafip-common/src/main/java/net/sf/joafip/logger/DummyLogger.java
trunk/joafip-common/src/main/java/net/sf/joafip/logger/IJoafipLogger.java
trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java
trunk/joafip-common/src/test/java/net/sf/joafip/AbstractJoafipCommonTestCase.java
trunk/joafip-example-simplestore/src/test/java/net/sf/joafip/simplestore/TestSimpleStore.java
trunk/joafip-file/src/test/java/net/sf/joafip/file/service/RandomAccessFileReadWriteCacheTest.java
trunk/joafip-file/src/test/java/net/sf/joafip/file/service/RandomFileTest.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/TestIdNode.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/entity/TestAbstractFileStorable.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/entity/TestDataRecordIdentifier.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/entity/TestMarshall.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestHeapElementManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestHeapRecordManage.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestRandomAccessFileCache.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/record/service/TestStoreRestore.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/AbstractTestHeapDataManagerRecord.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapDataManager.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapDataManagerBackup.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapDataManagerFreeing.java
trunk/joafip-heapfile/src/test/java/net/sf/joafip/heapfile/service/TestHeapDataMgrWithScenario.java
trunk/joafip-log4j/src/main/java/net/sf/joafip/logger/Log4jAdapter.java
trunk/joafip-meminspector/src/test/java/net/sf/joafip/meminspector/TestMemInspector.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/AbstractTestByPosition.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/AbstractTestDelete.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/AbstractTestInsert.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/AbstractTestNumberOfChild.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestAppend.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestByPositionDuplicate.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestByPositionUnique.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestDeleteDuplicate.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestDeleteUnique.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestFirstLastNext.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestIndex.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestInsertDuplicate.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestInsertUnique.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestNumberOfChildDoNotManageNodeIndex.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestNumberOfChildManageNodeIndex.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestSearchDuplicate.java
trunk/joafip-rbtree/src/test/java/net/sf/joafip/redblacktree/service/TestSearchUnique.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/InErrorTests.java
trunk/joafip-testsuite/src/main/java/net/sf/joafip/service/rel400/ServiceRel400Tests.java
Added Paths:
-----------
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestTreeMapIteratorAutoSave.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestTreeSetIteratorAutoSave.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestTreeSupportIterator.java
trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestTreeSupportIteratorAutoSave.java
Modified: trunk/joafip/src/test/java/net/sf/joafip/entity/TestFilePersistenceProperties.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/entity/TestFilePersistenceProperties.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/entity/TestFilePersistenceProperties.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -18,12 +18,14 @@
import net.sf.joafip.AbstractJoafipTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.service.ClassLoaderProvider;
import net.sf.joafip.service.FilePersistenceException;
import net.sf.joafip.service.FilePersistencePropertiesReader;
@NotStorableClass
+@StorableAccess
public class TestFilePersistenceProperties extends AbstractJoafipTestCase {
private static final String PROP =
Modified: trunk/joafip/src/test/java/net/sf/joafip/entity/rel400/BobASDelegatingListenDelegate.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/entity/rel400/BobASDelegatingListenDelegate.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/entity/rel400/BobASDelegatingListenDelegate.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -37,6 +37,8 @@
@AssertNotNull
private final BobAsDelegateNotifyDelegating delegate;
+ private final boolean constructed;
+
public BobASDelegatingListenDelegate(final IInstanceFactory instanceFactory) {
super();
delegate = BobAsDelegateNotifyDelegating.newInstance(instanceFactory,
@@ -45,8 +47,13 @@
throw new IllegalStateException("delegate must not be null");
}
initialize();// NOPMD
+ constructed = true;
}
+ public boolean isConstructed() {
+ return constructed;
+ }
+
public static BobASDelegatingListenDelegate newInstance(
final IInstanceFactory instanceFactory) {
final BobASDelegatingListenDelegate newInstance;
Modified: trunk/joafip/src/test/java/net/sf/joafip/ograph/OGraphTest.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/ograph/OGraphTest.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/ograph/OGraphTest.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -5,6 +5,7 @@
import java.util.Set;
import net.sf.joafip.AbstractJoafipTestCase;
+import net.sf.joafip.NoStorableAccess;
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.TestException;
import net.sf.joafip.logger.JoafipLogger;
@@ -15,6 +16,7 @@
import net.sf.joafip.store.service.objectfortest.BobContainer;
@NotStorableClass
+@NoStorableAccess
public class OGraphTest extends AbstractJoafipTestCase {
private static final String BAD_PATH = "bad path";
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/AbstractCopyRuntime.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/AbstractCopyRuntime.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/AbstractCopyRuntime.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -30,6 +30,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
/**
@@ -38,6 +39,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public abstract class AbstractCopyRuntime extends AbstractDeleteFileTestCase {
public AbstractCopyRuntime() throws TestException {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/AbstractTestCustomObjectIO.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/AbstractTestCustomObjectIO.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/AbstractTestCustomObjectIO.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -18,6 +18,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.store.service.objectfortest.Bob1;
@@ -25,6 +26,7 @@
import net.sf.joafip.store.service.objectfortest.Bob3;
@NotStorableClass
+@StorableAccess
public abstract class AbstractTestCustomObjectIO extends
AbstractDeleteFileTestCase {
@@ -41,7 +43,7 @@
}
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception { // NOPMD
super.setUp();
// filePersistence = new FilePersistence(1, null, path,
// /**/false/* do not remove files */,
@@ -56,7 +58,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ protected void tearDown() throws Exception { // NOPMD
try {
filePersistence.close();
} catch (final Throwable throwable) {// NOPMD
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/AbstractTestFilePersistence.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/AbstractTestFilePersistence.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/AbstractTestFilePersistence.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -18,6 +18,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.store.entity.garbage.ReferenceLinkGarbageException;
@@ -26,6 +27,7 @@
import net.sf.joafip.store.service.objectfortest.BobContainer;
@NotStorableClass
+@StorableAccess
public abstract class AbstractTestFilePersistence extends
AbstractDeleteFileTestCase {
@@ -47,7 +49,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ protected void tearDown() throws Exception { // NOPMD
try {
filePersistence.close();
} catch (final Throwable throwable) {// NOPMD
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestBobSerializeStackOverflow.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestBobSerializeStackOverflow.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestBobSerializeStackOverflow.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -25,6 +25,8 @@
import java.util.Set;
import net.sf.joafip.AbstractDeleteFileTestCase;
+import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.java.util.PLinkedTreeSet;
@@ -35,6 +37,8 @@
*
* @author luc peuvrier
*/
+@NotStorableClass
+@StorableAccess
public class TestBobSerializeStackOverflow extends AbstractDeleteFileTestCase {
private static final String BIG_BOB_KEY = "bigBobKey";
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestClear.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestClear.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestClear.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -24,6 +24,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.store.service.objectfortest.Bob1;
@@ -34,6 +35,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestClear extends AbstractDeleteFileTestCase {
private static final String BOB1_KEY = "bob1";
@@ -64,7 +66,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ protected void tearDown() throws Exception { // NOPMD
try {
filePersistence.close();
} catch (final Throwable throwable) {// NOPMD
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestCrashSafe.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestCrashSafe.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestCrashSafe.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -28,6 +28,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestConstant;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
@@ -51,6 +52,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestCrashSafe extends AbstractDeleteFileTestCase {
private static final JoafipLogger LOGGER = JoafipLogger
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithBob1Custom.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithBob1Custom.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithBob1Custom.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -17,10 +17,12 @@
package net.sf.joafip.service;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.store.service.objectfortest.Bob1;
@NotStorableClass
+@StorableAccess
public class TestCustomObjectIOWithBob1Custom extends // NOPMD
AbstractTestCustomObjectIO {
@@ -34,7 +36,7 @@
}
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception { // NOPMD
super.setUp();
filePersistence.setObjectIOForClass(Bob1.class,
Bob1ObjectInputForTestCustom.class,
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithSerializer.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithSerializer.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithSerializer.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -17,12 +17,14 @@
package net.sf.joafip.service;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.store.service.objectfortest.Bob1;
import net.sf.joafip.store.service.objectio.serialize.input.ObjectInputSerialize;
import net.sf.joafip.store.service.objectio.serialize.output.ObjectOutputSerialize;
@NotStorableClass
+@StorableAccess
public class TestCustomObjectIOWithSerializer extends // NOPMD
AbstractTestCustomObjectIO {
@@ -36,7 +38,7 @@
}
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception { // NOPMD
super.setUp();
filePersistence.setObjectIOForClass(Bob1.class,
ObjectInputSerialize.class, ObjectOutputSerialize.class);
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithSerializerZipper.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithSerializerZipper.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestCustomObjectIOWithSerializerZipper.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -17,12 +17,14 @@
package net.sf.joafip.service;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.store.service.objectfortest.Bob1;
import net.sf.joafip.store.service.objectio.serialize.input.ObjectInputSerializeZipped;
import net.sf.joafip.store.service.objectio.serialize.output.ObjectOutputSerializeZipped;
@NotStorableClass
+@StorableAccess
public class TestCustomObjectIOWithSerializerZipper extends // NOPMD
AbstractTestCustomObjectIO {
@@ -36,7 +38,7 @@
}
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception { // NOPMD
super.setUp();
filePersistence.setObjectIOForClass(Bob1.class,
ObjectInputSerializeZipped.class,
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceNoG.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -1,9 +1,11 @@
package net.sf.joafip.service;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
@NotStorableClass
+@StorableAccess
public class TestFilePersistenceNoG extends AbstractTestFilePersistence {// NOPMD
public TestFilePersistenceNoG() throws TestException {
@@ -15,7 +17,7 @@
}
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception { // NOPMD
super.setUp();
// filePersistence = new FilePersistence(1, null, path,
// /**/false/* do not remove files */,
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceOpenClose.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceOpenClose.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceOpenClose.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -18,11 +18,13 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.java.util.PLinkedList;
@NotStorableClass
+@StorableAccess
public class TestFilePersistenceOpenClose extends AbstractDeleteFileTestCase {
private static final String LIST_MUST_BE_NULL = "list must be null";
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceWithG.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceWithG.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceWithG.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -1,9 +1,11 @@
package net.sf.joafip.service;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
@NotStorableClass
+@StorableAccess
public class TestFilePersistenceWithG extends AbstractTestFilePersistence {// NOPMD
public TestFilePersistenceWithG() throws TestException {
@@ -15,7 +17,7 @@
}
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception { // NOPMD
super.setUp();
// filePersistence = new FilePersistence(1, null, path,
// /**/false/* do not remove files */,
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestMultipleFilePersistenceInstance.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestMultipleFilePersistenceInstance.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestMultipleFilePersistenceInstance.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -26,6 +26,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestConstant;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
@@ -40,6 +41,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestMultipleFilePersistenceInstance extends
AbstractDeleteFileTestCase {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestVersion.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestVersion.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestVersion.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -17,10 +17,12 @@
package net.sf.joafip.service;
import net.sf.joafip.AbstractJoafipTestCase;
+import net.sf.joafip.DoNotTransform;
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.TestException;
@NotStorableClass
+@DoNotTransform
public class TestVersion extends AbstractJoafipTestCase {
public TestVersion() throws TestException {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestBugChangeLog.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestBugChangeLog.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestBugChangeLog.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -18,6 +18,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestConstant;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
@@ -38,6 +39,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestBugChangeLog extends AbstractDeleteFileTestCase {
private static final String SESION_MUST_BE_OPENED = "sesion must be opened";
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestGarbageModeError.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestGarbageModeError.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestGarbageModeError.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -18,6 +18,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestConstant;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
@@ -34,6 +35,7 @@
import net.sf.joafip.store.service.proxy.ProxyManager2;
@NotStorableClass
+@StorableAccess
public class TestGarbageModeError extends AbstractDeleteFileTestCase {
private static final String KEY = "key";
@@ -51,7 +53,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ protected void tearDown() throws Exception { // NOPMD
filePersistence = null;// NOPMD
session = null;// NOPMD
}
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestRootObjectMapAutoSave.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestRootObjectMapAutoSave.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestRootObjectMapAutoSave.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -23,6 +23,8 @@
package net.sf.joafip.service.bug;
import net.sf.joafip.AbstractDeleteFileTestCase;
+import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.service.FilePersistenceBuilder;
import net.sf.joafip.service.FilePersistenceClassNotFoundException;
@@ -39,6 +41,8 @@
* @author luc peuvrier
*
*/
+@NotStorableClass
+@StorableAccess
public class TestRootObjectMapAutoSave extends AbstractDeleteFileTestCase {
public TestRootObjectMapAutoSave() throws TestException {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestSaveUnloaded.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestSaveUnloaded.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/TestSaveUnloaded.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -17,6 +17,7 @@
package net.sf.joafip.service.bug;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.service.FilePersistenceClassNotFoundException;
@@ -29,6 +30,7 @@
import net.sf.joafip.store.service.objectfortest.BobExternalizable;
@NotStorableClass
+@StorableAccess
public class TestSaveUnloaded extends AbstractFilePersistenceForTest {
private static final String KEY = "key";
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/bug/java/util/TestPArrayList.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/java/util/TestPArrayList.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/java/util/TestPArrayList.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -23,6 +23,7 @@
package net.sf.joafip.service.bug.java.util;
import net.sf.joafip.AbstractJoafipTestCase;
+import net.sf.joafip.DoNotTransform;
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.TestException;
import net.sf.joafip.java.util.PArrayList;
@@ -34,6 +35,7 @@
*
*/
@NotStorableClass
+@DoNotTransform
public class TestPArrayList extends AbstractJoafipTestCase {
public TestPArrayList() throws TestException {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/bug/primitive/TestPrimitiveIO.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/primitive/TestPrimitiveIO.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/primitive/TestPrimitiveIO.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -17,6 +17,7 @@
package net.sf.joafip.service.bug.primitive;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.service.FilePersistenceClassNotFoundException;
@@ -34,6 +35,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestPrimitiveIO extends AbstractFilePersistenceForTest {
private static final String READ_MUST_BE_EQUALS_TO_WROTE = "read must be equals to wrote";
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistence.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistence.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistence.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -26,6 +26,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.entity.MutableInteger;
@@ -45,6 +46,7 @@
* @author luc peuvrier
*/
@NotStorableClass
+@StorableAccess
public class TestEnumPersistence extends AbstractDeleteFileTestCase {
private IFilePersistence filePersistence;
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistenceMemory.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistenceMemory.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistenceMemory.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -27,6 +27,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.entity.MutableInteger;
@@ -50,6 +51,7 @@
* @author luc peuvrier
*/
@NotStorableClass
+@StorableAccess
public class TestEnumPersistenceMemory extends AbstractDeleteFileTestCase {
private IFilePersistence filePersistence;
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestClassLoaderPersistence.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestClassLoaderPersistence.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestClassLoaderPersistence.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -26,6 +26,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.service.FilePersistenceBuilder;
@@ -44,6 +45,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestClassLoaderPersistence extends AbstractDeleteFileTestCase {
private static final String KEY = "key";
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestImport222NotLazy.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestImport222NotLazy.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestImport222NotLazy.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -25,11 +25,13 @@
import java.io.InputStream;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.service.FilePersistenceBuilder;
import net.sf.joafip.store.service.conversion.def.InputStreamAndSource;
@NotStorableClass
+@StorableAccess
public class TestImport222NotLazy extends AbstractTestImport222 { // NOPMD
public TestImport222NotLazy() throws TestException {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestThisInConstructor.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestThisInConstructor.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestThisInConstructor.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -24,6 +24,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.EnumFilePersistenceCloseAction;
import net.sf.joafip.entity.ForThisTest;
@@ -44,6 +45,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestThisInConstructor extends AbstractDeleteFileTestCase {
private static final String KEY =
@@ -60,7 +62,7 @@
}
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception { // NOPMD
super.setUp();
// filePersistence = new FilePersistence(1, null, path, true, false);
final FilePersistenceBuilder builder = new FilePersistenceBuilder();
@@ -73,7 +75,7 @@
}
@Override
- protected void tearDown() throws Exception {
+ protected void tearDown() throws Exception { // NOPMD
try {
filePersistence.close();
} catch (final Exception exception) { // NOPMD
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestUseRuntime222NotLazy.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestUseRuntime222NotLazy.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel300/TestUseRuntime222NotLazy.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -23,6 +23,7 @@
package net.sf.joafip.service.rel300;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.service.FilePersistenceBuilder;
import net.sf.joafip.service.FilePersistenceClassNotFoundException;
@@ -40,6 +41,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestUseRuntime222NotLazy extends AbstractTestUseRuntime222 { // NOPMD
public TestUseRuntime222NotLazy() throws TestException {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel301/TestUseRuntime300NotLazy.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel301/TestUseRuntime300NotLazy.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel301/TestUseRuntime300NotLazy.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -26,6 +26,7 @@
import java.net.URISyntaxException;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.service.FilePersistenceBuilder;
import net.sf.joafip.service.FilePersistenceClassNotFoundException;
@@ -42,6 +43,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestUseRuntime300NotLazy extends AbstractTestRuntime300 { // NOPMD
public TestUseRuntime300NotLazy() throws TestException {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel310/TestUseRuntime301NotLazyConversionA.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel310/TestUseRuntime301NotLazyConversionA.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel310/TestUseRuntime301NotLazyConversionA.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -25,6 +25,7 @@
import java.io.InputStream;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.service.FilePersistenceBuilder;
import net.sf.joafip.store.service.conversion.def.InputStreamAndSource;
@@ -35,6 +36,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestUseRuntime301NotLazyConversionA extends AbstractTestRuntime301 { // NOPMD
public TestUseRuntime301NotLazyConversionA() throws TestException {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel310/TestUseRuntime301NotLazyConversionB.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel310/TestUseRuntime301NotLazyConversionB.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel310/TestUseRuntime301NotLazyConversionB.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -25,6 +25,7 @@
import java.io.InputStream;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.service.FilePersistenceBuilder;
import net.sf.joafip.store.service.conversion.def.InputStreamAndSource;
@@ -35,6 +36,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestUseRuntime301NotLazyConversionB extends AbstractTestRuntime301 { // NOPMD
public TestUseRuntime301NotLazyConversionB() throws TestException {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestAutoSave.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestAutoSave.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestAutoSave.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -64,6 +64,8 @@
public class TestAutoSave extends AbstractDeleteFileTestCase implements
IAutoSaveEventListener {
+ private static final String MUST_HAS_INSTANCE_FACTORY = "must has instance factory";
+
private static final String MUST_SAVE = "must save";
private static final String KEY = "key";
@@ -316,7 +318,7 @@
FilePersistenceTooBigForSerializationException {
session.open();
final IInstanceFactory instanceFactory = session.getInstanceFactory();
- assertNotNull("must have instance factory", instanceFactory);
+ assertNotNull(MUST_HAS_INSTANCE_FACTORY, instanceFactory);
saveDoneFlag = false;
BobASDelegatingListenDelegate bob = new BobASDelegatingListenDelegate(
@@ -344,13 +346,11 @@
FilePersistenceTooBigForSerializationException {
session.open();
final IInstanceFactory instanceFactory = session.getInstanceFactory();
- assertNotNull("must have instance factory", instanceFactory);
+ assertNotNull(MUST_HAS_INSTANCE_FACTORY, instanceFactory);
saveDoneFlag = false;
- BobASDelegatingListenDelegate bob = (BobASDelegatingListenDelegate) instanceFactory
- .newInstance(BobASDelegatingListenDelegate.class,
- new Class<?>[] { IInstanceFactory.class },
- new Object[] { instanceFactory });
+ BobASDelegatingListenDelegate bob = BobASDelegatingListenDelegate
+ .newInstance(instanceFactory);
assertTrue(MUST_SAVE, saveDoneFlag);
saveDoneFlag = false;
@@ -366,6 +366,22 @@
session.close();
}
+ public void testSaveInConstruction4() throws FilePersistenceException,
+ FilePersistenceClassNotFoundException,
+ FilePersistenceInvalidClassException,
+ FilePersistenceDataCorruptedException,
+ FilePersistenceNotSerializableException,
+ FilePersistenceTooBigForSerializationException, ProxyException {
+ session.open();
+ final IInstanceFactory instanceFactory = session.getInstanceFactory();
+ assertNotNull(MUST_HAS_INSTANCE_FACTORY, instanceFactory);
+ final BobASDelegatingListenDelegate bob = BobASDelegatingListenDelegate
+ .newInstance(instanceFactory);
+ assertTrue("must be a proxy", ProxyManager2.isProxyOrEnhanced(bob));
+ assertTrue("must be unloaded", ProxyManager2.isUnloaded(bob));
+ assertTrue("bad state saved", bob.isConstructed());
+ }
+
public void testWithTransient() throws FilePersistenceException,
FilePersistenceClassNotFoundException,
FilePersistenceInvalidClassException,
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestConstructEntrySetIteratorOfPMapKeyNavigableSet.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestConstructEntrySetIteratorOfPMapKeyNavigableSet.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestConstructEntrySetIteratorOfPMapKeyNavigableSet.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -26,6 +26,8 @@
import java.util.NavigableMap;
import net.sf.joafip.AbstractJoafipCommonTestCase;
+import net.sf.joafip.DoNotTransform;
+import net.sf.joafip.NotStorableClass;
import net.sf.joafip.TestException;
import net.sf.joafip.java.util.PMapKeyNavigableSet;
import net.sf.joafip.java.util.PTreeMap;
@@ -39,6 +41,8 @@
* @author luc peuvrier
*
*/
+@NotStorableClass
+@DoNotTransform
public class TestConstructEntrySetIteratorOfPMapKeyNavigableSet extends
AbstractJoafipCommonTestCase implements IInstanceFactory {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestProxyTestList.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestProxyTestList.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestProxyTestList.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -16,6 +16,7 @@
*/
package net.sf.joafip.service.rel400;
+import net.sf.joafip.DoNotTransform;
import net.sf.joafip.NotStorableClass;
import net.sf.joafip.TestException;
import net.sf.joafip.entity.rel400.ProxyTestList;
@@ -29,6 +30,7 @@
*
*/
@NotStorableClass
+@DoNotTransform
public class TestProxyTestList extends AbstractLinkedListTest {
public TestProxyTestList() throws TestException {
@@ -40,7 +42,7 @@
}
@Override
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception { // NOPMD
linkedList = new ProxyTestList<String>();
super.setUp();
}
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestRuntime310Garbage.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -5,6 +5,7 @@
import java.util.Set;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.heapfile.record.entity.DataRecordIdentifier;
import net.sf.joafip.heapfile.service.HeapException;
@@ -33,6 +34,7 @@
import net.sf.joafip.store.service.proxy.ProxyManager2;
@NotStorableClass
+@StorableAccess
public class TestRuntime310Garbage extends AbstractCopyRuntime implements
IGarbageListener {
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestSaveInExclusiveDataAccessSession.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestSaveInExclusiveDataAccessSession.java 2011-10-21 01:36:31 UTC (rev 2932)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestSaveInExclusiveDataAccessSession.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -29,6 +29,7 @@
import net.sf.joafip.AbstractDeleteFileTestCase;
import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
import net.sf.joafip.TestException;
import net.sf.joafip.java.util.PLinkedList;
import net.sf.joafip.reflect.HelperReflect;
@@ -67,6 +68,7 @@
*
*/
@NotStorableClass
+@StorableAccess
public class TestSaveInExclusiveDataAccessSession extends
AbstractDeleteFileTestCase {
@@ -251,16 +253,12 @@
final Object object = objectAndPersistInfo.getObject();
if (!excludedObjectSet.containsKey(object)) {
fail = true;
- builder.append(object.getClass().getName());
+ builder.append(objectAndPersistInfo.toString());
builder.append(", loaded=");
try {
final boolean loadedOrNotAProxy = ProxyManager2
.isLoadedOrNotAProxy(object);
builder.append(loadedOrNotAProxy);
- if (loadedOrNotAProxy) {
- builder.append(", ");
- builder.append(object.toString());
- }
} catch (final ProxyException exception) {
builder.append(exception.getMessage());
}
Added: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestTreeMapIteratorAutoSave.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestTreeMapIteratorAutoSave.java (rev 0)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestTreeMapIteratorAutoSave.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2011 Luc Peuvrier
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
+ * Licensed under the LGPL License, Version 3, 29 June 2007 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.sf.joafip.service.rel400;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import net.sf.joafip.AbstractDeleteFileTestCase;
+import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
+import net.sf.joafip.TestException;
+import net.sf.joafip.java.util.PTreeMap;
+import net.sf.joafip.service.FilePersistenceBuilder;
+import net.sf.joafip.service.FilePersistenceClassNotFoundException;
+import net.sf.joafip.service.FilePersistenceDataCorruptedException;
+import net.sf.joafip.service.FilePersistenceException;
+import net.sf.joafip.service.FilePersistenceInvalidClassException;
+import net.sf.joafip.service.FilePersistenceNotSerializableException;
+import net.sf.joafip.service.FilePersistenceTooBigForSerializationException;
+import net.sf.joafip.service.IExclusiveDataAccessSession;
+import net.sf.joafip.service.IFilePersistence;
+import net.sf.joafip.store.service.proxy.IInstanceFactory;
+
+/**
+ *
+ * @author luc peuvrier
+ *
+ */
+@NotStorableClass
+@StorableAccess
+public class TestTreeMapIteratorAutoSave extends AbstractDeleteFileTestCase {
+
+ public final static String ID_KEY_NAME = "idKey";
+
+ public static final String TYPE_KEY_NAME = "typeKey";
+
+ private IFilePersistence filePersistence;
+
+ public TestTreeMapIteratorAutoSave() throws TestException {
+ super();
+ }
+
+ public TestTreeMapIteratorAutoSave(final String name) throws TestException {
+ super(name);
+ }
+
+ @Override
+ public void setUp() throws Exception { // NOPMD
+ super.setUp();
+ final FilePersistenceBuilder builder = new FilePersistenceBuilder();
+ builder.setPathName("z:/runtime");
+ builder.setRemoveFiles(true);
+ builder.setProxyMode(true);
+ builder.setAutoSaveEnabled(true);
+ builder.setMaxInMemoryThreshold(0);
+ builder.setMaintenedInMemory(false);
+ filePersistence = builder.build();
+ }
+
+ @Override
+ public void tearDown() throws Exception { // NOPMD
+ try {
+ filePersistence.close();
+ } catch (Exception e) { // NOPMD
+ // ignore error
+ }
+ super.tearDown();
+ }
+
+ @SuppressWarnings("unchecked")
+ public void test0() throws FilePersistenceException,
+ FilePersistenceClassNotFoundException,
+ FilePersistenceInvalidClassException,
+ FilePersistenceDataCorruptedException,
+ FilePersistenceNotSerializableException,
+ FilePersistenceTooBigForSerializationException {
+ final IExclusiveDataAccessSession session = filePersistence
+ .createExclusiveDataAccessSession();
+
+ final IInstanceFactory instanceFactory = session.getInstanceFactory();
+ session.open();
+ final Map<String, String> map = PTreeMap.newInstance(instanceFactory);
+ map.put(ID_KEY_NAME, ID_KEY_NAME);
+ map.put(TYPE_KEY_NAME, TYPE_KEY_NAME);
+ final Iterator<Entry<String, String>> iterator = map.entrySet()
+ .iterator();
+ assertTrue("must has first element", iterator.hasNext());
+ Entry<String, String> next = iterator.next();
+ assertEquals("bad first key", ID_KEY_NAME, next.getKey());
+ assertTrue("must has second element", iterator.hasNext());
+ next = iterator.next();
+ assertEquals("bad second key", TYPE_KEY_NAME, next.getKey());
+ assertFalse("must not has more element", iterator.hasNext());
+ }
+}
Added: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestTreeSetIteratorAutoSave.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestTreeSetIteratorAutoSave.java (rev 0)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestTreeSetIteratorAutoSave.java 2011-10-21 01:40:53 UTC (rev 2933)
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2011 Luc Peuvrier
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
+ * Licensed under the LGPL License, Version 3, 29 June 2007 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * JOAFIP is distributed in t...
[truncated message content] |
