diff --git a/testData/AnnotationTest.java b/testData/AnnotatorTestData.java similarity index 100% rename from testData/AnnotationTest.java rename to testData/AnnotatorTestData.java diff --git a/testData/Example.simple b/testData/FoldingTestData.simple similarity index 100% rename from testData/Example.simple rename to testData/FoldingTestData.simple diff --git a/testData/FormatterTestDataAfter.simple b/testData/FormatterTestDataAfter.simple new file mode 100644 index 000000000..31492ca75 --- /dev/null +++ b/testData/FormatterTestDataAfter.simple @@ -0,0 +1,13 @@ +# You are reading the ".properties" entry. +! The exclamation mark can also mark text as comments. +website = http://en.wikipedia.org/ + +language = English +# The backslash below tells the application to continue reading +# the value onto the next line. +message = Welcome to \ + Wikipedia! +# Add spaces to the key +key\ with\ spaces = This is the value that could be looked up with the key "key with spaces". +# Unicode +tab : \u0009 \ No newline at end of file diff --git a/testData/FormattingTestData.simple b/testData/FormatterTestDataBefore.simple similarity index 100% rename from testData/FormattingTestData.simple rename to testData/FormatterTestDataBefore.simple diff --git a/testData/ParsingTestData.simple b/testData/ParsingTestData.simple new file mode 100644 index 000000000..31492ca75 --- /dev/null +++ b/testData/ParsingTestData.simple @@ -0,0 +1,13 @@ +# You are reading the ".properties" entry. +! The exclamation mark can also mark text as comments. +website = http://en.wikipedia.org/ + +language = English +# The backslash below tells the application to continue reading +# the value onto the next line. +message = Welcome to \ + Wikipedia! +# Add spaces to the key +key\ with\ spaces = This is the value that could be looked up with the key "key with spaces". +# Unicode +tab : \u0009 \ No newline at end of file diff --git a/testData/Example.txt b/testData/ParsingTestData.txt similarity index 100% rename from testData/Example.txt rename to testData/ParsingTestData.txt diff --git a/tests/com/simpleplugin/SimpleCodeInsightTest.java b/tests/com/simpleplugin/SimpleCodeInsightTest.java index b89bc27e3..460ee7fd9 100644 --- a/tests/com/simpleplugin/SimpleCodeInsightTest.java +++ b/tests/com/simpleplugin/SimpleCodeInsightTest.java @@ -31,17 +31,17 @@ public class SimpleCodeInsightTest extends LightCodeInsightFixtureTestCase { } public void testAnnotator() { - myFixture.configureByFiles("AnnotationTest.java", "Example.simple"); + myFixture.configureByFiles("AnnotatorTestData.java", "Example.simple"); myFixture.checkHighlighting(false, false, true); } public void testFolding() { - myFixture.configureByFiles("Example.simple"); + myFixture.configureByFiles("FoldingTestData.simple"); myFixture.testFolding(getTestDataPath() + "/FoldingTestData.java"); } - public void testFormatting() { - myFixture.configureByFiles("FormattingTestData.simple"); + public void testFormatter() { + myFixture.configureByFiles("FormatterTestDataBefore.simple"); CodeStyleSettingsManager.getSettings(getProject()).SPACE_AROUND_ASSIGNMENT_OPERATORS = true; ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override @@ -49,7 +49,7 @@ public class SimpleCodeInsightTest extends LightCodeInsightFixtureTestCase { CodeStyleManager.getInstance(getProject()).reformat(myFixture.getFile()); } }); - myFixture.checkResultByFile("Example.simple"); + myFixture.checkResultByFile("FormatterTestDataAfter.simple"); } public void testRename() { diff --git a/tests/com/simpleplugin/SimpleParsingTest.java b/tests/com/simpleplugin/SimpleParsingTest.java index c5b394dd4..63c416f79 100644 --- a/tests/com/simpleplugin/SimpleParsingTest.java +++ b/tests/com/simpleplugin/SimpleParsingTest.java @@ -7,7 +7,7 @@ public class SimpleParsingTest extends ParsingTestCase { super("", "simple", new SimpleParserDefinition()); } - public void testExample() { + public void testParsingTestData() { doTest(true, false); }