Cassandra ES is not an MapEntityStore, as testcase makes one think. Signed-off-by: niclas <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/563f2254 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/563f2254 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/563f2254 Branch: refs/heads/develop Commit: 563f2254afa95554cb83c26ac2b23b100b9fafa4 Parents: 5d91b65 Author: niclas <[email protected]> Authored: Tue May 23 08:00:32 2017 +0800 Committer: niclas <[email protected]> Committed: Tue May 23 08:00:32 2017 +0800 ---------------------------------------------------------------------- .../cassandra/CassandraEntityStoreTest.java | 93 ++++++++++++++++++++ .../cassandra/CassandraMapEntityStoreTest.java | 93 -------------------- 2 files changed, 93 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/563f2254/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java b/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java new file mode 100644 index 0000000..bead8cb --- /dev/null +++ b/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java @@ -0,0 +1,93 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + */ +package org.apache.polygene.entitystore.cassandra; + +import org.apache.polygene.api.common.Visibility; +import org.apache.polygene.bootstrap.AssemblyException; +import org.apache.polygene.bootstrap.ModuleAssembly; +import org.apache.polygene.entitystore.cassandra.assembly.CassandraEntityStoreAssembler; +import org.apache.polygene.test.EntityTestAssembler; +import org.apache.polygene.test.entity.AbstractEntityStoreTest; +import org.apache.polygene.test.entity.CanRemoveAll; +import org.apache.polygene.test.internal.DockerRule; +import org.junit.ClassRule; +import org.junit.Ignore; +import org.junit.Test; + +/** + * Test the CassandraEntityStoreService. + * <p>Installing Cassandra and starting it should suffice as the test use Cassandra defaults: 127.0.0.1:3000</p> + */ +public class CassandraEntityStoreTest + extends AbstractEntityStoreTest +{ + @ClassRule + public static final DockerRule DOCKER = new DockerRule( "cassandra", "Starting listening for CQL clients" ); + + @Override + // START SNIPPET: assembly + public void assemble( ModuleAssembly module ) + throws AssemblyException + { + // END SNIPPET: assembly + super.assemble( module ); + + ModuleAssembly config = module.layer().module( "config" ); + new EntityTestAssembler().assemble( config ); + module.services( CassandraEntityStoreService.class ).withTypes( CanRemoveAll.class ).withMixins( EmptyCassandraTableMixin.class ); + + // START SNIPPET: assembly + new CassandraEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module ); + // END SNIPPET: assembly + + CassandraEntityStoreConfiguration cassandraConfig = config.forMixin( CassandraEntityStoreConfiguration.class ).declareDefaults(); + String host = DOCKER.getDockerHost(); + int port = DOCKER.getExposedContainerPort( "9042/tcp" ); + System.out.println("Cassandra: " + host + ":" + port); + cassandraConfig.hostnames().set( host + ':' + port ); + cassandraConfig.createIfMissing().set( true ); + // START SNIPPET: assembly + } + // END SNIPPET: assembly + + @Override + public void setUp() + throws Exception + { + super.setUp(); + } + + @Override + public void tearDown() + throws Exception + { + CanRemoveAll cleaner = serviceFinder.findService( CanRemoveAll.class ).get(); + cleaner.removeAll(); + super.tearDown(); + } + + @Ignore( "POLYGENE-256" ) + @Test + @Override + public void givenAssociationsModifiedWhenUnitOfWorkCompletesThenStoreState() + { + super.givenAssociationsModifiedWhenUnitOfWorkCompletesThenStoreState(); + } +} http://git-wip-us.apache.org/repos/asf/polygene-java/blob/563f2254/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraMapEntityStoreTest.java ---------------------------------------------------------------------- diff --git a/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraMapEntityStoreTest.java b/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraMapEntityStoreTest.java deleted file mode 100644 index dd752d9..0000000 --- a/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraMapEntityStoreTest.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - */ -package org.apache.polygene.entitystore.cassandra; - -import org.apache.polygene.api.common.Visibility; -import org.apache.polygene.bootstrap.AssemblyException; -import org.apache.polygene.bootstrap.ModuleAssembly; -import org.apache.polygene.entitystore.cassandra.assembly.CassandraEntityStoreAssembler; -import org.apache.polygene.test.EntityTestAssembler; -import org.apache.polygene.test.entity.AbstractEntityStoreTest; -import org.apache.polygene.test.entity.CanRemoveAll; -import org.apache.polygene.test.internal.DockerRule; -import org.junit.ClassRule; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Test the CassandraEntityStoreService. - * <p>Installing Cassandra and starting it should suffice as the test use Cassandra defaults: 127.0.0.1:3000</p> - */ -public class CassandraMapEntityStoreTest - extends AbstractEntityStoreTest -{ - @ClassRule - public static final DockerRule DOCKER = new DockerRule( "cassandra", "Starting listening for CQL clients" ); - - @Override - // START SNIPPET: assembly - public void assemble( ModuleAssembly module ) - throws AssemblyException - { - // END SNIPPET: assembly - super.assemble( module ); - - ModuleAssembly config = module.layer().module( "config" ); - new EntityTestAssembler().assemble( config ); - module.services( CassandraEntityStoreService.class ).withTypes( CanRemoveAll.class ).withMixins( EmptyCassandraTableMixin.class ); - - // START SNIPPET: assembly - new CassandraEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module ); - // END SNIPPET: assembly - - CassandraEntityStoreConfiguration cassandraConfig = config.forMixin( CassandraEntityStoreConfiguration.class ).declareDefaults(); - String host = DOCKER.getDockerHost(); - int port = DOCKER.getExposedContainerPort( "9042/tcp" ); - System.out.println("Cassandra: " + host + ":" + port); - cassandraConfig.hostnames().set( host + ':' + port ); - cassandraConfig.createIfMissing().set( true ); - // START SNIPPET: assembly - } - // END SNIPPET: assembly - - @Override - public void setUp() - throws Exception - { - super.setUp(); - } - - @Override - public void tearDown() - throws Exception - { - CanRemoveAll cleaner = serviceFinder.findService( CanRemoveAll.class ).get(); - cleaner.removeAll(); - super.tearDown(); - } - - @Ignore( "POLYGENE-256" ) - @Test - @Override - public void givenAssociationsModifiedWhenUnitOfWorkCompletesThenStoreState() - { - super.givenAssociationsModifiedWhenUnitOfWorkCompletesThenStoreState(); - } -}
