From ad32f6ec49efd23382a648ef2adb791a6014a39e Mon Sep 17 00:00:00 2001 From: Pavel Talanov Date: Mon, 6 Feb 2012 15:27:51 +0400 Subject: [PATCH] reorganise test structure and remove a couple of old test classes --- .../jetbrains/k2js/test/BasicClassTest.java | 38 +-------------- .../jetbrains/k2js/test/ConditionalTest.java | 13 +---- .../jetbrains/k2js/test/IntrinsicTest.java | 24 ---------- .../jetbrains/k2js/test/OperationTest.java | 44 ----------------- .../jetbrains/k2js/test/SimpleTestSuite.java | 46 ++++++++++++++++++ .../org/jetbrains/k2js/test/WhileTest.java | 48 ------------------- .../extensionClosure.jet | 0 .../cases/incrementProperty.kt | 2 - .../operation => simple}/cases/assign.kt | 4 +- .../while => simple}/cases/breakDoWhile.kt | 0 .../while => simple}/cases/breakWhile.kt | 0 .../cases/classInstantiation.kt | 0 .../operation => simple}/cases/comparison.kt | 0 ...complexExpressionAsConstructorParameter.kt | 0 .../cases/constructorWithParameter.kt | 0 .../constructorWithPropertiesAsParameters.kt | 0 .../while => simple}/cases/continueDoWhile.kt | 0 .../while => simple}/cases/continueWhile.kt | 0 .../while => simple}/cases/doWhile.kt | 0 .../while => simple}/cases/doWhile2.kt | 0 .../conditional => simple}/cases/elseif.kt | 4 +- .../conditional => simple}/cases/if.kt | 4 +- .../cases/ifElseAsExpression.kt | 0 .../cases/methodDeclarationAndCall.kt | 0 .../cases/minusAssignOnProperty.kt | 0 .../operation => simple}/cases/notBoolean.kt | 0 .../intrinsic => simple}/cases/plusAssign.kt | 0 .../cases/positiveAndNegativeNumbers.kt | 0 .../cases/postfixIntOperations.kt | 0 .../cases/prefixIntOperations.kt | 0 .../propertiesAsParametersInitialized.kt | 0 .../{class => simple}/cases/propertyAccess.kt | 0 .../cases/simpleInitializer.kt | 0 .../while => simple}/cases/while.kt | 0 .../while => simple}/cases/while2.kt | 0 35 files changed, 57 insertions(+), 170 deletions(-) delete mode 100644 translator/test/org/jetbrains/k2js/test/IntrinsicTest.java delete mode 100644 translator/test/org/jetbrains/k2js/test/OperationTest.java create mode 100644 translator/test/org/jetbrains/k2js/test/SimpleTestSuite.java delete mode 100644 translator/test/org/jetbrains/k2js/test/WhileTest.java rename translator/testFiles/examples/{sortedTests/unsupported => cases}/extensionClosure.jet (100%) rename translator/testFiles/{class => examples}/cases/incrementProperty.kt (95%) rename translator/testFiles/{expression/operation => simple}/cases/assign.kt (71%) rename translator/testFiles/{expression/while => simple}/cases/breakDoWhile.kt (100%) rename translator/testFiles/{expression/while => simple}/cases/breakWhile.kt (100%) rename translator/testFiles/{class => simple}/cases/classInstantiation.kt (100%) rename translator/testFiles/{expression/operation => simple}/cases/comparison.kt (100%) rename translator/testFiles/{class => simple}/cases/complexExpressionAsConstructorParameter.kt (100%) rename translator/testFiles/{class => simple}/cases/constructorWithParameter.kt (100%) rename translator/testFiles/{class => simple}/cases/constructorWithPropertiesAsParameters.kt (100%) rename translator/testFiles/{expression/while => simple}/cases/continueDoWhile.kt (100%) rename translator/testFiles/{expression/while => simple}/cases/continueWhile.kt (100%) rename translator/testFiles/{expression/while => simple}/cases/doWhile.kt (100%) rename translator/testFiles/{expression/while => simple}/cases/doWhile2.kt (100%) rename translator/testFiles/{expression/conditional => simple}/cases/elseif.kt (84%) rename translator/testFiles/{expression/conditional => simple}/cases/if.kt (83%) rename translator/testFiles/{expression/conditional => simple}/cases/ifElseAsExpression.kt (100%) rename translator/testFiles/{class => simple}/cases/methodDeclarationAndCall.kt (100%) rename translator/testFiles/{expression/intrinsic => simple}/cases/minusAssignOnProperty.kt (100%) rename translator/testFiles/{expression/operation => simple}/cases/notBoolean.kt (100%) rename translator/testFiles/{expression/intrinsic => simple}/cases/plusAssign.kt (100%) rename translator/testFiles/{expression/operation => simple}/cases/positiveAndNegativeNumbers.kt (100%) rename translator/testFiles/{expression/operation => simple}/cases/postfixIntOperations.kt (100%) rename translator/testFiles/{expression/operation => simple}/cases/prefixIntOperations.kt (100%) rename translator/testFiles/{class => simple}/cases/propertiesAsParametersInitialized.kt (100%) rename translator/testFiles/{class => simple}/cases/propertyAccess.kt (100%) rename translator/testFiles/{class => simple}/cases/simpleInitializer.kt (100%) rename translator/testFiles/{expression/while => simple}/cases/while.kt (100%) rename translator/testFiles/{expression/while => simple}/cases/while2.kt (100%) diff --git a/translator/test/org/jetbrains/k2js/test/BasicClassTest.java b/translator/test/org/jetbrains/k2js/test/BasicClassTest.java index 6251c09f49b..0a9e9f02bd8 100644 --- a/translator/test/org/jetbrains/k2js/test/BasicClassTest.java +++ b/translator/test/org/jetbrains/k2js/test/BasicClassTest.java @@ -3,6 +3,7 @@ package org.jetbrains.k2js.test; /** * @author Pavel Talanov */ +//TODO: remove class public class BasicClassTest extends TranslationTest { final private static String MAIN = "class/"; @@ -12,43 +13,6 @@ public class BasicClassTest extends TranslationTest { return MAIN; } - - public void testClassInstantiation() throws Exception { - testFooBoxIsTrue("classInstantiation.kt"); - } - - public void testMethodDeclarationAndCall() throws Exception { - testFooBoxIsTrue("methodDeclarationAndCall.kt"); - } - - public void testConstructorWithParameter() throws Exception { - testFooBoxIsTrue("constructorWithParameter.kt"); - } - - public void testConstructorWithPropertiesAsParameters() throws Exception { - testFooBoxIsTrue("constructorWithPropertiesAsParameters.kt"); - } - - public void testIncrementProperty() throws Exception { - testFunctionOutput("incrementProperty.kt", "foo", "box", "OK"); - } - - public void testSimpleInitializer() throws Exception { - testFooBoxIsTrue("simpleInitializer.kt"); - } - - public void testComplexExpressionAsConstructorParameter() throws Exception { - testFooBoxIsTrue("complexExpressionAsConstructorParameter.kt"); - } - - public void testPropertyAccess() throws Exception { - testFooBoxIsTrue("propertyAccess.kt"); - } - - public void testPropertiesAsParametersInitialized() throws Exception { - testFooBoxIsTrue("propertiesAsParametersInitialized.kt"); - } - public void testClassWithoutNamespace() throws Exception { testFunctionOutput("classWithoutNamespace.kt", "Anonymous", "box", true); } diff --git a/translator/test/org/jetbrains/k2js/test/ConditionalTest.java b/translator/test/org/jetbrains/k2js/test/ConditionalTest.java index 8a2d0d0ccba..8c70c521ca1 100644 --- a/translator/test/org/jetbrains/k2js/test/ConditionalTest.java +++ b/translator/test/org/jetbrains/k2js/test/ConditionalTest.java @@ -5,6 +5,7 @@ import org.mozilla.javascript.JavaScriptException; /** * @author Pavel Talanov */ +//TODO: remove class public class ConditionalTest extends AbstractExpressionTest { final private static String MAIN = "conditional/"; @@ -14,18 +15,6 @@ public class ConditionalTest extends AbstractExpressionTest { return MAIN; } - public void testIfElseAsExpression() throws Exception { - testFooBoxIsTrue("ifElseAsExpression.kt"); - } - - public void testIfElse() throws Exception { - testFunctionOutput("if.kt", "foo", "box", 5); - } - - public void testIfElseIf() throws Exception { - testFunctionOutput("elseif.kt", "foo", "box", 5); - } - public void testIfElseAsExpressionWithThrow() throws Exception { try { testFooBoxIsTrue("ifAsExpressionWithThrow.kt"); diff --git a/translator/test/org/jetbrains/k2js/test/IntrinsicTest.java b/translator/test/org/jetbrains/k2js/test/IntrinsicTest.java deleted file mode 100644 index d8632916568..00000000000 --- a/translator/test/org/jetbrains/k2js/test/IntrinsicTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.jetbrains.k2js.test; - -/** - * @author Pavel Talanov - */ -public class IntrinsicTest extends AbstractExpressionTest { - - final private static String MAIN = "intrinsic/"; - - @Override - protected String mainDirectory() { - return MAIN; - } - - public void testIntrinsicPlusAssign() throws Exception { - testFooBoxIsTrue("plusAssign.kt"); - } - - - public void testMinusAssignOnProperty() throws Exception { - testFooBoxIsTrue("minusAssignOnProperty.kt"); - } - -} diff --git a/translator/test/org/jetbrains/k2js/test/OperationTest.java b/translator/test/org/jetbrains/k2js/test/OperationTest.java deleted file mode 100644 index 444b7527f6d..00000000000 --- a/translator/test/org/jetbrains/k2js/test/OperationTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.jetbrains.k2js.test; - -/** - * @author Pavel Talanov - */ -public final class OperationTest extends AbstractExpressionTest { - final private static String MAIN = "operation/"; - - @Override - protected String mainDirectory() { - return MAIN; - } - - - public void testPrefixIntOperations() throws Exception { - testFooBoxIsTrue("prefixIntOperations.kt"); - } - - - public void testPostfixIntOperations() throws Exception { - testFooBoxIsTrue("postfixIntOperations.kt"); - } - - - public void testNotBoolean() throws Exception { - testFooBoxIsTrue("notBoolean.kt"); - } - - - public void testPositiveAndNegativeNumbers() throws Exception { - testFooBoxIsTrue("positiveAndNegativeNumbers.kt"); - } - - - public void testAssign() throws Exception { - testFunctionOutput("assign.kt", "foo", "f", 2.0); - } - - - public void testComparison() throws Exception { - testFooBoxIsTrue("comparison.kt"); - } -} - diff --git a/translator/test/org/jetbrains/k2js/test/SimpleTestSuite.java b/translator/test/org/jetbrains/k2js/test/SimpleTestSuite.java new file mode 100644 index 00000000000..9339032d609 --- /dev/null +++ b/translator/test/org/jetbrains/k2js/test/SimpleTestSuite.java @@ -0,0 +1,46 @@ +package org.jetbrains.k2js.test; + +import junit.framework.Test; +import org.jetbrains.annotations.NotNull; + +/** + * @author Pavel Talanov + */ +public final class SimpleTestSuite extends TranslationTest { + final private static String MAIN = "simple/"; + + @Override + protected String mainDirectory() { + return MAIN; + } + + public void runBoxTest(String filename) throws Exception { + testFooBoxIsTrue(filename); + } + + private String name; + + public SimpleTestSuite(String name) { + this.name = name; + } + + @Override + public String getName() { + return name; + } + + public void runTest() throws Exception { + runBoxTest(getName()); + } + + public static Test suite() { + return TranslatorTestCaseBuilder.suiteForDirectory("translator", + "/testFiles/simple/cases/", true, new TranslatorTestCaseBuilder.NamedTestFactory() { + @NotNull + @Override + public Test createTest(@NotNull String dataPath, @NotNull String name) { + return (new SimpleTestSuite(name)); + } + }); + } +} diff --git a/translator/test/org/jetbrains/k2js/test/WhileTest.java b/translator/test/org/jetbrains/k2js/test/WhileTest.java deleted file mode 100644 index 3572c5d2dd9..00000000000 --- a/translator/test/org/jetbrains/k2js/test/WhileTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.jetbrains.k2js.test; - -/** - * @author Pavel Talanov - */ -public final class WhileTest extends AbstractExpressionTest { - - private static final String MAIN = "while/"; - - protected String mainDirectory() { - return MAIN; - } - - public void testWhileSimpleTest() throws Exception { - testFooBoxIsTrue("while.kt"); - } - - public void testDoWhileSimpleTest() throws Exception { - testFooBoxIsTrue("doWhile.kt"); - } - - public void testDoWhileExecutesAtLeastOnce() throws Exception { - testFooBoxIsTrue("doWhile2.kt"); - } - - public void testWhileDoesntExecuteEvenOnceIfConditionIsFalse() throws Exception { - testFooBoxIsTrue("while2.kt"); - } - - public void testBreakWhile() throws Exception { - testFooBoxIsTrue("breakWhile.kt"); - } - - - public void testBreakDoWhile() throws Exception { - testFooBoxIsTrue("breakDoWhile.kt"); - } - - - public void testContinueWhile() throws Exception { - testFooBoxIsTrue("continueWhile.kt"); - } - - - public void testContinueDoWhile() throws Exception { - testFooBoxIsTrue("continueDoWhile.kt"); - } -} diff --git a/translator/testFiles/examples/sortedTests/unsupported/extensionClosure.jet b/translator/testFiles/examples/cases/extensionClosure.jet similarity index 100% rename from translator/testFiles/examples/sortedTests/unsupported/extensionClosure.jet rename to translator/testFiles/examples/cases/extensionClosure.jet diff --git a/translator/testFiles/class/cases/incrementProperty.kt b/translator/testFiles/examples/cases/incrementProperty.kt similarity index 95% rename from translator/testFiles/class/cases/incrementProperty.kt rename to translator/testFiles/examples/cases/incrementProperty.kt index d15bf027d23..29123dbcaf3 100644 --- a/translator/testFiles/class/cases/incrementProperty.kt +++ b/translator/testFiles/examples/cases/incrementProperty.kt @@ -1,5 +1,3 @@ -package foo - class Slot() { var vitality: Int = 10000 diff --git a/translator/testFiles/expression/operation/cases/assign.kt b/translator/testFiles/simple/cases/assign.kt similarity index 71% rename from translator/testFiles/expression/operation/cases/assign.kt rename to translator/testFiles/simple/cases/assign.kt index 209a556b7a7..cd9759ab40b 100644 --- a/translator/testFiles/expression/operation/cases/assign.kt +++ b/translator/testFiles/simple/cases/assign.kt @@ -4,4 +4,6 @@ fun f(): Int { var x: Int = 1 x = x + 1 return x -} \ No newline at end of file +} + +fun box() = f() == 2 \ No newline at end of file diff --git a/translator/testFiles/expression/while/cases/breakDoWhile.kt b/translator/testFiles/simple/cases/breakDoWhile.kt similarity index 100% rename from translator/testFiles/expression/while/cases/breakDoWhile.kt rename to translator/testFiles/simple/cases/breakDoWhile.kt diff --git a/translator/testFiles/expression/while/cases/breakWhile.kt b/translator/testFiles/simple/cases/breakWhile.kt similarity index 100% rename from translator/testFiles/expression/while/cases/breakWhile.kt rename to translator/testFiles/simple/cases/breakWhile.kt diff --git a/translator/testFiles/class/cases/classInstantiation.kt b/translator/testFiles/simple/cases/classInstantiation.kt similarity index 100% rename from translator/testFiles/class/cases/classInstantiation.kt rename to translator/testFiles/simple/cases/classInstantiation.kt diff --git a/translator/testFiles/expression/operation/cases/comparison.kt b/translator/testFiles/simple/cases/comparison.kt similarity index 100% rename from translator/testFiles/expression/operation/cases/comparison.kt rename to translator/testFiles/simple/cases/comparison.kt diff --git a/translator/testFiles/class/cases/complexExpressionAsConstructorParameter.kt b/translator/testFiles/simple/cases/complexExpressionAsConstructorParameter.kt similarity index 100% rename from translator/testFiles/class/cases/complexExpressionAsConstructorParameter.kt rename to translator/testFiles/simple/cases/complexExpressionAsConstructorParameter.kt diff --git a/translator/testFiles/class/cases/constructorWithParameter.kt b/translator/testFiles/simple/cases/constructorWithParameter.kt similarity index 100% rename from translator/testFiles/class/cases/constructorWithParameter.kt rename to translator/testFiles/simple/cases/constructorWithParameter.kt diff --git a/translator/testFiles/class/cases/constructorWithPropertiesAsParameters.kt b/translator/testFiles/simple/cases/constructorWithPropertiesAsParameters.kt similarity index 100% rename from translator/testFiles/class/cases/constructorWithPropertiesAsParameters.kt rename to translator/testFiles/simple/cases/constructorWithPropertiesAsParameters.kt diff --git a/translator/testFiles/expression/while/cases/continueDoWhile.kt b/translator/testFiles/simple/cases/continueDoWhile.kt similarity index 100% rename from translator/testFiles/expression/while/cases/continueDoWhile.kt rename to translator/testFiles/simple/cases/continueDoWhile.kt diff --git a/translator/testFiles/expression/while/cases/continueWhile.kt b/translator/testFiles/simple/cases/continueWhile.kt similarity index 100% rename from translator/testFiles/expression/while/cases/continueWhile.kt rename to translator/testFiles/simple/cases/continueWhile.kt diff --git a/translator/testFiles/expression/while/cases/doWhile.kt b/translator/testFiles/simple/cases/doWhile.kt similarity index 100% rename from translator/testFiles/expression/while/cases/doWhile.kt rename to translator/testFiles/simple/cases/doWhile.kt diff --git a/translator/testFiles/expression/while/cases/doWhile2.kt b/translator/testFiles/simple/cases/doWhile2.kt similarity index 100% rename from translator/testFiles/expression/while/cases/doWhile2.kt rename to translator/testFiles/simple/cases/doWhile2.kt diff --git a/translator/testFiles/expression/conditional/cases/elseif.kt b/translator/testFiles/simple/cases/elseif.kt similarity index 84% rename from translator/testFiles/expression/conditional/cases/elseif.kt rename to translator/testFiles/simple/cases/elseif.kt index 9f1e1435d54..636c724140d 100644 --- a/translator/testFiles/expression/conditional/cases/elseif.kt +++ b/translator/testFiles/simple/cases/elseif.kt @@ -1,6 +1,6 @@ package foo -fun box() : Int { +fun bor() : Int { val a = 2; val b = 3; var c = 4; @@ -14,3 +14,5 @@ fun box() : Int { return 5; } } + +fun box() = bor() == 5 \ No newline at end of file diff --git a/translator/testFiles/expression/conditional/cases/if.kt b/translator/testFiles/simple/cases/if.kt similarity index 83% rename from translator/testFiles/expression/conditional/cases/if.kt rename to translator/testFiles/simple/cases/if.kt index 08ff96a9be0..0c76fb23ac6 100644 --- a/translator/testFiles/expression/conditional/cases/if.kt +++ b/translator/testFiles/simple/cases/if.kt @@ -1,6 +1,6 @@ package foo -fun box() : Int { +fun bol() : Int { val a = 2; val b = 3; var c = 4; @@ -17,3 +17,5 @@ fun box() : Int { } } +fun box() = bol() == 5 + diff --git a/translator/testFiles/expression/conditional/cases/ifElseAsExpression.kt b/translator/testFiles/simple/cases/ifElseAsExpression.kt similarity index 100% rename from translator/testFiles/expression/conditional/cases/ifElseAsExpression.kt rename to translator/testFiles/simple/cases/ifElseAsExpression.kt diff --git a/translator/testFiles/class/cases/methodDeclarationAndCall.kt b/translator/testFiles/simple/cases/methodDeclarationAndCall.kt similarity index 100% rename from translator/testFiles/class/cases/methodDeclarationAndCall.kt rename to translator/testFiles/simple/cases/methodDeclarationAndCall.kt diff --git a/translator/testFiles/expression/intrinsic/cases/minusAssignOnProperty.kt b/translator/testFiles/simple/cases/minusAssignOnProperty.kt similarity index 100% rename from translator/testFiles/expression/intrinsic/cases/minusAssignOnProperty.kt rename to translator/testFiles/simple/cases/minusAssignOnProperty.kt diff --git a/translator/testFiles/expression/operation/cases/notBoolean.kt b/translator/testFiles/simple/cases/notBoolean.kt similarity index 100% rename from translator/testFiles/expression/operation/cases/notBoolean.kt rename to translator/testFiles/simple/cases/notBoolean.kt diff --git a/translator/testFiles/expression/intrinsic/cases/plusAssign.kt b/translator/testFiles/simple/cases/plusAssign.kt similarity index 100% rename from translator/testFiles/expression/intrinsic/cases/plusAssign.kt rename to translator/testFiles/simple/cases/plusAssign.kt diff --git a/translator/testFiles/expression/operation/cases/positiveAndNegativeNumbers.kt b/translator/testFiles/simple/cases/positiveAndNegativeNumbers.kt similarity index 100% rename from translator/testFiles/expression/operation/cases/positiveAndNegativeNumbers.kt rename to translator/testFiles/simple/cases/positiveAndNegativeNumbers.kt diff --git a/translator/testFiles/expression/operation/cases/postfixIntOperations.kt b/translator/testFiles/simple/cases/postfixIntOperations.kt similarity index 100% rename from translator/testFiles/expression/operation/cases/postfixIntOperations.kt rename to translator/testFiles/simple/cases/postfixIntOperations.kt diff --git a/translator/testFiles/expression/operation/cases/prefixIntOperations.kt b/translator/testFiles/simple/cases/prefixIntOperations.kt similarity index 100% rename from translator/testFiles/expression/operation/cases/prefixIntOperations.kt rename to translator/testFiles/simple/cases/prefixIntOperations.kt diff --git a/translator/testFiles/class/cases/propertiesAsParametersInitialized.kt b/translator/testFiles/simple/cases/propertiesAsParametersInitialized.kt similarity index 100% rename from translator/testFiles/class/cases/propertiesAsParametersInitialized.kt rename to translator/testFiles/simple/cases/propertiesAsParametersInitialized.kt diff --git a/translator/testFiles/class/cases/propertyAccess.kt b/translator/testFiles/simple/cases/propertyAccess.kt similarity index 100% rename from translator/testFiles/class/cases/propertyAccess.kt rename to translator/testFiles/simple/cases/propertyAccess.kt diff --git a/translator/testFiles/class/cases/simpleInitializer.kt b/translator/testFiles/simple/cases/simpleInitializer.kt similarity index 100% rename from translator/testFiles/class/cases/simpleInitializer.kt rename to translator/testFiles/simple/cases/simpleInitializer.kt diff --git a/translator/testFiles/expression/while/cases/while.kt b/translator/testFiles/simple/cases/while.kt similarity index 100% rename from translator/testFiles/expression/while/cases/while.kt rename to translator/testFiles/simple/cases/while.kt diff --git a/translator/testFiles/expression/while/cases/while2.kt b/translator/testFiles/simple/cases/while2.kt similarity index 100% rename from translator/testFiles/expression/while/cases/while2.kt rename to translator/testFiles/simple/cases/while2.kt