From fd0476b073809d1ffeadba59a42f1afdf8a2e511 Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Mon, 13 May 2013 22:04:10 +0400 Subject: [PATCH] Updated TypeEvalContext in tests --- python/testSrc/com/jetbrains/python/PyTypeParserTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python/testSrc/com/jetbrains/python/PyTypeParserTest.java b/python/testSrc/com/jetbrains/python/PyTypeParserTest.java index 67cce7cc7325..f6535dae06f1 100644 --- a/python/testSrc/com/jetbrains/python/PyTypeParserTest.java +++ b/python/testSrc/com/jetbrains/python/PyTypeParserTest.java @@ -33,7 +33,7 @@ public class PyTypeParserTest extends PyTestCase { myFixture.configureByFile("typeParser/typeParser.py"); final PyCollectionType type = (PyCollectionType) PyTypeParser.getTypeByName(myFixture.getFile(), "list of MyObject"); assertClassType(type, "list"); - assertClassType(type.getElementType(TypeEvalContext.userInitiated(null)), "MyObject"); + assertClassType(type.getElementType(getTypeEvalContext()), "MyObject"); } public void testDictType() { @@ -41,7 +41,7 @@ public class PyTypeParserTest extends PyTestCase { final PyCollectionType type = (PyCollectionType) PyTypeParser.getTypeByName(myFixture.getFile(), "dict from str to MyObject"); assertNotNull(type); assertClassType(type, "dict"); - final PyType elementType = type.getElementType(TypeEvalContext.userInitiated(null)); + final PyType elementType = type.getElementType(getTypeEvalContext()); assertInstanceOf(elementType, PyTupleType.class); final PyTupleType tupleType = (PyTupleType)elementType; assertEquals(2, tupleType.getElementCount()); @@ -49,6 +49,10 @@ public class PyTypeParserTest extends PyTestCase { assertClassType(tupleType.getElementType(1), "MyObject"); } + private TypeEvalContext getTypeEvalContext() { + return TypeEvalContext.userInitiated(myFixture.getFile()); + } + public void testUnionType() { myFixture.configureByFile("typeParser/typeParser.py"); final PyUnionType type = (PyUnionType)PyTypeParser.getTypeByName(myFixture.getFile(), "MyObject or str");