From b0302246a06844db4e934a72377a21d4e6eced80 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Tue, 25 Dec 2012 19:11:25 +0400 Subject: [PATCH] HtmlTabledDescriptorRendererTest renamed to DiagnosticMessageTest --- .../inference/reportingImprovements/FunctionPlaceholder.kt | 2 +- .../conflictingSubstitutions.kt | 2 +- .../conflictingSubstitutions1.html | 0 .../conflictingSubstitutions2.html | 0 .../functionPlaceholder.kt | 0 .../functionPlaceholder1.html | 0 .../functionPlaceholder2.html | 0 .../functionPlaceholder3.html | 0 .../renderCollectionOfTypes.kt | 0 .../renderCollectionOfTypes1.txt | 0 ...DescriptorRendererTest.java => DiagnosticMessageTest.java} | 4 ++-- 11 files changed, 4 insertions(+), 4 deletions(-) rename idea/testData/{htmlTabledRenderer => diagnosticMessage}/conflictingSubstitutions.kt (81%) rename idea/testData/{htmlTabledRenderer => diagnosticMessage}/conflictingSubstitutions1.html (100%) rename idea/testData/{htmlTabledRenderer => diagnosticMessage}/conflictingSubstitutions2.html (100%) rename idea/testData/{htmlTabledRenderer => diagnosticMessage}/functionPlaceholder.kt (100%) rename idea/testData/{htmlTabledRenderer => diagnosticMessage}/functionPlaceholder1.html (100%) rename idea/testData/{htmlTabledRenderer => diagnosticMessage}/functionPlaceholder2.html (100%) rename idea/testData/{htmlTabledRenderer => diagnosticMessage}/functionPlaceholder3.html (100%) rename idea/testData/{htmlTabledRenderer => diagnosticMessage}/renderCollectionOfTypes.kt (100%) rename idea/testData/{htmlTabledRenderer => diagnosticMessage}/renderCollectionOfTypes1.txt (100%) rename idea/tests/org/jetbrains/jet/plugin/highlighter/{HtmlTabledDescriptorRendererTest.java => DiagnosticMessageTest.java} (96%) diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt index e0ffc0be979..18d0f3a35e1 100644 --- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt +++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt @@ -1,4 +1,4 @@ -//For testing error messages text see HtmlTabledDescriptorRendererTest.testFunctionPlaceholder +//For testing error messages text see DiagnosticMessageTest.testFunctionPlaceholder package a class A diff --git a/idea/testData/htmlTabledRenderer/conflictingSubstitutions.kt b/idea/testData/diagnosticMessage/conflictingSubstitutions.kt similarity index 81% rename from idea/testData/htmlTabledRenderer/conflictingSubstitutions.kt rename to idea/testData/diagnosticMessage/conflictingSubstitutions.kt index feb4d86f5df..6a86248dada 100644 --- a/idea/testData/htmlTabledRenderer/conflictingSubstitutions.kt +++ b/idea/testData/diagnosticMessage/conflictingSubstitutions.kt @@ -1,4 +1,4 @@ -// see org.jetbrains.jet.plugin.highlighter.HtmlTabledDescriptorRendererTest +// see org.jetbrains.jet.plugin.highlighter.DiagnosticMessageTest import java.io.Closeable diff --git a/idea/testData/htmlTabledRenderer/conflictingSubstitutions1.html b/idea/testData/diagnosticMessage/conflictingSubstitutions1.html similarity index 100% rename from idea/testData/htmlTabledRenderer/conflictingSubstitutions1.html rename to idea/testData/diagnosticMessage/conflictingSubstitutions1.html diff --git a/idea/testData/htmlTabledRenderer/conflictingSubstitutions2.html b/idea/testData/diagnosticMessage/conflictingSubstitutions2.html similarity index 100% rename from idea/testData/htmlTabledRenderer/conflictingSubstitutions2.html rename to idea/testData/diagnosticMessage/conflictingSubstitutions2.html diff --git a/idea/testData/htmlTabledRenderer/functionPlaceholder.kt b/idea/testData/diagnosticMessage/functionPlaceholder.kt similarity index 100% rename from idea/testData/htmlTabledRenderer/functionPlaceholder.kt rename to idea/testData/diagnosticMessage/functionPlaceholder.kt diff --git a/idea/testData/htmlTabledRenderer/functionPlaceholder1.html b/idea/testData/diagnosticMessage/functionPlaceholder1.html similarity index 100% rename from idea/testData/htmlTabledRenderer/functionPlaceholder1.html rename to idea/testData/diagnosticMessage/functionPlaceholder1.html diff --git a/idea/testData/htmlTabledRenderer/functionPlaceholder2.html b/idea/testData/diagnosticMessage/functionPlaceholder2.html similarity index 100% rename from idea/testData/htmlTabledRenderer/functionPlaceholder2.html rename to idea/testData/diagnosticMessage/functionPlaceholder2.html diff --git a/idea/testData/htmlTabledRenderer/functionPlaceholder3.html b/idea/testData/diagnosticMessage/functionPlaceholder3.html similarity index 100% rename from idea/testData/htmlTabledRenderer/functionPlaceholder3.html rename to idea/testData/diagnosticMessage/functionPlaceholder3.html diff --git a/idea/testData/htmlTabledRenderer/renderCollectionOfTypes.kt b/idea/testData/diagnosticMessage/renderCollectionOfTypes.kt similarity index 100% rename from idea/testData/htmlTabledRenderer/renderCollectionOfTypes.kt rename to idea/testData/diagnosticMessage/renderCollectionOfTypes.kt diff --git a/idea/testData/htmlTabledRenderer/renderCollectionOfTypes1.txt b/idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt similarity index 100% rename from idea/testData/htmlTabledRenderer/renderCollectionOfTypes1.txt rename to idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRendererTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTest.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRendererTest.java rename to idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTest.java index bc2150c2040..1ef601edfca 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRendererTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTest.java @@ -38,7 +38,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -public class HtmlTabledDescriptorRendererTest extends JetLiteFixture { +public class DiagnosticMessageTest extends JetLiteFixture { @Override protected JetCoreEnvironment createEnvironment() { return createEnvironmentWithMockJdk(ConfigurationKind.JDK_ONLY); @@ -46,7 +46,7 @@ public class HtmlTabledDescriptorRendererTest extends JetLiteFixture { @Override protected String getTestDataPath() { - return PluginTestCaseBase.getTestDataPathBase() + "/htmlTabledRenderer/"; + return PluginTestCaseBase.getTestDataPathBase() + "/diagnosticMessage/"; } public void doTest(String name, int diagnosticNumber, AbstractDiagnosticFactory... diagnosticFactories) throws Exception {