From 30c007d8002d867de9cdb09152be046bb4012fd1 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Mon, 27 Feb 2017 18:26:00 +0300
Subject: [PATCH] PY-20057 Fix a few tests broken due to changes in
 PyGenericType

---
 .../src/com/jetbrains/python/psi/types/PyGenericType.java   | 3 +--
 .../PyTypeCheckerInspection/FunctionParameterReturnType.py  | 2 +-
 .../PyTypeCheckerInspection/MetaClassIteration.py           | 2 +-
 python/testSrc/com/jetbrains/python/PyTypeParserTest.java   | 6 ++----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/python/src/com/jetbrains/python/psi/types/PyGenericType.java b/python/src/com/jetbrains/python/psi/types/PyGenericType.java
index cbd568bfe764..bcfd524dc416 100644
--- a/python/src/com/jetbrains/python/psi/types/PyGenericType.java
+++ b/python/src/com/jetbrains/python/psi/types/PyGenericType.java
@@ -26,7 +26,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author vlan
@@ -84,7 +83,7 @@ public class PyGenericType implements PyType, PyInstantiableType<PyGenericType>
       return false;
     }
     final PyGenericType type = (PyGenericType)o;
-    return myName.equals(type.myName) && Objects.equals(myBound, type.getBound()) && myIsDefinition == type.isDefinition();
+    return myName.equals(type.myName) && myIsDefinition == type.isDefinition();
   }
 
   @Override
diff --git a/python/testData/inspections/PyTypeCheckerInspection/FunctionParameterReturnType.py b/python/testData/inspections/PyTypeCheckerInspection/FunctionParameterReturnType.py
index efdfc5722cde..3a4d0a8c1273 100644
--- a/python/testData/inspections/PyTypeCheckerInspection/FunctionParameterReturnType.py
+++ b/python/testData/inspections/PyTypeCheckerInspection/FunctionParameterReturnType.py
@@ -15,7 +15,7 @@ def test():
     for item in func(<warning descr="Expected type '(Any) -> str', got '(x: Any) -> int' instead">f</warning>, []):
         pass
 
-    for item in func(<warning descr="Expected type '(Any) -> str', got 'int' instead">int</warning>, []):
+    for item in func(<warning descr="Expected type '(Any) -> str', got 'Type[int]' instead">int</warning>, []):
         pass
 
     for item in func(<warning descr="Expected type '(Any) -> str', got '(x: Any) -> int' instead">lambda x: int(x)</warning>, []):
diff --git a/python/testData/inspections/PyTypeCheckerInspection/MetaClassIteration.py b/python/testData/inspections/PyTypeCheckerInspection/MetaClassIteration.py
index 0ec69266af7c..daaefdd4cc32 100644
--- a/python/testData/inspections/PyTypeCheckerInspection/MetaClassIteration.py
+++ b/python/testData/inspections/PyTypeCheckerInspection/MetaClassIteration.py
@@ -23,7 +23,7 @@ for x in C1:
     pass
 
 
-for y in <warning descr="Expected 'collections.Iterable', got 'C2' instead">C2</warning>:
+for y in <warning descr="Expected 'collections.Iterable', got 'Type[C2]' instead">C2</warning>:
     pass
 
 
diff --git a/python/testSrc/com/jetbrains/python/PyTypeParserTest.java b/python/testSrc/com/jetbrains/python/PyTypeParserTest.java
index 79e1a3e7c958..af5b38ff7c8c 100644
--- a/python/testSrc/com/jetbrains/python/PyTypeParserTest.java
+++ b/python/testSrc/com/jetbrains/python/PyTypeParserTest.java
@@ -24,8 +24,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import static com.jetbrains.python.psi.PyUtil.as;
-
 /**
  * @author yole
  */
@@ -139,7 +137,7 @@ public class PyTypeParserTest extends PyTestCase {
     final PyType type = PyTypeParser.getTypeByName(myFixture.getFile(), "T");
     assertNotNull(type);
     assertInstanceOf(type, PyGenericType.class);
-    assertEquals("TypeVar('T')", type.getName());
+    assertEquals("T", type.getName());
   }
 
   // PY-4223
@@ -251,7 +249,7 @@ public class PyTypeParserTest extends PyTestCase {
     assertEquals("int", type0.getName());
     final PyType type1 = parameterTypes.get(1).getType(context);
     assertNotNull(type1);
-    assertEquals("TypeVar('T')", type1.getName());
+    assertEquals("T", type1.getName());
   }
 
   public void testCallableWithoutArgs() {