azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got rid of "namespace" word in test data.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-01-10 23:42:19 +04:00
parent ee3312fb00
commit 958f7c862d
102 changed files with 302 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/semantics/KotlinLibTest.java
+4 -4
View File
@@ -29,13 +29,13 @@ public final class KotlinLibTest extends SingleFileTranslationTest {
super("kotlinLib/");
}
public void testNamespaceHasDeclaredFunction() throws Exception {
runJavascriptTest("namespace.js");
public void testPackageHasDeclaredFunction() throws Exception {
runJavascriptTest("package.js");
}
public void testNamespaceHasDeclaredClasses() throws Exception {
runJavascriptTest("namespaceWithClasses.js");
public void testPackageHasDeclaredClasses() throws Exception {
runJavascriptTest("packageWithClasses.js");
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
+10 -10
View File
@@ -41,8 +41,8 @@ public final class MiscTest extends AbstractExpressionTest {
fooBoxTest();
}
public void testClassWithoutNamespace() throws Exception {
runFunctionOutputTest("classWithoutNamespace.kt", Namer.getRootPackageName(), "box", true);
public void testClassWithoutPackage() throws Exception {
runFunctionOutputTest("classWithoutPackage.kt", Namer.getRootPackageName(), "box", true);
}
public void testIfElseAsExpressionWithThrow() throws Exception {
@@ -103,15 +103,15 @@ public final class MiscTest extends AbstractExpressionTest {
fooBoxTest();
}
public void testNamespacePropertyCalledAsFun() throws Exception {
public void testPackagePropertyCalledAsFun() throws Exception {
fooBoxTest();
}
public void testExtensionLiteralCreatedAtNamespaceLevel() throws Exception {
public void testExtensionLiteralCreatedAtPackageLevel() throws Exception {
fooBoxTest();
}
public void testTemporaryVariableCreatedInNamespaceInitializer() throws Exception {
public void testTemporaryVariableCreatedInPackageInitializer() throws Exception {
fooBoxTest();
}
@@ -131,8 +131,8 @@ public final class MiscTest extends AbstractExpressionTest {
checkFooBoxIsTrue("KT-1865.kt");
}
public void testMainFunInNestedNamespace() throws Exception {
checkOutput("mainFunInNestedNamespace.kt", "ayee");
public void testMainFunInNestedPackage() throws Exception {
checkOutput("mainFunInNestedPackage.kt", "ayee");
}
@@ -149,14 +149,14 @@ public final class MiscTest extends AbstractExpressionTest {
fooBoxTest();
}
public void testNamespaceLevelVarInPackage() throws Exception {
public void testPackageLevelVarInPackage() throws Exception {
fooBoxIsValue("OK");
}
//TODO: see http://youtrack.jetbrains.com/issue/KT-2564
@SuppressWarnings("UnusedDeclaration")
public void TODO_testNamespaceLevelVarInRoot() throws Exception {
runFunctionOutputTest("namespaceLevelVarInRoot.kt", Namer.getRootPackageName(), "box", "OK");
public void TODO_testPackageLevelVarInRoot() throws Exception {
runFunctionOutputTest("packageLevelVarInRoot.kt", Namer.getRootPackageName(), "box", "OK");
}
public void testLazyPropertyGetterNotCalledOnStart() throws Exception {
js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiNamespaceTest.java
-61
View File
@@ -1,61 +0,0 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.k2js.test.semantics;
import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
public class MultiNamespaceTest extends MultipleFilesTranslationTest {
public MultiNamespaceTest() {
super("multiNamespace/");
}
public void testFunctionsVisibleFromOtherNamespace() throws Exception {
checkFooBoxIsTrue("functionsVisibleFromOtherNamespace");
}
//TODO: fails on centos-1 build agent, can't reproduce
public void TODO_testClassesInheritedFromOtherNamespace() throws Exception {
checkFooBoxIsTrue("classesInheritedFromOtherNamespace");
}
public void testNamespaceVariableVisibleFromOtherNamespace() throws Exception {
checkFooBoxIsTrue("namespaceVariableVisibleFromOtherNamespace");
}
public void testNestedNamespaceFunctionCalledFromOtherNamespace() throws Exception {
runMultiFileTest("nestedNamespaceFunctionCalledFromOtherNamespace", "a.foo", "box", true);
}
public void testSubnamespacesWithClashingNames() throws Exception {
runMultiFileTest("subnamespacesWithClashingNames", "a.foo", "box", true);
}
public void testSubnamespacesWithClashingNamesUsingImport() throws Exception {
runMultiFileTest("subnamespacesWithClashingNamesUsingImport", "a.foo", "box", true);
}
public void testCreateClassFromOtherNamespace() throws Exception {
runMultiFileTest("createClassFromOtherNamespace", "a.foo", "box", true);
}
public void testCreateClassFromOtherNamespaceUsingImport() throws Exception {
runMultiFileTest("createClassFromOtherNamespaceUsingImport", "a.foo", "box", true);
}
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/MultiPackageTest.java
+61
View File
@@ -0,0 +1,61 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.k2js.test.semantics;
import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
public class MultiPackageTest extends MultipleFilesTranslationTest {
public MultiPackageTest() {
super("multiPackage/");
}
public void testFunctionsVisibleFromOtherPackage() throws Exception {
checkFooBoxIsTrue("functionsVisibleFromOtherPackage");
}
//TODO: fails on centos-1 build agent, can't reproduce
public void TODO_testClassesInheritedFromOtherPackage() throws Exception {
checkFooBoxIsTrue("classesInheritedFromOtherPackage");
}
public void testPackageVariableVisibleFromOtherPackage() throws Exception {
checkFooBoxIsTrue("PackageVariableVisibleFromOtherPackage");
}
public void testNestedPackageFunctionCalledFromOtherPackage() throws Exception {
runMultiFileTest("nestedPackageFunctionCalledFromOtherPackage", "a.foo", "box", true);
}
public void testSubPackagesWithClashingNames() throws Exception {
runMultiFileTest("subPackagesWithClashingNames", "a.foo", "box", true);
}
public void testSubPackagesWithClashingNamesUsingImport() throws Exception {
runMultiFileTest("subPackagesWithClashingNamesUsingImport", "a.foo", "box", true);
}
public void testCreateClassFromOtherPackage() throws Exception {
runMultiFileTest("createClassFromOtherPackage", "a.foo", "box", true);
}
public void testCreateClassFromOtherPackageUsingImport() throws Exception {
runMultiFileTest("createClassFromOtherPackageUsingImport", "a.foo", "box", true);
}
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/NamespaceTest.java
-48
View File
@@ -1,48 +0,0 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.k2js.test.semantics;
import org.jetbrains.k2js.test.SingleFileTranslationTest;
public final class NamespaceTest extends SingleFileTranslationTest {
public NamespaceTest() {
super("namespace/");
}
public void testNestedNamespace() throws Exception {
runFunctionOutputTest("nestedNamespace.kt", "foo.bar", "box", true);
}
public void testDeeplyNestedNamespace() throws Exception {
runFunctionOutputTest("deeplyNestedNamespace.kt", "foo1.foo2.foo3.foo5.foo6.foo7.foo8", "box", true);
}
public void testDeeplyNestedNamespaceFunctionCalled() throws Exception {
runFunctionOutputTest("deeplyNestedNamespaceFunctionCalled.kt", "foo1.foo2.foo3.foo5.foo6.foo7.foo8", "box", true
);
}
public void testClassCreatedInDeeplyNestedNamespace() throws Exception {
runFunctionOutputTest("classCreatedInDeeplyNestedNamespace.kt", "foo1.foo2.foo3.foo5.foo6.foo7.foo8", "box", true
);
}
public void testInitializersOfNestedNamespacesExecute() throws Exception {
runFunctionOutputTest("initializersOfNestedNamespacesExecute.kt", "foo1.foo2.foo3.foo5.foo6.foo7.foo8", "box", true
);
}
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/PackageTest.java
+48
View File
@@ -0,0 +1,48 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.k2js.test.semantics;
import org.jetbrains.k2js.test.SingleFileTranslationTest;
public final class PackageTest extends SingleFileTranslationTest {
public PackageTest() {
super("package/");
}
public void testNestedPackage() throws Exception {
runFunctionOutputTest("nestedPackage.kt", "foo.bar", "box", true);
}
public void testDeeplyNestedPackage() throws Exception {
runFunctionOutputTest("deeplyNestedPackage.kt", "foo1.foo2.foo3.foo5.foo6.foo7.foo8", "box", true);
}
public void testDeeplyNestedPackageFunctionCalled() throws Exception {
runFunctionOutputTest("deeplyNestedPackageFunctionCalled.kt", "foo1.foo2.foo3.foo5.foo6.foo7.foo8", "box", true
);
}
public void testClassCreatedInDeeplyNestedPackage() throws Exception {
runFunctionOutputTest("classCreatedInDeeplyNestedPackage.kt", "foo1.foo2.foo3.foo5.foo6.foo7.foo8", "box", true
);
}
public void testInitializersOfNestedPackagesExecute() throws Exception {
runFunctionOutputTest("initializersOfNestedPackagesExecute.kt", "foo1.foo2.foo3.foo5.foo6.foo7.foo8", "box", true
);
}
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/PropertyAccessTest.java
+4 -4
View File
@@ -56,21 +56,21 @@ public final class PropertyAccessTest extends SingleFileTranslationTest {
fooBoxTest();
}
public void testNamespacePropertyInitializer() throws Exception {
public void testPackagePropertyInitializer() throws Exception {
fooBoxTest();
}
public void testNamespacePropertySet() throws Exception {
public void testPackagePropertySet() throws Exception {
fooBoxTest();
}
public void testNamespaceCustomAccessors() throws Exception {
public void testPackageCustomAccessors() throws Exception {
fooBoxTest();
}
public void testClassUsesNamespaceProperties() throws Exception {
public void testClassUsesPackageProperties() throws Exception {
fooBoxTest();
}