:tools:generator unignore test in generated application
Most of the base set of test pass now.
CI is not running these so no point ignoring them.
At least this will fail for people building locally, which makes sense.
Tests involving MySQL or PostgreSQL @Ignored
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
index ba74116..59d6751 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
@@ -35,8 +35,9 @@
import org.apache.polygene.tools.model.descriptor.ApplicationDetailDescriptor;
import org.apache.polygene.tools.model.descriptor.ApplicationDetailDescriptorBuilder;
<%
-polygene.needsDelayChecker = false;
+polygene.ignoredTest = ['MySQL', 'PostgreSQL'].indexOf(polygene.entitystore) != -1 || ['SQL'].indexOf(polygene.indexing) != -1;
polygene.needsDocker = ['Cassandra', 'Redis', 'Riak', 'MongoDB'].indexOf(polygene.entitystore) != -1 || ['Memcache'].indexOf(polygene.caching) != -1;
+polygene.needsDelayChecker = false;
if( polygene.entitystore !== 'Memory' && polygene.entitystore !== 'Preferences' ) {
if( polygene.entitystore.indexOf('SQL') < 0 ) {
@@ -67,12 +68,20 @@
<%
}
%>
-import org.junit.Ignore;
import org.junit.Test;
+<%
+if( polygene.ignoredTest ) {
+%>
+// This combination of EntityStore and Index/Query extensions requires some manual setup
+// This the respective extensions documentation for details
+@org.junit.Ignore
+<%
+}
+%>
public class BootstrapTest
{
- @Test @Ignore( "TODO: Testcase doesn't work for all combinations yet. Docker issues?" )
+ @Test
public void applicationBootstrapSucceeds()
throws Exception
{
@@ -111,12 +120,14 @@
entityStoreSetup( assembly );
<%
if( polygene.caching === 'Memcache' ) {
-%>
- cacheSetup( assembly );
+%> cacheSetup( assembly );
<%
}
-%>
- }
+if( polygene.indexing === 'SQL' ) {
+%> indexingSetup( assembly );
+<%
+}
+%> }
<%
if( polygene.entitystore === 'Cassandra' ) {
%>
@@ -214,18 +225,16 @@
%>
private void entityStoreSetup(ApplicationAssembly assembly )
{
- // A special docker image is needed, skipping this test for now
- // See the SQL EntityStore documentation for details
- org.junit.Assume.assumeTrue( false );
+ // See the @Ignore annotation above
+ throw new UnsupportedOperationException();
}
<% }
if( polygene.entitystore === 'PostgreSQL' ) {
%>
private void entityStoreSetup(ApplicationAssembly assembly )
{
- // A special docker image is needed, skipping this test for now
- // See the SQL EntityStore documentation for details
- org.junit.Assume.assumeTrue( false );
+ // See the @Ignore annotation above
+ throw new UnsupportedOperationException();
}
<% }
if( polygene.entitystore === 'Preferences' ) {
@@ -300,6 +309,15 @@
<%
}
+if( polygene.indexing === 'SQL' ) {
+%>
+ private void indexingSetup( ApplicationAssembly assembly )
+ {
+ // See the @Ignore annotation above
+ throw new UnsupportedOperationException();
+ }
+<%
+}
%>
<%
