You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/02/15 21:56:22 UTC

[archiva-redback-core] 01/02: Adding additional unit test

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git

commit 81816de77fc660aac1e45b976e5b2f31450078be
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Fri Feb 15 18:04:59 2019 +0100

    Adding additional unit test
---
 .../acc2/CommonsConfigurationRegistryTest.java     | 28 ++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/redback-common/redback-common-configuration/redback-common-configuration-acc2/src/test/java/org/apache/archiva/redback/common/config/acc2/CommonsConfigurationRegistryTest.java b/redback-common/redback-common-configuration/redback-common-configuration-acc2/src/test/java/org/apache/archiva/redback/common/config/acc2/CommonsConfigurationRegistryTest.java
index df54639..57d55cd 100644
--- a/redback-common/redback-common-configuration/redback-common-configuration-acc2/src/test/java/org/apache/archiva/redback/common/config/acc2/CommonsConfigurationRegistryTest.java
+++ b/redback-common/redback-common-configuration/redback-common-configuration-acc2/src/test/java/org/apache/archiva/redback/common/config/acc2/CommonsConfigurationRegistryTest.java
@@ -21,6 +21,9 @@ package org.apache.archiva.redback.common.config.acc2;
 
 import org.apache.archiva.redback.common.config.api.ConfigRegistry;
 import org.apache.archiva.redback.common.config.api.RegistryException;
+import org.apache.commons.configuration2.XMLConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,6 +32,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.rmi.registry.Registry;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -369,16 +373,20 @@ public class CommonsConfigurationRegistryTest
         registry.save();
 
         // @TODO: Migrate test implementation to commons config 2.4
-//        XMLConfiguration configuration = new XMLConfiguration( dest );
-//        assertEquals( Arrays.asList( new String[]{ "1", "3" } ), configuration.getList( "listElements.listElement" ) );
-//
-//        // file in ${basedir}/target/conf/shared.xml
-//        Registry section = this.registry.getSection( "org.apache.maven.shared.app.user" );
-//        section.setString( "foo", "zloug" );
-//        section.save();
-//
-//        configuration = new XMLConfiguration( new File( "target/conf/shared.xml" ) );
-//        assertNotNull( configuration.getString( "foo" ) );
+
+        FileBasedConfigurationBuilder<XMLConfiguration> builder = new FileBasedConfigurationBuilder<>( XMLConfiguration.class)
+                .configure( new Parameters().xml().setFile(dest.toFile()) );
+        XMLConfiguration configuration = builder.getConfiguration();
+        assertEquals( Arrays.asList( new String[]{ "1", "3" } ), configuration.getList( "listElements.listElement" ) );
+
+        // file in ${basedir}/target/conf/shared.xml
+        ConfigRegistry section = this.registry.getPartOfCombined( "org.apache.maven.shared.app.user" );
+        section.setString( "foo", "zloug" );
+        section.save();
+        builder = new FileBasedConfigurationBuilder<>( XMLConfiguration.class)
+                .configure( new Parameters().xml().setFile( Paths.get("target/conf/shared.xml").toFile() ) );
+        configuration = builder.getConfiguration();
+        assertNotNull( configuration.getString( "foo" ) );
 
     }