azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ExceptionUtils rewritten in Kotlin

Browse Source
This commit is contained in:
Andrey Breslav
2014-01-29 17:33:40 +04:00
parent d0787795b6
commit 210827b1d5
28 changed files with 107 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/MockLibraryUtil.java
+3 -3
View File
@@ -20,7 +20,7 @@ import com.intellij.util.io.ZipUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.ExitCode;
import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
import org.jetbrains.jet.utils.ExceptionUtils;
import org.jetbrains.jet.utils.UtilsPackage;
import org.jetbrains.jet.utils.PathUtil;
import java.io.*;
@@ -53,7 +53,7 @@ public class MockLibraryUtil {
return jarFile;
}
catch (IOException e) {
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
}
@@ -73,7 +73,7 @@ public class MockLibraryUtil {
assertEquals(new String(outStream.toByteArray()), ExitCode.OK.name(), invocationResult.name());
}
catch (Throwable e) {
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
}
compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java
+3 -3
View File
@@ -39,7 +39,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.lang.diagnostics.*;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.utils.ExceptionUtils;
import org.jetbrains.jet.utils.UtilsPackage;
import org.junit.Assert;
import java.io.File;
@@ -85,7 +85,7 @@ public abstract class BaseDiagnosticsTest extends JetLiteFixture {
JetTestUtils.mkdirs(javaFilesDir);
}
catch (IOException e) {
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
return javaFilesDir;
}
@@ -97,7 +97,7 @@ public abstract class BaseDiagnosticsTest extends JetLiteFixture {
Files.write(content, javaFile, Charset.forName("utf-8"));
return true;
} catch (Exception e) {
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
}
compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java
+2 -2
View File
@@ -28,7 +28,7 @@ import org.jetbrains.jet.cli.common.ExitCode;
import org.jetbrains.jet.cli.js.K2JSCompiler;
import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
import org.jetbrains.jet.test.Tmpdir;
import org.jetbrains.jet.utils.ExceptionUtils;
import org.jetbrains.jet.utils.UtilsPackage;
import org.junit.Rule;
import org.junit.rules.TestName;
@@ -54,7 +54,7 @@ public class CliBaseTest {
return Pair.create(bytes.toString("utf-8"), exitCode);
}
catch (Exception e) {
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
finally {
System.setOut(origOut);
compiler/tests/org/jetbrains/jet/codegen/AbstractBytecodeTextTest.java
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.utils.ExceptionUtils;
import org.jetbrains.jet.utils.UtilsPackage;
import java.io.File;
import java.util.ArrayList;
@@ -54,7 +54,7 @@ public abstract class AbstractBytecodeTextTest extends CodegenTestCase {
}
catch (Throwable e) {
System.out.println(text);
ExceptionUtils.rethrow(e);
UtilsPackage.rethrow(e);
}
}
compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java
+2 -2
View File
@@ -32,7 +32,7 @@ import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.types.lang.InlineUtil;
import org.jetbrains.jet.utils.ExceptionUtils;
import org.jetbrains.jet.utils.UtilsPackage;
import java.io.File;
import java.io.IOException;
@@ -115,7 +115,7 @@ public class CodegenTestUtil {
return javaClassesTempDirectory;
}
catch (IOException e) {
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
}
compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java
+3 -3
View File
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.test.TestCaseWithTmpdir;
import org.jetbrains.jet.utils.ExceptionUtils;
import org.jetbrains.jet.utils.UtilsPackage;
import java.io.File;
import java.io.IOException;
@@ -80,7 +80,7 @@ public class LineNumberTest extends TestCaseWithTmpdir {
text = FileUtil.loadFile(file);
}
catch (IOException e) {
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
return JetTestUtils.createFile(file.getName(), text, environment.getProject());
@@ -121,7 +121,7 @@ public class LineNumberTest extends TestCaseWithTmpdir {
}
catch (Throwable e) {
System.out.println(factory.createText());
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
}
compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
import org.jetbrains.jet.utils.ExceptionUtils;
import org.jetbrains.jet.utils.UtilsPackage;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -81,7 +81,7 @@ public class ScriptGenTest extends CodegenTestCase {
}
catch (Throwable e) {
System.out.println(generateToText());
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
}
compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.codegen.CodegenTestCase;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.utils.ExceptionUtils;
import org.jetbrains.jet.utils.UtilsPackage;
import java.io.File;
import java.lang.reflect.Method;
@@ -102,7 +102,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
}
catch (Throwable e) {
System.out.println(generateToText());
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
}
}
compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
+2 -2
View File
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.test.TestCaseWithTmpdir;
import org.jetbrains.jet.test.util.DescriptorValidator;
import org.jetbrains.jet.test.util.RecursiveDescriptorComparator;
import org.jetbrains.jet.utils.ExceptionUtils;
import org.jetbrains.jet.utils.UtilsPackage;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -129,7 +129,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
return outputFile;
}
catch (IOException e) {
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
}
compiler/tests/org/jetbrains/jet/test/Tmpdir.java
+2 -2
View File
@@ -20,7 +20,7 @@ import com.google.common.io.Files;
import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.utils.ExceptionUtils;
import org.jetbrains.jet.utils.UtilsPackage;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
@@ -37,7 +37,7 @@ public class Tmpdir extends TestWatcher {
tmpDir = Files.createTempDir().getCanonicalFile();
}
catch (IOException e) {
throw ExceptionUtils.rethrow(e);
throw UtilsPackage.rethrow(e);
}
}