This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-nosql-couchbase-resourceprovider.git
commit 18947f5061c4d93fd1dce0225419059cb13e56cb Author: Stefan Seifert <[email protected]> AuthorDate: Wed May 20 15:46:51 2015 +0000 SLING-4381 fix problem with deleted resources; define profile for integration tests git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1680609 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 53 ++++++++++++++++++++++ .../impl/CouchbaseNoSqlAdapter.java | 2 +- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8df9d96..5345940 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,60 @@ <artifactId>maven-scr-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <testFailureIgnore>false</testFailureIgnore> + <includes> + <include>**/*Test.java</include> + </includes> + <excludes> + <exclude>**/*IT.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> </build> + + <profiles> + + <!-- + Profile for Integration tests with a real couchbase server running. + You have to set JVM parameters for couchbase host and bucket name, e.g. + mvn -Pcouchbase-integration-test -DcouchbaseHosts=localhost:8091 -DbucketName=test integration-test + --> + <profile> + <id>couchbase-integration-test</id> + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + <configuration> + <includes> + <include>**/*IT.java</include> + </includes> + <excludes> + <exclude>**/*Test.java</exclude> + </excludes> + </configuration> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> </project> diff --git a/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java b/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java index 14f4e72..6d85b4f 100644 --- a/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java +++ b/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java @@ -52,7 +52,7 @@ class CouchbaseNoSqlAdapter implements NoSqlAdapter { @Override public boolean validPath(String path) { - return (couchbaseClient != null); + return (couchbaseClient != null && couchbaseClient.isEnabled()); } @Override -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
