From fdc7654b9a31425e745ceaea72dc8aa4de992988 Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Tue, 21 Mar 2017 18:58:02 +0300 Subject: [PATCH] PyStringFormatParserTest and EpydocStringTest extend TestCase instead of UsefulTestCase as they don't need any time-consuming bookkeeping of it, and the rest of auxiliary methods can be imported statically. --- python/testSrc/com/jetbrains/python/EpydocStringTest.java | 6 ++++-- .../com/jetbrains/python/PyStringFormatParserTest.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/python/testSrc/com/jetbrains/python/EpydocStringTest.java b/python/testSrc/com/jetbrains/python/EpydocStringTest.java index 2746f76e15a1..dc6d72602f6f 100644 --- a/python/testSrc/com/jetbrains/python/EpydocStringTest.java +++ b/python/testSrc/com/jetbrains/python/EpydocStringTest.java @@ -15,17 +15,19 @@ */ package com.jetbrains.python; -import com.intellij.testFramework.UsefulTestCase; import com.jetbrains.python.documentation.docstrings.EpydocString; import com.jetbrains.python.toolbox.Substring; +import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; import java.util.List; +import static com.intellij.testFramework.UsefulTestCase.assertOrderedEquals; + /** * @author yole */ -public class EpydocStringTest extends UsefulTestCase { +public class EpydocStringTest extends TestCase { public void testTagValue() { EpydocString docString = createEpydocDocString("@rtype: C{str}"); Substring s = docString.getTagValue("rtype"); diff --git a/python/testSrc/com/jetbrains/python/PyStringFormatParserTest.java b/python/testSrc/com/jetbrains/python/PyStringFormatParserTest.java index 3ec16c295031..f12e69bee207 100644 --- a/python/testSrc/com/jetbrains/python/PyStringFormatParserTest.java +++ b/python/testSrc/com/jetbrains/python/PyStringFormatParserTest.java @@ -16,21 +16,22 @@ package com.jetbrains.python; import com.intellij.openapi.util.TextRange; -import com.intellij.testFramework.UsefulTestCase; import com.intellij.util.containers.ContainerUtil; import com.jetbrains.python.inspections.PyNewStyleStringFormatParser; import com.jetbrains.python.inspections.PyNewStyleStringFormatParser.Field; import com.jetbrains.python.inspections.PyNewStyleStringFormatParser.ParseResult; +import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; import java.util.List; +import static com.intellij.testFramework.UsefulTestCase.*; import static com.jetbrains.python.inspections.PyStringFormatParser.*; /** * @author yole */ -public class PyStringFormatParserTest extends UsefulTestCase { +public class PyStringFormatParserTest extends TestCase { public void testSimple() { List chunks = parsePercentFormat("abc"); assertEquals(1, chunks.size());