From 07b2f4c928bb82e8a99a65b8f7ffc84799596300 Mon Sep 17 00:00:00 2001 From: Davide Grohmann Date: Thu, 20 Oct 2016 23:35:31 +0200 Subject: [PATCH] Fix packaging after renaming --- .../neo4j/commandline/dbms/UnbindFromClusterCommand.java | 2 +- .../org.neo4j.commandline.admin.AdminCommand$Provider | 0 .../commandline/dbms/UnbindFromClusterCommandTest.java | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename enterprise/{core-edge => causal-clustering}/src/main/java/org/neo4j/commandline/dbms/UnbindFromClusterCommand.java (98%) rename enterprise/{core-edge => causal-clustering}/src/main/resources/META-INF/services/org.neo4j.commandline.admin.AdminCommand$Provider (100%) rename enterprise/{core-edge => causal-clustering}/src/test/java/org/neo4j/commandline/dbms/UnbindFromClusterCommandTest.java (97%) diff --git a/enterprise/core-edge/src/main/java/org/neo4j/commandline/dbms/UnbindFromClusterCommand.java b/enterprise/causal-clustering/src/main/java/org/neo4j/commandline/dbms/UnbindFromClusterCommand.java similarity index 98% rename from enterprise/core-edge/src/main/java/org/neo4j/commandline/dbms/UnbindFromClusterCommand.java rename to enterprise/causal-clustering/src/main/java/org/neo4j/commandline/dbms/UnbindFromClusterCommand.java index afed95c73317f..657118bd7185c 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/commandline/dbms/UnbindFromClusterCommand.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/commandline/dbms/UnbindFromClusterCommand.java @@ -44,7 +44,7 @@ import static java.lang.String.format; import static java.nio.file.Files.exists; -import static org.neo4j.coreedge.core.EnterpriseCoreEditionModule.CLUSTER_STATE_DIRECTORY_NAME; +import static org.neo4j.causalclustering.core.EnterpriseCoreEditionModule.CLUSTER_STATE_DIRECTORY_NAME; public class UnbindFromClusterCommand implements AdminCommand { diff --git a/enterprise/core-edge/src/main/resources/META-INF/services/org.neo4j.commandline.admin.AdminCommand$Provider b/enterprise/causal-clustering/src/main/resources/META-INF/services/org.neo4j.commandline.admin.AdminCommand$Provider similarity index 100% rename from enterprise/core-edge/src/main/resources/META-INF/services/org.neo4j.commandline.admin.AdminCommand$Provider rename to enterprise/causal-clustering/src/main/resources/META-INF/services/org.neo4j.commandline.admin.AdminCommand$Provider diff --git a/enterprise/core-edge/src/test/java/org/neo4j/commandline/dbms/UnbindFromClusterCommandTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/commandline/dbms/UnbindFromClusterCommandTest.java similarity index 97% rename from enterprise/core-edge/src/test/java/org/neo4j/commandline/dbms/UnbindFromClusterCommandTest.java rename to enterprise/causal-clustering/src/test/java/org/neo4j/commandline/dbms/UnbindFromClusterCommandTest.java index c8c486b67bea4..efb590bcf8c73 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/commandline/dbms/UnbindFromClusterCommandTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/commandline/dbms/UnbindFromClusterCommandTest.java @@ -45,6 +45,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.mockito.Matchers.contains; +import static org.mockito.Matchers.startsWith; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.neo4j.kernel.internal.StoreLocker.STORE_LOCK_FILENAME; @@ -124,8 +125,7 @@ public void shouldFailToUnbindLiveDatabase() throws Exception catch ( CommandFailed e ) { // then - assertThat( e.getMessage(), containsString( - "Database is currently locked. Please shutdown Neo4j." ) ); + assertThat( e.getMessage(), containsString( "Database is currently locked. Please shutdown Neo4j." ) ); } finally { @@ -172,7 +172,7 @@ public void shouldReportWhenClusterStateDirectoryIsNotPresent() throws Exception // when command.execute( databaseName( "graph.db" ) ); - verify(outsideWorld).stdOutLine( contains( "No cluster state found in" ) ); + verify( outsideWorld ).stdErrLine( startsWith( "No cluster state found in" ) ); } private String[] databaseName( String databaseName )