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

Remove redundant abstract tests. Use AbstractCodegenTest instead

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2012-11-20 13:55:18 +04:00
parent 3fc2e5d20c
commit 961fde3c8a
5 changed files with 9 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/extension/AbstractExtensionPropertiesTest.java
-39
View File
@@ -1,39 +0,0 @@
/*
* Copyright 2010-2012 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.jet.codegen.extension;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.codegen.CodegenTestCase;
import java.io.IOException;
public abstract class AbstractExtensionPropertiesTest extends CodegenTestCase {
private static final String REDUNDANT_PATH_PREFIX = "compiler/testData/codegen";
@Override
public void setUp() throws Exception {
super.setUp();
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_AND_ANNOTATIONS);
}
protected void doTest(String path) throws IOException {
String relativePath = path.substring(REDUNDANT_PATH_PREFIX.length());
blackBoxFile(relativePath);
}
}
compiler/tests/org/jetbrains/jet/codegen/extension/ExtensionPropertiesTestGenerated.java → compiler/tests/org/jetbrains/jet/codegen/generated/ExtensionPropertiesTestGenerated.java
+3 -3
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.codegen.extension;
package org.jetbrains.jet.codegen.generated;
import junit.framework.Assert;
import junit.framework.Test;
@@ -24,11 +24,11 @@ import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.InnerTestClasses;
import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.jet.codegen.extension.AbstractExtensionPropertiesTest;
import org.jetbrains.jet.codegen.generated.AbstractCodegenTest;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
@TestMetadata("compiler/testData/codegen/extensionProperties")
public class ExtensionPropertiesTestGenerated extends AbstractExtensionPropertiesTest {
public class ExtensionPropertiesTestGenerated extends AbstractCodegenTest {
public void testAllFilesPresentInExtensionProperties() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/extensionProperties"), "kt", true);
}
compiler/tests/org/jetbrains/jet/codegen/labels/LabelGenTestGenerated.java → compiler/tests/org/jetbrains/jet/codegen/generated/LabelGenTestGenerated.java
+3 -3
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.codegen.labels;
package org.jetbrains.jet.codegen.generated;
import junit.framework.Assert;
import junit.framework.Test;
@@ -24,11 +24,11 @@ import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.InnerTestClasses;
import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.jet.codegen.labels.AbstractLabelGenTest;
import org.jetbrains.jet.codegen.generated.AbstractCodegenTest;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
@TestMetadata("compiler/testData/codegen/label")
public class LabelGenTestGenerated extends AbstractLabelGenTest {
public class LabelGenTestGenerated extends AbstractCodegenTest {
public void testAllFilesPresentInLabel() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/label"), "kt", true);
}
compiler/tests/org/jetbrains/jet/codegen/labels/AbstractLabelGenTest.java
-38
View File
@@ -1,38 +0,0 @@
/*
* Copyright 2010-2012 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.jet.codegen.labels;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.codegen.CodegenTestCase;
import java.io.IOException;
public abstract class AbstractLabelGenTest extends CodegenTestCase {
private static final String REDUNDANT_PATH_PREFIX = "compiler/testData/codegen";
@Override
public void setUp() throws Exception {
super.setUp();
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_AND_ANNOTATIONS);
}
protected void doTest(String path) throws IOException {
String relativePath = path.substring(REDUNDANT_PATH_PREFIX.length());
blackBoxFile(relativePath);
}
}
generators/org/jetbrains/jet/generators/tests/GenerateTests.java
+3 -5
View File
@@ -20,13 +20,11 @@ import junit.framework.TestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve;
import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest;
import org.jetbrains.jet.codegen.generated.AbstractCodegenTest;
import org.jetbrains.jet.codegen.AbstractDataClassCodegenTest;
import org.jetbrains.jet.codegen.AbstractIntrinsicsTestCase;
import org.jetbrains.jet.codegen.AbstractMultiDeclTestCase;
import org.jetbrains.jet.codegen.extension.AbstractExtensionPropertiesTest;
import org.jetbrains.jet.codegen.flags.AbstractWriteFlagsTest;
import org.jetbrains.jet.codegen.labels.AbstractLabelGenTest;
import org.jetbrains.jet.codegen.generated.AbstractCodegenTest;
import org.jetbrains.jet.jvm.compiler.AbstractLoadCompiledKotlinTest;
import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest;
import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest;
@@ -97,7 +95,7 @@ public class GenerateTests {
generateTest(
"compiler/tests/",
"LabelGenTestGenerated",
AbstractLabelGenTest.class,
AbstractCodegenTest.class,
testModel("compiler/testData/codegen/label")
);
@@ -111,7 +109,7 @@ public class GenerateTests {
generateTest(
"compiler/tests/",
"ExtensionPropertiesTestGenerated",
AbstractExtensionPropertiesTest.class,
AbstractCodegenTest.class,
testModel("compiler/testData/codegen/extensionProperties")
);