Author: mreutegg
Date: Tue Sep 8 06:37:26 2015
New Revision: 1701729
URL: http://svn.apache.org/r1701729
Log:
OAK-3356: Unclosed sessions in oak-jcr and oak-upgrade tests
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyNodeTypesUpgradeTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistorySidegradeTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/resources/logback-test.xml
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyNodeTypesUpgradeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyNodeTypesUpgradeTest.java?rev=1701729&r1=1701728&r2=1701729&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyNodeTypesUpgradeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyNodeTypesUpgradeTest.java
Tue Sep 8 06:37:26 2015
@@ -49,5 +49,6 @@ public class CopyNodeTypesUpgradeTest ex
assertEquals("More than one child node definition", 1, cnd.length);
assertEquals("Incorrect default primary type", "test:Folder",
cnd[0].getDefaultPrimaryTypeName());
assertEquals("More than two property definitions", 4, pd.length);
+ adminSession.logout();
}
}
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistorySidegradeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistorySidegradeTest.java?rev=1701729&r1=1701728&r2=1701729&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistorySidegradeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistorySidegradeTest.java
Tue Sep 8 06:37:26 2015
@@ -43,6 +43,7 @@ public class CopyVersionHistorySidegrade
try {
createSourceContent(session);
} finally {
+ session.logout();
repository.shutdown();
}
}
@@ -56,6 +57,8 @@ public class CopyVersionHistorySidegrade
sidegrade.copy(null);
repository = (RepositoryImpl) new Jcr(new
Oak(targetNodeStore)).createRepository();
- return repository.login(AbstractRepositoryUpgradeTest.CREDENTIALS);
+ Session s =
repository.login(AbstractRepositoryUpgradeTest.CREDENTIALS);
+ sessions.add(s);
+ return s;
}
}
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.java?rev=1701729&r1=1701728&r2=1701729&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyVersionHistoryTest.java
Tue Sep 8 06:37:26 2015
@@ -39,6 +39,9 @@ import javax.jcr.version.VersionManager;
import java.io.File;
import java.io.IOException;
import java.util.Calendar;
+import java.util.List;
+
+import com.google.common.collect.Lists;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -59,6 +62,8 @@ public class CopyVersionHistoryTest exte
protected RepositoryImpl repository;
+ protected List<Session> sessions = Lists.newArrayList();
+
private static Calendar betweenHistories;
/**
@@ -232,11 +237,17 @@ public class CopyVersionHistoryTest exte
}
repository = (RepositoryImpl) new Jcr(new
Oak(targetNodeStore)).createRepository();
- return repository.login(AbstractRepositoryUpgradeTest.CREDENTIALS);
+ Session s =
repository.login(AbstractRepositoryUpgradeTest.CREDENTIALS);
+ sessions.add(s);
+ return s;
}
@After
public void closeRepository() {
+ for (Session s : sessions) {
+ s.logout();
+ }
+ sessions.clear();
repository.shutdown();
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/resources/logback-test.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/resources/logback-test.xml?rev=1701729&r1=1701728&r2=1701729&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/resources/logback-test.xml
(original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/resources/logback-test.xml Tue
Sep 8 06:37:26 2015
@@ -29,7 +29,7 @@
</encoder>
</appender>
- <root level="DEBUG">
+ <root level="INFO">
<!--
<appender-ref ref="console"/>
-->
