Fix deprecation warnings on junit.framework.Assert

Use org.junit.Assert instead everywhere. Also fix some other minor warnings

idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java

@@ -26,11 +26,11 @@ import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementPresentation;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
-import junit.framework.Assert;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.InTextDirectivesUtils;
 import org.jetbrains.jet.plugin.project.TargetPlatform;
+import org.junit.Assert;
 
 import java.util.*;
 
@@ -160,16 +160,6 @@ public class ExpectedCompletionUtils {
         }
     }
 
-    @NotNull
-    public static CompletionProposal[] itemsShouldExist(String fileText) {
-        return itemsShouldExist(fileText, null);
-    }
-
-    @NotNull
-    public static CompletionProposal[] itemsShouldAbsent(String fileText) {
-        return itemsShouldAbsent(fileText, null);
-    }
-
     public static CompletionProposal[] processProposalAssertions(String fileText, String... prefixes) {
         Collection<CompletionProposal> proposals = new ArrayList<CompletionProposal>();
         for (String proposalStr : InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, prefixes)) {
@@ -191,11 +181,6 @@ public class ExpectedCompletionUtils {
         return ArrayUtil.toObjectArray(proposals, CompletionProposal.class);
     }
 
-    @Nullable
-    public static Integer getExpectedNumber(String fileText) {
-        return getExpectedNumber(fileText, null);
-    }
-
     @Nullable
     public static Integer getExpectedNumber(String fileText, @Nullable TargetPlatform platform) {
         if (platform == null) {

idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java

@@ -27,7 +27,6 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.util.SmartList;
-import junit.framework.Assert;
 import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
@@ -44,6 +43,7 @@ import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
 import org.jetbrains.jet.plugin.project.ResolveSessionForBodies;
+import org.junit.Assert;
 
 import java.util.*;
 
@@ -124,7 +124,7 @@ public abstract class AbstractOverrideImplementTest extends JetLightCodeInsightF
         assertNotNull("Caret should be inside class or object", classOrObject);
 
         final JetFile jetFile = classOrObject.getContainingJetFile();
-        final ResolveSessionForBodies resolveSession = ResolvePackage.getLazyResolveSession(jetFile);
+        ResolveSessionForBodies resolveSession = ResolvePackage.getLazyResolveSession(jetFile);
         Set<CallableMemberDescriptor> descriptors =
                 handler.collectMethodsToGenerate(classOrObject, resolveSession.resolveToElement(classOrObject));
 
@@ -164,7 +164,7 @@ public abstract class AbstractOverrideImplementTest extends JetLightCodeInsightF
 
         new WriteCommandAction(myFixture.getProject(), myFixture.getFile()) {
             @Override
-            protected void run(Result result) throws Throwable {
+            protected void run(@NotNull Result result) throws Throwable {
                 OverrideImplementMethodsHandler.generateMethods(myFixture.getEditor(), classOrObject,
                         OverrideImplementMethodsHandler.membersFromDescriptors(jetFile, Collections.singletonList(singleToOverride))
                 );
@@ -181,7 +181,7 @@ public abstract class AbstractOverrideImplementTest extends JetLightCodeInsightF
         BindingContext bindingContext = AnalyzerFacadeWithCache.getContextForElement(classOrObject);
         Set<CallableMemberDescriptor> descriptors = handler.collectMethodsToGenerate(classOrObject, bindingContext);
 
-        final ArrayList<CallableMemberDescriptor> descriptorsList = new ArrayList<CallableMemberDescriptor>(descriptors);
+        final List<CallableMemberDescriptor> descriptorsList = new ArrayList<CallableMemberDescriptor>(descriptors);
         Collections.sort(descriptorsList, new Comparator<CallableMemberDescriptor>() {
             @Override
             public int compare(@NotNull CallableMemberDescriptor desc1, @NotNull CallableMemberDescriptor desc2) {
@@ -191,7 +191,7 @@ public abstract class AbstractOverrideImplementTest extends JetLightCodeInsightF
 
         new WriteCommandAction(myFixture.getProject(), myFixture.getFile()) {
             @Override
-            protected void run(Result result) throws Throwable {
+            protected void run(@NotNull Result result) throws Throwable {
                 OverrideImplementMethodsHandler.generateMethods(
                         myFixture.getEditor(), classOrObject,
                         OverrideImplementMethodsHandler.membersFromDescriptors(jetFile, descriptorsList));

idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java

@@ -25,10 +25,10 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.testFramework.UsefulTestCase;
-import junit.framework.Assert;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.InTextDirectivesUtils;
 import org.jetbrains.jet.testing.ReferenceUtils;
+import org.junit.Assert;
 
 import java.util.Arrays;
 import java.util.Collections;

idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java

@@ -26,7 +26,6 @@ import com.intellij.psi.impl.PsiManagerEx;
 import com.intellij.psi.impl.file.impl.FileManager;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
-import junit.framework.Assert;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.InTextDirectivesUtils;
 import org.jetbrains.jet.JetTestCaseBuilder;
@@ -35,6 +34,7 @@ import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver;
 import org.jetbrains.jet.test.util.UtilPackage;
 import org.jetbrains.jet.testing.ReferenceUtils;
+import org.junit.Assert;
 
 import java.util.List;
 import java.util.Set;

idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java

@@ -20,10 +20,10 @@ import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.NavigationItem;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiPackage;
-import junit.framework.Assert;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.asJava.KotlinLightClass;
 import org.jetbrains.jet.plugin.presentation.JetLightClassListCellRenderer;
+import org.junit.Assert;
 
 public final class ReferenceUtils {
     private ReferenceUtils() {