add: AbstractKernelFixture#withConfResource

vi-ai · Jun 7, 2021 · 0e6aa60 · 0e6aa60
1 parent 5ad0ffa
commit 0e6aa60
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/oap-stdlib/src/main/java/oap/application/testng/AbstractKernelFixture.java b/oap-stdlib/src/main/java/oap/application/testng/AbstractKernelFixture.java
@@ -36,6 +36,7 @@
 import oap.testng.TestDirectoryFixture;
 
 import javax.annotation.Nonnull;
+import java.io.UncheckedIOException;
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -44,6 +45,7 @@
 import java.util.Map;
 
 import static oap.http.testng.HttpAsserts.httpPrefix;
+import static oap.io.IoStreams.Encoding.PLAIN;
 import static oap.testng.TestDirectoryFixture.testDirectory;
 
 public abstract class AbstractKernelFixture<Self extends AbstractKernelFixture<Self>> extends AbstractEnvFixture<Self> {
@@ -114,29 +116,44 @@ protected void defineDefaults() {
     }
 
     @SuppressWarnings( "unchecked" )
-    public Self withConfdResources( Class<?> clazz, String confdResource ) {
-        this.confd = TestDirectoryFixture.testPath( "/application.test.confd" );
+    public Self withConfdResources( Class<?> clazz, String confdResource ) throws UncheckedIOException {
+        initConfd();
 
         Resources.filePaths( clazz, confdResource )
             .forEach( path -> oap.io.Files.copyDirectory( path, this.confd ) );
 
         return ( Self ) this;
     }
 
+    @SuppressWarnings( "unchecked" )
+    public Self withConfResource( Class<?> clazz, String confdResource ) throws UncheckedIOException {
+        initConfd();
+
+        Resources.filePath( clazz, confdResource )
+            .ifPresent( path -> oap.io.Files.copy( path, PLAIN, this.confd.resolve( path.getFileName() ), PLAIN ) );
+
+        return ( Self ) this;
+    }
+
+    private void initConfd() {
+        if( this.confd == null )
+            this.confd = TestDirectoryFixture.testPath( "/application.test.confd" + "." + prefix );
+    }
+
     @Nonnull
-    public <T> T service( @Nonnull String moduleName, @Nonnull Class<T> clazz ) {
+    public <T> T service( @Nonnull String moduleName, @Nonnull Class<T> clazz ) throws IllegalArgumentException {
         return kernel.serviceOfClass( moduleName, clazz )
             .orElseThrow( () -> new IllegalArgumentException( "unknown service " + moduleName + ":" + clazz ) );
     }
 
     @Nonnull
-    public <T> T service( @Nonnull String moduleName, @Nonnull String serviceName ) {
+    public <T> T service( @Nonnull String moduleName, @Nonnull String serviceName ) throws IllegalArgumentException {
         return kernel.<T>service( moduleName, serviceName )
             .orElseThrow( () -> new IllegalArgumentException( "unknown service " + moduleName + ":" + serviceName ) );
     }
 
     @Nonnull
-    public <T> T service( @Nonnull String reference ) {
+    public <T> T service( @Nonnull String reference ) throws IllegalArgumentException {
         return kernel.<T>service( reference )
             .orElseThrow( () -> new IllegalArgumentException( "unknown service " + reference ) );
     }

diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
     </repositories>
 
     <properties>
-        <oap.project.version>9.9.12</oap.project.version>
+        <oap.project.version>9.9.13</oap.project.version>
 
 
         <oap.deps.testng.version>7.4.0</oap.deps.testng.version>