Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
d7172313
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d7172313
编写于
5月 01, 2012
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "enhance tests (mostly codegen)" temporarily
This reverts commit
95f9bcba
.
上级
035fd686
变更
43
隐藏空白更改
内联
并排
Showing
43 changed file
with
43 addition
and
378 deletion
+43
-378
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
...rg/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+0
-11
compiler/testData/codegen/classes/overloadPlusAssign.jet
compiler/testData/codegen/classes/overloadPlusAssign.jet
+1
-1
compiler/testData/codegen/classes/overloadPlusAssignReturn.jet
...ler/testData/codegen/classes/overloadPlusAssignReturn.jet
+1
-1
compiler/testData/codegen/classes/overloadPlusToPlusAssign.jet
...ler/testData/codegen/classes/overloadPlusToPlusAssign.jet
+1
-1
compiler/testData/codegen/classes/overloadUnaryOperator.jet
compiler/testData/codegen/classes/overloadUnaryOperator.jet
+1
-1
compiler/testData/codegen/controlStructures/forUserType.jet
compiler/testData/codegen/controlStructures/forUserType.jet
+6
-6
compiler/testData/codegen/regressions/kt471.kt
compiler/testData/codegen/regressions/kt471.kt
+17
-15
compiler/testData/codegen/regressions/kt475.jet
compiler/testData/codegen/regressions/kt475.jet
+1
-1
compiler/testData/codegen/super/basicmethodSuperClass.jet
compiler/testData/codegen/super/basicmethodSuperClass.jet
+1
-1
compiler/tests/org/jetbrains/jet/JetLiteFixture.java
compiler/tests/org/jetbrains/jet/JetLiteFixture.java
+1
-15
compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java
compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java
+1
-9
compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java
...tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java
+0
-7
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
.../tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
+0
-6
compiler/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java
...er/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java
+0
-8
compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java
compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java
+2
-11
compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java
.../tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java
+0
-3
compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
+0
-67
compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java
...iler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java
+0
-9
compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
...iler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
+3
-4
compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
...ests/org/jetbrains/jet/codegen/ControlStructuresTest.java
+0
-37
compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java
...sts/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java
+0
-7
compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
...iler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
+0
-8
compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
...ler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+0
-8
compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java
compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java
+0
-8
compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java
.../tests/org/jetbrains/jet/codegen/PatternMatchingTest.java
+0
-8
compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
...r/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
+0
-9
compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
...iler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
+0
-24
compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java
compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java
+0
-8
compiler/tests/org/jetbrains/jet/codegen/StringsTest.java
compiler/tests/org/jetbrains/jet/codegen/StringsTest.java
+0
-8
compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java
compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java
+0
-9
compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java
compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java
+0
-9
compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java
compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java
+0
-3
compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java
compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java
+0
-8
compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
+0
-12
compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java
...sts/org/jetbrains/jet/resolve/DescriptorRendererTest.java
+0
-8
compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
.../tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
+2
-7
compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java
.../org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java
+0
-4
compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java
compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java
+5
-2
compiler/tests/org/jetbrains/jet/runtime/JetNpeTest.java
compiler/tests/org/jetbrains/jet/runtime/JetNpeTest.java
+0
-8
compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java
.../jetbrains/jet/types/JetDefaultModalityModifiersTest.java
+0
-1
compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java
compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java
+0
-1
compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java
...iler/tests/org/jetbrains/jet/types/JetOverridingTest.java
+0
-1
compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
...ler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+0
-3
未找到文件。
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
浏览文件 @
d7172313
...
...
@@ -47,14 +47,8 @@ import java.util.List;
public
class
JetCoreEnvironment
extends
JavaCoreEnvironment
{
private
final
List
<
JetFile
>
sourceFiles
=
new
ArrayList
<
JetFile
>();
@NotNull
private
final
CompilerDependencies
compilerDependencies
;
public
JetCoreEnvironment
(
Disposable
parentDisposable
,
@NotNull
CompilerDependencies
compilerDependencies
)
{
super
(
parentDisposable
);
this
.
compilerDependencies
=
compilerDependencies
;
registerFileType
(
JetFileType
.
INSTANCE
,
"kt"
);
registerFileType
(
JetFileType
.
INSTANCE
,
"kts"
);
registerFileType
(
JetFileType
.
INSTANCE
,
"ktm"
);
...
...
@@ -156,9 +150,4 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
}
}
}
@NotNull
public
CompilerDependencies
getCompilerDependencies
()
{
return
compilerDependencies
;
}
}
compiler/testData/codegen/classes/overloadPlusAssign.jet
浏览文件 @
d7172313
...
...
@@ -12,7 +12,7 @@ class ArrayWrapper<T>() {
}
fun get(index: Int): T {
return contents.get(index)
.sure()
return contents.get(index)
}
}
...
...
compiler/testData/codegen/classes/overloadPlusAssignReturn.jet
浏览文件 @
d7172313
...
...
@@ -15,7 +15,7 @@ class ArrayWrapper<T>() {
}
fun get(index: Int): T {
return contents.get(index)
.sure()
return contents.get(index)
}
}
...
...
compiler/testData/codegen/classes/overloadPlusToPlusAssign.jet
浏览文件 @
d7172313
...
...
@@ -15,7 +15,7 @@ class ArrayWrapper<T>() {
}
fun get(index: Int): T {
return contents.get(index)
.sure()
return contents.get(index)
}
}
...
...
compiler/testData/codegen/classes/overloadUnaryOperator.jet
浏览文件 @
d7172313
...
...
@@ -15,7 +15,7 @@ class ArrayWrapper<T>() {
}
fun get(index: Int): T {
return contents.get(index)
.sure()
return contents.get(index)
}
}
...
...
compiler/testData/codegen/controlStructures/forUserType.jet
浏览文件 @
d7172313
...
...
@@ -19,28 +19,28 @@ fun box() : String {
val c1: java.lang.Iterable<Int> = MyCollection1()
sum = 0
for (el in c1) {
sum = sum + el
.sure()
sum = sum + el
}
if(sum != 15) return "c1 failed"
val c2 = MyCollection1()
sum = 0
for (el in c2) {
sum = sum + el
.sure()
sum = sum + el
}
if(sum != 15) return "c2 failed"
val c3: Iterable<Int> = MyCollection2()
sum = 0
for (el in c3) {
sum = sum + el
.sure()
sum = sum + el
}
if(sum != 15) return "c3 failed"
val c4 = MyCollection2()
sum = 0
for (el in c4) {
sum = sum + el
.sure()
sum = sum + el
}
if(sum != 15) return "c4 failed"
...
...
@@ -50,7 +50,7 @@ fun box() : String {
}
sum = 0
for (el in a) {
sum = sum + el
.sure()
sum = sum + el
}
if(sum != 10) return "a failed"
...
...
@@ -69,7 +69,7 @@ fun box() : String {
val c7 = MyCollection5()
sum = 0
for (el in c7) {
sum = sum + el
.sure()
sum = sum + el
}
if(sum != 0) return "c7 failed"
...
...
compiler/testData/codegen/regressions/kt471.kt
浏览文件 @
d7172313
import
java.util.ArrayList
class
MyNumber
(
val
i
:
Int
)
{
fun
inc
():
MyNumber
=
MyNumber
(
i
+
1
)
}
...
...
@@ -50,26 +52,25 @@ fun test6() : Boolean {
return
true
}
class
MyArrayList
<
T
>(
var
value
:
T
)
{
fun
get
(
index
:
Int
):
T
{
if
(
index
!=
17
)
throw
Exception
()
return
value
}
fun
set
(
index
:
Int
,
value
:
T
):
Unit
{
if
(
index
!=
17
)
throw
Exception
()
this
.
value
=
value
}
fun
test7
()
:
Boolean
{
var
mnr
=
ArrayList
<
MyNumber
>()
mnr
.
add
(
MyNumber
(
42
))
mnr
[
0
]++
if
(
mnr
[
0
].
i
!=
43
)
return
false
return
true
}
fun
test7
()
:
Boolean
{
var
mnr
=
MyArrayList
<
MyNumber
>(
MyNumber
(
42
))
mnr
[
17
]++
if
(
mnr
[
17
].
i
!=
43
)
return
false
fun
test8
()
:
Boolean
{
var
mnr
=
ArrayList
<
MyNumber
>()
mnr
.
add
(
MyNumber
(
42
))
mnr
.
add
(
MyNumber
(
41
))
mnr
[
1
]
=
mnr
[
0
]++
if
(
mnr
[
0
].
i
!=
43
)
return
false
if
(
mnr
[
1
].
i
!=
42
)
return
false
return
true
}
fun
box
()
:
String
{
var
m
=
MyNumber
(
42
)
...
...
@@ -81,6 +82,7 @@ fun box() : String {
if
(!
test5
())
return
"fail test 5"
if
(!
test6
())
return
"fail test 6"
if
(!
test7
())
return
"fail test 7"
if
(!
test8
())
return
"fail test 8"
++
m
...
...
compiler/testData/codegen/regressions/kt475.jet
浏览文件 @
d7172313
...
...
@@ -14,5 +14,5 @@ var <T> ArrayList<T>.length : Int
set(value: Int) = throw java.lang.Error()
var <T> ArrayList<T>.last : T
get() = get(size()-1)
.sure()
get() = get(size()-1)
set(el : T) { set(size()-1, el) }
compiler/testData/codegen/super/basicmethodSuperClass.jet
浏览文件 @
d7172313
import java.util.ArrayList
class N() : ArrayList<Any>() {
override fun add(el: Any
?
) : Boolean {
override fun add(el: Any) : Boolean {
if (!super<ArrayList>.add(el)) {
throw Exception()
}
...
...
compiler/tests/org/jetbrains/jet/JetLiteFixture.java
浏览文件 @
d7172313
...
...
@@ -30,10 +30,8 @@ import com.intellij.testFramework.LightVirtualFile;
import
com.intellij.testFramework.TestDataFile
;
import
com.intellij.testFramework.UsefulTestCase
;
import
org.jetbrains.annotations.NonNls
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
;
import
org.jetbrains.jet.lang.psi.JetFile
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
org.jetbrains.jet.plugin.JetLanguage
;
import
java.io.File
;
...
...
@@ -67,26 +65,14 @@ public abstract class JetLiteFixture extends UsefulTestCase {
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
();
}
protected
void
createEnvironmentWithMockJdk
()
{
if
(
myEnvironment
!=
null
)
{
throw
new
IllegalStateException
(
"must not set up myEnvironemnt twice"
);
}
myEnvironment
=
JetTestUtils
.
createEnvironmentWithMockJdk
(
getTestRootDisposable
());
}
protected
void
createEnvironmentWithMockJdk
(
@NotNull
CompilerSpecialMode
compilerSpecialMode
)
{
if
(
myEnvironment
!=
null
)
{
throw
new
IllegalStateException
(
"must not set up myEnvironemnt twice"
);
}
myEnvironment
=
JetTestUtils
.
createEnvironmentWithMockJdk
(
getTestRootDisposable
(),
compilerSpecialMode
);
}
protected
void
createEnvironmentWithFullJdk
()
{
if
(
myEnvironment
!=
null
)
{
throw
new
IllegalStateException
(
"must not set up myEnvironemnt twice"
);
}
myEnvironment
=
JetTestUtils
.
createEnvironmentWithFullJdk
(
getTestRootDisposable
());
}
...
...
compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java
浏览文件 @
d7172313
...
...
@@ -31,7 +31,6 @@ import org.jetbrains.jet.JetTestUtils;
import
org.jetbrains.jet.lang.cfg.LoopInfo
;
import
org.jetbrains.jet.lang.cfg.pseudocode.*
;
import
org.jetbrains.jet.lang.psi.*
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.io.File
;
import
java.io.FileNotFoundException
;
...
...
@@ -43,7 +42,7 @@ public class JetControlFlowTest extends JetLiteFixture {
static
{
System
.
setProperty
(
"idea.platform.prefix"
,
"Idea"
);
}
private
String
myName
;
public
JetControlFlowTest
(
String
dataPath
,
String
name
)
{
...
...
@@ -51,13 +50,6 @@ public class JetControlFlowTest extends JetLiteFixture {
myName
=
name
;
}
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
STDLIB
);
}
@Override
public
String
getName
()
{
return
"test"
+
myName
;
...
...
compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java
浏览文件 @
d7172313
...
...
@@ -40,13 +40,6 @@ public class CheckerTestUtilTest extends JetLiteFixture {
super
(
"diagnostics/checkerTestUtil"
);
}
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
();
}
protected
void
doTest
(
TheTest
theTest
)
throws
Exception
{
prepareForTest
(
"test"
);
theTest
.
test
(
myFile
);
...
...
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
浏览文件 @
d7172313
...
...
@@ -54,12 +54,6 @@ public class JetDiagnosticsTest extends JetLiteFixture {
this
.
name
=
name
;
}
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
STDLIB
);
}
@Override
public
String
getName
()
{
return
"test"
+
name
;
...
...
compiler/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java
浏览文件 @
d7172313
...
...
@@ -17,7 +17,6 @@
package
org.jetbrains.jet.codegen
;
import
jet.JetObject
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.annotation.*
;
import
java.lang.reflect.Constructor
;
...
...
@@ -25,13 +24,6 @@ import java.lang.reflect.InvocationTargetException;
import
java.lang.reflect.Method
;
public
class
AnnotationGenTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
public
void
testPropField
()
throws
NoSuchFieldException
,
NoSuchMethodException
{
loadText
(
"[Deprecated] var x = 0"
);
Class
aClass
=
generateNamespaceClass
();
...
...
compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java
浏览文件 @
d7172313
...
...
@@ -16,18 +16,9 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.Method
;
public
class
ArrayGenTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
public
void
testKt238
()
throws
Exception
{
blackBoxFile
(
"regressions/kt238.jet"
);
}
...
...
@@ -246,7 +237,7 @@ public class ArrayGenTest extends CodegenTestCase {
public
void
testCollectionAssignGetMultiIndex
()
throws
Exception
{
loadText
(
"import java.util.ArrayList\n"
+
"fun box() : String { val s = ArrayList<String>(1); s.add(\"\"); s [1, -1] = \"5\"; s[2, -2] += \"7\"; return s[2,-2] }\n"
+
"fun ArrayList<String>.get(index1: Int, index2 : Int) = this[index1+index2]
.sure()
\n"
+
"fun ArrayList<String>.get(index1: Int, index2 : Int) = this[index1+index2]\n"
+
"fun ArrayList<String>.set(index1: Int, index2 : Int, elem: String) { this[index1+index2] = elem }\n"
);
// System.out.println(generateToText());
Method
foo
=
generateFunction
(
"box"
);
...
...
@@ -266,7 +257,7 @@ public class ArrayGenTest extends CodegenTestCase {
public
void
testCollectionGetMultiIndex
()
throws
Exception
{
loadText
(
"import java.util.ArrayList\n"
+
"fun box() : String { val s = ArrayList<String>(1); s.add(\"\"); s [1, -1] = \"5\"; return s[2, -2] }\n"
+
"fun ArrayList<String>.get(index1: Int, index2 : Int) = this[index1+index2]
.sure()
\n"
+
"fun ArrayList<String>.get(index1: Int, index2 : Int) = this[index1+index2]\n"
+
"fun ArrayList<String>.set(index1: Int, index2 : Int, elem: String) { this[index1+index2] = elem }\n"
);
// System.out.println(generateToText());
Method
foo
=
generateFunction
(
"box"
);
...
...
compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java
浏览文件 @
d7172313
...
...
@@ -16,11 +16,8 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
public
class
BridgeMethodGenTest
extends
CodegenTestCase
{
public
void
testBridgeMethod
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"bridge.jet"
);
}
}
compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
浏览文件 @
d7172313
...
...
@@ -16,8 +16,6 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Method
;
import
java.lang.reflect.Modifier
;
...
...
@@ -28,14 +26,7 @@ import java.util.List;
* @author alex.tkachman
*/
public
class
ClassGenTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
}
public
void
testPSVMClass
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
(
"classes/simpleClass.jet"
);
final
Class
aClass
=
loadClass
(
"SimpleClass"
,
generateClassesInFile
());
...
...
@@ -46,7 +37,6 @@ public class ClassGenTest extends CodegenTestCase {
}
public
void
testArrayListInheritance
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
(
"classes/inheritingFromArrayList.jet"
);
// System.out.println(generateToText());
final
Class
aClass
=
loadClass
(
"Foo"
,
generateClassesInFile
());
...
...
@@ -54,37 +44,30 @@ public class ClassGenTest extends CodegenTestCase {
}
public
void
testInheritanceAndDelegation_DelegatingDefaultConstructorProperties
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/inheritance.jet"
);
}
public
void
testInheritanceAndDelegation2
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/delegation2.kt"
);
}
public
void
testFunDelegation
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/funDelegation.jet"
);
}
public
void
testPropertyDelegation
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/propertyDelegation.jet"
);
}
public
void
testDiamondInheritance
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/diamondInheritance.jet"
);
}
public
void
testRightHandOverride
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/rightHandOverride.jet"
);
}
public
void
testNewInstanceExplicitConstructor
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
(
"classes/newInstanceDefaultConstructor.jet"
);
// System.out.println(generateToText());
final
Method
method
=
generateFunction
(
"test"
);
...
...
@@ -93,22 +76,18 @@ public class ClassGenTest extends CodegenTestCase {
}
public
void
testInnerClass
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/innerClass.jet"
);
}
public
void
testInheritedInnerClass
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/inheritedInnerClass.jet"
);
}
public
void
testInitializerBlock
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/initializerBlock.jet"
);
}
public
void
testAbstractMethod
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"abstract class Foo { abstract fun x(): String; fun y(): Int = 0 }"
);
final
ClassFileFactory
codegens
=
generateClassesInFile
();
...
...
@@ -118,42 +97,34 @@ public class ClassGenTest extends CodegenTestCase {
}
public
void
testInheritedMethod
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/inheritedMethod.jet"
);
}
public
void
testInitializerBlockDImpl
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/initializerBlockDImpl.jet"
);
}
public
void
testPropertyInInitializer
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/propertyInInitializer.jet"
);
}
public
void
testOuterThis
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/outerThis.jet"
);
}
public
void
testSecondaryConstructors
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/secondaryConstructors.jet"
);
}
public
void
testExceptionConstructor
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/exceptionConstructor.jet"
);
}
public
void
testSimpleBox
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/simpleBox.jet"
);
}
public
void
testAbstractClass
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"abstract class SimpleClass() { }"
);
final
Class
aClass
=
createClassLoader
(
generateClassesInFile
()).
loadClass
(
"SimpleClass"
);
...
...
@@ -161,18 +132,15 @@ public class ClassGenTest extends CodegenTestCase {
}
public
void
testClassObject
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/classObject.jet"
);
}
public
void
testClassObjectMethod
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
// todo to be implemented after removal of type info
// blackBoxFile("classes/classObjectMethod.jet");
}
public
void
testClassObjectInterface
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
(
"classes/classObjectInterface.jet"
);
final
Method
method
=
generateFunction
();
Object
result
=
method
.
invoke
(
null
);
...
...
@@ -180,32 +148,26 @@ public class ClassGenTest extends CodegenTestCase {
}
public
void
testOverloadBinaryOperator
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/overloadBinaryOperator.jet"
);
}
public
void
testOverloadUnaryOperator
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/overloadUnaryOperator.jet"
);
}
public
void
testOverloadPlusAssign
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/overloadPlusAssign.jet"
);
}
public
void
testOverloadPlusAssignReturn
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/overloadPlusAssignReturn.jet"
);
}
public
void
testOverloadPlusToPlusAssign
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/overloadPlusToPlusAssign.jet"
);
}
public
void
testEnumClass
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"enum class Direction { NORTH; SOUTH; EAST; WEST }"
);
final
Class
direction
=
createClassLoader
(
generateClassesInFile
()).
loadClass
(
"Direction"
);
// System.out.println(generateToText());
...
...
@@ -215,7 +177,6 @@ public class ClassGenTest extends CodegenTestCase {
}
public
void
testEnumConstantConstructors
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"enum class Color(val rgb: Int) { RED: Color(0xFF0000); GREEN: Color(0x00FF00); }"
);
final
Class
colorClass
=
createClassLoader
(
generateClassesInFile
()).
loadClass
(
"Color"
);
final
Field
redField
=
colorClass
.
getField
(
"RED"
);
...
...
@@ -225,25 +186,21 @@ public class ClassGenTest extends CodegenTestCase {
}
public
void
testClassObjFields
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"class A() { class object { val value = 10 } }\n"
+
"fun box() = if(A.value == 10) \"OK\" else \"fail\""
);
blackBox
();
}
public
void
testKt249
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt249.jet"
);
}
public
void
testKt48
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt48.jet"
);
// System.out.println(generateToText());
}
public
void
testKt309
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun box() = null"
);
final
Method
method
=
generateFunction
(
"box"
);
assertEquals
(
method
.
getReturnType
().
getName
(),
"java.lang.Object"
);
...
...
@@ -251,73 +208,60 @@ public class ClassGenTest extends CodegenTestCase {
}
public
void
testKt343
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt343.jet"
);
// System.out.println(generateToText());
}
public
void
testKt508
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
(
"regressions/kt508.jet"
);
// System.out.println(generateToText());
blackBox
();
}
public
void
testKt504
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
(
"regressions/kt504.jet"
);
// System.out.println(generateToText());
blackBox
();
}
public
void
testKt501
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt501.jet"
);
}
public
void
testKt496
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt496.jet"
);
// System.out.println(generateToText());
}
public
void
testKt500
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt500.jet"
);
}
public
void
testKt694
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
// blackBoxFile("regressions/kt694.jet");
}
public
void
testKt285
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
// blackBoxFile("regressions/kt285.jet");
}
public
void
testKt707
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt707.jet"
);
}
public
void
testKt857
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
// blackBoxFile("regressions/kt857.jet");
}
public
void
testKt903
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt903.jet"
);
}
public
void
testKt940
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt940.kt"
);
}
public
void
testKt1018
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1018.kt"
);
}
...
...
@@ -332,58 +276,47 @@ public class ClassGenTest extends CodegenTestCase {
}
public
void
testKt1134
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1134.kt"
);
}
public
void
testKt1157
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1157.kt"
);
}
public
void
testKt471
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt471.kt"
);
}
public
void
testKt1213
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
// blackBoxFile("regressions/kt1213.kt");
}
public
void
testKt723
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt723.kt"
);
}
public
void
testKt725
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt725.kt"
);
}
public
void
testKt633
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt633.kt"
);
}
public
void
testKt1345
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1345.kt"
);
}
public
void
testKt1538
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1538.kt"
);
}
public
void
testKt1759
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1759.kt"
);
}
public
void
testResolveOrder
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"classes/resolveOrder.jet"
);
}
}
compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java
浏览文件 @
d7172313
...
...
@@ -16,19 +16,10 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
/**
* @author max
*/
public
class
ClosuresGenTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
public
void
testSimplestClosure
()
throws
Exception
{
blackBoxFile
(
"classes/simplestClosure.jet"
);
// System.out.println(generateToText());
...
...
compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
浏览文件 @
d7172313
...
...
@@ -24,7 +24,6 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import
org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.jet.lang.psi.JetFile
;
import
org.jetbrains.jet.lang.psi.JetPsiUtil
;
import
org.jetbrains.jet.lang.resolve.AnalyzingUtils
;
import
org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
org.jetbrains.jet.parsing.JetParsingTest
;
...
...
@@ -128,9 +127,8 @@ public abstract class CodegenTestCase extends JetLiteFixture {
private
GenerationState
generateCommon
(
ClassBuilderFactory
classBuilderFactory
)
{
final
AnalyzeExhaust
analyzeExhaust
=
AnalyzerFacadeForJVM
.
analyzeOneFileWithJavaIntegrationAndCheckForErrors
(
myFile
,
JetControlFlowDataTraceFactory
.
EMPTY
,
myEnvironment
.
getCompilerDependencies
(
));
CompileCompilerDependenciesTest
.
compilerDependenciesForTests
(
CompilerSpecialMode
.
REGULAR
,
false
));
analyzeExhaust
.
throwIfError
();
AnalyzingUtils
.
throwExceptionOnErrors
(
analyzeExhaust
.
getBindingContext
());
GenerationState
state
=
new
GenerationState
(
getProject
(),
classBuilderFactory
,
analyzeExhaust
,
Collections
.
singletonList
(
myFile
));
state
.
compileCorrectFiles
(
CompilationErrorHandler
.
THROW_EXCEPTION
);
return
state
;
...
...
@@ -196,7 +194,8 @@ public abstract class CodegenTestCase extends JetLiteFixture {
r
=
method
;
}
if
(
r
==
null
)
{
throw
new
AssertionError
();
}
if
(
r
==
null
)
throw
new
AssertionError
();
return
r
;
}
catch
(
Error
e
)
{
System
.
out
.
println
(
generateToText
());
...
...
compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
浏览文件 @
d7172313
...
...
@@ -16,8 +16,6 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.Method
;
import
java.util.Arrays
;
...
...
@@ -33,7 +31,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testIf
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
// System.out.println(generateToText());
...
...
@@ -43,7 +40,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testSingleBranchIf
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
// System.out.println(generateToText());
...
...
@@ -65,7 +61,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
private
void
factorialTest
(
final
String
name
)
throws
IllegalAccessException
,
InvocationTargetException
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
(
name
);
// System.out.println(generateToText());
...
...
@@ -75,7 +70,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testContinue
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
...
...
@@ -84,7 +78,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testIfNoElse
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
...
...
@@ -93,7 +86,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testCondJumpOnStack
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"import java.lang.Boolean as jlBoolean; fun foo(a: String): Int = if (jlBoolean.parseBoolean(a)) 5 else 10"
);
final
Method
main
=
generateFunction
();
assertEquals
(
5
,
main
.
invoke
(
null
,
"true"
));
...
...
@@ -101,7 +93,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testFor
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
...
...
@@ -110,7 +101,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testIfBlock
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
...
...
@@ -121,7 +111,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testForInArray
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
...
...
@@ -130,7 +119,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testForInRange
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun foo(sb: StringBuilder) { for(x in 1..4) sb.append(x) }"
);
final
Method
main
=
generateFunction
();
StringBuilder
stringBuilder
=
new
StringBuilder
();
...
...
@@ -139,7 +127,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testThrowCheckedException
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun foo() { throw Exception(); }"
);
final
Method
main
=
generateFunction
();
boolean
caught
=
false
;
...
...
@@ -154,7 +141,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testTryCatch
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
...
...
@@ -163,7 +149,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testTryFinally
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
...
...
@@ -183,37 +168,30 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testForUserType
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"controlStructures/forUserType.jet"
);
}
public
void
testForIntArray
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"controlStructures/forIntArray.jet"
);
}
public
void
testForPrimitiveIntArray
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"controlStructures/forPrimitiveIntArray.jet"
);
}
public
void
testForNullableIntArray
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"controlStructures/forNullableIntArray.jet"
);
}
public
void
testForIntRange
()
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"controlStructures/forIntRange.jet"
);
}
public
void
testKt237
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt237.jet"
);
}
public
void
testCompareToNull
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun foo(a: String?, b: String?): Boolean = a == null && b !== null && null == a && null !== b"
);
String
text
=
generateToText
();
assertTrue
(!
text
.
contains
(
"java/lang/Object.equals"
));
...
...
@@ -224,7 +202,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testCompareToNonnullableEq
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun foo(a: String?, b: String): Boolean = a == b || b == a"
);
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
...
...
@@ -233,7 +210,6 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testCompareToNonnullableNotEq
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun foo(a: String?, b: String): Boolean = a != b"
);
String
text
=
generateToText
();
// System.out.println(text);
...
...
@@ -244,18 +220,15 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testKt299
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt299.jet"
);
}
public
void
testKt416
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt416.jet"
);
// System.out.println(generateToText());
}
public
void
testKt513
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt513.jet"
);
}
...
...
@@ -265,37 +238,31 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testKt769
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt769.jet"
);
// System.out.println(generateToText());
}
public
void
testKt773
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt773.jet"
);
// System.out.println(generateToText());
}
public
void
testKt772
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt772.jet"
);
// System.out.println(generateToText());
}
public
void
testKt870
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt870.jet"
);
// System.out.println(generateToText());
}
public
void
testKt958
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt958.jet"
);
// System.out.println(generateToText());
}
public
void
testQuicksort
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"controlStructures/quicksort.jet"
);
// System.out.println(generateToText());
}
...
...
@@ -313,22 +280,18 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public
void
testKt1076
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1076.kt"
);
}
public
void
testKt998
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt998.kt"
);
}
public
void
testKt628
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt628.kt"
);
}
public
void
testKt1441
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1441.kt"
);
}
}
compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java
浏览文件 @
d7172313
...
...
@@ -16,8 +16,6 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.Method
;
/**
...
...
@@ -31,7 +29,6 @@ public class ExtensionFunctionsTest extends CodegenTestCase {
}
public
void
testSimple
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
final
Method
foo
=
generateFunction
(
"foo"
);
final
Character
c
=
(
Character
)
foo
.
invoke
(
null
);
...
...
@@ -39,7 +36,6 @@ public class ExtensionFunctionsTest extends CodegenTestCase {
}
public
void
testWhenFail
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
// System.out.println(generateToText());
Method
foo
=
generateFunction
(
"foo"
);
...
...
@@ -47,18 +43,15 @@ public class ExtensionFunctionsTest extends CodegenTestCase {
}
public
void
testVirtual
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"extensionFunctions/virtual.jet"
);
}
public
void
testShared
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"extensionFunctions/shared.kt"
);
// System.out.println(generateToText());
}
public
void
testKt475
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt475.jet"
);
}
...
...
compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
浏览文件 @
d7172313
...
...
@@ -16,8 +16,6 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.Method
;
...
...
@@ -25,12 +23,6 @@ import java.lang.reflect.Method;
* @author alex.tkachman
*/
public
class
FunctionGenTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
public
void
testDefaultArgs
()
throws
Exception
{
blackBoxFile
(
"functions/defaultargs.jet"
);
// System.out.println(generateToText());
...
...
compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
浏览文件 @
d7172313
...
...
@@ -19,7 +19,6 @@ package org.jetbrains.jet.codegen;
import
jet.IntRange
;
import
jet.Tuple2
;
import
jet.Tuple4
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.awt.*
;
import
java.lang.reflect.InvocationTargetException
;
...
...
@@ -31,13 +30,6 @@ import java.util.Arrays;
* @author yole
*/
public
class
NamespaceGenTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
public
void
testPSVM
()
throws
Exception
{
loadFile
(
"PSVM.jet"
);
// System.out.println(generateToText());
...
...
compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java
浏览文件 @
d7172313
...
...
@@ -16,19 +16,11 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
/**
* @author yole
* @author alex.tkachman
*/
public
class
ObjectGenTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
public
void
testSimpleObject
()
throws
Exception
{
blackBoxFile
(
"objects/simpleObject.jet"
);
// System.out.println(generateToText());
...
...
compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java
浏览文件 @
d7172313
...
...
@@ -17,7 +17,6 @@
package
org.jetbrains.jet.codegen
;
import
jet.Tuple2
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.Method
;
...
...
@@ -25,13 +24,6 @@ import java.lang.reflect.Method;
* @author yole
*/
public
class
PatternMatchingTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
@Override
protected
String
getPrefix
()
{
return
"patternMatching"
;
...
...
compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
浏览文件 @
d7172313
...
...
@@ -16,8 +16,6 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.Method
;
/**
...
...
@@ -25,13 +23,6 @@ import java.lang.reflect.Method;
* @author alex.tkachman
*/
public
class
PrimitiveTypesTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
public
void
testPlus
()
throws
Exception
{
loadText
(
"fun f(a: Int, b: Int): Int { return a + b }"
);
...
...
compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
浏览文件 @
d7172313
...
...
@@ -16,8 +16,6 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.Constructor
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Method
;
...
...
@@ -33,7 +31,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testPrivateVal
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
final
Class
aClass
=
loadImplementationClass
(
generateClassesInFile
(),
"PrivateVal"
);
final
Field
[]
fields
=
aClass
.
getDeclaredFields
();
...
...
@@ -43,7 +40,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testPrivateVar
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
final
Class
aClass
=
loadImplementationClass
(
generateClassesInFile
(),
"PrivateVar"
);
final
Object
instance
=
aClass
.
newInstance
();
...
...
@@ -54,7 +50,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testPublicVar
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"class PublicVar() { public var foo : Int = 0; }"
);
final
Class
aClass
=
loadImplementationClass
(
generateClassesInFile
(),
"PublicVar"
);
final
Object
instance
=
aClass
.
newInstance
();
...
...
@@ -65,7 +60,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testAccessorsInInterface
()
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"class AccessorsInInterface() { public var foo : Int = 0; }"
);
final
Class
aClass
=
loadClass
(
"AccessorsInInterface"
,
generateClassesInFile
());
assertNotNull
(
findMethodByName
(
aClass
,
"getFoo"
));
...
...
@@ -73,7 +67,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testPrivatePropertyInNamespace
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"private val x = 239"
);
final
Class
nsClass
=
generateNamespaceClass
();
final
Field
[]
fields
=
nsClass
.
getDeclaredFields
();
...
...
@@ -86,7 +79,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testFieldPropertyAccess
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
(
"properties/fieldPropertyAccess.jet"
);
// System.out.println(generateToText());
final
Method
method
=
generateFunction
();
...
...
@@ -95,14 +87,12 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testFieldGetter
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"val now: Long get() = System.currentTimeMillis(); fun foo() = now"
);
final
Method
method
=
generateFunction
(
"foo"
);
assertIsCurrentTime
((
Long
)
method
.
invoke
(
null
));
}
public
void
testFieldSetter
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
final
Method
method
=
generateFunction
(
"append"
);
method
.
invoke
(
null
,
"IntelliJ "
);
...
...
@@ -114,7 +104,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testFieldSetterPlusEq
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
final
Method
method
=
generateFunction
(
"append"
);
method
.
invoke
(
null
,
"IntelliJ "
);
...
...
@@ -123,7 +112,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testAccessorsWithoutBody
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"class AccessorsWithoutBody() { protected var foo: Int = 349\n get\n private set\n fun setter() { foo = 610; } } "
);
// System.out.println(generateToText());
final
Class
aClass
=
loadImplementationClass
(
generateClassesInFile
(),
"AccessorsWithoutBody"
);
...
...
@@ -141,7 +129,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testInitializersForNamespaceProperties
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"val x = System.currentTimeMillis()"
);
final
Method
method
=
generateFunction
(
"getX"
);
method
.
setAccessible
(
true
);
...
...
@@ -149,7 +136,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testPropertyReceiverOnStack
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadFile
();
final
Class
aClass
=
loadImplementationClass
(
generateClassesInFile
(),
"Evaluator"
);
final
Constructor
constructor
=
aClass
.
getConstructor
(
StringBuilder
.
class
);
...
...
@@ -161,7 +147,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testAbstractVal
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"abstract class Foo { public abstract val x: String }"
);
final
ClassFileFactory
codegens
=
generateClassesInFile
();
final
Class
aClass
=
loadClass
(
"Foo"
,
codegens
);
...
...
@@ -169,7 +154,6 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testVolatileProperty
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"abstract class Foo { public volatile var x: String = \"\"; }"
);
// System.out.println(generateToText());
final
ClassFileFactory
codegens
=
generateClassesInFile
();
...
...
@@ -179,18 +163,15 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testKt257
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt257.jet"
);
// System.out.println(generateToText());
}
public
void
testKt613
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt613.jet"
);
}
public
void
testKt160
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"internal val s = java.lang.Double.toString(1.0)"
);
final
Method
method
=
generateFunction
(
"getS"
);
method
.
setAccessible
(
true
);
...
...
@@ -198,12 +179,10 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testKt1165
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1165.kt"
);
}
public
void
testKt1168
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1168.kt"
);
}
...
...
@@ -213,17 +192,14 @@ public class PropertyGenTest extends CodegenTestCase {
}
public
void
testKt1159
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1159.kt"
);
}
public
void
testKt1417
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1417.kt"
);
}
public
void
testKt1398
()
throws
Exception
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt1398.kt"
);
}
...
...
compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java
浏览文件 @
d7172313
...
...
@@ -16,15 +16,7 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
public
class
SafeRefTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
public
void
test247
()
throws
Exception
{
blackBoxFile
(
"regressions/kt247.jet"
);
}
...
...
compiler/tests/org/jetbrains/jet/codegen/StringsTest.java
浏览文件 @
d7172313
...
...
@@ -16,8 +16,6 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.Method
;
...
...
@@ -27,12 +25,6 @@ import java.lang.reflect.Method;
*/
public
class
StringsTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
public
void
testAnyToString
()
throws
InvocationTargetException
,
IllegalAccessException
{
loadText
(
"fun foo(x: Any) = x.toString()"
);
// System.out.println(generateToText());
...
...
compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java
浏览文件 @
d7172313
...
...
@@ -16,16 +16,7 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
public
class
SuperGenTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
public
void
testBasicProperty
()
{
blackBoxFile
(
"/super/basicproperty.jet"
);
// System.out.println(generateToText());
...
...
compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java
浏览文件 @
d7172313
...
...
@@ -16,16 +16,7 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
public
class
TraitsTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
@Override
protected
String
getPrefix
()
{
return
"traits"
;
...
...
compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java
浏览文件 @
d7172313
...
...
@@ -16,11 +16,8 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
public
class
TupleGenTest
extends
CodegenTestCase
{
public
void
testBasic
()
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"/tuples/basic.jet"
);
// System.out.println(generateToText());
}
...
...
compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java
浏览文件 @
d7172313
...
...
@@ -17,7 +17,6 @@
package
org.jetbrains.jet.codegen
;
import
jet.TypeCastException
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.Method
;
...
...
@@ -26,13 +25,6 @@ import java.lang.reflect.Method;
* @author alex.tkachman
*/
public
class
TypeInfoTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
}
@Override
protected
String
getPrefix
()
{
return
"typeInfo"
;
...
...
compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
浏览文件 @
d7172313
...
...
@@ -16,8 +16,6 @@
package
org.jetbrains.jet.codegen
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.lang.reflect.Array
;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.Method
;
...
...
@@ -28,7 +26,6 @@ import java.util.Arrays;
*/
public
class
VarArgTest
extends
CodegenTestCase
{
public
void
testStringArray
()
throws
InvocationTargetException
,
IllegalAccessException
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun test(vararg ts: String) = ts"
);
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
...
...
@@ -37,7 +34,6 @@ public class VarArgTest extends CodegenTestCase {
}
public
void
testIntArray
()
throws
InvocationTargetException
,
IllegalAccessException
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun test(vararg ts: Int) = ts"
);
// System.out.println(generateToText());
final
Method
main
=
generateFunction
();
...
...
@@ -46,7 +42,6 @@ public class VarArgTest extends CodegenTestCase {
}
public
void
testIntArrayKotlinNoArgs
()
throws
InvocationTargetException
,
IllegalAccessException
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun test() = testf(); fun testf(vararg ts: Int) = ts"
);
// System.out.println(generateToText());
final
Method
main
=
generateFunction
(
"test"
);
...
...
@@ -55,7 +50,6 @@ public class VarArgTest extends CodegenTestCase {
}
public
void
testIntArrayKotlin
()
throws
InvocationTargetException
,
IllegalAccessException
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun test() = testf(239, 7); fun testf(vararg ts: Int) = ts"
);
// System.out.println(generateToText());
final
Method
main
=
generateFunction
(
"test"
);
...
...
@@ -66,7 +60,6 @@ public class VarArgTest extends CodegenTestCase {
}
public
void
testNullableIntArrayKotlin
()
throws
InvocationTargetException
,
IllegalAccessException
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun test() = testf(239.toByte(), 7.toByte()); fun testf(vararg ts: Byte?) = ts"
);
// System.out.println(generateToText());
final
Method
main
=
generateFunction
(
"test"
);
...
...
@@ -77,7 +70,6 @@ public class VarArgTest extends CodegenTestCase {
}
public
void
testIntArrayKotlinObj
()
throws
InvocationTargetException
,
IllegalAccessException
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun test() = testf(\"239\"); fun testf(vararg ts: String) = ts"
);
// System.out.println(generateToText());
final
Method
main
=
generateFunction
(
"test"
);
...
...
@@ -87,7 +79,6 @@ public class VarArgTest extends CodegenTestCase {
}
public
void
testArrayT
()
throws
InvocationTargetException
,
IllegalAccessException
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"fun test() = _array(2, 4); fun <T> _array(vararg elements : T) = elements"
);
// System.out.println(generateToText());
final
Method
main
=
generateFunction
(
"test"
);
...
...
@@ -103,12 +94,10 @@ public class VarArgTest extends CodegenTestCase {
}
public
void
testKt797
()
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
blackBoxFile
(
"regressions/kt796_797.jet"
);
}
public
void
testArrayAsVararg
()
throws
InvocationTargetException
,
IllegalAccessException
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"private fun asList(vararg elems: String) = elems; fun test(ts: Array<String>) = asList(*ts); "
);
//System.out.println(generateToText());
final
Method
main
=
generateFunction
(
"test"
);
...
...
@@ -117,7 +106,6 @@ public class VarArgTest extends CodegenTestCase {
}
public
void
testArrayAsVararg2
()
throws
InvocationTargetException
,
IllegalAccessException
{
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
JDK_HEADERS
);
loadText
(
"private fun asList(vararg elems: String) = elems; fun test(ts1: Array<String>, ts2: String) = asList(*ts1, ts2); "
);
System
.
out
.
println
(
generateToText
());
final
Method
main
=
generateFunction
(
"test"
);
...
...
compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java
浏览文件 @
d7172313
...
...
@@ -41,14 +41,6 @@ import java.util.List;
* @since 4/6/12
*/
public
class
DescriptorRendererTest
extends
JetLiteFixture
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
();
}
public
void
testGlobalProperties
()
throws
IOException
{
doTest
();
}
...
...
compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
浏览文件 @
d7172313
...
...
@@ -27,7 +27,6 @@ import org.jetbrains.annotations.NotNull;
import
org.jetbrains.annotations.Nullable
;
import
org.jetbrains.jet.CompileCompilerDependenciesTest
;
import
org.jetbrains.jet.analyzer.AnalyzeExhaust
;
import
org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
;
import
org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory
;
import
org.jetbrains.jet.lang.descriptors.*
;
import
org.jetbrains.jet.lang.diagnostics.Diagnostic
;
...
...
@@ -79,13 +78,9 @@ public abstract class ExpectedResolveData {
private
final
Map
<
String
,
DeclarationDescriptor
>
nameToDescriptor
;
private
final
Map
<
String
,
PsiElement
>
nameToPsiElement
;
@NotNull
private
final
JetCoreEnvironment
jetCoreEnvironment
;
public
ExpectedResolveData
(
Map
<
String
,
DeclarationDescriptor
>
nameToDescriptor
,
Map
<
String
,
PsiElement
>
nameToPsiElement
,
@NotNull
JetCoreEnvironment
environment
)
{
public
ExpectedResolveData
(
Map
<
String
,
DeclarationDescriptor
>
nameToDescriptor
,
Map
<
String
,
PsiElement
>
nameToPsiElement
)
{
this
.
nameToDescriptor
=
nameToDescriptor
;
this
.
nameToPsiElement
=
nameToPsiElement
;
jetCoreEnvironment
=
environment
;
}
public
final
JetFile
createFileFromMarkedUpText
(
String
fileName
,
String
text
)
{
...
...
@@ -148,7 +143,7 @@ public abstract class ExpectedResolveData {
AnalyzeExhaust
analyzeExhaust
=
AnalyzerFacadeForJVM
.
analyzeFilesWithJavaIntegration
(
project
,
files
,
Predicates
.<
PsiFile
>
alwaysTrue
(),
JetControlFlowDataTraceFactory
.
EMPTY
,
jetCoreEnvironment
.
getCompilerDependencies
(
));
CompileCompilerDependenciesTest
.
compilerDependenciesForTests
(
CompilerSpecialMode
.
REGULAR
,
true
));
BindingContext
bindingContext
=
analyzeExhaust
.
getBindingContext
();
for
(
Diagnostic
diagnostic
:
bindingContext
.
getDiagnostics
())
{
if
(
diagnostic
.
getFactory
()
instanceof
UnresolvedReferenceDiagnosticFactory
)
{
...
...
compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java
浏览文件 @
d7172313
...
...
@@ -20,7 +20,6 @@ import org.jetbrains.annotations.NonNls;
import
org.jetbrains.jet.JetLiteFixture
;
import
org.jetbrains.jet.JetTestUtils
;
import
org.jetbrains.jet.lang.psi.JetFile
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
java.util.List
;
...
...
@@ -33,9 +32,6 @@ public abstract class ExtensibleResolveTestCase extends JetLiteFixture {
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
(
CompilerSpecialMode
.
STDLIB
);
expectedResolveData
=
getExpectedResolveData
();
}
...
...
compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java
浏览文件 @
d7172313
...
...
@@ -24,6 +24,7 @@ import com.intellij.psi.PsiElement;
import
com.intellij.psi.PsiMethod
;
import
junit.framework.Test
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.jet.CompileCompilerDependenciesTest
;
import
org.jetbrains.jet.JetTestCaseBuilder
;
import
org.jetbrains.jet.di.InjectorForJavaSemanticServices
;
import
org.jetbrains.jet.di.InjectorForTests
;
...
...
@@ -36,6 +37,8 @@ import org.jetbrains.jet.lang.resolve.FqName;
import
org.jetbrains.jet.lang.resolve.calls.CallResolver
;
import
org.jetbrains.jet.lang.resolve.calls.OverloadResolutionResults
;
import
org.jetbrains.jet.lang.resolve.calls.ResolvedCall
;
import
org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
;
import
org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver
;
import
org.jetbrains.jet.lang.resolve.java.PsiClassFinder
;
import
org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor
;
import
org.jetbrains.jet.lang.types.JetType
;
...
...
@@ -100,7 +103,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
nameToDeclaration
.
put
(
"java::java.lang.Number"
,
java_lang_Number
);
nameToDeclaration
.
put
(
"java::java.lang.Number.intValue()"
,
java_lang_Number
.
findMethodsByName
(
"intValue"
,
true
)[
0
]);
return
new
ExpectedResolveData
(
nameToDescriptor
,
nameToDeclaration
,
myEnvironment
)
{
return
new
ExpectedResolveData
(
nameToDescriptor
,
nameToDeclaration
)
{
@Override
protected
JetFile
createJetFile
(
String
fileName
,
String
text
)
{
return
createCheckAndReturnPsiFile
(
fileName
,
text
);
...
...
@@ -124,7 +127,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
private
PsiClass
findClass
(
String
qualifiedName
)
{
Project
project
=
getProject
();
InjectorForJavaSemanticServices
injector
=
new
InjectorForJavaSemanticServices
(
myEnvironment
.
getCompilerDependencies
(
),
project
);
CompileCompilerDependenciesTest
.
compilerDependenciesForTests
(
CompilerSpecialMode
.
REGULAR
,
true
),
project
);
return
injector
.
getPsiClassFinderForJvm
().
findPsiClass
(
new
FqName
(
qualifiedName
),
PsiClassFinder
.
RuntimeClassesHandleMode
.
THROW
);
}
...
...
compiler/tests/org/jetbrains/jet/runtime/JetNpeTest.java
浏览文件 @
d7172313
...
...
@@ -22,14 +22,6 @@ import org.jetbrains.jet.codegen.CodegenTestCase;
import
java.lang.reflect.Method
;
public
class
JetNpeTest
extends
CodegenTestCase
{
@Override
protected
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
();
}
public
void
testStackTrace
()
{
try
{
Intrinsics
.
throwNpe
();
...
...
compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java
浏览文件 @
d7172313
...
...
@@ -45,7 +45,6 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture {
@Override
public
void
setUp
()
throws
Exception
{
super
.
setUp
();
super
.
createEnvironmentWithMockJdk
();
tc
.
setUp
();
}
...
...
compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java
浏览文件 @
d7172313
...
...
@@ -40,7 +40,6 @@ public class JetOverloadTest extends JetLiteFixture {
@Override
public
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
();
InjectorForTests
injector
=
new
InjectorForTests
(
getProject
());
library
=
injector
.
getJetStandardLibrary
();
descriptorResolver
=
injector
.
getDescriptorResolver
();
...
...
compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java
浏览文件 @
d7172313
...
...
@@ -40,7 +40,6 @@ public class JetOverridingTest extends JetLiteFixture {
@Override
public
void
setUp
()
throws
Exception
{
super
.
setUp
();
createEnvironmentWithMockJdk
();
InjectorForTests
injector
=
new
InjectorForTests
(
getProject
());
library
=
injector
.
getJetStandardLibrary
();
descriptorResolver
=
injector
.
getDescriptorResolver
();
...
...
compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
浏览文件 @
d7172313
...
...
@@ -66,9 +66,6 @@ public class JetTypeCheckerTest extends JetLiteFixture {
@Override
public
void
setUp
()
throws
Exception
{
super
.
setUp
();
super
.
createEnvironmentWithMockJdk
();
library
=
JetStandardLibrary
.
getInstance
();
classDefinitions
=
new
ClassDefinitions
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录