[Joafip-svn] SF.net SVN: joafip:[3172] trunk/joafip/src/test/java/net/sf/joafip
Brought to you by:
luc_peuvrier
Menu
▾
▴
[Joafip-svn] SF.net SVN: joafip:[3172] trunk/joafip/src/test/java/net/sf/joafip
|
From: <luc...@us...> - 2012-11-29 08:23:56
|
Revision: 3172
http://joafip.svn.sourceforge.net/joafip/?rev=3172&view=rev
Author: luc_peuvrier
Date: 2012-11-29 08:23:44 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
test failure correction
Modified Paths:
--------------
trunk/joafip/src/test/java/net/sf/joafip/service/TestExportImport.java
trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceSetupByProperties.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumKeptInMemory.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/rel400/TestStoredImmutableEnum.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestObjectReferenceLink.java
trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStore.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/objectfortest/EnumForTest.java
Added Paths:
-----------
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType1.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType2.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType3.java
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType4.java
Removed Paths:
-------------
trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType.java
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestExportImport.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestExportImport.java 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestExportImport.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -63,6 +63,7 @@
@Override
protected void setUp() throws Exception {// NOPMD
super.setUp();
+ EnumForTest.clear();
final File path2 = new File(RUNTIME);
path2.mkdirs();
HelperDeleteJoafipFileForTest.deleteFiles(path2);
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceSetupByProperties.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceSetupByProperties.java 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/TestFilePersistenceSetupByProperties.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -64,8 +64,7 @@
@Override
protected void setUp() throws Exception {// NOPMD
super.setUp();
- EnumForTest.VAL1.setObject(null);
- EnumForTest.VAL2.setObject(null);
+ EnumForTest.clear();
try {
FilePersistence.setIdCount(100);
} catch (final FilePersistenceException exception) {// NOPMD
Deleted: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType.java 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -1,47 +0,0 @@
-package net.sf.joafip.service.bug.savenum;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public enum EnumOrderType {
-
- /***/
- LINE(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT, EnumStrategy.NUMERIC),
- /***/
- BOX(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT, EnumStrategy.NUMERIC),
- /***/
- NUMERIC_GLYPH_COLLECTION(EnumStrategy.ALL_TYPES, EnumStrategy.NUMERIC),
- /***/
- TEXT_GLYPH_COLLECTION(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT), IMAGE(
- EnumStrategy.ALL_TYPES, EnumStrategy.TEXT),
- /***/
- DRAWING_ORDER_CONTAINER(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
- EnumStrategy.NUMERIC),
- /***/
- SHELF_LABEL_TRANSITION(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
- EnumStrategy.NUMERIC),
- /***/
- SCREEN_TRANSITION_FRAME(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
- EnumStrategy.NUMERIC),
- /***/
- SCREEN_TRANSITION_SPRITE(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
- EnumStrategy.NUMERIC);
-
- private final Set<EnumStrategy> strategieSet =
- /**/new HashSet<EnumStrategy>();
-
- private EnumOrderType(final EnumStrategy... strategies) {
- for (final EnumStrategy strategy : strategies) {
- this.strategieSet.add(strategy);
- }
- }
-
- public boolean canConvertToScriptOrders(
- final EnumStrategy displayScriptStrategy) {
- return strategieSet.contains(displayScriptStrategy);
- }
-
- public Set<EnumStrategy> getStrategieSet() {
- return strategieSet;
- }
-}
Copied: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType1.java (from rev 3170, trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType.java)
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType1.java (rev 0)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType1.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -0,0 +1,47 @@
+package net.sf.joafip.service.bug.savenum;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public enum EnumOrderType1 {
+
+ /***/
+ LINE(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT, EnumStrategy.NUMERIC),
+ /***/
+ BOX(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT, EnumStrategy.NUMERIC),
+ /***/
+ NUMERIC_GLYPH_COLLECTION(EnumStrategy.ALL_TYPES, EnumStrategy.NUMERIC),
+ /***/
+ TEXT_GLYPH_COLLECTION(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT), IMAGE(
+ EnumStrategy.ALL_TYPES, EnumStrategy.TEXT),
+ /***/
+ DRAWING_ORDER_CONTAINER(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SHELF_LABEL_TRANSITION(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SCREEN_TRANSITION_FRAME(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SCREEN_TRANSITION_SPRITE(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC);
+
+ private final Set<EnumStrategy> strategieSet =
+ /**/new HashSet<EnumStrategy>();
+
+ private EnumOrderType1(final EnumStrategy... strategies) {
+ for (final EnumStrategy strategy : strategies) {
+ this.strategieSet.add(strategy);
+ }
+ }
+
+ public boolean canConvertToScriptOrders(
+ final EnumStrategy displayScriptStrategy) {
+ return strategieSet.contains(displayScriptStrategy);
+ }
+
+ public Set<EnumStrategy> getStrategieSet() {
+ return strategieSet;
+ }
+}
Added: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType2.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType2.java (rev 0)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType2.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -0,0 +1,47 @@
+package net.sf.joafip.service.bug.savenum;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public enum EnumOrderType2 {
+
+ /***/
+ LINE(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT, EnumStrategy.NUMERIC),
+ /***/
+ BOX(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT, EnumStrategy.NUMERIC),
+ /***/
+ NUMERIC_GLYPH_COLLECTION(EnumStrategy.ALL_TYPES, EnumStrategy.NUMERIC),
+ /***/
+ TEXT_GLYPH_COLLECTION(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT), IMAGE(
+ EnumStrategy.ALL_TYPES, EnumStrategy.TEXT),
+ /***/
+ DRAWING_ORDER_CONTAINER(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SHELF_LABEL_TRANSITION(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SCREEN_TRANSITION_FRAME(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SCREEN_TRANSITION_SPRITE(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC);
+
+ private final Set<EnumStrategy> strategieSet =
+ /**/new HashSet<EnumStrategy>();
+
+ private EnumOrderType2(final EnumStrategy... strategies) {
+ for (final EnumStrategy strategy : strategies) {
+ this.strategieSet.add(strategy);
+ }
+ }
+
+ public boolean canConvertToScriptOrders(
+ final EnumStrategy displayScriptStrategy) {
+ return strategieSet.contains(displayScriptStrategy);
+ }
+
+ public Set<EnumStrategy> getStrategieSet() {
+ return strategieSet;
+ }
+}
Property changes on: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType3.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType3.java (rev 0)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType3.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -0,0 +1,47 @@
+package net.sf.joafip.service.bug.savenum;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public enum EnumOrderType3 {
+
+ /***/
+ LINE(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT, EnumStrategy.NUMERIC),
+ /***/
+ BOX(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT, EnumStrategy.NUMERIC),
+ /***/
+ NUMERIC_GLYPH_COLLECTION(EnumStrategy.ALL_TYPES, EnumStrategy.NUMERIC),
+ /***/
+ TEXT_GLYPH_COLLECTION(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT), IMAGE(
+ EnumStrategy.ALL_TYPES, EnumStrategy.TEXT),
+ /***/
+ DRAWING_ORDER_CONTAINER(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SHELF_LABEL_TRANSITION(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SCREEN_TRANSITION_FRAME(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SCREEN_TRANSITION_SPRITE(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC);
+
+ private final Set<EnumStrategy> strategieSet =
+ /**/new HashSet<EnumStrategy>();
+
+ private EnumOrderType3(final EnumStrategy... strategies) {
+ for (final EnumStrategy strategy : strategies) {
+ this.strategieSet.add(strategy);
+ }
+ }
+
+ public boolean canConvertToScriptOrders(
+ final EnumStrategy displayScriptStrategy) {
+ return strategieSet.contains(displayScriptStrategy);
+ }
+
+ public Set<EnumStrategy> getStrategieSet() {
+ return strategieSet;
+ }
+}
Property changes on: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType4.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType4.java (rev 0)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType4.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -0,0 +1,47 @@
+package net.sf.joafip.service.bug.savenum;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public enum EnumOrderType4 {
+
+ /***/
+ LINE(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT, EnumStrategy.NUMERIC),
+ /***/
+ BOX(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT, EnumStrategy.NUMERIC),
+ /***/
+ NUMERIC_GLYPH_COLLECTION(EnumStrategy.ALL_TYPES, EnumStrategy.NUMERIC),
+ /***/
+ TEXT_GLYPH_COLLECTION(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT), IMAGE(
+ EnumStrategy.ALL_TYPES, EnumStrategy.TEXT),
+ /***/
+ DRAWING_ORDER_CONTAINER(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SHELF_LABEL_TRANSITION(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SCREEN_TRANSITION_FRAME(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC),
+ /***/
+ SCREEN_TRANSITION_SPRITE(EnumStrategy.ALL_TYPES, EnumStrategy.TEXT,
+ EnumStrategy.NUMERIC);
+
+ private final Set<EnumStrategy> strategieSet =
+ /**/new HashSet<EnumStrategy>();
+
+ private EnumOrderType4(final EnumStrategy... strategies) {
+ for (final EnumStrategy strategy : strategies) {
+ this.strategieSet.add(strategy);
+ }
+ }
+
+ public boolean canConvertToScriptOrders(
+ final EnumStrategy displayScriptStrategy) {
+ return strategieSet.contains(displayScriptStrategy);
+ }
+
+ public Set<EnumStrategy> getStrategieSet() {
+ return strategieSet;
+ }
+}
Property changes on: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/EnumOrderType4.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumKeptInMemory.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumKeptInMemory.java 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumKeptInMemory.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -95,7 +95,7 @@
// /**/false /* no garbage management */,
// /**/crashSafeMode/* crash safe mode */);
filePersistence = builder.build();
- filePersistence.storedImmutableEnum(new Class[] { EnumOrderType.class,
+ filePersistence.storedImmutableEnum(new Class[] { EnumOrderType1.class,
EnumStrategy.class });
}
@@ -149,7 +149,7 @@
dataAccessSession.open();
BobContainer bobContainer = new BobContainer();
- bobContainer.setObject1(EnumOrderType.BOX);
+ bobContainer.setObject1(EnumOrderType1.BOX);
bobContainer.setObject2(EnumStrategy.ALL_TYPES);
dataAccessSession.setObject("key", bobContainer);
dataAccessSession.closeAndWait(EnumFilePersistenceCloseAction.SAVE);
@@ -162,16 +162,16 @@
dataAccessSession.open();
bobContainer = (BobContainer) dataAccessSession.getObject("key");
final Object object1 = bobContainer.getObject1();
- assertEquals(BAD_VALUE, EnumOrderType.BOX, object1);
+ assertEquals(BAD_VALUE, EnumOrderType1.BOX, object1);
assertEquals(BAD_VALUE, EnumStrategy.ALL_TYPES,
bobContainer.getObject2());
- bobContainer.setObject1(EnumOrderType.DRAWING_ORDER_CONTAINER);
+ bobContainer.setObject1(EnumOrderType1.DRAWING_ORDER_CONTAINER);
bobContainer.setObject2(EnumStrategy.NUMERIC);
dataAccessSession.closeAndWait(EnumFilePersistenceCloseAction.SAVE);
dataAccessSession.open();
bobContainer = (BobContainer) dataAccessSession.getObject("key");
- assertEquals(BAD_VALUE, EnumOrderType.DRAWING_ORDER_CONTAINER,
+ assertEquals(BAD_VALUE, EnumOrderType1.DRAWING_ORDER_CONTAINER,
bobContainer.getObject1());
assertEquals(BAD_VALUE, EnumStrategy.NUMERIC, bobContainer.getObject2());
dataAccessSession.closeAndWait(EnumFilePersistenceCloseAction.SAVE);
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 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistence.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -105,7 +105,7 @@
dataAccessSession.closeAndWait(EnumFilePersistenceCloseAction.SAVE);
logWrote();
- filePersistence.storedMutableEnum(EnumOrderType.class);
+ filePersistence.storedMutableEnum(EnumOrderType2.class);
dataAccessSession.open();
dataAccessSession.closeAndWait(EnumFilePersistenceCloseAction.SAVE);
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 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/bug/savenum/TestEnumPersistenceMemory.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -88,7 +88,7 @@
// true/* proxyMode */, removeFiles, false/* garbageManagement */);
filePersistence = builder.build();
// filePersistence.setSubstitutionOfJavaUtilCollection();
- filePersistence.storedMutableEnum(EnumOrderType.class);
+ filePersistence.storedMutableEnum(EnumOrderType3.class);
filePersistence.storedMutableEnum(EnumStrategy.class);
filePersistence.setRecordSaveActions(true);
@@ -96,7 +96,7 @@
.createDataAccessSession();
dataAccessSession.open();
- final Set<EnumStrategy> strategieSet1 = EnumOrderType.BOX
+ final Set<EnumStrategy> strategieSet1 = EnumOrderType3.BOX
.getStrategieSet();
// strategieSet1 is the object create by new in EnumOrderType
assertFalse("must not be a proxy",
@@ -109,7 +109,7 @@
logWrote();
dataAccessSession.open();
- final Set<EnumStrategy> strategieSet2 = EnumOrderType.BOX
+ final Set<EnumStrategy> strategieSet2 = EnumOrderType3.BOX
.getStrategieSet();
if (logger.debugEnabled) {
logger.debug("strategieSet2 id "
@@ -144,7 +144,7 @@
filePersistence = builder.build();
// filePersistence.setSubstitutionOfJavaUtilCollection();
- filePersistence.storedMutableEnum(EnumOrderType.class);
+ filePersistence.storedMutableEnum(EnumOrderType4.class);
filePersistence.storedMutableEnum(EnumStrategy.class);
filePersistence.setRecordSaveActions(true);
@@ -152,7 +152,7 @@
.createDataAccessSession();
dataAccessSession.open();
- final Set<EnumStrategy> strategieSet1 = EnumOrderType.BOX
+ final Set<EnumStrategy> strategieSet1 = EnumOrderType4.BOX
.getStrategieSet();
if (logger.debugEnabled) {
logger.debug("strategieSet1 id "
@@ -164,7 +164,7 @@
logWrote();
dataAccessSession.open();
- final Set<EnumStrategy> strategieSet2 = EnumOrderType.BOX
+ final Set<EnumStrategy> strategieSet2 = EnumOrderType4.BOX
.getStrategieSet();
assertNotSame("must be created", strategieSet1, strategieSet2);
assertTrue("must be a proxy",
Modified: trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestStoredImmutableEnum.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestStoredImmutableEnum.java 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/service/rel400/TestStoredImmutableEnum.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -34,6 +34,12 @@
super(name);
}
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ EnumForTest.clear();
+ }
+
@SuppressWarnings("PMD")
public void test() throws FilePersistenceException,
FilePersistenceInvalidClassException,
Modified: trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestObjectReferenceLink.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestObjectReferenceLink.java 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestObjectReferenceLink.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -77,6 +77,12 @@
super(name);
}
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ EnumForTest.clear();
+ }
+
public void testUniqLink() throws StoreException, ObjectIOException,
ObjectIODataRecordNotFoundException, StoreInvalidClassException,
StoreNotSerializableException, StoreClassNotFoundException,
Modified: trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStore.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStore.java 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/service/AbstractTestStore.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -74,6 +74,7 @@
@Override
protected void setUp() throws Exception {// NOPMD
super.setUp();
+ EnumForTest.clear();
}
@Override
Modified: trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/TestDeepCopier.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/TestDeepCopier.java 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/TestDeepCopier.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -50,6 +50,12 @@
super(name);
}
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ EnumForTest.clear();
+ }
+
@SuppressWarnings("unchecked")
public void testDeepCopyWithHashMap() throws CopierException {
final HashMap<String, Bob1> source = new HashMap<String, Bob1>();
Modified: trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/TestProxyDeepCopier.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/TestProxyDeepCopier.java 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/service/copier/TestProxyDeepCopier.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -55,6 +55,12 @@
super(name);
}
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ EnumForTest.clear();
+ }
+
@SuppressWarnings("unchecked")
public void testCopyToProxy() throws CopierException {
final PTreeSet<String> set = new PTreeSet<String>();
Modified: trunk/joafip/src/test/java/net/sf/joafip/store/service/objectfortest/EnumForTest.java
===================================================================
--- trunk/joafip/src/test/java/net/sf/joafip/store/service/objectfortest/EnumForTest.java 2012-11-28 12:32:19 UTC (rev 3171)
+++ trunk/joafip/src/test/java/net/sf/joafip/store/service/objectfortest/EnumForTest.java 2012-11-29 08:23:44 UTC (rev 3172)
@@ -13,4 +13,9 @@
this.object = object;
}
+ public static void clear(){
+ for(EnumForTest enumForTest:values()){
+ enumForTest.setObject(null);
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
