Extended logging for some ldcache test that fail on jenkins but work locally.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/4adec76c Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/4adec76c Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/4adec76c Branch: refs/heads/develop Commit: 4adec76c99bb198c5573454c508c636ea652dffe Parents: 55d4087 Author: Jakob Frank <[email protected]> Authored: Thu Jul 23 09:46:42 2015 +0200 Committer: Jakob Frank <[email protected]> Committed: Thu Jul 23 09:46:42 2015 +0200 ---------------------------------------------------------------------- .../backend/file/test/LDCacheFileTest.java | 29 ++++++++------------ .../src/test/resources/logback.xml | 3 ++ .../src/test/resources/logback.xml | 3 ++ .../services/test/ng/BaseLDCacheTest.java | 13 +++++---- .../ldcache-core/src/test/resources/logback.xml | 3 ++ 5 files changed, 28 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/4adec76c/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java b/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java index d08d866..040eb4f 100644 --- a/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java +++ b/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java @@ -14,15 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.marmotta.ldcache.backend.file.test; -import com.google.common.io.Files; -import org.apache.commons.io.FileUtils; import org.apache.marmotta.ldcache.api.LDCachingBackend; import org.apache.marmotta.ldcache.backend.file.LDCachingFileBackend; import org.apache.marmotta.ldcache.services.test.ng.BaseLDCacheTest; +import org.junit.Rule; import org.junit.internal.AssumptionViolatedException; +import org.junit.rules.TemporaryFolder; import org.openrdf.repository.RepositoryException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,33 +38,27 @@ public class LDCacheFileTest extends BaseLDCacheTest { private static Logger log = LoggerFactory.getLogger(LDCacheFileTest.class); + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + /** * Needs to be implemented by tests to provide the correct backend. Backend needs to be properly initialised. * - * @return + * @return an LDCachingBackend */ @Override protected LDCachingBackend createBackend() { - final File storageDir = Files.createTempDir(); - - LDCachingBackend backend = null; try { - backend = new LDCachingFileBackend(storageDir) { - @Override - public void shutdown() { - super.shutdown(); - - try { - FileUtils.deleteDirectory(storageDir); - } catch (IOException e) { - } - } - }; + final File storageDir = temporaryFolder.newFolder(); + LDCachingBackend backend = null; + backend = new LDCachingFileBackend(storageDir); backend.initialize(); return backend; } catch (RepositoryException e) { throw new AssumptionViolatedException("could not initialise backend",e); + } catch (IOException e) { + throw new AssumptionViolatedException("could not create storage-dir for file backend", e); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4adec76c/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml b/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml index ea28135..d3e58c4 100644 --- a/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml +++ b/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml @@ -21,6 +21,9 @@ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern> </encoder> </appender> + + <logger name="org.apache.marmotta.ldcache" level="DEBUG" /> + <root level="${root-level:-INFO}"> <appender-ref ref="CONSOLE"/> </root> http://git-wip-us.apache.org/repos/asf/marmotta/blob/4adec76c/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml b/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml index ea28135..d3e58c4 100644 --- a/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml +++ b/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml @@ -21,6 +21,9 @@ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern> </encoder> </appender> + + <logger name="org.apache.marmotta.ldcache" level="DEBUG" /> + <root level="${root-level:-INFO}"> <appender-ref ref="CONSOLE"/> </root> http://git-wip-us.apache.org/repos/asf/marmotta/blob/4adec76c/libraries/ldcache/ldcache-core/src/test/java/org/apache/marmotta/ldcache/services/test/ng/BaseLDCacheTest.java ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-core/src/test/java/org/apache/marmotta/ldcache/services/test/ng/BaseLDCacheTest.java b/libraries/ldcache/ldcache-core/src/test/java/org/apache/marmotta/ldcache/services/test/ng/BaseLDCacheTest.java index 8f42b22..725c327 100644 --- a/libraries/ldcache/ldcache-core/src/test/java/org/apache/marmotta/ldcache/services/test/ng/BaseLDCacheTest.java +++ b/libraries/ldcache/ldcache-core/src/test/java/org/apache/marmotta/ldcache/services/test/ng/BaseLDCacheTest.java @@ -141,15 +141,18 @@ public abstract class BaseLDCacheTest { // run a SPARQL test to see if the returned data is correct InputStream sparql = BaseLDCacheTest.class.getResourceAsStream(sparqlFile); - BooleanQuery testLabel = connection.prepareBooleanQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql)); - Assert.assertTrue("SPARQL test query failed", testLabel.evaluate()); + final String query = IOUtils.toString(sparql); + BooleanQuery testLabel = connection.prepareBooleanQuery(QueryLanguage.SPARQL, query); + final boolean testResult = testLabel.evaluate(); + + if(!testResult && log.isDebugEnabled()) { + log.debug("QUERY: {}", query); - if(log.isDebugEnabled()) { StringWriter out = new StringWriter(); connection.export(Rio.createWriter(RDFFormat.TURTLE, out)); - log.debug("DATA:"); - log.debug(out.toString()); + log.debug("DATA: {}", out.toString()); } + Assert.assertTrue("SPARQL test query failed", testResult); connection.commit(); connection.close(); http://git-wip-us.apache.org/repos/asf/marmotta/blob/4adec76c/libraries/ldcache/ldcache-core/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-core/src/test/resources/logback.xml b/libraries/ldcache/ldcache-core/src/test/resources/logback.xml index ea28135..d3e58c4 100644 --- a/libraries/ldcache/ldcache-core/src/test/resources/logback.xml +++ b/libraries/ldcache/ldcache-core/src/test/resources/logback.xml @@ -21,6 +21,9 @@ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern> </encoder> </appender> + + <logger name="org.apache.marmotta.ldcache" level="DEBUG" /> + <root level="${root-level:-INFO}"> <appender-ref ref="CONSOLE"/> </root>
