db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r368757 - in /db/jdo/trunk/tck20/test: conf/ java/org/apache/jdo/tck/util/
Date Fri, 13 Jan 2006 15:29:05 GMT
Author: mbo
Date: Fri Jan 13 07:28:52 2006
New Revision: 368757

URL: http://svn.apache.org/viewcvs?rev=368757&view=rev
Log:
JDO-275: Split out alltests.conf into several, smaller configurations
This replaces the alltests.conf by 11 new configuration files: 
instancecallback.conf, jdohelper.conf, pm.conf, pmf.conf, enhancement.conf, 
extents.conf, lifecycle.conf, models.conf, query.conf, jdoql.conf, transactions.conf
It also adds the total number of test runs, errors and failures to the test output. 

Added:
    db/jdo/trunk/tck20/test/conf/enhancement.conf
    db/jdo/trunk/tck20/test/conf/extents.conf
    db/jdo/trunk/tck20/test/conf/instancecallbacks.conf
    db/jdo/trunk/tck20/test/conf/jdohelper.conf
    db/jdo/trunk/tck20/test/conf/jdoql.conf
    db/jdo/trunk/tck20/test/conf/lifecycle.conf
    db/jdo/trunk/tck20/test/conf/models.conf
    db/jdo/trunk/tck20/test/conf/pm.conf
    db/jdo/trunk/tck20/test/conf/pmf.conf
    db/jdo/trunk/tck20/test/conf/query.conf
    db/jdo/trunk/tck20/test/conf/transactions.conf
Removed:
    db/jdo/trunk/tck20/test/conf/alltests.conf
Modified:
    db/jdo/trunk/tck20/test/conf/configurations.list
    db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/ResultSummary.java

Modified: db/jdo/trunk/tck20/test/conf/configurations.list
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/configurations.list?rev=368757&r1=368756&r2=368757&view=diff
==============================================================================
--- db/jdo/trunk/tck20/test/conf/configurations.list (original)
+++ db/jdo/trunk/tck20/test/conf/configurations.list Fri Jan 13 07:28:52 2006
@@ -1,5 +1,15 @@
 jdo.tck.cfglist = \
-                 alltests.conf \
+                 instancecallbacks.conf \
+                 jdohelper.conf \
+                 pm.conf \
+                 pmf.conf \
+                 enhancement.conf \
+                 extents.conf \
+                 lifecycle.conf \
+                 models.conf \
+                 query.conf \
+                 jdoql.conf \
+                 transactions.conf \
                  companyNoRelationships.conf \
                  companyEmbedded.conf \
                  company1-1Relationships.conf \

Added: db/jdo/trunk/tck20/test/conf/enhancement.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/enhancement.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/enhancement.conf (added)
+++ db/jdo/trunk/tck20/test/conf/enhancement.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,11 @@
+jdo.tck.description = All enhancement, persistencecapable tests with standard mapping, no
testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.enhancement.FieldAccessModified \
+org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable \
+org.apache.jdo.tck.api.persistencecapable.CopyKeyFieldsFromObjectId \
+org.apache.jdo.tck.api.persistencecapable.NewObjectIdInstance
+

Added: db/jdo/trunk/tck20/test/conf/extents.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/extents.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/extents.conf (added)
+++ db/jdo/trunk/tck20/test/conf/extents.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,19 @@
+jdo.tck.description = All extent tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.extents.CloseAll \
+org.apache.jdo.tck.extents.CloseOfExtentIteratorIsIteratorSpecific \
+org.apache.jdo.tck.extents.GetCandidateClass \
+org.apache.jdo.tck.extents.GetPersistenceManager \
+org.apache.jdo.tck.extents.HasSubclassesFalse \
+org.apache.jdo.tck.extents.HasSubclassesTrue \
+org.apache.jdo.tck.extents.InstancesDeletedPriorToIterationNotReturned \
+org.apache.jdo.tck.extents.InstancesPersistedPriorToIterationReturned \
+org.apache.jdo.tck.extents.IteratorHasNextFalseAfterExtentClose \
+org.apache.jdo.tck.extents.IteratorMutatingMethods \
+org.apache.jdo.tck.extents.IteratorNextAfterExtentClose \
+org.apache.jdo.tck.extents.IteratorNextAfterExtentCloseAll \
+org.apache.jdo.tck.extents.Iterators

Added: db/jdo/trunk/tck20/test/conf/instancecallbacks.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/instancecallbacks.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/instancecallbacks.conf (added)
+++ db/jdo/trunk/tck20/test/conf/instancecallbacks.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,22 @@
+jdo.tck.description = All instancecallback tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.api.instancecallbacks.AccessOtherInstancesInPrestore \
+org.apache.jdo.tck.api.instancecallbacks.AccessingFieldsInPredelete \
+org.apache.jdo.tck.api.instancecallbacks.CallingJdoPostload \
+org.apache.jdo.tck.api.instancecallbacks.CallingJdoPreclear \
+org.apache.jdo.tck.api.instancecallbacks.CallingJdoPredelete \
+org.apache.jdo.tck.api.instancecallbacks.CallingJdoPrestore \
+org.apache.jdo.tck.api.instancecallbacks.InstanceLifecycleListenerAttach \
+org.apache.jdo.tck.api.instancecallbacks.InstanceLifecycleListenerClear \
+org.apache.jdo.tck.api.instancecallbacks.InstanceLifecycleListenerCreate \
+org.apache.jdo.tck.api.instancecallbacks.InstanceLifecycleListenerDelete \
+org.apache.jdo.tck.api.instancecallbacks.InstanceLifecycleListenerDetach \
+org.apache.jdo.tck.api.instancecallbacks.InstanceLifecycleListenerDirty \
+org.apache.jdo.tck.api.instancecallbacks.InstanceLifecycleListenerLoad \
+org.apache.jdo.tck.api.instancecallbacks.InstanceLifecycleListenerStore \
+org.apache.jdo.tck.api.instancecallbacks.ModificationOfNontransactionalNonpersistentFields
\
+org.apache.jdo.tck.api.instancecallbacks.NoAccessToFieldsAfterPredelete

Added: db/jdo/trunk/tck20/test/conf/jdohelper.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/jdohelper.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/jdohelper.conf (added)
+++ db/jdo/trunk/tck20/test/conf/jdohelper.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,48 @@
+jdo.tck.description = All jdohelper tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.api.jdohelper.GetObjectId \
+org.apache.jdo.tck.api.jdohelper.GetObjectIdForNull \
+org.apache.jdo.tck.api.jdohelper.GetObjectIdForTransient \
+org.apache.jdo.tck.api.jdohelper.GetObjectIdNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.GetObjectIds \
+org.apache.jdo.tck.api.jdohelper.GetPersistenceManager \
+org.apache.jdo.tck.api.jdohelper.GetPersistenceManagerForNull \
+org.apache.jdo.tck.api.jdohelper.GetPersistenceManagerForTransient \
+org.apache.jdo.tck.api.jdohelper.GetPersistenceManagerNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.GetTransactionalObjectId \
+org.apache.jdo.tck.api.jdohelper.GetTransactionalObjectIdForNull \
+org.apache.jdo.tck.api.jdohelper.GetTransactionalObjectIdForTransient \
+org.apache.jdo.tck.api.jdohelper.GetTransactionalObjectIdNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.IsDeleted \
+org.apache.jdo.tck.api.jdohelper.IsDeletedFalse \
+org.apache.jdo.tck.api.jdohelper.IsDeletedForNull \
+org.apache.jdo.tck.api.jdohelper.IsDeletedForTransient \
+org.apache.jdo.tck.api.jdohelper.IsDeletedNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.IsDirty \
+org.apache.jdo.tck.api.jdohelper.IsDirtyFalse \
+org.apache.jdo.tck.api.jdohelper.IsDirtyForNull \
+org.apache.jdo.tck.api.jdohelper.IsDirtyForTransient \
+org.apache.jdo.tck.api.jdohelper.IsDirtyNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.IsNew \
+org.apache.jdo.tck.api.jdohelper.IsNewFalse \
+org.apache.jdo.tck.api.jdohelper.IsNewForNull \
+org.apache.jdo.tck.api.jdohelper.IsNewForTransient \
+org.apache.jdo.tck.api.jdohelper.IsNewNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.IsPersistent \
+org.apache.jdo.tck.api.jdohelper.IsPersistentFalse \
+org.apache.jdo.tck.api.jdohelper.IsPersistentForNull \
+org.apache.jdo.tck.api.jdohelper.IsPersistentForTransient \
+org.apache.jdo.tck.api.jdohelper.IsPersistentNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.IsTransactional \
+org.apache.jdo.tck.api.jdohelper.IsTransactionalFalse \
+org.apache.jdo.tck.api.jdohelper.IsTransactionalForNull \
+org.apache.jdo.tck.api.jdohelper.IsTransactionalForTransient \
+org.apache.jdo.tck.api.jdohelper.IsTransactionalNotPersistenceCapable \
+org.apache.jdo.tck.api.jdohelper.MakeDirty \
+org.apache.jdo.tck.api.jdohelper.MakeDirtyForNull \
+org.apache.jdo.tck.api.jdohelper.MakeDirtyForTransient \
+org.apache.jdo.tck.api.jdohelper.MakeDirtyNotPersistenceCapable

Added: db/jdo/trunk/tck20/test/conf/jdoql.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/jdoql.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/jdoql.conf (added)
+++ db/jdo/trunk/tck20/test/conf/jdoql.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,87 @@
+jdo.tck.description = All jdoql tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.query.jdoql.AssignmentPrePostIncrementDecrementNotSupported \
+org.apache.jdo.tck.query.jdoql.Cast \
+org.apache.jdo.tck.query.jdoql.CharacterAndStringLiterals \
+org.apache.jdo.tck.query.jdoql.ComparingCollectionFieldToNull \
+org.apache.jdo.tck.query.jdoql.ComparingPersistentAndNonPersistentInstance \
+org.apache.jdo.tck.query.jdoql.DenoteUniquenessInFilter \
+org.apache.jdo.tck.query.jdoql.ExecuteQueryWhenPersistenceManagerIsClosed \
+org.apache.jdo.tck.query.jdoql.ExecutingMultipleQueriesSimultaneouslyIsThreadSafe \
+org.apache.jdo.tck.query.jdoql.ExecutingQueryWhenNoTransactionNoNontransactionalRead \
+org.apache.jdo.tck.query.jdoql.Having \
+org.apache.jdo.tck.query.jdoql.IdentifiersEqualFieldNames \
+org.apache.jdo.tck.query.jdoql.IgnoreCacheFalse \
+org.apache.jdo.tck.query.jdoql.MultipleActiveQueryInstanceInSamePersistenceManager \
+org.apache.jdo.tck.query.jdoql.MultipleIdenticalImports \
+org.apache.jdo.tck.query.jdoql.NamespaceOfIdentifiers \
+org.apache.jdo.tck.query.jdoql.NavigationThroughACollectionField \
+org.apache.jdo.tck.query.jdoql.NavigationThroughANullValuedField \
+org.apache.jdo.tck.query.jdoql.NavigationThroughReferencesUsesDotOperator \
+org.apache.jdo.tck.query.jdoql.NegativeRange \
+org.apache.jdo.tck.query.jdoql.NullCollectionsAndContainsMethod \
+org.apache.jdo.tck.query.jdoql.NullCollectionsAndIsEmpty \
+org.apache.jdo.tck.query.jdoql.OrderingSpecification \
+org.apache.jdo.tck.query.jdoql.ParenthesesMarkOperatorPrecedence \
+org.apache.jdo.tck.query.jdoql.PositiveRange \
+org.apache.jdo.tck.query.jdoql.QueryIsSerializable \
+org.apache.jdo.tck.query.jdoql.QueryResultPassedToAnotherQuery \
+org.apache.jdo.tck.query.jdoql.QueryWithNoFilter \
+org.apache.jdo.tck.query.jdoql.RangeAsString \
+org.apache.jdo.tck.query.jdoql.RestoredSerializedQueryInstanceLosesAssociationWithPM \
+org.apache.jdo.tck.query.jdoql.SeparateNamespaceForTypeNames \
+org.apache.jdo.tck.query.jdoql.WhiteSpaceIsACharacterAndIgnored \
+org.apache.jdo.tck.query.jdoql.keywords.InvalidUseOfKeywords \
+org.apache.jdo.tck.query.jdoql.keywords.KeywordsAsFieldNames \
+org.apache.jdo.tck.query.jdoql.keywords.SingleString \
+org.apache.jdo.tck.query.jdoql.keywords.ThisIsReservedWordForElementOfCollection \
+org.apache.jdo.tck.query.jdoql.keywords.UppercaseLowercase \
+org.apache.jdo.tck.query.jdoql.keywords.UseOfThisToAcessHiddenField \
+org.apache.jdo.tck.query.jdoql.methods.MethodsAndObjectConstructionNotSupported \
+org.apache.jdo.tck.query.jdoql.methods.StartsWithAndEndsWith \
+org.apache.jdo.tck.query.jdoql.methods.SupportedCollectionMethods \
+org.apache.jdo.tck.query.jdoql.methods.SupportedJDOHelperMethods \
+org.apache.jdo.tck.query.jdoql.methods.SupportedMapMethods \
+org.apache.jdo.tck.query.jdoql.methods.SupportedMathMethods \
+org.apache.jdo.tck.query.jdoql.methods.SupportedStringMethods \
+org.apache.jdo.tck.query.jdoql.operators.BinaryAddition \
+org.apache.jdo.tck.query.jdoql.operators.BinarySubtraction \
+org.apache.jdo.tck.query.jdoql.operators.BitwiseComplement \
+org.apache.jdo.tck.query.jdoql.operators.BooleanLogicalAND \
+org.apache.jdo.tck.query.jdoql.operators.BooleanLogicalOR \
+org.apache.jdo.tck.query.jdoql.operators.ConditionalAND \
+org.apache.jdo.tck.query.jdoql.operators.ConditionalOR \
+org.apache.jdo.tck.query.jdoql.operators.Division \
+org.apache.jdo.tck.query.jdoql.operators.Equality \
+org.apache.jdo.tck.query.jdoql.operators.EqualityAndComparisonsBetweenDateFieldsAndParameters
\
+org.apache.jdo.tck.query.jdoql.operators.EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances
\
+org.apache.jdo.tck.query.jdoql.operators.EqualityAndComparisonsBetweenStringFieldsAndParameters
\
+org.apache.jdo.tck.query.jdoql.operators.GreaterThan \
+org.apache.jdo.tck.query.jdoql.operators.GreaterThanOrEqual \
+org.apache.jdo.tck.query.jdoql.operators.Instanceof \
+org.apache.jdo.tck.query.jdoql.operators.LessThan \
+org.apache.jdo.tck.query.jdoql.operators.LessThanOrEqual \
+org.apache.jdo.tck.query.jdoql.operators.LogicalComplement \
+org.apache.jdo.tck.query.jdoql.operators.Multiplication \
+org.apache.jdo.tck.query.jdoql.operators.Modulo \
+org.apache.jdo.tck.query.jdoql.operators.NotEquals \
+org.apache.jdo.tck.query.jdoql.operators.PromotionOfNumericOperands \
+org.apache.jdo.tck.query.jdoql.operators.SignInversion \
+org.apache.jdo.tck.query.jdoql.operators.StringConcatenation \
+org.apache.jdo.tck.query.jdoql.operators.UnaryPlus \
+org.apache.jdo.tck.query.jdoql.parameters.BoundParameterCheck \
+org.apache.jdo.tck.query.jdoql.parameters.ImplicitParameters \
+org.apache.jdo.tck.query.jdoql.parameters.MixedParameters \
+org.apache.jdo.tck.query.jdoql.parameters.OrderOfParameters \
+org.apache.jdo.tck.query.jdoql.parameters.ParameterBoundToDifferentPM \
+org.apache.jdo.tck.query.jdoql.parameters.ParameterDeclaredWithSameNameAsFieldOfCandidateClass
\
+org.apache.jdo.tck.query.jdoql.parameters.PrimitiveParameterPassedAsNull \
+org.apache.jdo.tck.query.jdoql.variables.MixedVariables \
+org.apache.jdo.tck.query.jdoql.variables.UnconstrainedVariable \
+org.apache.jdo.tck.query.jdoql.variables.VariablesAndFields \
+org.apache.jdo.tck.query.jdoql.variables.VariablesWithoutExtent \
+org.apache.jdo.tck.query.jdoql.variables.VariableDeclaredWithSameNameAsFieldOfCandidateClass

Added: db/jdo/trunk/tck20/test/conf/lifecycle.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/lifecycle.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/lifecycle.conf (added)
+++ db/jdo/trunk/tck20/test/conf/lifecycle.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,15 @@
+jdo.tck.description = All lifecycle tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.lifecycle.HollowInstanceMaintainsPK \
+org.apache.jdo.tck.lifecycle.MultiplePMsReturnInstancesRepresentingSamePC \
+org.apache.jdo.tck.lifecycle.ObjectIdNotModifiedWhenObjectIdInstanceModified \
+org.apache.jdo.tck.lifecycle.PMReturnsIdenticalInstancesForEqualObjIds \
+org.apache.jdo.tck.lifecycle.PMsCanSharePCClassesButNotPCInstances \
+org.apache.jdo.tck.lifecycle.StateTransitions \
+org.apache.jdo.tck.lifecycle.TransientTransactionalStateCommit \
+org.apache.jdo.tck.lifecycle.TransientTransactionalStateRollback \
+org.apache.jdo.tck.lifecycle.nontransactional.ModificationOfNontransactionalInstanceOutsideTransaction

Added: db/jdo/trunk/tck20/test/conf/models.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/models.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/models.conf (added)
+++ db/jdo/trunk/tck20/test/conf/models.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,54 @@
+jdo.tck.description = All model tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.models.embedded.SecondClassObjectsTrackTheirChanges  \
+org.apache.jdo.tck.models.fieldtypes.TestArrayCollections \
+org.apache.jdo.tck.models.fieldtypes.TestArrayListCollections \
+org.apache.jdo.tck.models.fieldtypes.TestCollectionCollections \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfBigDecimal \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfBigInteger \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfBoolean \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfByte \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfCharacter \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfDate \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfDouble \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfFloat \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfInteger \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfLocale \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfLong \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfObject \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitiveboolean \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitivebyte \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitivechar \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitivedouble \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitivefloat \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitiveint \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitivelong \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfPrimitiveshort \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfShort \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfSimpleClass \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfSimpleInterface \
+org.apache.jdo.tck.models.fieldtypes.TestFieldsOfString \
+org.apache.jdo.tck.models.fieldtypes.TestHashMapStringKeyCollections \
+org.apache.jdo.tck.models.fieldtypes.TestHashMapStringValueCollections \
+org.apache.jdo.tck.models.fieldtypes.TestHashSetCollections \
+org.apache.jdo.tck.models.fieldtypes.TestHashtableStringKeyCollections \
+org.apache.jdo.tck.models.fieldtypes.TestHashtableStringValueCollections \
+org.apache.jdo.tck.models.fieldtypes.TestLinkedListCollections \
+org.apache.jdo.tck.models.fieldtypes.TestListCollections \
+org.apache.jdo.tck.models.fieldtypes.TestMapStringKeyCollections \
+org.apache.jdo.tck.models.fieldtypes.TestMapStringValueCollections \
+org.apache.jdo.tck.models.fieldtypes.TestSetCollections \
+org.apache.jdo.tck.models.fieldtypes.TestTreeMapStringKeyCollections \
+org.apache.jdo.tck.models.fieldtypes.TestTreeMapStringValueCollections \
+org.apache.jdo.tck.models.fieldtypes.TestTreeSetCollections \
+org.apache.jdo.tck.models.fieldtypes.TestVectorCollections \
+org.apache.jdo.tck.models.inheritance.FieldWithSameNameInSuperclass \
+org.apache.jdo.tck.models.inheritance.NonPersistentFieldsAreNonPersistentInSubclasses \
+org.apache.jdo.tck.models.inheritance.NonpersistentSuperClass \
+org.apache.jdo.tck.models.inheritance.PersistenceCapableFlexibilityInInheritanceHierarchy
\
+org.apache.jdo.tck.models.inheritance.PersistentFieldsArePersistentInSubClasses \
+org.apache.jdo.tck.models.inheritance.TransactionalFieldsAreTransactionalInSubclasses

Added: db/jdo/trunk/tck20/test/conf/pm.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/pm.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/pm.conf (added)
+++ db/jdo/trunk/tck20/test/conf/pm.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,96 @@
+jdo.tck.description = All pm tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.api.persistencemanager.ChangingObjectIdHasNoEffectOnInstance \
+org.apache.jdo.tck.api.persistencemanager.ConcurrentPersistenceManagers \
+org.apache.jdo.tck.api.persistencemanager.ConcurrentPersistenceManagersSameClasses \
+org.apache.jdo.tck.api.persistencemanager.CurrentTransaction \
+org.apache.jdo.tck.api.persistencemanager.DeletePersistent \
+org.apache.jdo.tck.api.persistencemanager.DeletePersistentAllFails \
+org.apache.jdo.tck.api.persistencemanager.DeletePersistentFailsIfInstanceIsTransient \
+org.apache.jdo.tck.api.persistencemanager.DeletePersistentFailsIfInstanceManagedByAnotherPersistenceManager
\
+org.apache.jdo.tck.api.persistencemanager.DeletePersistentHasNoEffectOnDeletedInstances \
+org.apache.jdo.tck.api.persistencemanager.GetPersistenceManagerFactory \
+org.apache.jdo.tck.api.persistencemanager.GetSetUserObject \
+org.apache.jdo.tck.api.persistencemanager.GetTransactionalObjectIdWhenObjectIdBeingChanged
\
+org.apache.jdo.tck.api.persistencemanager.GetTransactionalObjectIdWithNoTransaction \
+org.apache.jdo.tck.api.persistencemanager.NoPersistenceManagerIfTransient \
+org.apache.jdo.tck.api.persistencemanager.ObjectIdUniqueAmongInstances \
+org.apache.jdo.tck.api.persistencemanager.OneInstanceOfObjectPerPersistenceManager \
+org.apache.jdo.tck.api.persistencemanager.OnePersistenceManagerIfPersistentOrTransactional
\
+org.apache.jdo.tck.api.persistencemanager.OptimisticFailure \
+org.apache.jdo.tck.api.persistencemanager.SameTransactionInstanceForAllCallsToCurrentTransaction
\
+org.apache.jdo.tck.api.persistencemanager.ThreadSafe \
+org.apache.jdo.tck.api.persistencemanager.TransientTransactionalInstanceRetainsValuesAtCommit
\
+org.apache.jdo.tck.api.persistencemanager.cache.CallingEvictAllWithCollectionContainingNulls
\
+org.apache.jdo.tck.api.persistencemanager.cache.CallingRefreshAllWithCollectionContainingNulls
\
+org.apache.jdo.tck.api.persistencemanager.cache.EvictAllWithNoParameters \
+org.apache.jdo.tck.api.persistencemanager.cache.EvictingCollectionOfInstancesSideEffects
\
+org.apache.jdo.tck.api.persistencemanager.cache.EvictingWithRestoreValuesFalse \
+org.apache.jdo.tck.api.persistencemanager.cache.EvictingWithRetainValuesFalse \
+org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToEvictAllThrowsException \
+org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToEvictHasNoEffect \
+org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToRefreshAllThrowsException \
+org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToRefreshHasNoEffect \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllNoParameterSideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllWithArraySideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllWithCollectionSideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllWithNoParameters \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshSideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.Retrieve \
+org.apache.jdo.tck.api.persistencemanager.close.AfterCloseAllMethodsThrowException \
+org.apache.jdo.tck.api.persistencemanager.close.CloseThrowsExceptionWhenActiveTx \
+org.apache.jdo.tck.api.persistencemanager.close.IsClosedIsFalseUponConstruction \
+org.apache.jdo.tck.api.persistencemanager.close.IsClosedIsFalseUponRetrievalFromPool \
+org.apache.jdo.tck.api.persistencemanager.close.IsClosedIsTrueAfterClose \
+org.apache.jdo.tck.api.persistencemanager.extent.GetExtentWithInstancesMadePersistentViaReachability
\
+org.apache.jdo.tck.api.persistencemanager.extent.GetExtentWithNoSubclasses \
+org.apache.jdo.tck.api.persistencemanager.extent.GetExtentWithSubclasses \
+org.apache.jdo.tck.api.persistencemanager.flags.GetIgnoreCache \
+org.apache.jdo.tck.api.persistencemanager.flags.SetIgnoreCacheToFalse \
+org.apache.jdo.tck.api.persistencemanager.flags.SetIgnoreCacheToTrue \
+org.apache.jdo.tck.api.persistencemanager.flags.SetMultithreadedFalse \
+org.apache.jdo.tck.api.persistencemanager.flags.SetMultithreadedTrue \
+org.apache.jdo.tck.api.persistencemanager.flags.SettingFlagsWithTransactionInstance \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectById \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNoValidationInstanceInCache
\
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNoValidationInstanceInCacheNoStateChange
\
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNoValidationInstanceNotInCache
\
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNoValidationInstanceNotInCacheNoTx
\
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNoValidationInstanceNotInDatastore
\
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdNotResolved \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdWithValidationInstanceInCache
\
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdWithValidationInstanceInCacheNotInDatastore
\
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore
\
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectId \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectIdClass \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectIdClassForAbstractOrNonPersistenceCapableClass
\
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectIdForNullOrNotPersistent \
+org.apache.jdo.tck.api.persistencemanager.getobject.GetObjectIdWithApplicationModifyingIdentity
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeNontransactionalAllFails \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeNontransactionalDirtyInstance \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeNontransactionalIsImmediate \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeNontransactionalPersistentCleanInstance
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeNontransactionalTransientCleanInstance
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistent \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistentAllFails \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistentAndInstancesNotReachable
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistentAssignsObjectId \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistentFailsIfInstanceManagedByAnotherPersistenceManager
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakePersistentHasNoEffectOnPersistentInstances
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactional \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactionalANontransactionalPersistentInstance
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactionalAllFails \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactionalIsImmediate \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactionalPriorToTransactionRolledback
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransactionalWithinTransactionRolledback
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransient \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientAllFails \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientCausesLossOfIdentity \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientFailsWithDirtyInstance \
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientFieldsPreservedUnchanged
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientHasNoEffectOnTransientInstances
\
+org.apache.jdo.tck.api.persistencemanager.lifecycle.MakeTransientNotSubjectToRollback

Added: db/jdo/trunk/tck20/test/conf/pmf.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/pmf.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/pmf.conf (added)
+++ db/jdo/trunk/tck20/test/conf/pmf.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,34 @@
+jdo.tck.description = All pmf tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.api.persistencemanagerfactory.AfterCloseGetPMThrowsException \
+org.apache.jdo.tck.api.persistencemanagerfactory.AfterCloseSetMethodsThrowException \
+org.apache.jdo.tck.api.persistencemanagerfactory.AfterGetPersistenceManagerNoSetMethodsSucceed
\
+org.apache.jdo.tck.api.persistencemanagerfactory.Close \
+org.apache.jdo.tck.api.persistencemanagerfactory.CloseFailsIfTransactionActive \
+org.apache.jdo.tck.api.persistencemanagerfactory.CloseWithoutPermissionThrowsSecurityException
\
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByFile \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByFileAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResource \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResourceAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStream \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStreamAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocation \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocationAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManager \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManagerFactoryByPropertiesInstance
\
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManagerForUser \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetProperties \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetConnectionPassword \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetConnectionURL \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetConnectionUserName \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetIgnoreCache \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetMultithreaded \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetNonTransactionalRead \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetNonTransactionalWrite \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetOptimistic \
+org.apache.jdo.tck.api.persistencemanagerfactory.SetRetainValues \
+org.apache.jdo.tck.api.persistencemanagerfactory.SupportedOptions

Added: db/jdo/trunk/tck20/test/conf/query.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/query.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/query.conf (added)
+++ db/jdo/trunk/tck20/test/conf/query.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,70 @@
+jdo.tck.description = All query tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.query.api.ChangeQuery \
+org.apache.jdo.tck.query.api.Close \
+org.apache.jdo.tck.query.api.CloseAll \
+org.apache.jdo.tck.query.api.CompileQuery \
+org.apache.jdo.tck.query.api.DeclareImports \
+org.apache.jdo.tck.query.api.DeclareParameters \
+org.apache.jdo.tck.query.api.DeclareVariables \
+org.apache.jdo.tck.query.api.ExecuteQuery \
+org.apache.jdo.tck.query.api.ExecuteQueryWithArray \
+org.apache.jdo.tck.query.api.ExecuteQueryWithMap \
+org.apache.jdo.tck.query.api.GetFetchPlan \
+org.apache.jdo.tck.query.api.GetIgnoreCache \
+org.apache.jdo.tck.query.api.GetPersistenceManager \
+org.apache.jdo.tck.query.api.GetPersistenceManagerFromRestoredSerializedQuery \
+org.apache.jdo.tck.query.api.InvalidNamedQuery \
+org.apache.jdo.tck.query.api.MetadataSearchOrder \
+org.apache.jdo.tck.query.api.NamedQueryNotFound \
+org.apache.jdo.tck.query.api.NewNamedQuery \
+org.apache.jdo.tck.query.api.NewQueryFromExistingQueryBoundToPMFromSameVendor \
+org.apache.jdo.tck.query.api.NewQueryFromRestoredSerializedQuery \
+org.apache.jdo.tck.query.api.NewQueryWithCandidateClass \
+org.apache.jdo.tck.query.api.NewQueryWithCandidateClassAndCollection \
+org.apache.jdo.tck.query.api.NewQueryWithCandidateClassAndExtent \
+org.apache.jdo.tck.query.api.NewQueryWithCandidateClassAndFilter \
+org.apache.jdo.tck.query.api.NewQueryWithCandidateClassCollectionFilter \
+org.apache.jdo.tck.query.api.NewQueryWithExtent \
+org.apache.jdo.tck.query.api.NewQueryWithExtentAndFilter \
+org.apache.jdo.tck.query.api.NewQueryWithSpecifiedLanguageAndQuery \
+org.apache.jdo.tck.query.api.NewQuerySingleString \
+org.apache.jdo.tck.query.api.QueryExtentions \
+org.apache.jdo.tck.query.api.SetCandidateCollection \
+org.apache.jdo.tck.query.api.SetCandidateExtent \
+org.apache.jdo.tck.query.api.SetFilter \
+org.apache.jdo.tck.query.api.SetGrouping \
+org.apache.jdo.tck.query.api.SetIgnoreCache \
+org.apache.jdo.tck.query.api.SetOrdering \
+org.apache.jdo.tck.query.api.SetRange \
+org.apache.jdo.tck.query.api.SetResult \
+org.apache.jdo.tck.query.api.SetResultClass \
+org.apache.jdo.tck.query.api.SetUnique \
+org.apache.jdo.tck.query.api.SetterReplacePreviousValues \
+org.apache.jdo.tck.query.api.SingleStringQuery \
+org.apache.jdo.tck.query.api.UnmodifiableQuery \
+org.apache.jdo.tck.query.delete.DeleteCallback \
+org.apache.jdo.tck.query.delete.DeletePersistentAll \
+org.apache.jdo.tck.query.delete.DeleteQueryElements \
+org.apache.jdo.tck.query.result.AggregateResult \
+org.apache.jdo.tck.query.result.DefaultResult \
+org.apache.jdo.tck.query.result.DefaultUnique \
+org.apache.jdo.tck.query.result.DistinctCandidateInstances \
+org.apache.jdo.tck.query.result.DistinctQuery \
+org.apache.jdo.tck.query.result.Grouping \
+org.apache.jdo.tck.query.result.ImmutableQueryResult \
+org.apache.jdo.tck.query.result.NPEInResultExpr \
+org.apache.jdo.tck.query.result.NullResults \
+org.apache.jdo.tck.query.result.ResultClassRequirements \
+org.apache.jdo.tck.query.result.ResultExpressions \
+org.apache.jdo.tck.query.result.ShapeOfResult \
+org.apache.jdo.tck.query.result.Unique \
+org.apache.jdo.tck.query.result.VariableInResult \
+org.apache.jdo.tck.query.sql.ShapeOfResult \
+org.apache.jdo.tck.query.sql.NoCandidateClass \
+org.apache.jdo.tck.query.sql.AllowedAPIMethods \
+org.apache.jdo.tck.query.sql.NewQuery

Added: db/jdo/trunk/tck20/test/conf/transactions.conf
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/transactions.conf?rev=368757&view=auto
==============================================================================
--- db/jdo/trunk/tck20/test/conf/transactions.conf (added)
+++ db/jdo/trunk/tck20/test/conf/transactions.conf Fri Jan 13 07:28:52 2006
@@ -0,0 +1,33 @@
+jdo.tck.description = All transaction tests with standard mapping, no testdata. 
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.transactions.AfterCompletionMethodCalledWhenCommitted \
+org.apache.jdo.tck.transactions.AfterCompletionMethodCalledWhenRolledback \
+org.apache.jdo.tck.transactions.AfterSetRollbackOnlyCommitFails \
+org.apache.jdo.tck.transactions.BeforeCompletionMethodCalled \
+org.apache.jdo.tck.transactions.BeforeCompletionMethodNotCalledBeforeRollback \
+org.apache.jdo.tck.transactions.Commit \
+org.apache.jdo.tck.transactions.GetPersistenceManager \
+org.apache.jdo.tck.transactions.GetRetainValues \
+org.apache.jdo.tck.transactions.GetRollbackOnlyReturnsFalseUntilSet \
+org.apache.jdo.tck.transactions.GetSynchronization \
+org.apache.jdo.tck.transactions.IsActive \
+org.apache.jdo.tck.transactions.IsActiveUntilAfterCompletionMethodCalled \
+org.apache.jdo.tck.transactions.Rollback \
+org.apache.jdo.tck.transactions.SetNontransactionalRead \
+org.apache.jdo.tck.transactions.WhenNontransactionalReadIsFalse \
+org.apache.jdo.tck.transactions.SetNontransactionalReadCalledDuringTxCompletion \
+org.apache.jdo.tck.transactions.SetNontransactionalWriteCalledDuringTxCompletion \
+org.apache.jdo.tck.transactions.SetNontransactionalReadTrueWhenNotSupported \
+org.apache.jdo.tck.transactions.SetOptimistic \
+org.apache.jdo.tck.transactions.SetOptimisticCalledDuringTxCompletion \
+org.apache.jdo.tck.transactions.SetOptimisticDuringTransaction \
+org.apache.jdo.tck.transactions.SetOptimisticTrueWhenNotSupported \
+org.apache.jdo.tck.transactions.SetRetainValues \
+org.apache.jdo.tck.transactions.SetRetainValuesCalledDuringTxCompletion \
+org.apache.jdo.tck.transactions.SetRetainValuesTrueWhenNotSupported \
+org.apache.jdo.tck.transactions.SetSynchronization \
+org.apache.jdo.tck.transactions.SetSynchronizationToNull

Modified: db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/ResultSummary.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/ResultSummary.java?rev=368757&r1=368756&r2=368757&view=diff
==============================================================================
--- db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/ResultSummary.java (original)
+++ db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/util/ResultSummary.java Fri Jan 13 07:28:52
2006
@@ -47,6 +47,15 @@
     
     /* The number of failed configurations. */
     private int nrOfFailedConfigurations = 0;
+
+    /* The total number of tests. */
+    private int totalTestCount = 0;
+
+    /* The total number of failures. */
+    private int totalFailureCount = 0;
+    
+    /* The total number of errors. */
+    private int totalErrorCount = 0;
     
     /**
      * Deserializes an instance and prints that instance to
@@ -61,7 +70,7 @@
         String directory = args[0] + File.separator;
         ResultSummary resultSummary = ResultSummary.load(directory);
         String newLine = System.getProperty("line.separator");
-        String resultMessage = "Result: " + resultSummary; 
+        String resultMessage = resultSummary.toString();
         String message = "-------" + newLine + resultMessage;
         appendTCKResultMessage(directory, message);
         System.out.println(resultMessage);
@@ -147,8 +156,11 @@
      */
     private void increment(TestResult result) {
         this.nrOfTotalConfigurations++;
+        this.totalTestCount += result.runCount();
         if (!result.wasSuccessful()) {
             this.nrOfFailedConfigurations++;
+            this.totalFailureCount += result.failureCount();
+            this.totalErrorCount += result.errorCount();
         }
     }
     
@@ -182,13 +194,21 @@
      * @see Object#toString()
      */
     public String toString() {
-        String result;
+        String newLine = System.getProperty("line.separator");
+        StringBuffer result = new StringBuffer();
+        result.append("Total tests run: ").append(totalTestCount).append(".");
         if (this.nrOfFailedConfigurations==0) {
-            result = "All (" + this.nrOfTotalConfigurations + ") configurations passed.";
+            result.append(newLine);
+            result.append("All (").append(this.nrOfTotalConfigurations);
+            result.append(") configurations passed.");
         } else {
-            result = String.valueOf(this.nrOfFailedConfigurations) + " of " +
-                     this.nrOfTotalConfigurations + " configurations failed.";
+            result.append(" Failures: ").append(totalFailureCount);
+            result.append(", Errors: ").append(totalErrorCount).append(".");
+            result.append(newLine);
+            result.append(this.nrOfFailedConfigurations).append(" of ");
+            result.append(this.nrOfTotalConfigurations);
+            result.append(" configurations failed.");
         }
-        return result;
+        return result.toString();
     }
 }



Mime
View raw message