Merge abstract_class_instantiated in the same file
diff --git a/tests/functional/a/abstract/abstract_class_instantiated_py3.py b/tests/functional/a/abstract/abstract_class_instantiated.py
similarity index 89%
rename from tests/functional/a/abstract/abstract_class_instantiated_py3.py
rename to tests/functional/a/abstract/abstract_class_instantiated.py
index bf2ef2e..85facb5 100644
--- a/tests/functional/a/abstract/abstract_class_instantiated_py3.py
+++ b/tests/functional/a/abstract/abstract_class_instantiated.py
@@ -126,3 +126,18 @@
def main2():
FourthBadClass() # [abstract-class-instantiated]
+
+
+class BadClassTwo(abc.ABC):
+ """
+ Check that instantiating a class with `abc.ABCMeta` as ancestor fails if it
+ defines abstract methods.
+ """
+ @abc.abstractmethod
+ def test(self):
+ pass
+
+
+def main_two():
+ """ do nothing """
+ BadClassTwo() # [abstract-class-instantiated]
diff --git a/tests/functional/a/abstract/abstract_class_instantiated.txt b/tests/functional/a/abstract/abstract_class_instantiated.txt
new file mode 100644
index 0000000..757528d
--- /dev/null
+++ b/tests/functional/a/abstract/abstract_class_instantiated.txt
@@ -0,0 +1,6 @@
+abstract-class-instantiated:108:4:main:Abstract class 'BadMroAbstractMethods' with abstract methods instantiated:HIGH
+abstract-class-instantiated:109:4:main:Abstract class 'BadClass' with abstract methods instantiated:HIGH
+abstract-class-instantiated:110:4:main:Abstract class 'SecondBadClass' with abstract methods instantiated:HIGH
+abstract-class-instantiated:111:4:main:Abstract class 'ThirdBadClass' with abstract methods instantiated:HIGH
+abstract-class-instantiated:128:4:main2:Abstract class 'FourthBadClass' with abstract methods instantiated:HIGH
+abstract-class-instantiated:143:4:main_two:Abstract class 'BadClassTwo' with abstract methods instantiated:HIGH
diff --git a/tests/functional/a/abstract/abstract_class_instantiated_py3.rc b/tests/functional/a/abstract/abstract_class_instantiated_py3.rc
deleted file mode 100644
index c093be2..0000000
--- a/tests/functional/a/abstract/abstract_class_instantiated_py3.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.0
diff --git a/tests/functional/a/abstract/abstract_class_instantiated_py3.txt b/tests/functional/a/abstract/abstract_class_instantiated_py3.txt
deleted file mode 100644
index f08baf8..0000000
--- a/tests/functional/a/abstract/abstract_class_instantiated_py3.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-abstract-class-instantiated:108:4:main:Abstract class 'BadMroAbstractMethods' with abstract methods instantiated
-abstract-class-instantiated:109:4:main:Abstract class 'BadClass' with abstract methods instantiated
-abstract-class-instantiated:110:4:main:Abstract class 'SecondBadClass' with abstract methods instantiated
-abstract-class-instantiated:111:4:main:Abstract class 'ThirdBadClass' with abstract methods instantiated
-abstract-class-instantiated:128:4:main2:Abstract class 'FourthBadClass' with abstract methods instantiated
diff --git a/tests/functional/a/abstract/abstract_class_instantiated_py34.py b/tests/functional/a/abstract/abstract_class_instantiated_py34.py
deleted file mode 100644
index e24ad28..0000000
--- a/tests/functional/a/abstract/abstract_class_instantiated_py34.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-Check that instantiating a class with `abc.ABCMeta` as ancestor fails if it
-defines abstract methods.
-"""
-
-# pylint: disable=too-few-public-methods, missing-docstring, no-init
-
-import abc
-
-
-
-class BadClass(abc.ABC):
- @abc.abstractmethod
- def test(self):
- pass
-
-def main():
- """ do nothing """
- BadClass() # [abstract-class-instantiated]
diff --git a/tests/functional/a/abstract/abstract_class_instantiated_py34.rc b/tests/functional/a/abstract/abstract_class_instantiated_py34.rc
deleted file mode 100644
index f400a86..0000000
--- a/tests/functional/a/abstract/abstract_class_instantiated_py34.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-[testoptions]
-min_pyver=3.4
diff --git a/tests/functional/a/abstract/abstract_class_instantiated_py34.txt b/tests/functional/a/abstract/abstract_class_instantiated_py34.txt
deleted file mode 100644
index 88d0ef3..0000000
--- a/tests/functional/a/abstract/abstract_class_instantiated_py34.txt
+++ /dev/null
@@ -1 +0,0 @@
-abstract-class-instantiated:19:4:main:Abstract class 'BadClass' with abstract methods instantiated
