From daae0431d190cceceee62d7163a4e67e2c622aa2 Mon Sep 17 00:00:00 2001
From: Michal Kordas <kordas.michal@gmail.com>
Date: Fri, 11 Sep 2015 22:48:59 +0200
Subject: [PATCH] Issue #2161: Unify naming files with test inputs

---
 .../rule488numericliterals/UpperEllTest.java                  | 2 +-
 .../{UpperEllInput.java => InputUpperEll.java}                | 2 +-
 .../checkstyle/checks/annotation/MissingDeprecatedTest.java   | 4 ++--
 ...catedAnnotation.java => InputBadDeprecatedAnnotation.java} | 4 ++--
 ...ialCaseDeprecated.java => InputSpecialCaseDeprecated.java} | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/it/resources/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/{UpperEllInput.java => InputUpperEll.java} (99%)
 rename src/test/resources/com/puppycrawl/tools/checkstyle/annotation/{BadDeprecatedAnnotation.java => InputBadDeprecatedAnnotation.java} (87%)
 rename src/test/resources/com/puppycrawl/tools/checkstyle/annotation/{SpecialCaseDeprecated.java => InputSpecialCaseDeprecated.java} (96%)

diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java
index be69329eb..4899874ea 100644
--- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllTest.java
@@ -49,7 +49,7 @@ public class UpperEllTest extends BaseCheckTestSupport{
         };
         
         Configuration checkConfig = builder.getCheckConfig("UpperEll");
-        String filePath = builder.getFilePath("UpperEllInput");
+        String filePath = builder.getFilePath("InputUpperEll");
         
         Integer[] warnList = builder.getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllInput.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/InputUpperEll.java
similarity index 99%
rename from src/it/resources/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllInput.java
rename to src/it/resources/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/InputUpperEll.java
index 1fd89c6e2..9158d23f1 100644
--- a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/UpperEllInput.java
+++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule488numericliterals/InputUpperEll.java
@@ -1,6 +1,6 @@
 package com.google.checkstyle.test.chapter4formatting.rule488numericliterals;
 
-class UpperEllInput
+class InputUpperEll
 {
     /** test **/
     private final long IGNORE = 666l + 666L; //warn
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedTest.java
index 57f1caf45..8a5538c80 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedTest.java
@@ -71,7 +71,7 @@ public class MissingDeprecatedTest extends BaseCheckTestSupport {
             "56: " + getCheckMessage(MSG_KEY_ANNOTATION_MISSING_DEPRECATED),
         };
 
-        verify(checkConfig, getPath("annotation" + File.separator + "BadDeprecatedAnnotation.java"), expected);
+        verify(checkConfig, getPath("annotation" + File.separator + "InputBadDeprecatedAnnotation.java"), expected);
     }
 
     /**
@@ -121,7 +121,7 @@ public class MissingDeprecatedTest extends BaseCheckTestSupport {
             "51: " + getCheckMessage(MSG_KEY_JAVADOC_DUPLICATE_TAG, "@deprecated"),
         };
 
-        verify(checkConfig, getPath("annotation" + File.separator + "SpecialCaseDeprecated.java"), expected);
+        verify(checkConfig, getPath("annotation" + File.separator + "InputSpecialCaseDeprecated.java"), expected);
     }
 
     /**
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/BadDeprecatedAnnotation.java b/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputBadDeprecatedAnnotation.java
similarity index 87%
rename from src/test/resources/com/puppycrawl/tools/checkstyle/annotation/BadDeprecatedAnnotation.java
rename to src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputBadDeprecatedAnnotation.java
index ad10aaf31..c1e27525c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/BadDeprecatedAnnotation.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputBadDeprecatedAnnotation.java
@@ -4,12 +4,12 @@ package com.puppycrawl.tools.checkstyle.annotation;
  * @deprecated
  *  stuff
  */
-public class BadDeprecatedAnnotation
+public class InputBadDeprecatedAnnotation
 {
     /**
      * @deprecated        stuff
      */
-    protected BadDeprecatedAnnotation() {
+    protected InputBadDeprecatedAnnotation() {
 
     }
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SpecialCaseDeprecated.java b/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputSpecialCaseDeprecated.java
similarity index 96%
rename from src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SpecialCaseDeprecated.java
rename to src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputSpecialCaseDeprecated.java
index 7397def26..aaedcbe10 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/SpecialCaseDeprecated.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/annotation/InputSpecialCaseDeprecated.java
@@ -5,7 +5,7 @@ package com.puppycrawl.tools.checkstyle.annotation;
  * @deprecated boo
  */
 @Deprecated
-public class SpecialCaseDeprecated
+public class InputSpecialCaseDeprecated
 {
     /**
      * @deprecated bleh