Reorder new tests

Author: brianschubert

test-data/unit/check-classes.test

@@ -147,48 +147,6 @@ class Base:
 class Derived(Base):
     __hash__ = 1  # E: Incompatible types in assignment (expression has type "int", base class "Base" defined the type as "Callable[[Base], int]")
 
-[case testOverrideCallableAttributeWithMethod]
-from typing import Callable
-
-class Base:
-    func1: Callable[[str], str]
-    func2: Callable[[str], str]
-    func3: Callable[[str], str]
-
-class Derived(Base):
-    def func1(self, x: str) -> str:
-        pass
-
-    @classmethod
-    def func2(cls, x: str) -> str:
-        pass
-
-    @staticmethod
-    def func3(x: str) -> str:
-        pass
-[builtins fixtures/classmethod.pyi]
-
-[case testOverrideCallableUnionAttributeWithMethod]
-from typing import Callable, Union
-
-class Base:
-    func1: Union[Callable[[str], str], str]
-    func2: Union[Callable[[str], str], str]
-    func3: Union[Callable[[str], str], str]
-
-class Derived(Base):
-    def func1(self, x: str) -> str:
-        pass
-
-    @classmethod
-    def func2(cls, x: str) -> str:
-        pass
-
-    @staticmethod
-    def func3(x: str) -> str:
-        pass
-[builtins fixtures/classmethod.pyi]
-
 [case testOverridePartialAttributeWithMethod]
 # This was crashing: https://github.com/python/mypy/issues/11686.
 class Base:
@@ -772,19 +730,6 @@ class B(A):
         pass
 [builtins fixtures/classmethod.pyi]
 
-[case testOverrideCallableAttributeWithSettableProperty]
-from typing import Callable
-
-class A:
-    f: Callable[[str], None]
-
-class B(A):
-    @property
-    def f(self) -> Callable[[object], None]: pass
-    @func.setter
-    def f(self, x: object) -> None: pass
-[builtins fixtures/property.pyi]
-
 [case testOverrideCallableAttributeWithMethodMutableOverride]
 # flags: --enable-error-code=mutable-override
 from typing import Callable
@@ -804,6 +749,19 @@ class B(A):
     def f3(x: object) -> None: pass         # E: Covariant override of a mutable attribute (base class "A" defined the type as "Callable[[str], None]", override has type "Callable[[object], None]")
 [builtins fixtures/classmethod.pyi]
 
+[case testOverrideCallableAttributeWithSettableProperty]
+from typing import Callable
+
+class A:
+    f: Callable[[str], None]
+
+class B(A):
+    @property
+    def f(self) -> Callable[[object], None]: pass
+    @func.setter
+    def f(self, x: object) -> None: pass
+[builtins fixtures/property.pyi]
+
 [case testOverrideCallableAttributeWithSettablePropertyMutableOverride]
 # flags: --enable-error-code=mutable-override
 from typing import Callable
@@ -818,6 +776,27 @@ class B(A):
     def f(self, x: object) -> None: pass
 [builtins fixtures/property.pyi]
 
+[case testOverrideCallableUnionAttributeWithMethod]
+from typing import Callable, Union
+
+class Base:
+    f1: Union[Callable[[str], str], str]
+    f2: Union[Callable[[str], str], str]
+    f3: Union[Callable[[str], str], str]
+
+class Derived(Base):
+    def f1(self, x: str) -> str:
+        pass
+
+    @classmethod
+    def f2(cls, x: str) -> str:
+        pass
+
+    @staticmethod
+    def f3(x: str) -> str:
+        pass
+[builtins fixtures/classmethod.pyi]
+
 -- Constructors
 -- ------------