Fix UTs after renaming of one test class

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-mess.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-mess.txt
new file mode 100644 (file)
index 0000000..48d30c9
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-mess.txt
@@ -0,0 +1,37 @@
+package org.sonar.plugins.switchoffviolations.pattern;
+
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+/**
+ * 
+ */
+public class LineRange {
+  int from, to;
+
+  public LineRange(int from, int to) {
+    if (to < from) {
+      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
+    }
+    this.from = from;
+    this.to = to;
+  }
+
+  // SONAR-OFF
+  public boolean in(int lineId) {
+    return from <= lineId && lineId <= to;
+  }
+  // FOO-OFF
+
+  public Set<Integer> toLines() {
+    Set<Integer> lines = Sets.newLinkedHashSet();
+    // SONAR-ON
+    for (int index = from; index <= to; index++) {
+      lines.add(index);
+    }
+    // FOO-ON
+    return lines;
+  }
+
+}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-twice.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-twice.txt
new file mode 100644 (file)
index 0000000..9ae63dc
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-twice.txt
@@ -0,0 +1,37 @@
+package org.sonar.plugins.switchoffviolations.pattern;
+
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+/**
+ * 
+ */
+public class LineRange {
+  int from, to;
+
+  public LineRange(int from, int to) {
+    if (to < from) {
+      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
+    }
+    this.from = from;
+    this.to = to;
+  }
+
+  // SONAR-OFF
+  public boolean in(int lineId) {
+    return from <= lineId && lineId <= to;
+  }
+  // SONAR-ON
+
+  public Set<Integer> toLines() {
+    Set<Integer> lines = Sets.newLinkedHashSet();
+    // FOO-OFF
+    for (int index = from; index <= to; index++) {
+      lines.add(index);
+    }
+    // FOO-ON
+    return lines;
+  }
+
+}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-unfinished.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-unfinished.txt
new file mode 100644 (file)
index 0000000..dd76561
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-unfinished.txt
@@ -0,0 +1,34 @@
+package org.sonar.plugins.switchoffviolations.pattern;
+
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+/**
+ * 
+ */
+public class LineRange {
+  int from, to;
+
+  public LineRange(int from, int to) {
+    if (to < from) {
+      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
+    }
+    this.from = from;
+    this.to = to;
+  }
+
+  // SONAR-OFF
+  public boolean in(int lineId) {
+    return from <= lineId && lineId <= to;
+  }
+
+  public Set<Integer> toLines() {
+    Set<Integer> lines = Sets.newLinkedHashSet();
+    for (int index = from; index <= to; index++) {
+      lines.add(index);
+    }
+    return lines;
+  }
+
+}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-wrong-order.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-wrong-order.txt
new file mode 100644 (file)
index 0000000..7cac0b9
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp-wrong-order.txt
@@ -0,0 +1,35 @@
+package org.sonar.plugins.switchoffviolations.pattern;
+
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+/**
+ * 
+ */
+public class LineRange {
+  int from, to;
+
+  public LineRange(int from, int to) {
+    if (to < from) {
+      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
+    }
+    this.from = from;
+    this.to = to;
+  }
+
+  // SONAR-ON
+  public boolean in(int lineId) {
+    return from <= lineId && lineId <= to;
+  }
+  // SONAR-OFF
+
+  public Set<Integer> toLines() {
+    Set<Integer> lines = Sets.newLinkedHashSet();
+    for (int index = from; index <= to; index++) {
+      lines.add(index);
+    }
+    return lines;
+  }
+
+}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp.txt
new file mode 100644 (file)
index 0000000..002169f
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-double-regexp.txt
@@ -0,0 +1,35 @@
+package org.sonar.plugins.switchoffviolations.pattern;
+
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+/**
+ * 
+ */
+public class LineRange {
+  int from, to;
+
+  public LineRange(int from, int to) {
+    if (to < from) {
+      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
+    }
+    this.from = from;
+    this.to = to;
+  }
+
+  // SONAR-OFF
+  public boolean in(int lineId) {
+    return from <= lineId && lineId <= to;
+  }
+  // SONAR-ON
+
+  public Set<Integer> toLines() {
+    Set<Integer> lines = Sets.newLinkedHashSet();
+    for (int index = from; index <= to; index++) {
+      lines.add(index);
+    }
+    return lines;
+  }
+
+}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-no-regexp.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-no-regexp.txt
new file mode 100644 (file)
index 0000000..f18fa5b
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-no-regexp.txt
@@ -0,0 +1,33 @@
+package org.sonar.plugins.switchoffviolations.pattern;
+
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+/**
+ * 
+ */
+public class LineRange {
+  int from, to;
+
+  public LineRange(int from, int to) {
+    if (to < from) {
+      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
+    }
+    this.from = from;
+    this.to = to;
+  }
+
+  public boolean in(int lineId) {
+    return from <= lineId && lineId <= to;
+  }
+
+  public Set<Integer> toLines() {
+    Set<Integer> lines = Sets.newLinkedHashSet();
+    for (int index = from; index <= to; index++) {
+      lines.add(index);
+    }
+    return lines;
+  }
+
+}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt
new file mode 100644 (file)
index 0000000..e09ecd7
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-single-regexp-and-double-regexp.txt
@@ -0,0 +1,36 @@
+package org.sonar.plugins.switchoffviolations.pattern;
+
+import com.google.common.collect.Sets;
+
+  // SONAR-OFF
+
+import java.util.Set;
+
+/**
+ * @SONAR-IGNORE-ALL
+ */
+public class LineRange {
+  int from, to;
+
+  public LineRange(int from, int to) {
+    if (to < from) {
+      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
+    }
+    this.from = from;
+    this.to = to;
+  }
+
+  public boolean in(int lineId) {
+    return from <= lineId && lineId <= to;
+  }
+  // SONAR-ON
+
+  public Set<Integer> toLines() {
+    Set<Integer> lines = Sets.newLinkedHashSet();
+    for (int index = from; index <= to; index++) {
+      lines.add(index);
+    }
+    return lines;
+  }
+
+}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-single-regexp.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-single-regexp.txt
new file mode 100644 (file)
index 0000000..ef135eb
--- /dev/null
+++ b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/IgnoreIssuesRegexpScannerTest/file-with-single-regexp.txt
@@ -0,0 +1,33 @@
+package org.sonar.plugins.switchoffviolations.pattern;
+
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+/**
+ * @SONAR-IGNORE-ALL
+ */
+public class LineRange {
+  int from, to;
+
+  public LineRange(int from, int to) {
+    if (to < from) {
+      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
+    }
+    this.from = from;
+    this.to = to;
+  }
+
+  public boolean in(int lineId) {
+    return from <= lineId && lineId <= to;
+  }
+
+  public Set<Integer> toLines() {
+    Set<Integer> lines = Sets.newLinkedHashSet();
+    for (int index = from; index <= to; index++) {
+      lines.add(index);
+    }
+    return lines;
+  }
+
+}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-mess.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-mess.txt
deleted file mode 100644 (file)
index 48d30c9..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-mess.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.sonar.plugins.switchoffviolations.pattern;
-
-import com.google.common.collect.Sets;
-
-import java.util.Set;
-
-/**
- * 
- */
-public class LineRange {
-  int from, to;
-
-  public LineRange(int from, int to) {
-    if (to < from) {
-      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
-    }
-    this.from = from;
-    this.to = to;
-  }
-
-  // SONAR-OFF
-  public boolean in(int lineId) {
-    return from <= lineId && lineId <= to;
-  }
-  // FOO-OFF
-
-  public Set<Integer> toLines() {
-    Set<Integer> lines = Sets.newLinkedHashSet();
-    // SONAR-ON
-    for (int index = from; index <= to; index++) {
-      lines.add(index);
-    }
-    // FOO-ON
-    return lines;
-  }
-
-}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-twice.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-twice.txt
deleted file mode 100644 (file)
index 9ae63dc..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-twice.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.sonar.plugins.switchoffviolations.pattern;
-
-import com.google.common.collect.Sets;
-
-import java.util.Set;
-
-/**
- * 
- */
-public class LineRange {
-  int from, to;
-
-  public LineRange(int from, int to) {
-    if (to < from) {
-      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
-    }
-    this.from = from;
-    this.to = to;
-  }
-
-  // SONAR-OFF
-  public boolean in(int lineId) {
-    return from <= lineId && lineId <= to;
-  }
-  // SONAR-ON
-
-  public Set<Integer> toLines() {
-    Set<Integer> lines = Sets.newLinkedHashSet();
-    // FOO-OFF
-    for (int index = from; index <= to; index++) {
-      lines.add(index);
-    }
-    // FOO-ON
-    return lines;
-  }
-
-}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-unfinished.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-unfinished.txt
deleted file mode 100644 (file)
index dd76561..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-unfinished.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.sonar.plugins.switchoffviolations.pattern;
-
-import com.google.common.collect.Sets;
-
-import java.util.Set;
-
-/**
- * 
- */
-public class LineRange {
-  int from, to;
-
-  public LineRange(int from, int to) {
-    if (to < from) {
-      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
-    }
-    this.from = from;
-    this.to = to;
-  }
-
-  // SONAR-OFF
-  public boolean in(int lineId) {
-    return from <= lineId && lineId <= to;
-  }
-
-  public Set<Integer> toLines() {
-    Set<Integer> lines = Sets.newLinkedHashSet();
-    for (int index = from; index <= to; index++) {
-      lines.add(index);
-    }
-    return lines;
-  }
-
-}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-wrong-order.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-wrong-order.txt
deleted file mode 100644 (file)
index 7cac0b9..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp-wrong-order.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.sonar.plugins.switchoffviolations.pattern;
-
-import com.google.common.collect.Sets;
-
-import java.util.Set;
-
-/**
- * 
- */
-public class LineRange {
-  int from, to;
-
-  public LineRange(int from, int to) {
-    if (to < from) {
-      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
-    }
-    this.from = from;
-    this.to = to;
-  }
-
-  // SONAR-ON
-  public boolean in(int lineId) {
-    return from <= lineId && lineId <= to;
-  }
-  // SONAR-OFF
-
-  public Set<Integer> toLines() {
-    Set<Integer> lines = Sets.newLinkedHashSet();
-    for (int index = from; index <= to; index++) {
-      lines.add(index);
-    }
-    return lines;
-  }
-
-}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp.txt
deleted file mode 100644 (file)
index 002169f..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-double-regexp.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.sonar.plugins.switchoffviolations.pattern;
-
-import com.google.common.collect.Sets;
-
-import java.util.Set;
-
-/**
- * 
- */
-public class LineRange {
-  int from, to;
-
-  public LineRange(int from, int to) {
-    if (to < from) {
-      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
-    }
-    this.from = from;
-    this.to = to;
-  }
-
-  // SONAR-OFF
-  public boolean in(int lineId) {
-    return from <= lineId && lineId <= to;
-  }
-  // SONAR-ON
-
-  public Set<Integer> toLines() {
-    Set<Integer> lines = Sets.newLinkedHashSet();
-    for (int index = from; index <= to; index++) {
-      lines.add(index);
-    }
-    return lines;
-  }
-
-}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-no-regexp.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-no-regexp.txt
deleted file mode 100644 (file)
index f18fa5b..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-no-regexp.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.sonar.plugins.switchoffviolations.pattern;
-
-import com.google.common.collect.Sets;
-
-import java.util.Set;
-
-/**
- * 
- */
-public class LineRange {
-  int from, to;
-
-  public LineRange(int from, int to) {
-    if (to < from) {
-      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
-    }
-    this.from = from;
-    this.to = to;
-  }
-
-  public boolean in(int lineId) {
-    return from <= lineId && lineId <= to;
-  }
-
-  public Set<Integer> toLines() {
-    Set<Integer> lines = Sets.newLinkedHashSet();
-    for (int index = from; index <= to; index++) {
-      lines.add(index);
-    }
-    return lines;
-  }
-
-}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-single-regexp-and-double-regexp.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-single-regexp-and-double-regexp.txt
deleted file mode 100644 (file)
index e09ecd7..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-single-regexp-and-double-regexp.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sonar.plugins.switchoffviolations.pattern;
-
-import com.google.common.collect.Sets;
-
-  // SONAR-OFF
-
-import java.util.Set;
-
-/**
- * @SONAR-IGNORE-ALL
- */
-public class LineRange {
-  int from, to;
-
-  public LineRange(int from, int to) {
-    if (to < from) {
-      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
-    }
-    this.from = from;
-    this.to = to;
-  }
-
-  public boolean in(int lineId) {
-    return from <= lineId && lineId <= to;
-  }
-  // SONAR-ON
-
-  public Set<Integer> toLines() {
-    Set<Integer> lines = Sets.newLinkedHashSet();
-    for (int index = from; index <= to; index++) {
-      lines.add(index);
-    }
-    return lines;
-  }
-
-}
\ No newline at end of file

diff --git a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-single-regexp.txt b/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-single-regexp.txt
deleted file mode 100644 (file)
index ef135eb..0000000
--- a/plugins/sonar-core-plugin/src/test/resources/org/sonar/plugins/core/issue/ignore/scanner/RegexpScannerTest/file-with-single-regexp.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.sonar.plugins.switchoffviolations.pattern;
-
-import com.google.common.collect.Sets;
-
-import java.util.Set;
-
-/**
- * @SONAR-IGNORE-ALL
- */
-public class LineRange {
-  int from, to;
-
-  public LineRange(int from, int to) {
-    if (to < from) {
-      throw new IllegalArgumentException("Line range is not valid: " + from + " must be greater than " + to);
-    }
-    this.from = from;
-    this.to = to;
-  }
-
-  public boolean in(int lineId) {
-    return from <= lineId && lineId <= to;
-  }
-
-  public Set<Integer> toLines() {
-    Set<Integer> lines = Sets.newLinkedHashSet();
-    for (int index = from; index <= to; index++) {
-      lines.add(index);
-    }
-    return lines;
-  }
-
-}
\ No newline at end of file