From a135b0952a3041e37dfc9b81452bc016a5687e25 Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Sat, 14 Mar 2015 15:41:43 +0100 Subject: [PATCH] Fix non-compiling input for CustomImportOrder check There are no classes directly under `com.google.common` package - such import was illegal. --- .../checkstyle/checks/imports/CustomImportOrderCheckTest.java | 2 +- .../tools/checkstyle/imports/InputCustomImportOrder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java index 25a2757d4..b9f07b6c1 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheckTest.java @@ -81,7 +81,7 @@ public class CustomImportOrderCheckTest extends BaseCheckTestSupport "9: " + getCheckMessage(MSG_LEX, "java.awt.Dialog"), "13: " + getCheckMessage(MSG_LEX, "java.io.File"), "15: " + getCheckMessage(MSG_LEX, "java.io.InputStream"), - "20: " + getCheckMessage(MSG_LEX, "com.google.common.*"), + "20: " + getCheckMessage(MSG_LEX, "com.google.common.collect.*"), }; verify(checkConfig, getPath("imports" + File.separator diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder.java b/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder.java index 625ae07fe..4335bead5 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/imports/InputCustomImportOrder.java @@ -17,7 +17,7 @@ import java.io.Reader; import com.puppycrawl.tools.*; -import com.google.common.*; +import com.google.common.collect.*; import org.junit.*; public class InputCustomImportOrder {