Make MavenEmbedderTest more isolated by using empty maven settings (a…

…pache#920)
kiegroup · Sep 14, 2016 · 096df6d · 096df6d
1 parent 8aa2be1
commit 096df6d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/kie-ci/src/main/java/org/kie/scanner/embedder/MavenSettings.java b/kie-ci/src/main/java/org/kie/scanner/embedder/MavenSettings.java
@@ -22,6 +22,7 @@
 import org.apache.maven.settings.building.SettingsBuilder;
 import org.apache.maven.settings.building.SettingsBuildingException;
 import org.apache.maven.settings.building.SettingsSource;
+import org.apache.maven.settings.building.StringSettingsSource;
 import org.apache.maven.settings.building.UrlSettingsSource;
 import org.kie.scanner.Aether;
 import org.kie.scanner.MavenRepository;
@@ -46,8 +47,17 @@ private static class SettingsHolder {
 
         private static void reinitSettings() {
             userSettingsSource = initUserSettingsSource();
+            internalInit();
+        }
+
+        private static void reinitSettingsFromString(String settings) {
+            userSettingsSource = new StringSettingsSource( settings );
+            internalInit();
+        }
+
+        private static void internalInit() {
             settings = initSettings(userSettingsSource);
-            mavenConf = new MavenRepositoryConfiguration(settings);
+            mavenConf = new MavenRepositoryConfiguration( settings);
             Aether.instance = null;
             MavenProjectLoader.mavenProject = null;
             MavenRepository.defaultMavenRepository = null;
@@ -59,6 +69,11 @@ public static void reinitSettings() {
         SettingsHolder.reinitSettings();
     }
 
+    // USE ONLY FOR TESTING PURPOSES
+    public static void reinitSettingsFromString(String settings) {
+        SettingsHolder.reinitSettingsFromString(settings);
+    }
+
     public static SettingsSource getUserSettingsSource() {
         return SettingsHolder.userSettingsSource;
     }

diff --git a/kie-ci/src/test/java/org/kie/scanner/embedder/MavenEmbedderTest.java b/kie-ci/src/test/java/org/kie/scanner/embedder/MavenEmbedderTest.java
@@ -39,14 +39,20 @@
 
 public class MavenEmbedderTest {
 
+    private final String EMPTY_SETTINGS = "<settings xmlns=\"http://maven.apache.org/SETTINGS/1.0.0\"\n" +
+                                          "      xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+                                          "      xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0\n" +
+                                          "                          http://maven.apache.org/xsd/settings-1.0.0.xsd\"/>\n";
+
     @Test
     public void testExternalRepositories() {
         String oldSettingsXmlPath = System.getProperty( CUSTOM_SETTINGS_PROPERTY );
         try {
             if (oldSettingsXmlPath != null) {
                 System.clearProperty( CUSTOM_SETTINGS_PROPERTY );
-                MavenSettings.reinitSettings();
             }
+            MavenSettings.reinitSettingsFromString(EMPTY_SETTINGS);
+
             final MavenRequest mavenRequest = createMavenRequest(null);
             final MavenEmbedder embedder = new MavenEmbedderMock( mavenRequest );
             final MavenExecutionRequest request = embedder.buildMavenExecutionRequest( mavenRequest );
@@ -69,8 +75,8 @@ public void testExternalRepositories() {
         } finally {
             if (oldSettingsXmlPath != null) {
                 System.setProperty( CUSTOM_SETTINGS_PROPERTY, oldSettingsXmlPath );
-                MavenSettings.reinitSettings();
             }
+            MavenSettings.reinitSettings();
         }
     }