From ff7e01a4dc98c86e1008e445fb47b8c137c5ea8a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 4 May 2011 08:11:53 +0200 Subject: [PATCH] skip mercurial unit tests if HgRepositoryHandler is not configured --- .../java/sonia/scm/repository/HgRepositoryHandlerTest.java | 3 +-- .../src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java b/plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java index cb3ed09d74..3f265d7635 100644 --- a/plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java +++ b/plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java @@ -37,7 +37,6 @@ package sonia.scm.repository; import sonia.scm.io.DefaultFileSystem; import sonia.scm.store.StoreFactory; -import sonia.scm.util.Util; import static org.junit.Assert.*; import static org.junit.Assume.*; @@ -94,7 +93,7 @@ public class HgRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase handler.getConfig().setRepositoryDirectory(directory); // skip tests if hg not in path - if (Util.isEmpty(handler.getConfig().getHgBinary())) + if (! handler.isConfigured()) { System.out.println("WARNING could not find hg, skipping test"); assumeTrue(false); diff --git a/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java b/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java index 22832020b6..d6348446c3 100644 --- a/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java +++ b/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java @@ -35,7 +35,6 @@ package sonia.scm.web.cgi; //~--- non-JDK imports -------------------------------------------------------- -import java.util.logging.Level; import org.slf4j.Logger; import org.slf4j.LoggerFactory;