I don't know the implementation of store.dispose() but if that call throws an exception fixture.dispose() will not be invoked. If there is no ordering dependency between store.dispose(), fixture.dispose(), and Revision.resetClockToDefault(), it's more robust to put them in different @After methods.
2017-03-01 9:38 GMT+01:00 <[email protected]>: > Author: mreutegg > Date: Wed Mar 1 08:38:32 2017 > New Revision: 1784874 > > URL: http://svn.apache.org/viewvc?rev=1784874&view=rev > Log: > OAK-5866: Some tests do not dispose fixture > > Modified: > > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceIteratorTest.java > > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/OrphanedBranchTest.java > > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionGCTest.java > > Modified: > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceIteratorTest.java > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceIteratorTest.java?rev=1784874&r1=1784873&r2=1784874&view=diff > ============================================================================== > --- > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceIteratorTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BlobReferenceIteratorTest.java > Wed Mar 1 08:38:32 2017 > @@ -73,6 +73,7 @@ public class BlobReferenceIteratorTest { > @After > public void tearDown() throws Exception { > store.dispose(); > + fixture.dispose(); > } > > @Test > > Modified: > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/OrphanedBranchTest.java > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/OrphanedBranchTest.java?rev=1784874&r1=1784873&r2=1784874&view=diff > ============================================================================== > --- > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/OrphanedBranchTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/OrphanedBranchTest.java > Wed Mar 1 08:38:32 2017 > @@ -82,6 +82,7 @@ public class OrphanedBranchTest { > @After > public void tearDown() throws Exception { > store.dispose(); > + fixture.dispose(); > } > > @Test > > Modified: > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionGCTest.java > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionGCTest.java?rev=1784874&r1=1784873&r2=1784874&view=diff > ============================================================================== > --- > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionGCTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionGCTest.java > Wed Mar 1 08:38:32 2017 > @@ -72,6 +72,7 @@ public class RevisionGCTest { > if (store != null) { > store.dispose(); > } > + fixture.dispose(); > Revision.resetClockToDefault(); > } > > >
