svn commit: r1727940 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java

[reschke]

Author: reschke
Date: Mon Feb  1 14:21:25 2016
New Revision: 1727940

URL: http://svn.apache.org/viewvc?rev=1727940&view=rev
Log:
OAK-3938: Occasional failure in 
MultiDocumentStoreTest.batchUpdateCachedDocument()

Change BulkCreateOrUpdateTest to restore RDBDataSourceWrapper settings after 
execution

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java?rev=1727940&r1=1727939&r2=1727940&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
 Mon Feb  1 14:21:25 2016
@@ -34,16 +34,30 @@ import java.util.concurrent.ConcurrentHa
 import javax.sql.DataSource;
 
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceWrapper;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class BulkCreateOrUpdateTest extends AbstractDocumentStoreTest {
 
     public BulkCreateOrUpdateTest(DocumentStoreFixture dsf) {
         super(dsf);
-        DataSource ds = dsf.getRDBDataSource();
-        if (ds instanceof RDBDataSourceWrapper) {
+    }
+
+    @Before
+    public void before() {
+        DataSource dataSource = dsf.getRDBDataSource();
+        if (dataSource instanceof RDBDataSourceWrapper) {
             // test drivers that do not return precise batch results
-            ((RDBDataSourceWrapper)ds).setBatchResultPrecise(false);
+            ((RDBDataSourceWrapper)dataSource).setBatchResultPrecise(false);
+        }
+    }
+
+    @After
+    public void after() {
+        DataSource dataSource = dsf.getRDBDataSource();
+        if (dataSource instanceof RDBDataSourceWrapper) {
+            ((RDBDataSourceWrapper)dataSource).setBatchResultPrecise(true);
         }
     }