From 8ba9e9f51b72e3472571776570371c2d49f78c51 Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Fri, 3 Aug 2012 08:08:03 +0300 Subject: [PATCH] even more exact test for KT-2509 --- compiler/testData/codegen/regressions/kt2509.kt | 3 +-- .../org/jetbrains/jet/codegen/CodegenTestCase.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/compiler/testData/codegen/regressions/kt2509.kt b/compiler/testData/codegen/regressions/kt2509.kt index 95369a2ee34..ae9c2a19808 100644 --- a/compiler/testData/codegen/regressions/kt2509.kt +++ b/compiler/testData/codegen/regressions/kt2509.kt @@ -1,6 +1,5 @@ -fun box() : String { +fun main(args: Array) { A() - return "OK" } class A: B() { diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java index 85976f5f41c..bfe7cf776c1 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java @@ -220,9 +220,15 @@ public abstract class CodegenTestCase extends UsefulTestCase { else { String fqName = NamespaceCodegen.getJVMClassNameForKotlinNs(JetPsiUtil.getFQName(myFiles.getPsiFiles().get(0))).getFqName().getFqName(); Class namespaceClass = loader.loadClass(fqName); - Method method = namespaceClass.getMethod("box"); - r = (String) method.invoke(null); - assertEquals("OK", r); + try { + Method method = namespaceClass.getMethod("box"); + r = (String) method.invoke(null); + assertEquals("OK", r); + } + catch (NoSuchMethodException e) { + Method method = namespaceClass.getMethod("main",String[].class); + method.invoke(null,new Object[]{new String[0]}); + } } } catch (Error e) { System.out.println(generateToText());