From f4ac06a48358b44f32c3b390cd5daf116521571c Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 13 Jun 2012 16:31:41 +0400 Subject: [PATCH] Test classes renamed to reflect what's happening in the tests --- ...actLazyResolveNamespaceComparingTest.java} | 2 +- ...solveNamespaceComparingTestGenerated.java} | 22 +++++++++---------- ...solveNamespaceComparingTestGenerator.java} | 10 ++++----- 3 files changed, 17 insertions(+), 17 deletions(-) rename compiler/tests/org/jetbrains/jet/lang/resolve/lazy/{AbstractLazyResolveComparingTest.java => AbstractLazyResolveNamespaceComparingTest.java} (99%) rename compiler/tests/org/jetbrains/jet/lang/resolve/lazy/{LazyResolveComparingTestGenerated.java => LazyResolveNamespaceComparingTestGenerated.java} (98%) rename compiler/tests/org/jetbrains/jet/lang/resolve/lazy/{LazyResolveComparingTestGenerator.java => LazyResolveNamespaceComparingTestGenerator.java} (87%) diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveComparingTest.java rename to compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java index 8f0f59a8850..da2457bf9ca 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java @@ -51,7 +51,7 @@ import java.util.List; /** * @author abreslav */ -public abstract class AbstractLazyResolveComparingTest { +public abstract class AbstractLazyResolveNamespaceComparingTest { private final Disposable rootDisposable = new Disposable() { @Override public void dispose() { diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerated.java rename to compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index 92c09e259a1..20b887e4ea8 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -25,15 +25,15 @@ import java.lang.reflect.Method; import java.util.HashSet; import java.util.Set; -/* This class is generated by LazyResolveComparingTestGenerator. DO NOT MODIFY MANUALLY */ +/* This class is generated by LazyResolveNamespaceComparingTestGenerator. DO NOT MODIFY MANUALLY */ @RunWith(Suite.class) @Suite.SuiteClasses({ - LazyResolveComparingTestGenerated.ReadKotlinBinaryClass.class, - LazyResolveComparingTestGenerated.ReadJavaBinaryClass.class, - LazyResolveComparingTestGenerated.LazyResolve.class + LazyResolveNamespaceComparingTestGenerated.ReadKotlinBinaryClass.class, + LazyResolveNamespaceComparingTestGenerated.ReadJavaBinaryClass.class, + LazyResolveNamespaceComparingTestGenerated.LazyResolve.class }) -public class LazyResolveComparingTestGenerated { - public static class ReadKotlinBinaryClass extends AbstractLazyResolveComparingTest { +public class LazyResolveNamespaceComparingTestGenerated { + public static class ReadKotlinBinaryClass extends AbstractLazyResolveNamespaceComparingTest { @Test public void allTestsPresentInReadKotlinBinaryClass() throws Exception { allTestsPresent(ReadKotlinBinaryClass.class, new File("compiler/testData/readKotlinBinaryClass"), true); @@ -710,14 +710,14 @@ public class LazyResolveComparingTestGenerated { else { String name = file.getName(); if (name.endsWith(".kt") && !methodNames.contains("test" + name.toLowerCase())) { - Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveComparingTestGenerator"); + Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveNamespaceComparingTestGenerator"); } } } } } - public static class ReadJavaBinaryClass extends AbstractLazyResolveComparingTest { + public static class ReadJavaBinaryClass extends AbstractLazyResolveNamespaceComparingTest { @Test public void allTestsPresentInReadJavaBinaryClass() throws Exception { allTestsPresent(ReadJavaBinaryClass.class, new File("compiler/testData/readJavaBinaryClass"), true); @@ -964,14 +964,14 @@ public class LazyResolveComparingTestGenerated { else { String name = file.getName(); if (name.endsWith(".kt") && !methodNames.contains("test" + name.toLowerCase())) { - Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveComparingTestGenerator"); + Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveNamespaceComparingTestGenerator"); } } } } } - public static class LazyResolve extends AbstractLazyResolveComparingTest { + public static class LazyResolve extends AbstractLazyResolveNamespaceComparingTest { @Test public void allTestsPresentInLazyResolve() throws Exception { allTestsPresent(LazyResolve.class, new File("compiler/testData/lazyResolve"), true); @@ -1003,7 +1003,7 @@ public class LazyResolveComparingTestGenerated { else { String name = file.getName(); if (name.endsWith(".kt") && !methodNames.contains("test" + name.toLowerCase())) { - Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveComparingTestGenerator"); + Assert.fail("Test data file missing from the generated test class: " + file + "\nPlease re-run the generator: LazyResolveNamespaceComparingTestGenerator"); } } } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerator.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerator.java similarity index 87% rename from compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerator.java rename to compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerator.java index 2eea8063502..c0c4a1d7840 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveComparingTestGenerator.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerator.java @@ -26,16 +26,16 @@ import java.util.Arrays; /** * @author abreslav */ -public class LazyResolveComparingTestGenerator { +public class LazyResolveNamespaceComparingTestGenerator { public static void main(String[] args) throws IOException { String testDataFileExtension = "kt"; new TestGenerator( "compiler/tests/", testDataFileExtension, "org.jetbrains.jet.lang.resolve.lazy", - "LazyResolveComparingTestGenerated", + "LazyResolveNamespaceComparingTestGenerated", "org.jetbrains.jet.lang.resolve.lazy", - "AbstractLazyResolveComparingTest", + "AbstractLazyResolveNamespaceComparingTest", Arrays.asList( new TestDataSource(new File("compiler/testData/readKotlinBinaryClass"), true, @@ -50,9 +50,9 @@ public class LazyResolveComparingTestGenerator { TestGenerator.filterFilesByExtension(testDataFileExtension), "doTest") ), - "LazyResolveComparingTestGenerator" + "LazyResolveNamespaceComparingTestGenerator" ).generateAndSave(); } - private LazyResolveComparingTestGenerator() {} + private LazyResolveNamespaceComparingTestGenerator() {} }