TouchInstinct
/
checkstyle
311
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #2260: Make ConfigurationLoader.loadConfiguration public

This commit is contained in:
Michal Kordas 2015-10-03 23:44:07 +02:00
parent 3feab62232
commit cdb6546adb
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
View File

@ -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 {

14
src/test/java/com/puppycrawl/tools/checkstyle/ConfigurationLoaderTest.java
View File

@ -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 {