db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bra...@apache.org
Subject svn commit: r355479 [1/2] - in /incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck: api/persistencecapable/ api/persistencemanager/cache/ api/persistencemanagerfactory/ lifecycle/ mapping/ query/api/ query/delete/ query/jdoql/ query/jdoql/keywords/...
Date Fri, 09 Dec 2005 13:04:57 GMT
Author: brazil
Date: Fri Dec  9 05:03:42 2005
New Revision: 355479

URL: http://svn.apache.org/viewcvs?rev=355479&view=rev
Log:
JDO-230: Fix order of makePersistent() and addTearDownClass() in localSetUp methods.

Modified:
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ChangeQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/Close.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/CloseAll.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/CompileQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/DeclareImports.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/DeclareParameters.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/GetFetchPlan.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewNamedQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/QueryExtentions.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetFilter.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetGrouping.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetOrdering.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetRange.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetResult.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetResultClass.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetUnique.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SingleStringQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/Cast.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/AggregateResult.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DefaultResult.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DefaultUnique.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/DistinctQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Grouping.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Having.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/NullResults.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ResultExpressions.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ShapeOfResult.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/Unique.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/VariableInResult.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/NewQuery.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java Fri Dec  9 05:03:42 2005
@@ -36,12 +36,12 @@
      * @return the object id of the persistent instance
      */
     protected Object makePersistent(Object pc) {
+        addTearDownClass(pc.getClass());
         PersistenceManager pm = getPM();
         pm.currentTransaction().begin();
         pm.makePersistent(pc);
         Object result = JDOHelper.getObjectId(pc);
         pm.currentTransaction().commit();
-        addTearDownInstance(pc);
         return result;
     }
     

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java Fri Dec  9 05:03:42 2005
@@ -68,8 +68,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        super.localSetUp();
         addTearDownClass(PCPoint2.class);
+        super.localSetUp();
     }
 
     /** */

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java Fri Dec  9 05:03:42 2005
@@ -64,8 +64,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        super.localSetUp();
         addTearDownClass(PCPoint2.class);
+        super.localSetUp();
     }
 
     /** */

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java Fri Dec  9 05:03:42 2005
@@ -64,8 +64,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        super.localSetUp();
         addTearDownClass(PCPoint2.class);
+        super.localSetUp();
     }
 
     /** */

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java Fri Dec  9 05:03:42 2005
@@ -93,13 +93,13 @@
     }
 
     protected void makePersistent() {
+        addTearDownClass(PCPoint.class);
         pm = pmf.getPersistenceManager();
         Transaction tx = pm.currentTransaction();
         tx.begin();
         PCPoint comp = new PCPoint(1, 2);
         pm.makePersistent(comp);
         tx.commit();
-        addTearDownInstance(comp);
     }
 
     /**

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java Fri Dec  9 05:03:42 2005
@@ -233,8 +233,8 @@
      */
     protected void localSetUp() {
         pm = getPM();
-        generatePersistentInstances();
         addTearDownClass(StateTransitionObj.class);
+        generatePersistentInstances();
     }
     
     public void test() {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java Fri Dec  9 05:03:42 2005
@@ -86,13 +86,13 @@
      */
     protected void localSetUp() {
         if (isTestToBePerformed()) {
+            addTearDownClass(CompanyModelReader.getTearDownClasses());
             getPM();
             CompanyFactoryRegistry.registerFactory(pm);
             CompanyModelReader reader = new CompanyModelReader(inputFilename);
             // persist test data
             pm.currentTransaction().begin();
             List rootList = reader.getRootList();
-            addTearDownClass(CompanyModelReader.getTearDownClasses());
             pm.makePersistentAll(rootList);
             rootOids = new ArrayList();
             for (Iterator i = rootList.iterator(); i.hasNext(); ) {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ChangeQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ChangeQuery.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ChangeQuery.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ChangeQuery.java Fri Dec  9 05:03:42 2005
@@ -98,7 +98,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/Close.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/Close.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/Close.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/Close.java Fri Dec  9 05:03:42 2005
@@ -128,8 +128,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/CloseAll.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/CloseAll.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/CloseAll.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/CloseAll.java Fri Dec  9 05:03:42 2005
@@ -98,8 +98,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/CompileQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/CompileQuery.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/CompileQuery.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/CompileQuery.java Fri Dec  9 05:03:42 2005
@@ -92,7 +92,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/DeclareImports.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/DeclareImports.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/DeclareImports.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/DeclareImports.java Fri Dec  9 05:03:42 2005
@@ -154,7 +154,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/DeclareParameters.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/DeclareParameters.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/DeclareParameters.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/DeclareParameters.java Fri Dec  9 05:03:42 2005
@@ -155,8 +155,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQuery.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQuery.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQuery.java Fri Dec  9 05:03:42 2005
@@ -160,8 +160,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java Fri Dec  9 05:03:42 2005
@@ -137,8 +137,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java Fri Dec  9 05:03:42 2005
@@ -139,8 +139,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/GetFetchPlan.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/GetFetchPlan.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/GetFetchPlan.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/GetFetchPlan.java Fri Dec  9 05:03:42 2005
@@ -158,7 +158,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistMylib(getPM());
         addTearDownClass(MylibReader.getTearDownClasses());
+        loadAndPersistMylib(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java Fri Dec  9 05:03:42 2005
@@ -117,9 +117,9 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
-        loadAndPersistMylib(getPM());
         addTearDownClass(MylibReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
+        loadAndPersistMylib(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewNamedQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewNamedQuery.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewNamedQuery.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewNamedQuery.java Fri Dec  9 05:03:42 2005
@@ -93,7 +93,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java Fri Dec  9 05:03:42 2005
@@ -156,8 +156,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java Fri Dec  9 05:03:42 2005
@@ -121,8 +121,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java Fri Dec  9 05:03:42 2005
@@ -90,7 +90,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java Fri Dec  9 05:03:42 2005
@@ -79,8 +79,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java Fri Dec  9 05:03:42 2005
@@ -78,8 +78,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java Fri Dec  9 05:03:42 2005
@@ -87,7 +87,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java Fri Dec  9 05:03:42 2005
@@ -87,8 +87,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java Fri Dec  9 05:03:42 2005
@@ -85,8 +85,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java Fri Dec  9 05:03:42 2005
@@ -81,7 +81,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java Fri Dec  9 05:03:42 2005
@@ -86,8 +86,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java Fri Dec  9 05:03:42 2005
@@ -104,7 +104,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/QueryExtentions.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/QueryExtentions.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/QueryExtentions.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/QueryExtentions.java Fri Dec  9 05:03:42 2005
@@ -80,7 +80,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java Fri Dec  9 05:03:42 2005
@@ -100,8 +100,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java Fri Dec  9 05:03:42 2005
@@ -99,7 +99,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetFilter.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetFilter.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetFilter.java Fri Dec  9 05:03:42 2005
@@ -92,8 +92,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetGrouping.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetGrouping.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetGrouping.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetGrouping.java Fri Dec  9 05:03:42 2005
@@ -75,7 +75,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetOrdering.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetOrdering.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetOrdering.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetOrdering.java Fri Dec  9 05:03:42 2005
@@ -132,7 +132,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetRange.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetRange.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetRange.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetRange.java Fri Dec  9 05:03:42 2005
@@ -74,7 +74,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetResult.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetResult.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetResult.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetResult.java Fri Dec  9 05:03:42 2005
@@ -88,7 +88,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetResultClass.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetResultClass.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetResultClass.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetResultClass.java Fri Dec  9 05:03:42 2005
@@ -81,7 +81,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetUnique.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetUnique.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetUnique.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetUnique.java Fri Dec  9 05:03:42 2005
@@ -82,7 +82,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java Fri Dec  9 05:03:42 2005
@@ -158,7 +158,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SingleStringQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SingleStringQuery.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SingleStringQuery.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/SingleStringQuery.java Fri Dec  9 05:03:42 2005
@@ -116,7 +116,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java Fri Dec  9 05:03:42 2005
@@ -185,7 +185,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java Fri Dec  9 05:03:42 2005
@@ -139,7 +139,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java Fri Dec  9 05:03:42 2005
@@ -244,7 +244,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/Cast.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/Cast.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/Cast.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/Cast.java Fri Dec  9 05:03:42 2005
@@ -108,7 +108,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java Fri Dec  9 05:03:42 2005
@@ -156,7 +156,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistMylib(getPM());
         addTearDownClass(MylibReader.getTearDownClasses());
+        loadAndPersistMylib(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java Fri Dec  9 05:03:42 2005
@@ -98,6 +98,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
         Employee employee = (Employee) getPersistentCompanyModelInstance("emp1");
         if (isNullCollectionSupported()) {
@@ -105,6 +106,5 @@
             employee.setProjects(null);
             getPM().currentTransaction().commit();
         }
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java Fri Dec  9 05:03:42 2005
@@ -114,7 +114,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java Fri Dec  9 05:03:42 2005
@@ -155,7 +155,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java Fri Dec  9 05:03:42 2005
@@ -181,7 +181,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java Fri Dec  9 05:03:42 2005
@@ -108,7 +108,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java Fri Dec  9 05:03:42 2005
@@ -66,9 +66,9 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         super.localSetUp();
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
     
     /** */

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java Fri Dec  9 05:03:42 2005
@@ -109,8 +109,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java Fri Dec  9 05:03:42 2005
@@ -190,7 +190,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java Fri Dec  9 05:03:42 2005
@@ -88,7 +88,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPrimitiveTypes(getPM());
         addTearDownClass(PrimitiveTypes.class);
+        loadAndPersistPrimitiveTypes(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java Fri Dec  9 05:03:42 2005
@@ -93,7 +93,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java Fri Dec  9 05:03:42 2005
@@ -125,7 +125,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java Fri Dec  9 05:03:42 2005
@@ -113,7 +113,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java Fri Dec  9 05:03:42 2005
@@ -151,7 +151,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java Fri Dec  9 05:03:42 2005
@@ -122,11 +122,11 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
         getPM().currentTransaction().begin();
         Employee emp1 = (Employee) getPersistentCompanyModelInstance("emp1");
         emp1.setProjects(null);
         getPM().currentTransaction().commit();
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java Fri Dec  9 05:03:42 2005
@@ -94,11 +94,11 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
         getPM().currentTransaction().begin();
         Employee emp1 = (Employee) getPersistentCompanyModelInstance("emp1");
         emp1.setProjects(null);
         getPM().currentTransaction().commit();
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java Fri Dec  9 05:03:42 2005
@@ -191,7 +191,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java Fri Dec  9 05:03:42 2005
@@ -378,8 +378,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java Fri Dec  9 05:03:42 2005
@@ -139,7 +139,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java Fri Dec  9 05:03:42 2005
@@ -185,8 +185,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java Fri Dec  9 05:03:42 2005
@@ -196,7 +196,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java Fri Dec  9 05:03:42 2005
@@ -99,7 +99,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java Fri Dec  9 05:03:42 2005
@@ -139,7 +139,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java Fri Dec  9 05:03:42 2005
@@ -121,7 +121,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java Fri Dec  9 05:03:42 2005
@@ -141,7 +141,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java Fri Dec  9 05:03:42 2005
@@ -105,7 +105,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java Fri Dec  9 05:03:42 2005
@@ -77,7 +77,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPrimitiveTypes(getPM());
         addTearDownClass(PrimitiveTypes.class);
+        loadAndPersistPrimitiveTypes(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java Fri Dec  9 05:03:42 2005
@@ -136,8 +136,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPCPoints(getPM());
         addTearDownClass(PCPoint.class);
+        loadAndPersistPCPoints(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java Fri Dec  9 05:03:42 2005
@@ -114,7 +114,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java Fri Dec  9 05:03:42 2005
@@ -198,8 +198,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
     
     /** */

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java Fri Dec  9 05:03:42 2005
@@ -124,8 +124,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 
     /** */

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java Fri Dec  9 05:03:42 2005
@@ -206,7 +206,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java Fri Dec  9 05:03:42 2005
@@ -314,8 +314,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistMylib(getPM());
         addTearDownClass(MylibReader.getTearDownClasses());
+        loadAndPersistMylib(getPM());
     }
 
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java Fri Dec  9 05:03:42 2005
@@ -304,8 +304,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistCompanyModel(getPM());
         addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
     }
 
     /** */

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java Fri Dec  9 05:03:42 2005
@@ -113,8 +113,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPrimitiveTypes(getPM());
         addTearDownClass(PrimitiveTypes.class);
+        loadAndPersistPrimitiveTypes(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java Fri Dec  9 05:03:42 2005
@@ -119,7 +119,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPrimitiveTypes(getPM());
         addTearDownClass(PrimitiveTypes.class);
+        loadAndPersistPrimitiveTypes(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java Fri Dec  9 05:03:42 2005
@@ -100,7 +100,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPrimitiveTypes(getPM());
         addTearDownClass(PrimitiveTypes.class);
+        loadAndPersistPrimitiveTypes(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java Fri Dec  9 05:03:42 2005
@@ -153,7 +153,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPrimitiveTypes(getPM());
         addTearDownClass(PrimitiveTypes.class);
+        loadAndPersistPrimitiveTypes(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java Fri Dec  9 05:03:42 2005
@@ -155,8 +155,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPrimitiveTypes(getPM());
         addTearDownClass(PrimitiveTypes.class);
+        loadAndPersistPrimitiveTypes(getPM());
     }
 }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java Fri Dec  9 05:03:42 2005
@@ -128,7 +128,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPrimitiveTypes(getPM());
         addTearDownClass(PrimitiveTypes.class);
+        loadAndPersistPrimitiveTypes(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java Fri Dec  9 05:03:42 2005
@@ -129,7 +129,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPrimitiveTypes(getPM());
         addTearDownClass(PrimitiveTypes.class);
+        loadAndPersistPrimitiveTypes(getPM());
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java?rev=355479&r1=355478&r2=355479&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java Fri Dec  9 05:03:42 2005
@@ -120,7 +120,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
-        loadAndPersistPrimitiveTypes(getPM());
         addTearDownClass(PrimitiveTypes.class);
+        loadAndPersistPrimitiveTypes(getPM());
     }
 }



Mime
View raw message