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

[Test] Use rethrow for checked exception in java-written tests

Browse Source 
In 9b5a9ccb `throws Exception` was removed from java test sources and
  all checked exceptions were wrapped with `RuntimeException`

But it was forgotten that there is a `rethrow` utility, which doesn't
  wrap exception but makes the javac happy at the same time
This commit is contained in:
Dmitriy Novozhilov
2024-03-14 10:02:48 +02:00
committed by Space Team
parent 09c27d78b8
commit f288163cbc
9 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java
+9 -8
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.test.KtAssert;
import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import java.io.File;
import java.io.FileNotFoundException;
@@ -94,16 +95,16 @@ public class KtTestUtil {
* This clarifies the exception by showing the full path.
*/
String messageWithFullPath = file.getAbsolutePath() + " (No such file or directory)";
throw new RuntimeException(
new IOException(
"Ensure you have your 'Working Directory' configured correctly as the root " +
"Kotlin project directory in your test configuration\n\t" +
messageWithFullPath,
fileNotFoundException
)
throw ExceptionUtilsKt.rethrow(
new IOException(
"Ensure you have your 'Working Directory' configured correctly as the root " +
"Kotlin project directory in your test configuration\n\t" +
messageWithFullPath,
fileNotFoundException
)
);
} catch (IOException e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java
+3 -2
View File
@@ -41,6 +41,7 @@ import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.KotlinTestWithEnvironmentManagement;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import java.io.File;
import java.io.IOException;
@@ -53,7 +54,7 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironmentMa
try {
doTestWithEnvironment(fileName, createEnvironmentWithMockJdk(ConfigurationKind.NO_KOTLIN_REFLECT));
} catch (Exception e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
@@ -61,7 +62,7 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironmentMa
try {
doTestWithEnvironment(fileName, createEnvironmentWithMockJdk(ConfigurationKind.JDK_ONLY));
} catch (Exception e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+1 -1
View File
@@ -526,7 +526,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
try {
doMultiFileTest(file, testFiles);
} catch (Exception e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java
+2 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.codegen.CodegenTestCase;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import java.io.File;
import java.io.IOException;
@@ -41,7 +42,7 @@ public abstract class AbstractDefaultArgumentsReflectionTest extends CodegenTest
doTestImpl(path);
}
catch (IOException e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+2 -1
View File
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestCaseWithTmpdir;
import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import org.jetbrains.kotlin.utils.KotlinPaths;
import org.jetbrains.kotlin.utils.PathUtil;
@@ -63,7 +64,7 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir {
try {
exitCode = runProcess(commandLine, executionLog);
} catch (ExecutionException e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
if (logName == null) {
compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java
+9 -8
View File
@@ -34,6 +34,7 @@ import org.jetbrains.kotlin.test.util.DescriptorValidator;
import org.jetbrains.kotlin.test.util.JUnit4Assertions;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.Configuration;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import org.junit.Assert;
import java.io.File;
@@ -66,7 +67,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
try {
doTestCompiledJava(javaFileName, COMPARATOR_CONFIGURATION);
} catch (Exception e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
@@ -130,7 +131,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
try {
doTestCompiledKotlin(ktFileName, ConfigurationKind.ALL, false);
} catch (Exception e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
@@ -140,7 +141,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
try {
doTestCompiledKotlinImpl(ktFileName, configurationKind, useTypeTableInSerializer);
} catch (Exception e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
@@ -223,7 +224,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
doTestJavaAgainstKotlinImpl(expectedFileName);
}
catch (Exception e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
@@ -256,7 +257,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
try {
doTestKotlinAgainstCompiledJavaWithKotlinImpl(expectedFileName);
} catch (Exception e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
@@ -320,7 +321,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
);
}
catch (IOException e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
@@ -333,7 +334,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
try {
fileContent = FileUtil.loadFile(new File(javaFileName));
} catch (IOException e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
List<File> srcFiles = TestFiles.createTestFiles(
@@ -387,7 +388,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
usePsiClassFilesReading(), useJavacWrapper(), withForeignAnnotations(), explicitLanguageVersionSettings,
getExtraClasspath(), this::configureEnvironment);
} catch (IOException e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+2 -2
View File
@@ -554,7 +554,7 @@ public class KotlinTestUtils {
try {
FileUtil.writeToFile(testDataFile, newText);
} catch (IOException ioException) {
throw new RuntimeException(ioException);
throw ExceptionUtilsKt.rethrow(e);
}
}
}
@@ -585,7 +585,7 @@ public class KotlinTestUtils {
try {
FileUtil.writeToFile(testDataFile, newText);
} catch (IOException e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}
}
compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java
+2 -1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.cli.common.modules.ModuleChunk;
import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser;
import org.jetbrains.kotlin.modules.Module;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import java.io.File;
import java.io.IOException;
@@ -69,7 +70,7 @@ public abstract class AbstractModuleXmlParserTest extends TestCase {
FileUtil.writeToFile(txtFile, actual);
}
catch (IOException e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
fail("Expected data file does not exist. A new file created: " + txtFile);
}
compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java
+2 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.TestsCompilerError;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.test.testFramework.KtParsingTestCase;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -98,7 +99,7 @@ public abstract class AbstractParsingTest extends KtParsingTestCase {
try {
doBaseTestImpl(filePath, fileType, contentFilter);
} catch (Exception e) {
throw new RuntimeException(e);
throw ExceptionUtilsKt.rethrow(e);
}
}