svn commit: r1859365 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/fixtures/nodestore/DocumentMongoNodeStoreFixture.java

[amitj]

Author: amitj
Date: Thu May 16 10:08:56 2019
New Revision: 1859365

URL: http://svn.apache.org/viewvc?rev=1859365&view=rev
Log:
OAK-8314: BlobIds created with direct uploads lack length suffix

Proper DB cleanup for DocumentNodeStore-Mongo fixture for BinaryAccessDSGCIT

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/fixtures/nodestore/DocumentMongoNodeStoreFixture.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/fixtures/nodestore/DocumentMongoNodeStoreFixture.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/fixtures/nodestore/DocumentMongoNodeStoreFixture.java?rev=1859365&r1=1859364&r2=1859365&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/fixtures/nodestore/DocumentMongoNodeStoreFixture.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/fixtures/nodestore/DocumentMongoNodeStoreFixture.java
 Thu May 16 10:08:56 2019
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.jcr.bi
 
 import java.io.File;
 import java.io.IOException;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import javax.jcr.RepositoryException;
@@ -37,6 +38,7 @@ import org.apache.jackrabbit.oak.plugins
 import 
org.apache.jackrabbit.oak.plugins.document.DocumentBlobReferenceRetriever;
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.document.MongoConnectionFactory;
+import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
 import org.apache.jackrabbit.oak.plugins.document.Revision;
 import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector;
 import 
org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentNodeStoreBuilder;
@@ -63,7 +65,7 @@ public class DocumentMongoNodeStoreFixtu
     private MongoConnection connection;
     private final Clock clock;
     public final MongoConnectionFactory connFactory = new 
MongoConnectionFactory();
-
+    private String db;
     public DocumentMongoNodeStoreFixture(@Nullable DataStoreFixture 
dataStoreFixture) {
         this.dataStoreFixture = dataStoreFixture;
         this.clock = new Clock.Virtual();
@@ -71,7 +73,8 @@ public class DocumentMongoNodeStoreFixtu
 
     @Override
     public boolean isAvailable() {
-        this.connection = connFactory.getConnection();
+        db = UUID.randomUUID().toString();
+        this.connection = connFactory.getConnection(db);
 
         // if a DataStore is configured, it must be available for our 
NodeStore to be available
         return (dataStoreFixture == null || dataStoreFixture.isAvailable()) && 
(connection != null);
@@ -134,6 +137,7 @@ public class DocumentMongoNodeStoreFixtu
                 File dataStoreFolder = (File) components.get(nodeStore, 
DataStore.class.getName() + ":folder");
                 FileUtils.deleteQuietly(dataStoreFolder);
             }
+            MongoUtils.dropDatabase(db);
             connection.close();
         } finally {
             components.row(nodeStore).clear();