From cdb6546adbf1e9fcc5b6c1fe9fd9b01d456d02c1 Mon Sep 17 00:00:00 2001
From: Michal Kordas <kordas.michal@gmail.com>
Date: Sat, 3 Oct 2015 23:44:07 +0200
Subject: [PATCH] Issue #2260: Make ConfigurationLoader.loadConfiguration
 public

---
 .../tools/checkstyle/ConfigurationLoader.java      |  2 +-
 .../tools/checkstyle/ConfigurationLoaderTest.java  | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
index f2d0d8dab..2f0cf6238 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
@@ -219,7 +219,7 @@ public final class ConfigurationLoader {
      * @return the check configurations
      * @throws CheckstyleException if an error occurs
      */
-    private static Configuration loadConfiguration(InputSource configSource,
+    public static Configuration loadConfiguration(InputSource configSource,
             PropertyResolver overridePropsResolver, boolean omitIgnoredModules)
         throws CheckstyleException {
         try {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java
index a1433708a..cfa387349 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java
@@ -33,6 +33,7 @@ import java.util.Properties;
 
 import org.junit.Test;
 import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
 
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 import com.puppycrawl.tools.checkstyle.api.Configuration;
@@ -410,6 +411,19 @@ public class ConfigurationLoaderTest {
         assertEquals(0, children[0].getChildren().length);
     }
 
+    @Test
+    public void testConfigWithIgnoreUsingInputSource() throws CheckstyleException {
+
+        final DefaultConfiguration config =
+                (DefaultConfiguration) ConfigurationLoader.loadConfiguration(new InputSource(
+                        new File("src/test/resources/com/puppycrawl/tools/checkstyle/configs/"
+                                + "config_with_ignore.xml").toURI().toString()),
+                        new PropertiesExpander(new Properties()), true);
+
+        final Configuration[] children = config.getChildren();
+        assertEquals(0, children[0].getChildren().length);
+    }
+
     @Test
     public void testConfigCheckerWithIgnore() throws CheckstyleException {