You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2018/05/04 02:22:12 UTC
[05/13] polygene-java git commit: Changed Assembler.assemble() to
allow Exception to be thrown (instead of only AssemblyException),
so one doesn't need to capture all kind of exceptions in one's Assembler just
to re-throw as AssemblyException.
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/DerbySQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/DerbySQLEntityStoreTest.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/DerbySQLEntityStoreTest.java
index 0bd6716..72e1bf6 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/DerbySQLEntityStoreTest.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/DerbySQLEntityStoreTest.java
@@ -35,7 +35,7 @@ public class DerbySQLEntityStoreTest extends AbstractEntityStoreTest
@Override
// START SNIPPET: assembly
public void assemble( ModuleAssembly module )
- throws AssemblyException
+ throws Exception
{
// END SNIPPET: assembly
super.assemble( module );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/H2SQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/H2SQLEntityStoreTest.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/H2SQLEntityStoreTest.java
index 46a66e3..4f61f00 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/H2SQLEntityStoreTest.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/H2SQLEntityStoreTest.java
@@ -35,7 +35,7 @@ public class H2SQLEntityStoreTest extends AbstractEntityStoreTest
@Override
// START SNIPPET: assembly
public void assemble( ModuleAssembly module )
- throws AssemblyException
+ throws Exception
{
// END SNIPPET: assembly
super.assemble( module );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
index 1f82735..66cdc52 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
@@ -51,7 +51,7 @@ public class MariaDbEntityStoreTest extends AbstractEntityStoreTest
@Override
// START SNIPPET: assembly
public void assemble( ModuleAssembly module )
- throws AssemblyException
+ throws Exception
{
// END SNIPPET: assembly
super.assemble( module );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
index 66417c8..dac8486 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
@@ -50,7 +50,7 @@ public class MySQLEntityStoreTest extends AbstractEntityStoreTest
@Override
// START SNIPPET: assembly
public void assemble( ModuleAssembly module )
- throws AssemblyException
+ throws Exception
{
// END SNIPPET: assembly
super.assemble( module );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/PostgreSQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/PostgreSQLEntityStoreTest.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/PostgreSQLEntityStoreTest.java
index 0c6aa81..cf6acac 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/PostgreSQLEntityStoreTest.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/PostgreSQLEntityStoreTest.java
@@ -44,7 +44,7 @@ public class PostgreSQLEntityStoreTest extends AbstractEntityStoreTest
@Override
// START SNIPPET: assembly
public void assemble( ModuleAssembly module )
- throws AssemblyException
+ throws Exception
{
// END SNIPPET: assembly
delay();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/SQLiteEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/SQLiteEntityStoreTest.java b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/SQLiteEntityStoreTest.java
index a0e12fe..ab31d88 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/SQLiteEntityStoreTest.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/SQLiteEntityStoreTest.java
@@ -44,7 +44,7 @@ public class SQLiteEntityStoreTest extends AbstractEntityStoreTest
@Override
// START SNIPPET: assembly
public void assemble( ModuleAssembly module )
- throws AssemblyException
+ throws Exception
{
// END SNIPPET: assembly
super.assemble( module );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-zookeeper/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-zookeeper/build.gradle b/extensions/entitystore-zookeeper/build.gradle
index b8c6430..8e6ea6f 100644
--- a/extensions/entitystore-zookeeper/build.gradle
+++ b/extensions/entitystore-zookeeper/build.gradle
@@ -29,6 +29,7 @@ dependencies {
implementation polygene.library( 'locking' )
implementation polygene.library( 'constraints' )
+ implementation polygene.library( 'execution' )
implementation libraries.zookeeper
runtimeOnly polygene.core.runtime
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZkUtil.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZkUtil.java b/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZkUtil.java
index 8b08892..bc98550 100644
--- a/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZkUtil.java
+++ b/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZkUtil.java
@@ -1,3 +1,22 @@
+/*
+ * 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.zookeeper;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreTest.java b/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreTest.java
index bf5bc99..8ffc5e9 100644
--- a/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreTest.java
+++ b/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreTest.java
@@ -19,6 +19,8 @@
*/
package org.apache.polygene.entitystore.zookeeper;
+import com.github.junit5docker.Docker;
+import com.github.junit5docker.Port;
import org.apache.polygene.api.common.Visibility;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -29,11 +31,15 @@ import org.apache.polygene.test.entity.AbstractEntityStoreTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.extension.ExtendWith;
+import static java.lang.Thread.sleep;
import static java.util.Collections.singletonList;
-@ExtendWith( TemporaryFolder.class )
-public class ZookeeperEntityStoreTest
- extends AbstractEntityStoreTest
+
+@Docker( image = "zookeeper",
+ ports = @Port( exposed = 32181, inner = 2181),
+ newForEachCase = false
+)
+public class ZookeeperEntityStoreTest extends AbstractEntityStoreTest
{
static final String TEST_ZNODE_NAME = "/polygene/entitystore-test";
@@ -41,9 +47,10 @@ public class ZookeeperEntityStoreTest
@Override
// START SNIPPET: assembly
public void assemble( ModuleAssembly module )
- throws AssemblyException
+ throws Exception
{
// END SNIPPET: assembly
+ sleep(1000);
super.assemble( module );
ModuleAssembly config = module.layer().module( "config" );
new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
@@ -52,7 +59,7 @@ public class ZookeeperEntityStoreTest
zkAssembler.withConfig( config, Visibility.layer ).assemble( module );
// END SNIPPET: assembly
ZookeeperEntityStoreConfiguration defaults = zkAssembler.configModule().forMixin( ZookeeperEntityStoreConfiguration.class ).declareDefaults();
- defaults.hosts().set( singletonList( "localhost:2181" ) );
+ defaults.hosts().set( singletonList( "localhost:32181" ) );
defaults.storageNode().set( TEST_ZNODE_NAME );
// START SNIPPET: assembly
}
@@ -62,6 +69,6 @@ public class ZookeeperEntityStoreTest
void cleanUp()
throws Exception
{
- ZkUtil.cleanUp( "localhost:2181", TEST_ZNODE_NAME );
+ ZkUtil.cleanUp( "localhost:32181", TEST_ZNODE_NAME );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreTestSuite.java b/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreTestSuite.java
index bf83f26..44b93d9 100644
--- a/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreTestSuite.java
+++ b/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreTestSuite.java
@@ -19,6 +19,8 @@
*/
package org.apache.polygene.entitystore.zookeeper;
+import com.github.junit5docker.Docker;
+import com.github.junit5docker.Port;
import org.apache.polygene.api.common.Visibility;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.entitystore.zookeeper.assembly.ZookeeperEntityStoreAssembler;
@@ -30,7 +32,10 @@ import org.junit.jupiter.api.extension.ExtendWith;
import static java.util.Collections.singletonList;
import static org.apache.polygene.entitystore.zookeeper.ZookeeperEntityStoreTest.TEST_ZNODE_NAME;
-@ExtendWith( TemporaryFolder.class )
+@Docker( image = "zookeeper",
+ ports = @Port( exposed = 32181, inner = 2181),
+ newForEachCase = false
+)
public class ZookeeperEntityStoreTestSuite
extends EntityStoreTestSuite
{
@@ -49,7 +54,7 @@ public class ZookeeperEntityStoreTestSuite
{
super.defineConfigModule( module );
ZookeeperEntityStoreConfiguration defaults = module.forMixin( ZookeeperEntityStoreConfiguration.class ).declareDefaults();
- defaults.hosts().set( singletonList( "localhost:2181" ) );
+ defaults.hosts().set( singletonList( "localhost:32181" ) );
defaults.storageNode().set( TEST_ZNODE_NAME );
}
@@ -57,6 +62,6 @@ public class ZookeeperEntityStoreTestSuite
void cleanUp()
throws Exception
{
- ZkUtil.cleanUp( "localhost:2181", TEST_ZNODE_NAME );
+ ZkUtil.cleanUp( "localhost:32181", TEST_ZNODE_NAME );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreWithCacheTest.java b/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreWithCacheTest.java
index 1efaf05..d376187 100644
--- a/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreWithCacheTest.java
+++ b/extensions/entitystore-zookeeper/src/test/java/org/apache/polygene/entitystore/zookeeper/ZookeeperEntityStoreWithCacheTest.java
@@ -19,6 +19,8 @@
*/
package org.apache.polygene.entitystore.zookeeper;
+import com.github.junit5docker.Docker;
+import com.github.junit5docker.Port;
import org.apache.polygene.api.common.Visibility;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -32,29 +34,37 @@ import org.junit.jupiter.api.extension.ExtendWith;
import static java.util.Collections.singletonList;
import static org.apache.polygene.entitystore.zookeeper.ZookeeperEntityStoreTest.TEST_ZNODE_NAME;
+@Docker( image = "zookeeper",
+ ports = @Port( exposed = 32181, inner = 2181),
+ newForEachCase = false
+)
public class ZookeeperEntityStoreWithCacheTest
extends AbstractEntityStoreWithCacheTest
{
@Override
public void assemble( ModuleAssembly module )
- throws AssemblyException
+ throws Exception
{
super.assemble( module );
+
ModuleAssembly config = module.layer().module( "config" );
- new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
+
ZookeeperEntityStoreAssembler zkAssembler = new ZookeeperEntityStoreAssembler();
zkAssembler.withConfig( config, Visibility.layer ).assemble( module );
ZookeeperEntityStoreConfiguration defaults = zkAssembler.configModule().forMixin( ZookeeperEntityStoreConfiguration.class ).declareDefaults();
- defaults.hosts().set( singletonList( "localhost:2181" ) );
+ defaults.hosts().set( singletonList( "localhost:32181" ) );
defaults.storageNode().set( TEST_ZNODE_NAME );
+
+ new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
+
}
@AfterEach
void cleanUp()
throws Exception
{
- ZkUtil.cleanUp( "localhost:2181", TEST_ZNODE_NAME );
+ ZkUtil.cleanUp( "localhost:32181", TEST_ZNODE_NAME );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RDFPerformanceTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RDFPerformanceTest.java b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RDFPerformanceTest.java
index dff5ade..8b8b0f1 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RDFPerformanceTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/RDFPerformanceTest.java
@@ -72,7 +72,8 @@ public class RDFPerformanceTest extends AbstractPolygeneTest
}
@Override
- public void assemble( ModuleAssembly module ) throws AssemblyException
+ public void assemble( ModuleAssembly module )
+ throws Exception
{
new FileConfigurationAssembler()
.withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ca66f7e7/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
index f1155bb..e694404 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
@@ -262,7 +262,18 @@ public class Qi95IssueTest
private ModuleAssembly addModule( LayerAssembly layerAssembly, String name, Assembler assembler )
{
ModuleAssembly moduleAssembly = layerAssembly.module( name );
- assembler.assemble( moduleAssembly );
+ try
+ {
+ assembler.assemble( moduleAssembly );
+ }
+ catch( RuntimeException e )
+ {
+ throw e;
+ }
+ catch( Exception e )
+ {
+ throw new AssemblyException( "Unable to assemble module " + name + " in layer " + layerAssembly.name() );
+ }
return moduleAssembly;
}