You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2016/11/19 22:50:34 UTC
[33/35] zest-java git commit: tests: properly isolate all tests that
rely on fileconfig
tests: properly isolate all tests that rely on fileconfig
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/6f97f0d2
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/6f97f0d2
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/6f97f0d2
Branch: refs/heads/develop
Commit: 6f97f0d272f4bcff840c5e359becc9c3ded70737
Parents: 3b69830
Author: Paul Merlin <pa...@apache.org>
Authored: Sat Nov 19 22:27:03 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Sat Nov 19 22:27:03 2016 +0100
----------------------------------------------------------------------
.../entitystore/file/FileEntityStoreTest.java | 11 +++++++--
.../file/FileEntityStoreWithCacheTest.java | 12 ++++++++--
.../entitystore/jdbm/JdbmEntityStoreTest.java | 22 +++++++----------
.../jdbm/JdbmEntityStoreWithCacheTest.java | 20 +++++++---------
.../leveldb/JavaLevelDBEntityStoreTest.java | 19 ++++++++++-----
.../leveldb/JniLevelDBEntityStoreTest.java | 19 ++++++++++-----
.../LevelDBEntityStoreWithCacheTest.java | 18 ++++++++++----
.../ElasticSearchComplexQueryTest.java | 7 +++---
.../elasticsearch/ElasticSearchFinderTest.java | 7 +++---
.../ElasticSearchQueryMultimoduleTest.java | 7 +++---
.../elasticsearch/ElasticSearchQueryTest.java | 7 +++---
.../index/elasticsearch/ElasticSearchTest.java | 7 +++---
.../index/elasticsearch/ImmenseTermTest.java | 7 +++---
.../apache/zest/index/rdf/ContainsAllTest.java | 21 +++++++++-------
.../org/apache/zest/index/rdf/ContainsTest.java | 21 +++++++++-------
.../zest/index/rdf/RDFPerformanceTest.java | 14 +++++++----
.../zest/index/solr/SolrEntityFinderTest.java | 7 +++---
.../zest/index/solr/SolrNamedQueryTest.java | 7 +++---
.../zest/index/solr/SolrQueryServiceTest.java | 7 +++---
.../apache/zest/index/solr/SolrQueryTest.java | 7 +++---
.../zest/library/rdf/ApplicationXmlTest.java | 25 ++++++++------------
.../rdf/repository/NativeRepositoryTest.java | 22 +++++++++++------
22 files changed, 175 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreTest.java b/extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreTest.java
index 10e85d6..720a94f 100644
--- a/extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreTest.java
+++ b/extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreTest.java
@@ -23,14 +23,19 @@ import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.file.assembly.FileEntityStoreAssembler;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
import org.apache.zest.test.EntityTestAssembler;
import org.apache.zest.test.entity.AbstractEntityStoreTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
public class FileEntityStoreTest
extends AbstractEntityStoreTest
{
+ @Rule
+ public final TemporaryFolder tmpDir = new TemporaryFolder();
@Override
// START SNIPPET: assembly
@@ -39,7 +44,9 @@ public class FileEntityStoreTest
{
// END SNIPPET: assembly
super.assemble( module );
- module.services( FileConfigurationService.class );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
ModuleAssembly config = module.layer().module( "config" );
new EntityTestAssembler().assemble( config );
new OrgJsonValueSerializationAssembler().assemble( module );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreWithCacheTest.java b/extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreWithCacheTest.java
index 9097cd8..f7be9c0 100644
--- a/extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreWithCacheTest.java
+++ b/extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreWithCacheTest.java
@@ -23,20 +23,28 @@ import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.file.assembly.FileEntityStoreAssembler;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
import org.apache.zest.test.EntityTestAssembler;
import org.apache.zest.test.cache.AbstractEntityStoreWithCacheTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
public class FileEntityStoreWithCacheTest
extends AbstractEntityStoreWithCacheTest
{
+ @Rule
+ public final TemporaryFolder tmpDir = new TemporaryFolder();
+
@Override
public void assemble( ModuleAssembly module )
throws AssemblyException
{
super.assemble( module );
- module.services( FileConfigurationService.class );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
ModuleAssembly config = module.layer().module( "config" );
new EntityTestAssembler().assemble( config );
new OrgJsonValueSerializationAssembler().assemble( module );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreTest.java b/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreTest.java
index e7e4332..5ea9652 100644
--- a/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreTest.java
+++ b/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreTest.java
@@ -19,28 +19,23 @@
*/
package org.apache.zest.entitystore.jdbm;
-import org.junit.Before;
import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.jdbm.assembly.JdbmEntityStoreAssembler;
-import org.apache.zest.library.fileconfig.FileConfiguration;
-import org.apache.zest.library.fileconfig.FileConfigurationDataWiper;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
import org.apache.zest.test.EntityTestAssembler;
import org.apache.zest.test.entity.AbstractEntityStoreTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
public class JdbmEntityStoreTest
extends AbstractEntityStoreTest
{
-
- @Before
- public void testDataCleanup()
- {
- FileConfiguration fileConfig = serviceFinder.findService( FileConfiguration.class ).get();
- FileConfigurationDataWiper.registerApplicationPassivationDataWiper( fileConfig, application );
- }
+ @Rule
+ public final TemporaryFolder tmpDir = new TemporaryFolder();
@Override
public void assemble( ModuleAssembly module )
@@ -49,11 +44,12 @@ public class JdbmEntityStoreTest
super.assemble( module );
ModuleAssembly config = module.layer().module( "config" );
- config.services( FileConfigurationService.class ).visibleIn( Visibility.layer ).instantiateOnStartup();
new EntityTestAssembler().assemble( config );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
new OrgJsonValueSerializationAssembler().assemble( module );
new JdbmEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
}
-
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreWithCacheTest.java b/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreWithCacheTest.java
index 75298c6..7170fe3 100644
--- a/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreWithCacheTest.java
+++ b/extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/JdbmEntityStoreWithCacheTest.java
@@ -19,27 +19,23 @@
*/
package org.apache.zest.entitystore.jdbm;
-import org.junit.Before;
import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.jdbm.assembly.JdbmEntityStoreAssembler;
-import org.apache.zest.library.fileconfig.FileConfiguration;
-import org.apache.zest.library.fileconfig.FileConfigurationDataWiper;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
import org.apache.zest.test.EntityTestAssembler;
import org.apache.zest.test.cache.AbstractEntityStoreWithCacheTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
public class JdbmEntityStoreWithCacheTest
extends AbstractEntityStoreWithCacheTest
{
- @Before
- public void testDataCleanup()
- {
- FileConfiguration fileConfig = serviceFinder.findService( FileConfiguration.class ).get();
- FileConfigurationDataWiper.registerApplicationPassivationDataWiper( fileConfig, application );
- }
+ @Rule
+ public final TemporaryFolder tmpDir = new TemporaryFolder();
@Override
public void assemble( ModuleAssembly module )
@@ -48,9 +44,11 @@ public class JdbmEntityStoreWithCacheTest
super.assemble( module );
ModuleAssembly config = module.layer().module( "config" );
- config.services( FileConfigurationService.class ).visibleIn( Visibility.layer ).instantiateOnStartup();
new EntityTestAssembler().assemble( config );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
new OrgJsonValueSerializationAssembler().assemble( module );
new JdbmEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JavaLevelDBEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JavaLevelDBEntityStoreTest.java b/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JavaLevelDBEntityStoreTest.java
index 3e9d6f3..f30f10f 100644
--- a/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JavaLevelDBEntityStoreTest.java
+++ b/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JavaLevelDBEntityStoreTest.java
@@ -23,14 +23,19 @@ import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.leveldb.assembly.LevelDBEntityStoreAssembler;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
import org.apache.zest.test.EntityTestAssembler;
import org.apache.zest.test.entity.AbstractEntityStoreTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
public class JavaLevelDBEntityStoreTest
extends AbstractEntityStoreTest
{
+ @Rule
+ public final TemporaryFolder tmpDir = new TemporaryFolder();
@Override
// START SNIPPET: assembly
@@ -43,13 +48,15 @@ public class JavaLevelDBEntityStoreTest
new EntityTestAssembler().visibleIn( Visibility.module ).assemble( config );
new OrgJsonValueSerializationAssembler().assemble( module );
- module.services( FileConfigurationService.class );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
// START SNIPPET: assembly
- new LevelDBEntityStoreAssembler().
- withConfig( config, Visibility.layer ).
- identifiedBy( "java-leveldb-entitystore" ).
- assemble( module );
+ new LevelDBEntityStoreAssembler()
+ .withConfig( config, Visibility.layer )
+ .identifiedBy( "java-leveldb-entitystore" )
+ .assemble( module );
// END SNIPPET: assembly
config.forMixin( LevelDBEntityStoreConfiguration.class ).declareDefaults().flavour().set( "java" );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JniLevelDBEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JniLevelDBEntityStoreTest.java b/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JniLevelDBEntityStoreTest.java
index cb2b297..47d3507 100644
--- a/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JniLevelDBEntityStoreTest.java
+++ b/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JniLevelDBEntityStoreTest.java
@@ -23,14 +23,19 @@ import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.leveldb.assembly.LevelDBEntityStoreAssembler;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
import org.apache.zest.test.EntityTestAssembler;
import org.apache.zest.test.entity.AbstractEntityStoreTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
public class JniLevelDBEntityStoreTest
extends AbstractEntityStoreTest
{
+ @Rule
+ public final TemporaryFolder tmpDir = new TemporaryFolder();
@Override
public void assemble( ModuleAssembly module )
@@ -42,12 +47,14 @@ public class JniLevelDBEntityStoreTest
new EntityTestAssembler().visibleIn( Visibility.module ).assemble( config );
new OrgJsonValueSerializationAssembler().assemble( module );
- module.services( FileConfigurationService.class );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
- new LevelDBEntityStoreAssembler().
- withConfig( config, Visibility.layer ).
- identifiedBy( "jni-leveldb-entitystore" ).
- assemble( module );
+ new LevelDBEntityStoreAssembler()
+ .withConfig( config, Visibility.layer )
+ .identifiedBy( "jni-leveldb-entitystore" )
+ .assemble( module );
config.forMixin( LevelDBEntityStoreConfiguration.class ).declareDefaults().flavour().set( "jni" );
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/LevelDBEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/LevelDBEntityStoreWithCacheTest.java b/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/LevelDBEntityStoreWithCacheTest.java
index 3485658..e875bfd 100644
--- a/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/LevelDBEntityStoreWithCacheTest.java
+++ b/extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/LevelDBEntityStoreWithCacheTest.java
@@ -23,14 +23,20 @@ import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.entitystore.leveldb.assembly.LevelDBEntityStoreAssembler;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
import org.apache.zest.test.EntityTestAssembler;
import org.apache.zest.test.cache.AbstractEntityStoreWithCacheTest;
import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
public class LevelDBEntityStoreWithCacheTest
extends AbstractEntityStoreWithCacheTest
{
+ @Rule
+ public final TemporaryFolder tmpDir = new TemporaryFolder();
+
@Override
public void assemble( ModuleAssembly module )
throws AssemblyException
@@ -40,11 +46,13 @@ public class LevelDBEntityStoreWithCacheTest
new EntityTestAssembler().visibleIn( Visibility.module ).assemble( config );
new OrgJsonValueSerializationAssembler().assemble( module );
- module.services( FileConfigurationService.class );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
new LevelDBEntityStoreAssembler().
- withConfig( config, Visibility.layer ).
- identifiedBy( "java-leveldb-entitystore" ).
- assemble( module );
+ withConfig( config, Visibility.layer ).
+ identifiedBy( "java-leveldb-entitystore" ).
+ assemble( module );
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchComplexQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchComplexQueryTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchComplexQueryTest.java
index bbb9c76..8e8577b 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchComplexQueryTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchComplexQueryTest.java
@@ -21,8 +21,8 @@ import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.index.elasticsearch.assembly.ESFilesystemIndexQueryAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.test.EntityTestAssembler;
import org.apache.zest.test.indexing.AbstractComplexQueryTest;
import org.junit.BeforeClass;
@@ -63,8 +63,9 @@ public class ElasticSearchComplexQueryTest
esConfig.indexNonAggregatedAssociations().set( Boolean.TRUE );
// FileConfig
- module.services( FileConfigurationService.class )
- .setMetaInfo( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
}
@Override
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchFinderTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchFinderTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchFinderTest.java
index 86ece1a..c85ebc7 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchFinderTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchFinderTest.java
@@ -21,8 +21,8 @@ import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.index.elasticsearch.assembly.ESFilesystemIndexQueryAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.test.EntityTestAssembler;
import org.apache.zest.test.indexing.AbstractEntityFinderTest;
import org.junit.BeforeClass;
@@ -61,8 +61,9 @@ public class ElasticSearchFinderTest
esConfig.indexNonAggregatedAssociations().set( Boolean.TRUE );
// FileConfig
- module.services( FileConfigurationService.class )
- .setMetaInfo( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
}
@Override
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java
index 5b8ff58..0840f35 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java
@@ -25,8 +25,8 @@ import org.apache.zest.bootstrap.LayerAssembly;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.unitofwork.DefaultUnitOfWorkAssembler;
import org.apache.zest.index.elasticsearch.assembly.ESFilesystemIndexQueryAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.test.EntityTestAssembler;
public class ElasticSearchQueryMultimoduleTest extends ElasticSearchQueryTest
@@ -57,7 +57,8 @@ public class ElasticSearchQueryMultimoduleTest extends ElasticSearchQueryTest
esConfig.indexNonAggregatedAssociations().set( Boolean.TRUE );
// FileConfig
- module.services( FileConfigurationService.class )
- .setMetaInfo( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
index 3feeff0..25c9091 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
@@ -25,8 +25,8 @@ import org.apache.zest.api.common.Visibility;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.index.elasticsearch.assembly.ESFilesystemIndexQueryAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.spi.query.EntityFinderException;
import org.apache.zest.test.EntityTestAssembler;
import org.apache.zest.test.indexing.AbstractQueryTest;
@@ -66,8 +66,9 @@ public class ElasticSearchQueryTest
esConfig.indexNonAggregatedAssociations().set( Boolean.TRUE );
// FileConfig
- module.services( FileConfigurationService.class )
- .setMetaInfo( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
}
@Test
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchTest.java
index 8240d3b..4a2050c 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchTest.java
@@ -34,8 +34,8 @@ import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.index.elasticsearch.assembly.ESFilesystemIndexQueryAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.test.EntityTestAssembler;
import org.junit.BeforeClass;
@@ -129,8 +129,9 @@ public class ElasticSearchTest
esConfig.indexNonAggregatedAssociations().set( Boolean.TRUE );
// FileConfig
- module.services( FileConfigurationService.class )
- .setMetaInfo( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
// Entities & Values
module.entities( Post.class, Page.class, Author.class, Comment.class );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ImmenseTermTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ImmenseTermTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ImmenseTermTest.java
index e7c55b2..04b9f6e 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ImmenseTermTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ImmenseTermTest.java
@@ -32,8 +32,8 @@ import org.apache.zest.api.unitofwork.UnitOfWork;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.index.elasticsearch.assembly.ESFilesystemIndexQueryAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.test.EntityTestAssembler;
import org.junit.BeforeClass;
@@ -103,8 +103,9 @@ public class ImmenseTermTest
esConfig.indexNonAggregatedAssociations().set( Boolean.TRUE );
// FileConfig
- module.services( FileConfigurationService.class )
- .setMetaInfo( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
// Entities & Values
module.entities( TestEntity.class, TestEntity2.class );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsAllTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsAllTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsAllTest.java
index c3f6195..53dabc1 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsAllTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsAllTest.java
@@ -19,8 +19,10 @@
*/
package org.apache.zest.index.rdf;
-import org.junit.Assert;
-import org.junit.Test;
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.zest.api.common.Visibility;
import org.apache.zest.api.entity.EntityBuilder;
import org.apache.zest.api.entity.EntityComposite;
@@ -36,15 +38,14 @@ import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.functional.Iterables;
import org.apache.zest.index.rdf.assembly.RdfNativeSesameStoreAssembler;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
import org.apache.zest.library.rdf.repository.NativeConfiguration;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.test.EntityTestAssembler;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+import org.junit.Assert;
import org.junit.Rule;
+import org.junit.Test;
import org.junit.rules.TemporaryFolder;
// A test to verify that containsAll QueryExpression works properly.
@@ -87,11 +88,13 @@ public class ContainsAllTest
public void assemble( ModuleAssembly module )
throws AssemblyException
{
- module.services( FileConfigurationService.class );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
ModuleAssembly prefModule = module.layer().module( "PrefModule" );
prefModule.entities( NativeConfiguration.class ).visibleIn( Visibility.application );
prefModule.forMixin( NativeConfiguration.class ).declareDefaults()
- .dataDirectory().set( tmpDir.getRoot().getAbsolutePath() );
+ .dataDirectory().set( new File( tmpDir.getRoot(), "rdf-data" ).getAbsolutePath() );
new EntityTestAssembler().assemble( prefModule );
module.entities( ExampleEntity.class );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsTest.java
index f864fcb..31107fb 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsTest.java
@@ -19,8 +19,10 @@
*/
package org.apache.zest.index.rdf;
-import org.junit.Assert;
-import org.junit.Test;
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.zest.api.common.Visibility;
import org.apache.zest.api.query.Query;
import org.apache.zest.api.query.QueryBuilder;
@@ -33,15 +35,14 @@ import org.apache.zest.index.rdf.ContainsAllTest.ExampleEntity;
import org.apache.zest.index.rdf.ContainsAllTest.ExampleValue;
import org.apache.zest.index.rdf.ContainsAllTest.ExampleValue2;
import org.apache.zest.index.rdf.assembly.RdfNativeSesameStoreAssembler;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
import org.apache.zest.library.rdf.repository.NativeConfiguration;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.test.EntityTestAssembler;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+import org.junit.Assert;
import org.junit.Rule;
+import org.junit.Test;
import org.junit.rules.TemporaryFolder;
public class ContainsTest extends AbstractZestTest
@@ -52,11 +53,13 @@ public class ContainsTest extends AbstractZestTest
@Override
public void assemble( ModuleAssembly module ) throws AssemblyException
{
- module.services( FileConfigurationService.class );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
ModuleAssembly prefModule = module.layer().module( "PrefModule" );
prefModule.entities( NativeConfiguration.class ).visibleIn( Visibility.application );
prefModule.forMixin( NativeConfiguration.class ).declareDefaults()
- .dataDirectory().set( tmpDir.getRoot().getAbsolutePath() );
+ .dataDirectory().set( new File( tmpDir.getRoot(), "rdf-data" ).getAbsolutePath() );
new EntityTestAssembler().assemble( prefModule );
module.entities( ExampleEntity.class );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RDFPerformanceTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RDFPerformanceTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RDFPerformanceTest.java
index cbef4f0..829761b 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RDFPerformanceTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RDFPerformanceTest.java
@@ -24,6 +24,7 @@ package org.apache.zest.index.rdf;
* JAVADOC
*/
+import java.io.File;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
@@ -43,7 +44,8 @@ import org.apache.zest.bootstrap.Assembler;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.index.rdf.assembly.RdfNativeSesameStoreAssembler;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
import org.apache.zest.library.rdf.repository.NativeConfiguration;
import org.apache.zest.spi.query.IndexExporter;
import org.apache.zest.test.AbstractZestTest;
@@ -72,11 +74,15 @@ public class RDFPerformanceTest extends AbstractZestTest
@Override
public void assemble( ModuleAssembly module ) throws AssemblyException
{
- module.services( FileConfigurationService.class );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
ModuleAssembly prefModule = module.layer().module( "PrefModule" );
prefModule.entities( NativeConfiguration.class ).visibleIn( Visibility.application );
- prefModule.forMixin( NativeConfiguration.class ).declareDefaults().tripleIndexes().set( "spoc,cspo" );
- prefModule.forMixin( NativeConfiguration.class ).declareDefaults().dataDirectory().set( tmpDir.getRoot().getAbsolutePath() );
+ prefModule.forMixin( NativeConfiguration.class ).declareDefaults()
+ .tripleIndexes().set( "spoc,cspo" );
+ prefModule.forMixin( NativeConfiguration.class ).declareDefaults()
+ .dataDirectory().set( new File( tmpDir.getRoot(), "rdf-data" ).getAbsolutePath() );
new EntityTestAssembler().assemble( prefModule );
module.entities( ExampleEntity.class );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrEntityFinderTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrEntityFinderTest.java b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrEntityFinderTest.java
index a9da8f7..3df9b54 100644
--- a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrEntityFinderTest.java
+++ b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrEntityFinderTest.java
@@ -21,8 +21,8 @@ package org.apache.zest.index.solr;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.test.indexing.AbstractEntityFinderTest;
import org.junit.Ignore;
import org.junit.Rule;
@@ -40,8 +40,9 @@ public class SolrEntityFinderTest
throws AssemblyException
{
super.assemble( module );
- module.services( FileConfigurationService.class )
- .setMetaInfo( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
new SolrAssembler().assemble( module );
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrNamedQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrNamedQueryTest.java b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrNamedQueryTest.java
index cee04c1..7076b0b 100644
--- a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrNamedQueryTest.java
+++ b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrNamedQueryTest.java
@@ -23,8 +23,8 @@ import java.util.function.Predicate;
import org.apache.zest.api.composite.Composite;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.test.indexing.AbstractNamedQueryTest;
import org.junit.Ignore;
import org.junit.Rule;
@@ -42,8 +42,9 @@ public class SolrNamedQueryTest
throws AssemblyException
{
super.assemble( module );
- module.services( FileConfigurationService.class )
- .setMetaInfo( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
new SolrAssembler().assemble( module );
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java
index 6b32c80..a602652 100644
--- a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java
+++ b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryServiceTest.java
@@ -33,8 +33,8 @@ import org.apache.zest.api.unitofwork.UnitOfWork;
import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.test.AbstractZestTest;
import org.apache.zest.test.EntityTestAssembler;
import org.junit.Assert;
@@ -57,8 +57,9 @@ public class SolrQueryServiceTest
{
module.layer().application().setMode( Application.Mode.test );
- module.services( FileConfigurationService.class )
- .setMetaInfo( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
new EntityTestAssembler().assemble( module );
// START SNIPPET: assembly
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryTest.java b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryTest.java
index 14ffd25..e0e57db 100644
--- a/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryTest.java
+++ b/extensions/indexing-solr/src/test/java/org/apache/zest/index/solr/SolrQueryTest.java
@@ -21,8 +21,8 @@ package org.apache.zest.index.solr;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
import org.apache.zest.library.fileconfig.FileConfigurationOverride;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.test.indexing.AbstractQueryTest;
import org.junit.Ignore;
import org.junit.Rule;
@@ -40,8 +40,9 @@ public class SolrQueryTest
throws AssemblyException
{
super.assemble( module );
- module.services( FileConfigurationService.class )
- .setMetaInfo( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) );
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
new SolrAssembler().assemble( module );
}
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/libraries/rdf/src/test/java/org/apache/zest/library/rdf/ApplicationXmlTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/ApplicationXmlTest.java b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/ApplicationXmlTest.java
index 29359a7..5a9480d 100644
--- a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/ApplicationXmlTest.java
+++ b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/ApplicationXmlTest.java
@@ -20,13 +20,9 @@
package org.apache.zest.library.rdf;
-import org.junit.Test;
-import org.openrdf.model.Statement;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFWriter;
-import org.openrdf.rio.RDFWriterFactory;
-import org.openrdf.rio.n3.N3WriterFactory;
-import org.openrdf.rio.rdfxml.RDFXMLWriterFactory;
+import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
import org.apache.zest.api.composite.TransientComposite;
import org.apache.zest.api.concern.ConcernOf;
import org.apache.zest.api.concern.Concerns;
@@ -37,14 +33,15 @@ import org.apache.zest.api.sideeffect.SideEffects;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.LayerAssembly;
import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.library.fileconfig.FileConfiguration;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
import org.apache.zest.library.rdf.model.ApplicationSerializer;
import org.apache.zest.test.AbstractZestTest;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
+import org.junit.Test;
+import org.openrdf.model.Statement;
+import org.openrdf.rio.RDFHandlerException;
+import org.openrdf.rio.RDFWriter;
+import org.openrdf.rio.RDFWriterFactory;
+import org.openrdf.rio.n3.N3WriterFactory;
+import org.openrdf.rio.rdfxml.RDFXMLWriterFactory;
/**
* JAVADOC
@@ -58,14 +55,12 @@ public class ApplicationXmlTest extends AbstractZestTest
LayerAssembly layerAssembly = module.layer();
layerAssembly.application().setName( "testapp" );
module.transients( TestComposite.class );
- module.services( FileConfigurationService.class );
}
@Test
public void testApplicationXml()
throws Exception
{
- FileConfiguration fileConfig = serviceFinder.findService( FileConfiguration.class ).get();
ApplicationSerializer parser = new ApplicationSerializer();
Iterable<Statement> graph = parser.serialize( application ); // TODO Fix this
writeN3( graph );
http://git-wip-us.apache.org/repos/asf/zest-java/blob/6f97f0d2/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/NativeRepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/NativeRepositoryTest.java b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/NativeRepositoryTest.java
index 08c7244..ba8f808 100644
--- a/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/NativeRepositoryTest.java
+++ b/libraries/rdf/src/test/java/org/apache/zest/library/rdf/repository/NativeRepositoryTest.java
@@ -20,31 +20,39 @@
package org.apache.zest.library.rdf.repository;
+import org.apache.zest.api.injection.scope.Service;
+import org.apache.zest.bootstrap.AssemblyException;
+import org.apache.zest.bootstrap.ModuleAssembly;
+import org.apache.zest.library.fileconfig.FileConfigurationAssembler;
+import org.apache.zest.library.fileconfig.FileConfigurationOverride;
+import org.apache.zest.test.AbstractZestTest;
+import org.apache.zest.test.EntityTestAssembler;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
-import org.apache.zest.api.injection.scope.Service;
-import org.apache.zest.bootstrap.AssemblyException;
-import org.apache.zest.bootstrap.ModuleAssembly;
-import org.apache.zest.library.fileconfig.FileConfigurationService;
-import org.apache.zest.test.AbstractZestTest;
-import org.apache.zest.test.EntityTestAssembler;
/**
* JAVADOC
*/
public class NativeRepositoryTest extends AbstractZestTest
{
+ @Rule
+ public final TemporaryFolder tmpDir = new TemporaryFolder();
+
@Service
Repository repository;
public void assemble(ModuleAssembly module) throws AssemblyException
{
new EntityTestAssembler().assemble( module );
- module.services(FileConfigurationService.class).instantiateOnStartup();
+ new FileConfigurationAssembler()
+ .withOverride( new FileConfigurationOverride().withConventionalRoot( tmpDir.getRoot() ) )
+ .assemble( module );
module.services(NativeRepositoryService.class).instantiateOnStartup();
module.entities(NativeConfiguration.class);
module.objects(getClass());