Fix deprecation warnings on junit.framework.Assert

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

compiler/android-tests/src/org/jetbrains/jet/compiler/CodegenTestsOnAndroidRunner.java

@@ -16,7 +16,6 @@
 
 package org.jetbrains.jet.compiler;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.jetbrains.annotations.NotNull;
@@ -25,6 +24,7 @@ import org.jetbrains.jet.compiler.ant.AntRunner;
 import org.jetbrains.jet.compiler.download.SDKDownloader;
 import org.jetbrains.jet.compiler.emulator.Emulator;
 import org.jetbrains.jet.compiler.run.PermissionManager;
+import org.junit.Assert;
 
 import java.io.File;
 import java.util.HashMap;
@@ -32,7 +32,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 public class CodegenTestsOnAndroidRunner {
     private static final Pattern ERROR_IN_TEST_OUTPUT_PATTERN =
             Pattern.compile("([\\s]+at .*| Caused .*| java.lang.RuntimeException: File: .*|[\\s]+\\.\\.\\. .* more| Error in .*)");
@@ -121,7 +120,7 @@ public class CodegenTestsOnAndroidRunner {
     [exec] ...............
     [exec] Error in testKt529:
     */
-    private Map<String, String> parseOutputForFailedTests(@NotNull String output) {
+    private static Map<String, String> parseOutputForFailedTests(@NotNull String output) {
         Map<String, String> result = new HashMap<String, String>();
         StringBuilder builder = new StringBuilder();
         String failedTestNamePrefix = " Error in ";
@@ -147,7 +146,7 @@ public class CodegenTestsOnAndroidRunner {
 
     //[exec] Tests run: 225,  Failures: 0,  Errors: 2
     @Nullable
-    private Statistics parseOutputForTestsNumberIfThereIsFailedTests(String output) {
+    private static Statistics parseOutputForTestsNumberIfThereIsFailedTests(String output) {
         Matcher matcher = NUMBER_OF_TESTS_IF_FAILED.matcher(output);
         if (matcher.find()) {
             return new Statistics(Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)),
@@ -158,7 +157,7 @@ public class CodegenTestsOnAndroidRunner {
 
     //[exec] OK (223 tests)
     @Nullable
-    private Statistics parseOutputForTestsNumberIfTestsPassed(String output) {
+    private static Statistics parseOutputForTestsNumberIfTestsPassed(String output) {
         Matcher matcher = NUMBER_OF_TESTS_OK.matcher(output);
         if (matcher.find()) {
             return new Statistics(Integer.parseInt(matcher.group(1)), 0, 0);

compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java

@@ -20,7 +20,6 @@ import com.google.common.collect.Lists;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.testFramework.UsefulTestCase;
-import junit.framework.Assert;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.OutputFileCollection;
@@ -32,6 +31,7 @@ import org.jetbrains.jet.compiler.PathManager;
 import org.jetbrains.jet.generators.tests.generator.TestGeneratorUtil;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.utils.Printer;
+import org.junit.Assert;
 
 import java.io.File;
 import java.io.IOException;
@@ -49,8 +49,10 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
     private static final String baseTestClassName = "AbstractCodegenTestCaseOnAndroid";
     private static final String generatorName = "CodegenTestsOnAndroidGenerator";
 
-    private JetCoreEnvironment environmentWithMockJdk = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS);
+    private final JetCoreEnvironment environmentWithMockJdk =
-    private JetCoreEnvironment environmentWithFullJdk = JetTestUtils.createEnvironmentWithFullJdk(myTestRootDisposable);
+            JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS);
+    private final JetCoreEnvironment environmentWithFullJdk =
+            JetTestUtils.createEnvironmentWithFullJdk(myTestRootDisposable);
 
     private final Pattern packagePattern = Pattern.compile("package (.*)");
 

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java

@@ -18,16 +18,13 @@ package org.jetbrains.jet.lang.cfg.pseudocode;
 
 import com.google.common.collect.*;
 import com.intellij.util.containers.BidirectionalMap;
-import jet.runtime.typeinfo.JetValueParameter;
 import kotlin.Function0;
-import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.cfg.Label;
 import org.jetbrains.jet.lang.cfg.LoopInfo;
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.*;
-import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.InstructionWithValue;
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.eval.MergeInstruction;
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.AbstractJumpInstruction;
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps.ConditionalJumpInstruction;

compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java

@@ -20,9 +20,9 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 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.junit.Assert;
 
 import java.io.BufferedReader;
 import java.io.IOException;

compiler/tests/org/jetbrains/jet/PackageClassNameTest.java

@@ -22,8 +22,8 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.junit.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassName;
-import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.*;
+import static org.junit.Assert.assertEquals;
 
 public class PackageClassNameTest {
 
@@ -57,11 +57,11 @@ public class PackageClassNameTest {
         doTest(FqName.ROOT.child(Name.identifier("kotlin")), "KotlinPackage", "_DefaultPackage");
     }
 
-    private void doTest(@NotNull String name, @NotNull String expectedForChild, @Nullable String expectedForParent) {
+    private static void doTest(@NotNull String name, @NotNull String expectedForChild, @Nullable String expectedForParent) {
         doTest(new FqName(name), expectedForChild, expectedForParent);
     }
 
-    private void doTest(@NotNull FqName name, @NotNull String expectedForChild, @Nullable String expectedForParent) {
+    private static void doTest(@NotNull FqName name, @NotNull String expectedForChild, @Nullable String expectedForParent) {
         assertEquals("Wrong result for child [" + name + "].", expectedForChild, getPackageClassName(name));
         if (expectedForParent != null) {
             assertEquals("Wrong result for parent [" + name + "].", expectedForParent, getPackageClassName(name.parent()));

compiler/tests/org/jetbrains/jet/codegen/DxChecker.java

@@ -18,15 +18,14 @@ package org.jetbrains.jet.codegen;
 
 import com.android.dx.command.dexer.Main;
 import com.android.dx.dex.cf.CfTranslator;
-import junit.framework.Assert;
 import org.jetbrains.jet.OutputFile;
+import org.junit.Assert;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 public class DxChecker {
 
     public static final boolean RUN_DX_CHECKER = true;

compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java

@@ -48,6 +48,7 @@ import org.jetbrains.jet.storage.ExceptionTracker;
 import org.jetbrains.jet.storage.LockBasedStorageManager;
 import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.jetbrains.jet.test.util.RecursiveDescriptorComparator;
+import org.junit.Assert;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -106,7 +107,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
 
         PackageViewDescriptor packageFromSource = exhaust.getModuleDescriptor().getPackage(TEST_PACKAGE_FQNAME);
         assert packageFromSource != null;
-        junit.framework.Assert.assertEquals("test", packageFromSource.getName().asString());
+        Assert.assertEquals("test", packageFromSource.getName().asString());
 
         PackageViewDescriptor packageFromBinary = LoadDescriptorUtil.loadTestPackageAndBindingContextFromJavaRoot(
                 tmpdir, getTestRootDisposable(), configurationKind).first;

compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java

@@ -18,13 +18,13 @@ package org.jetbrains.jet.lang.psi;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.util.PsiTreeUtil;
-import junit.framework.Assert;
 import org.jetbrains.jet.JetLiteFixture;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.resolve.ImportPath;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
+import org.junit.Assert;
 
 import java.io.File;
 import java.io.IOException;

compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java

@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.lazy;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
-import junit.framework.Assert;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetLiteFixture;
@@ -29,6 +28,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.resolve.ExpectedResolveData;
 import org.jetbrains.jet.resolve.JetExpectedResolveDataUtil;
+import org.junit.Assert;
 
 import java.io.File;
 import java.util.List;
@@ -53,8 +53,8 @@ public abstract class AbstractLazyResolveTest extends JetLiteFixture {
 
         return new ExpectedResolveData(
                 JetExpectedResolveDataUtil.prepareDefaultNameToDescriptors(project),
-                JetExpectedResolveDataUtil.prepareDefaultNameToDeclaration(project),
+                JetExpectedResolveDataUtil.prepareDefaultNameToDeclaration(project)
-                getEnvironment()) {
+        ) {
             @Override
             protected JetFile createJetFile(String fileName, String text) {
                 return createCheckAndReturnPsiFile(fileName, null, text);

compiler/tests/org/jetbrains/jet/resolve/AbstractResolveTest.java

@@ -27,8 +27,8 @@ public abstract class AbstractResolveTest extends ExtensibleResolveTestCase {
 
         return new ExpectedResolveData(
                 JetExpectedResolveDataUtil.prepareDefaultNameToDescriptors(project),
-                JetExpectedResolveDataUtil.prepareDefaultNameToDeclaration(project),
+                JetExpectedResolveDataUtil.prepareDefaultNameToDeclaration(project)
-                getEnvironment()) {
+        ) {
             @Override
             protected JetFile createJetFile(String fileName, String text) {
                 return createCheckAndReturnPsiFile(fileName, null, text);

compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java

@@ -20,12 +20,13 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.*;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.analyzer.AnalyzeExhaust;
-import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.diagnostics.Diagnostic;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
@@ -48,9 +49,9 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static junit.framework.Assert.*;
 import static org.jetbrains.jet.lang.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET;
 import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET;
+import static org.junit.Assert.*;
 
 public abstract class ExpectedResolveData {
 
@@ -80,13 +81,9 @@ public abstract class ExpectedResolveData {
     private final Map<String, DeclarationDescriptor> nameToDescriptor;
     private final Map<String, PsiElement> nameToPsiElement;
 
-    @NotNull
+    public ExpectedResolveData(Map<String, DeclarationDescriptor> nameToDescriptor, Map<String, PsiElement> nameToPsiElement) {
-    private final JetCoreEnvironment jetCoreEnvironment;
-
-    public ExpectedResolveData(Map<String, DeclarationDescriptor> nameToDescriptor, Map<String, PsiElement> nameToPsiElement, @NotNull JetCoreEnvironment environment) {
         this.nameToDescriptor = nameToDescriptor;
         this.nameToPsiElement = nameToPsiElement;
-        jetCoreEnvironment = environment;
     }
 
     public final JetFile createFileFromMarkedUpText(String fileName, String text) {

compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java

@@ -18,7 +18,6 @@ package org.jetbrains.jet.resolve;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import junit.framework.Assert;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.di.InjectorForJavaDescriptorResolver;
@@ -39,6 +38,7 @@ import org.jetbrains.jet.lang.types.TypeUtils;
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext;
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
+import org.junit.Assert;
 
 import java.util.Arrays;
 import java.util.HashMap;

compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java

@@ -17,7 +17,6 @@
 package org.jetbrains.jet.test.util;
 
 import com.google.common.collect.Lists;
-import junit.framework.Assert;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -26,6 +25,7 @@ import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassStaticsPackageFra
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
+import org.junit.Assert;
 
 import java.io.PrintStream;
 import java.util.Collection;

generators/tests/org/jetbrains/jet/generators/injectors/GenerateInjectorsTest.java

@@ -18,10 +18,10 @@ package org.jetbrains.jet.generators.injectors;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
-import junit.framework.Assert;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.di.DependencyInjectorGenerator;
+import org.junit.Assert;
 
 import java.io.IOException;
 

generators/tests/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMapTest.java

@@ -18,8 +18,8 @@ package org.jetbrains.jet.generators.jvm;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
-import junit.framework.Assert;
 import junit.framework.TestCase;
+import org.junit.Assert;
 
 public class GenerateJavaToKotlinMethodMapTest extends TestCase {
     public void testGenerateJavaToKotlinMethodMap() throws Exception {

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() {

js/js.tests/test/org/jetbrains/k2js/test/config/JsUnitTestReporter.java

@@ -17,11 +17,11 @@
 package org.jetbrains.k2js.test.config;
 
 import com.intellij.util.containers.ContainerUtil;
-import junit.framework.Assert;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Assert;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -118,7 +118,6 @@ public class JsUnitTestReporter {
                         Assert.fail(sb.toString());
                     }
                     eraseTestInfo(getName());
-                    Assert.assertTrue(result);
                 }
             });
         }

js/js.tests/test/org/jetbrains/k2js/test/semantics/NumberTest.java

@@ -16,9 +16,9 @@
 
 package org.jetbrains.k2js.test.semantics;
 
-import junit.framework.Assert;
 import org.jetbrains.k2js.facade.exceptions.TranslationInternalException;
 import org.jetbrains.k2js.test.SingleFileTranslationTest;
+import org.junit.Assert;
 
 public final class NumberTest extends SingleFileTranslationTest {
     public NumberTest() {
@@ -55,10 +55,11 @@ public final class NumberTest extends SingleFileTranslationTest {
         checkFooBoxIsOk();
     }
 
-    public void testHexademicalConstant() throws Exception {
+    public void testHexadecimalConstant() throws Exception {
         try {
             fooBoxTest();
-        } catch (TranslationInternalException e) {
+        }
+        catch (TranslationInternalException e) {
             Throwable cause = e.getCause();
             Assert.assertTrue(cause instanceof IllegalStateException);
             Assert.assertTrue(cause.getMessage().startsWith("Unsupported long constant "));