Merge remote-tracking branch 'origin/master'

This commit is contained in:
Yann Cébron
2017-03-21 11:20:41 +01:00
3 changed files with 6 additions and 6 deletions
@@ -16,9 +16,9 @@
package com.intellij.diff.tools.fragmented
import com.intellij.diff.util.Side
import com.intellij.testFramework.UsefulTestCase
import junit.framework.TestCase
class LineNumberConvertorCorrectorTest : UsefulTestCase() {
class LineNumberConvertorCorrectorTest : TestCase() {
fun testUnmodified() {
doTest(
{
@@ -15,9 +15,9 @@
*/
package com.intellij.diff.tools.fragmented
import com.intellij.testFramework.UsefulTestCase
import junit.framework.TestCase
class LineNumberConvertorTest : UsefulTestCase() {
class LineNumberConvertorTest : TestCase() {
fun testEmpty() {
doTest(
{
@@ -16,8 +16,8 @@
package org.jetbrains.plugins.github;
import com.intellij.openapi.util.Pair;
import com.intellij.testFramework.UsefulTestCase;
import com.intellij.util.containers.Convertor;
import junit.framework.TestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.github.api.GithubFullPath;
@@ -30,7 +30,7 @@ import static org.jetbrains.plugins.github.util.GithubUrlUtil.*;
/**
* @author Aleksey Pivovarov
*/
public class GithubUrlUtilTest extends UsefulTestCase {
public class GithubUrlUtilTest extends TestCase {
private static class TestCase<T> {
@NotNull final public List<Pair<String, T>> tests = new ArrayList<>();