From b74d248704674ae4511ae80428d0d9bb1f765426 Mon Sep 17 00:00:00 2001
From: Claudiu Popa <pcmanticore@gmail.com>
Date: Wed, 25 Sep 2019 17:50:54 +0200
Subject: Move files that were in the wrong directory

---
 pylint/test/functional/no_else_break.py     | 137 ----------------------------
 pylint/test/functional/no_else_break.txt    |   7 --
 pylint/test/functional/no_else_continue.py  | 137 ----------------------------
 pylint/test/functional/no_else_continue.txt |   7 --
 tests/functional/n/no_else_break.py         | 137 ++++++++++++++++++++++++++++
 tests/functional/n/no_else_break.txt        |   7 ++
 tests/functional/n/no_else_continue.py      | 137 ++++++++++++++++++++++++++++
 tests/functional/n/no_else_continue.txt     |   7 ++
 8 files changed, 288 insertions(+), 288 deletions(-)
 delete mode 100644 pylint/test/functional/no_else_break.py
 delete mode 100644 pylint/test/functional/no_else_break.txt
 delete mode 100644 pylint/test/functional/no_else_continue.py
 delete mode 100644 pylint/test/functional/no_else_continue.txt
 create mode 100644 tests/functional/n/no_else_break.py
 create mode 100644 tests/functional/n/no_else_break.txt
 create mode 100644 tests/functional/n/no_else_continue.py
 create mode 100644 tests/functional/n/no_else_continue.txt

diff --git a/pylint/test/functional/no_else_break.py b/pylint/test/functional/no_else_break.py
deleted file mode 100644
index cf23f313a..000000000
--- a/pylint/test/functional/no_else_break.py
+++ /dev/null
@@ -1,137 +0,0 @@
-""" Test that superfluous else return are detected. """
-
-# pylint:disable=invalid-name,missing-docstring,unused-variable
-
-
-def foo1(x, y, z):
-    for i in x:
-        if i > y:  # [no-else-break]
-            break
-        else:
-            a = z
-
-
-def foo2(x, y, w, z):
-    for i in x:
-        if i > y:  # [no-else-break]
-            break
-        elif i > w:
-            break
-        else:
-            a = z
-
-
-def foo3(x, y, z):
-    for i in x:
-        if i > y:
-            a = 1
-            if z:  # [no-else-break]
-                b = 2
-                break
-            else:
-                c = 3
-                break
-        else:
-            d = 4
-            break
-
-
-def foo4(x, y):
-    for i in x:
-        if i > x:  # [no-else-break]
-            if y:
-                a = 4
-            else:
-                b = 2
-            break
-        else:
-            c = 3
-        break
-
-
-def foo5(x, y, z):
-    for i in x:
-        if i > y:  # [no-else-break]
-            if y:
-                a = 4
-            else:
-                b = 2
-            break
-        elif z:
-            c = 2
-        else:
-            c = 3
-        break
-
-
-def foo6(x, y):
-    for i in x:
-        if i > x:
-            if y:  # [no-else-break]
-                a = 4
-                break
-            else:
-                b = 2
-        else:
-            c = 3
-        break
-
-
-def bar1(x, y, z):
-    for i in x:
-        if i > y:
-            break
-        return z
-
-
-def bar2(w, x, y, z):
-    for i in w:
-        if i > x:
-            break
-        if z < i:
-            a = y
-        else:
-            break
-        return
-
-
-def bar3(x, y, z):
-    for i in x:
-        if i > y:
-            if z:
-                break
-        else:
-            return z
-        return None
-
-
-def bar4(x):
-    for i in range(10):
-        if x:  # [no-else-break]
-            break
-        else:
-            try:
-                return
-            except ValueError:
-                break
-
-
-def nested1(x, y, z):
-    for i in x:
-        if i > x:
-            for j in y:
-                if j < z:
-                    break
-        else:
-            a = z
-
-
-def nested2(x, y, z):
-    for i in x:
-        if i > x:
-            for j in y:
-                if j > z:
-                    break
-                break
-        else:
-            a = z
diff --git a/pylint/test/functional/no_else_break.txt b/pylint/test/functional/no_else_break.txt
deleted file mode 100644
index e08264fb1..000000000
--- a/pylint/test/functional/no_else_break.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-no-else-break:7:foo1:Unnecessary "else" after "break"
-no-else-break:15:foo2:Unnecessary "elif" after "break"
-no-else-break:27:foo3:Unnecessary "else" after "break"
-no-else-break:40:foo4:Unnecessary "else" after "break"
-no-else-break:53:foo5:Unnecessary "elif" after "break"
-no-else-break:69:foo6:Unnecessary "else" after "break"
-no-else-break:109:bar4:Unnecessary "else" after "break"
diff --git a/pylint/test/functional/no_else_continue.py b/pylint/test/functional/no_else_continue.py
deleted file mode 100644
index 37f70f121..000000000
--- a/pylint/test/functional/no_else_continue.py
+++ /dev/null
@@ -1,137 +0,0 @@
-""" Test that superfluous else return are detected. """
-
-# pylint:disable=invalid-name,missing-docstring,unused-variable
-
-
-def foo1(x, y, z):
-    for i in x:
-        if i < y:  # [no-else-continue]
-            continue
-        else:
-            a = z
-
-
-def foo2(x, y, w, z):
-    for i in x:
-        if i < y:  # [no-else-continue]
-            continue
-        elif i < w:
-            continue
-        else:
-            a = z
-
-
-def foo3(x, y, z):
-    for i in x:
-        if i < y:
-            a = 1
-            if z:  # [no-else-continue]
-                b = 2
-                continue
-            else:
-                c = 3
-                continue
-        else:
-            d = 4
-            continue
-
-
-def foo4(x, y):
-    for i in x:
-        if i < x:  # [no-else-continue]
-            if y:
-                a = 4
-            else:
-                b = 2
-            continue
-        else:
-            c = 3
-        continue
-
-
-def foo5(x, y, z):
-    for i in x:
-        if i < y:  # [no-else-continue]
-            if y:
-                a = 4
-            else:
-                b = 2
-            continue
-        elif z:
-            c = 2
-        else:
-            c = 3
-        continue
-
-
-def foo6(x, y):
-    for i in x:
-        if i < x:
-            if y:  # [no-else-continue]
-                a = 4
-                continue
-            else:
-                b = 2
-        else:
-            c = 3
-        continue
-
-
-def bar1(x, y, z):
-    for i in x:
-        if i < y:
-            continue
-        return z
-
-
-def bar2(w, x, y, z):
-    for i in w:
-        if i < x:
-            continue
-        if z < i:
-            a = y
-        else:
-            continue
-        return
-
-
-def bar3(x, y, z):
-    for i in x:
-        if i < y:
-            if z:
-                continue
-        else:
-            return z
-        return None
-
-
-def bar4(x):
-    for i in range(10):
-        if x:  # [no-else-continue]
-            continue
-        else:
-            try:
-                return
-            except ValueError:
-                continue
-
-
-def nested1(x, y, z):
-    for i in x:
-        if i < x:
-            for j in y:
-                if j < z:
-                    continue
-        else:
-            a = z
-
-
-def nested2(x, y, z):
-    for i in x:
-        if i < x:
-            for j in y:
-                if j < z:
-                    continue
-                continue
-        else:
-            a = z
diff --git a/pylint/test/functional/no_else_continue.txt b/pylint/test/functional/no_else_continue.txt
deleted file mode 100644
index 33ddbf9d1..000000000
--- a/pylint/test/functional/no_else_continue.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-no-else-continue:7:foo1:Unnecessary "else" after "continue"
-no-else-continue:15:foo2:Unnecessary "elif" after "continue"
-no-else-continue:27:foo3:Unnecessary "else" after "continue"
-no-else-continue:40:foo4:Unnecessary "else" after "continue"
-no-else-continue:53:foo5:Unnecessary "elif" after "continue"
-no-else-continue:69:foo6:Unnecessary "else" after "continue"
-no-else-continue:109:bar4:Unnecessary "else" after "continue"
diff --git a/tests/functional/n/no_else_break.py b/tests/functional/n/no_else_break.py
new file mode 100644
index 000000000..cf23f313a
--- /dev/null
+++ b/tests/functional/n/no_else_break.py
@@ -0,0 +1,137 @@
+""" Test that superfluous else return are detected. """
+
+# pylint:disable=invalid-name,missing-docstring,unused-variable
+
+
+def foo1(x, y, z):
+    for i in x:
+        if i > y:  # [no-else-break]
+            break
+        else:
+            a = z
+
+
+def foo2(x, y, w, z):
+    for i in x:
+        if i > y:  # [no-else-break]
+            break
+        elif i > w:
+            break
+        else:
+            a = z
+
+
+def foo3(x, y, z):
+    for i in x:
+        if i > y:
+            a = 1
+            if z:  # [no-else-break]
+                b = 2
+                break
+            else:
+                c = 3
+                break
+        else:
+            d = 4
+            break
+
+
+def foo4(x, y):
+    for i in x:
+        if i > x:  # [no-else-break]
+            if y:
+                a = 4
+            else:
+                b = 2
+            break
+        else:
+            c = 3
+        break
+
+
+def foo5(x, y, z):
+    for i in x:
+        if i > y:  # [no-else-break]
+            if y:
+                a = 4
+            else:
+                b = 2
+            break
+        elif z:
+            c = 2
+        else:
+            c = 3
+        break
+
+
+def foo6(x, y):
+    for i in x:
+        if i > x:
+            if y:  # [no-else-break]
+                a = 4
+                break
+            else:
+                b = 2
+        else:
+            c = 3
+        break
+
+
+def bar1(x, y, z):
+    for i in x:
+        if i > y:
+            break
+        return z
+
+
+def bar2(w, x, y, z):
+    for i in w:
+        if i > x:
+            break
+        if z < i:
+            a = y
+        else:
+            break
+        return
+
+
+def bar3(x, y, z):
+    for i in x:
+        if i > y:
+            if z:
+                break
+        else:
+            return z
+        return None
+
+
+def bar4(x):
+    for i in range(10):
+        if x:  # [no-else-break]
+            break
+        else:
+            try:
+                return
+            except ValueError:
+                break
+
+
+def nested1(x, y, z):
+    for i in x:
+        if i > x:
+            for j in y:
+                if j < z:
+                    break
+        else:
+            a = z
+
+
+def nested2(x, y, z):
+    for i in x:
+        if i > x:
+            for j in y:
+                if j > z:
+                    break
+                break
+        else:
+            a = z
diff --git a/tests/functional/n/no_else_break.txt b/tests/functional/n/no_else_break.txt
new file mode 100644
index 000000000..e08264fb1
--- /dev/null
+++ b/tests/functional/n/no_else_break.txt
@@ -0,0 +1,7 @@
+no-else-break:7:foo1:Unnecessary "else" after "break"
+no-else-break:15:foo2:Unnecessary "elif" after "break"
+no-else-break:27:foo3:Unnecessary "else" after "break"
+no-else-break:40:foo4:Unnecessary "else" after "break"
+no-else-break:53:foo5:Unnecessary "elif" after "break"
+no-else-break:69:foo6:Unnecessary "else" after "break"
+no-else-break:109:bar4:Unnecessary "else" after "break"
diff --git a/tests/functional/n/no_else_continue.py b/tests/functional/n/no_else_continue.py
new file mode 100644
index 000000000..37f70f121
--- /dev/null
+++ b/tests/functional/n/no_else_continue.py
@@ -0,0 +1,137 @@
+""" Test that superfluous else return are detected. """
+
+# pylint:disable=invalid-name,missing-docstring,unused-variable
+
+
+def foo1(x, y, z):
+    for i in x:
+        if i < y:  # [no-else-continue]
+            continue
+        else:
+            a = z
+
+
+def foo2(x, y, w, z):
+    for i in x:
+        if i < y:  # [no-else-continue]
+            continue
+        elif i < w:
+            continue
+        else:
+            a = z
+
+
+def foo3(x, y, z):
+    for i in x:
+        if i < y:
+            a = 1
+            if z:  # [no-else-continue]
+                b = 2
+                continue
+            else:
+                c = 3
+                continue
+        else:
+            d = 4
+            continue
+
+
+def foo4(x, y):
+    for i in x:
+        if i < x:  # [no-else-continue]
+            if y:
+                a = 4
+            else:
+                b = 2
+            continue
+        else:
+            c = 3
+        continue
+
+
+def foo5(x, y, z):
+    for i in x:
+        if i < y:  # [no-else-continue]
+            if y:
+                a = 4
+            else:
+                b = 2
+            continue
+        elif z:
+            c = 2
+        else:
+            c = 3
+        continue
+
+
+def foo6(x, y):
+    for i in x:
+        if i < x:
+            if y:  # [no-else-continue]
+                a = 4
+                continue
+            else:
+                b = 2
+        else:
+            c = 3
+        continue
+
+
+def bar1(x, y, z):
+    for i in x:
+        if i < y:
+            continue
+        return z
+
+
+def bar2(w, x, y, z):
+    for i in w:
+        if i < x:
+            continue
+        if z < i:
+            a = y
+        else:
+            continue
+        return
+
+
+def bar3(x, y, z):
+    for i in x:
+        if i < y:
+            if z:
+                continue
+        else:
+            return z
+        return None
+
+
+def bar4(x):
+    for i in range(10):
+        if x:  # [no-else-continue]
+            continue
+        else:
+            try:
+                return
+            except ValueError:
+                continue
+
+
+def nested1(x, y, z):
+    for i in x:
+        if i < x:
+            for j in y:
+                if j < z:
+                    continue
+        else:
+            a = z
+
+
+def nested2(x, y, z):
+    for i in x:
+        if i < x:
+            for j in y:
+                if j < z:
+                    continue
+                continue
+        else:
+            a = z
diff --git a/tests/functional/n/no_else_continue.txt b/tests/functional/n/no_else_continue.txt
new file mode 100644
index 000000000..626adb5b8
--- /dev/null
+++ b/tests/functional/n/no_else_continue.txt
@@ -0,0 +1,7 @@
+no-else-continue:8:foo1:Unnecessary "else" after "continue"
+no-else-continue:16:foo2:Unnecessary "elif" after "continue"
+no-else-continue:28:foo3:Unnecessary "else" after "continue"
+no-else-continue:41:foo4:Unnecessary "else" after "continue"
+no-else-continue:54:foo5:Unnecessary "elif" after "continue"
+no-else-continue:70:foo6:Unnecessary "else" after "continue"
+no-else-continue:110:bar4:Unnecessary "else" after "continue"
-- 
cgit v1.2.1