From 97fbcb47758b0f2ffe0e9ebbec062bffb0ef8dbb Mon Sep 17 00:00:00 2001 From: Pavel Talanov Date: Sat, 26 Nov 2011 00:38:17 +0400 Subject: [PATCH] Added and sorted tests from jet repository. Fixed a bug with custom setter. --- .idea/modules.xml | 1 + .idea/workspace.xml | 903 +++++++++++------- examples/jetTests.iml | 13 + examples/test/ExampleTestSuite.java | 34 + examples/test/JetTestCaseBuilder.java | 86 ++ jetTests/test/ExampleTestSuite.java | 33 + translator/lib/asm-util-3.3.1.jar | Bin 0 -> 36961 bytes .../declaration/PropertyTranslator.java | 17 +- .../expression/FunctionTranslator.java | 31 +- .../k2js/translate/general/Translation.java | 2 +- .../jetbrains/k2js/test/ConditionalTest.java | 1 + .../org/jetbrains/k2js/test/ExampleTest.java | 18 + .../jetbrains/k2js/test/KotlinLibTest.java | 2 + .../jetbrains/k2js/test/TranslationTest.java | 2 +- .../examples/cases/closureWithParameter.jet | 7 + .../cases/closureWithParameterAndBoxing.jet | 7 + .../examples/cases/diamondInheritance.jet | 24 + .../cases/doubleEnclosedLocalVariable.jet | 8 + .../examples/cases/enclosingLocalVariable.jet | 8 + .../examples/cases/funDelegation.jet | 17 + .../examples/cases/initializerBlock.jet | 13 + translator/testFiles/examples/cases/kt242.jet | 19 + .../cases/newInstanceDefaultConstructor.jet | 11 + .../examples/cases/propertyDelegation.jet | 33 + .../examples/cases/rightHandOverride.jet | 20 + .../examples/cases/simplestClosure.jet | 7 + .../cases/simplestClosureAndBoxing.jet | 7 + .../sortedTests/failed/enclosingThis.jet | 12 + .../sortedTests/failed/simpleBox.jet | 8 + .../sortedTests/obscure/inheritedMethod.jet | 13 + .../unexpectedError/exceptionConstructor.jet | 7 + .../sortedTests/unsupported/basicproperty.jet | 22 + .../sortedTests/unsupported/classObject.jet | 11 + .../unsupported/classObjectInterface.jet | 9 + .../unsupported/classObjectMethod.jet | 13 + .../sortedTests/unsupported/enclosed.jet | 42 + .../unsupported/extensionClosure.jet | 13 + .../sortedTests/unsupported/inheritance.jet | 41 + .../unsupported/inheritedInnerClass.jet | 14 + .../unsupported/propertyInInitializer.jet | 16 + .../sortedTests/unsupported/traitproperty.jet | 29 + .../sortedTests/usesJava/basicmethod.jet | 21 + .../usesJava/inheritingFromArrayList.jet | 1 + .../usesJava/initializerBlockDImpl.jet | 20 + .../sortedTests/usesJava/innerClass.jet | 19 + .../usesJava/overloadBinaryOperator.jet | 25 + .../usesJava/overloadPlusAssign.jet | 26 + .../usesJava/overloadPlusAssignReturn.jet | 30 + .../usesJava/overloadPlusToPlusAssign.jet | 30 + .../usesJava/overloadUnaryOperator.jet | 28 + translator/translator.iml | 1 + 51 files changed, 1399 insertions(+), 376 deletions(-) create mode 100644 examples/jetTests.iml create mode 100644 examples/test/ExampleTestSuite.java create mode 100644 examples/test/JetTestCaseBuilder.java create mode 100644 jetTests/test/ExampleTestSuite.java create mode 100644 translator/lib/asm-util-3.3.1.jar create mode 100644 translator/test/org/jetbrains/k2js/test/ExampleTest.java create mode 100644 translator/testFiles/examples/cases/closureWithParameter.jet create mode 100644 translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet create mode 100644 translator/testFiles/examples/cases/diamondInheritance.jet create mode 100644 translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet create mode 100644 translator/testFiles/examples/cases/enclosingLocalVariable.jet create mode 100644 translator/testFiles/examples/cases/funDelegation.jet create mode 100644 translator/testFiles/examples/cases/initializerBlock.jet create mode 100644 translator/testFiles/examples/cases/kt242.jet create mode 100644 translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet create mode 100644 translator/testFiles/examples/cases/propertyDelegation.jet create mode 100644 translator/testFiles/examples/cases/rightHandOverride.jet create mode 100644 translator/testFiles/examples/cases/simplestClosure.jet create mode 100644 translator/testFiles/examples/cases/simplestClosureAndBoxing.jet create mode 100644 translator/testFiles/sortedTests/failed/enclosingThis.jet create mode 100644 translator/testFiles/sortedTests/failed/simpleBox.jet create mode 100644 translator/testFiles/sortedTests/obscure/inheritedMethod.jet create mode 100644 translator/testFiles/sortedTests/unexpectedError/exceptionConstructor.jet create mode 100644 translator/testFiles/sortedTests/unsupported/basicproperty.jet create mode 100644 translator/testFiles/sortedTests/unsupported/classObject.jet create mode 100644 translator/testFiles/sortedTests/unsupported/classObjectInterface.jet create mode 100644 translator/testFiles/sortedTests/unsupported/classObjectMethod.jet create mode 100644 translator/testFiles/sortedTests/unsupported/enclosed.jet create mode 100644 translator/testFiles/sortedTests/unsupported/extensionClosure.jet create mode 100644 translator/testFiles/sortedTests/unsupported/inheritance.jet create mode 100644 translator/testFiles/sortedTests/unsupported/inheritedInnerClass.jet create mode 100644 translator/testFiles/sortedTests/unsupported/propertyInInitializer.jet create mode 100644 translator/testFiles/sortedTests/unsupported/traitproperty.jet create mode 100644 translator/testFiles/sortedTests/usesJava/basicmethod.jet create mode 100644 translator/testFiles/sortedTests/usesJava/inheritingFromArrayList.jet create mode 100644 translator/testFiles/sortedTests/usesJava/initializerBlockDImpl.jet create mode 100644 translator/testFiles/sortedTests/usesJava/innerClass.jet create mode 100644 translator/testFiles/sortedTests/usesJava/overloadBinaryOperator.jet create mode 100644 translator/testFiles/sortedTests/usesJava/overloadPlusAssign.jet create mode 100644 translator/testFiles/sortedTests/usesJava/overloadPlusAssignReturn.jet create mode 100644 translator/testFiles/sortedTests/usesJava/overloadPlusToPlusAssign.jet create mode 100644 translator/testFiles/sortedTests/usesJava/overloadUnaryOperator.jet diff --git a/.idea/modules.xml b/.idea/modules.xml index a7eb64f9ca7..c9d9f6c088f 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -6,6 +6,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 071fe3c2f83..7234e15e999 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,11 +7,58 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + @@ -42,6 +89,60 @@ + + + + + + + + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - + - - + + - + + + + + + + + + + @@ -180,101 +279,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - + + - + - - + + - + - - + + - + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -300,22 +392,22 @@ @@ -405,20 +497,6 @@ - - - - - - - - - - @@ -465,7 +543,11 @@ @@ -479,7 +561,139 @@ + + + - - - - - @@ -562,6 +772,7 @@ + @@ -573,118 +784,27 @@ - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -751,6 +871,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -835,23 +1052,12 @@ - - - - - - - - - - - + + + + + localhost @@ -907,7 +1113,7 @@ - + @@ -924,13 +1130,13 @@ - - + + - + @@ -969,7 +1175,7 @@ @@ -1016,119 +1222,116 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1150,7 +1353,7 @@ - Android + No facets are configured - guava-10.0.1 + asm-util-3.3.1 - 1.6 + IDEA IC-110.408 - js + frontend.java