From ef828bcdcf32ac30ce35511ec38f52f989978994 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 5 Mar 2012 08:50:07 +0000 Subject: [PATCH] added test case for KT-1515 --- .../stdlib/testall/LanguageTestAllTest.java | 2 +- stdlib.ipr | 20 +++++++++++++++++++ .../kotlin/support/AsserterLoader.kt | 6 ++++++ testlib/test/language/JavaClassTest.kt | 16 +++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 stdlib/ktSrc/org/jetbrains/kotlin/support/AsserterLoader.kt create mode 100644 testlib/test/language/JavaClassTest.kt diff --git a/runtests/test/stdlib/testall/LanguageTestAllTest.java b/runtests/test/stdlib/testall/LanguageTestAllTest.java index 3e4371e8e9e..65cc48fbb5e 100644 --- a/runtests/test/stdlib/testall/LanguageTestAllTest.java +++ b/runtests/test/stdlib/testall/LanguageTestAllTest.java @@ -23,6 +23,6 @@ import test.language.*; */ public class LanguageTestAllTest { public static TestSuite suite() { - return new TestSuite(NullableCollectionsTest.class); + return new TestSuite(JavaClassTest.class, NullableCollectionsTest.class); } } diff --git a/stdlib.ipr b/stdlib.ipr index 227263bf56c..6b7dd4b98a5 100644 --- a/stdlib.ipr +++ b/stdlib.ipr @@ -2,6 +2,14 @@ + + + + + + + + + + + @@ -82,5 +93,14 @@ + + + + + + + + + diff --git a/stdlib/ktSrc/org/jetbrains/kotlin/support/AsserterLoader.kt b/stdlib/ktSrc/org/jetbrains/kotlin/support/AsserterLoader.kt new file mode 100644 index 00000000000..9720634c929 --- /dev/null +++ b/stdlib/ktSrc/org/jetbrains/kotlin/support/AsserterLoader.kt @@ -0,0 +1,6 @@ +package org.jetbrains.kotlin.support + +fun loadAsserter(): Unit { + val c = javaClass() + println("class is $c") +} \ No newline at end of file diff --git a/testlib/test/language/JavaClassTest.kt b/testlib/test/language/JavaClassTest.kt new file mode 100644 index 00000000000..12ccb3b5bf1 --- /dev/null +++ b/testlib/test/language/JavaClassTest.kt @@ -0,0 +1,16 @@ +package test.language + +import junit.framework.TestCase +import kotlin.test.* + +import org.jetbrains.kotlin.support.* + +class JavaClassTest : TestCase() { + + fun testJavaClass() { + // TODO this function fails! + // see KT-1515 + // loadAsserter() + } +} +