Fixes tests

Author: sobolevn

typesafety/test_typeclass/test_callback.yml

@@ -39,5 +39,5 @@
 
     accepts_typeclass(example)
   out: |
-    main:16: error: Argument 1 to "accepts_typeclass" has incompatible type "_TypeClass[float, Callable[[Any, bool], bool], <nothing>, Literal['main.example']]"; expected "Callable[[str, bool], bool]"
-    main:16: note: "_TypeClass[float, Callable[[Any, bool], bool], <nothing>, Literal['main.example']].__call__" has type "Callable[[Arg(Union[float, Supports[<nothing>]], 'instance'), VarArg(Any), KwArg(Any)], _ReturnType]"
+    main:16: error: Argument 1 to "accepts_typeclass" has incompatible type "_TypeClass[Union[int, float], Callable[[Any, bool], bool], <nothing>, Literal['main.example']]"; expected "Callable[[str, bool], bool]"
+    main:16: note: "_TypeClass[Union[int, float], Callable[[Any, bool], bool], <nothing>, Literal['main.example']].__call__" has type "Callable[[Arg(Union[float, Supports[<nothing>]], 'instance'), VarArg(Any), KwArg(Any)], _ReturnType]"

typesafety/test_typeclass/test_instance/test_instance_method.yml

@@ -188,8 +188,8 @@
     def _a_any(instance: Any) -> str:
         ...
   out: |
+    main:8: error: Argument 1 to "instance" of "_TypeClass" has incompatible type "object"; expected "None"
     main:8: error: Instance "Any" does not match runtime type "builtins.object"
-    main:8: error: Value of type variable "_NewInstanceType" of "instance" of "_TypeClass" cannot be "object"
 
 
 - case: typeclass_instance_wrong_param
@@ -201,7 +201,7 @@
     def a(instance) -> str:
         ...
 
-    a.instance(1)  # E: Value of type variable "_NewInstanceType" of "instance" of "_TypeClass" cannot be "int"
+    a.instance(1)  # E: Argument 1 to "instance" of "_TypeClass" has incompatible type "int"; expected "None"
 
 
 - case: typeclass_instance_callback_def

typesafety/test_typeclass/test_supports/test_typeguard.yml

@@ -51,8 +51,8 @@
         reveal_type(item)
         to_json(item)  # ok
   out: |
-    main:20: error: Argument 1 to "to_json" has incompatible type "Union[int, str]"; expected "Union[Dict[Any, Any], int, Supports[ToJson]]"
-    main:23: note: Revealed type is "Union[builtins.dict[Any, Any], builtins.int]"
+    main:20: error: Argument 1 to "to_json" has incompatible type "Union[int, str]"; expected "Union[int, Dict[Any, Any], Supports[ToJson]]"
+    main:23: note: Revealed type is "Union[builtins.int, builtins.dict[Any, Any]]"
 
 
 - case: typeclass_function_supports_typeguard_generic1
@@ -82,8 +82,8 @@
         reveal_type(item)
         copy(item)  # ok
   out: |
-    main:19: error: Argument 1 to "copy" has incompatible type "Union[builtins.int, builtins.str]"; expected "Union[builtins.dict[Any, Any], builtins.int]"
-    main:22: note: Revealed type is "Union[builtins.dict[Any, Any], builtins.int]"
+    main:19: error: Argument 1 to "copy" has incompatible type "Union[builtins.int, builtins.str]"; expected "Union[builtins.int, builtins.dict[Any, Any]]"
+    main:22: note: Revealed type is "Union[builtins.int, builtins.dict[Any, Any]]"
 
 
 - case: typeclass_object_supports_typeguard_generic1
@@ -116,5 +116,5 @@
         reveal_type(item)
         copy(item)  # ok
   out: |
-    main:22: error: Argument 1 to "copy" has incompatible type "Union[builtins.int, builtins.str]"; expected "Union[builtins.dict[Any, Any], builtins.int, classes._typeclass.Supports[main.Copy]]"
-    main:25: note: Revealed type is "Union[builtins.dict[Any, Any], builtins.int]"
+    main:22: error: Argument 1 to "copy" has incompatible type "Union[builtins.int, builtins.str]"; expected "Union[builtins.int, builtins.dict[Any, Any], classes._typeclass.Supports[main.Copy]]"
+    main:25: note: Revealed type is "Union[builtins.int, builtins.dict[Any, Any]]"

typesafety/test_typeclass/test_typeclass.yml

@@ -32,7 +32,7 @@
     to_json('a')
     to_json(None)
   out: |
-    main:20: error: Argument 1 to "to_json" has incompatible type "None"; expected "Union[str, int, Supports[ToJson]]"
+    main:20: error: Argument 1 to "to_json" has incompatible type "None"; expected "Union[int, str, Supports[ToJson]]"
 
 
 - case: typeclass_class_wrong_sig