This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 2e643d2c8d18de64d1a1d922ba09123621fed06f Author: Josh Tynjala <[email protected]> AuthorDate: Mon Oct 31 15:15:47 2022 -0700 formatter: a few more tests --- .../royale/formatter/TestImportDirective.java | 20 ++++ .../apache/royale/formatter/TestNumberLiteral.java | 102 ++++++++++++++++++++- .../org/apache/royale/formatter/TestRegExp.java | 4 +- 3 files changed, 123 insertions(+), 3 deletions(-) diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestImportDirective.java b/formatter/src/test/java/org/apache/royale/formatter/TestImportDirective.java index eb988f93b..fd702cc06 100644 --- a/formatter/src/test/java/org/apache/royale/formatter/TestImportDirective.java +++ b/formatter/src/test/java/org/apache/royale/formatter/TestImportDirective.java @@ -43,4 +43,24 @@ public class TestImportDirective extends BaseFormatterTests { // @formatter:on result); } + + @Test + public void testWildcard() { + FormatterSettings settings = new FormatterSettings(); + settings.insertSpaceAfterKeywordsInControlFlowStatements = true; + settings.placeOpenBraceOnNewLine = true; + settings.insertSpaces = false; + ASTokenFormatter formatter = new ASTokenFormatter(settings); + String result = formatter.format("file.as", + // @formatter:off + "import com.example.*;", + // @formatter:on + problems + ); + assertEquals( + // @formatter:off + "import com.example.*;", + // @formatter:on + result); + } } diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestNumberLiteral.java b/formatter/src/test/java/org/apache/royale/formatter/TestNumberLiteral.java index 544ec463c..cb3d00a01 100644 --- a/formatter/src/test/java/org/apache/royale/formatter/TestNumberLiteral.java +++ b/formatter/src/test/java/org/apache/royale/formatter/TestNumberLiteral.java @@ -44,6 +44,26 @@ public class TestNumberLiteral extends BaseFormatterTests { result); } + @Test + public void testNegativeFloat() { + FormatterSettings settings = new FormatterSettings(); + settings.insertSpaceBeforeAndAfterBinaryOperators = true; + settings.placeOpenBraceOnNewLine = false; + settings.insertSpaces = false; + ASTokenFormatter formatter = new ASTokenFormatter(settings); + String result = formatter.format("file.as", + // @formatter:off + "-123.4;", + // @formatter:on + problems + ); + assertEquals( + // @formatter:off + "-123.4;", + // @formatter:on + result); + } + @Test public void testInt() { FormatterSettings settings = new FormatterSettings(); @@ -65,7 +85,7 @@ public class TestNumberLiteral extends BaseFormatterTests { } @Test - public void testNegative() { + public void testNegativeInt() { FormatterSettings settings = new FormatterSettings(); settings.insertSpaceBeforeAndAfterBinaryOperators = true; settings.placeOpenBraceOnNewLine = false; @@ -83,4 +103,84 @@ public class TestNumberLiteral extends BaseFormatterTests { // @formatter:on result); } + + @Test + public void testHexadecimal() { + FormatterSettings settings = new FormatterSettings(); + settings.insertSpaceBeforeAndAfterBinaryOperators = true; + settings.placeOpenBraceOnNewLine = false; + settings.insertSpaces = false; + ASTokenFormatter formatter = new ASTokenFormatter(settings); + String result = formatter.format("file.as", + // @formatter:off + "0xfe1c23;", + // @formatter:on + problems + ); + assertEquals( + // @formatter:off + "0xfe1c23;", + // @formatter:on + result); + } + + @Test + public void testNegativeHexadecimal() { + FormatterSettings settings = new FormatterSettings(); + settings.insertSpaceBeforeAndAfterBinaryOperators = true; + settings.placeOpenBraceOnNewLine = false; + settings.insertSpaces = false; + ASTokenFormatter formatter = new ASTokenFormatter(settings); + String result = formatter.format("file.as", + // @formatter:off + "-0xfe1c23;", + // @formatter:on + problems + ); + assertEquals( + // @formatter:off + "-0xfe1c23;", + // @formatter:on + result); + } + + @Test + public void testExponential() { + FormatterSettings settings = new FormatterSettings(); + settings.insertSpaceBeforeAndAfterBinaryOperators = true; + settings.placeOpenBraceOnNewLine = false; + settings.insertSpaces = false; + ASTokenFormatter formatter = new ASTokenFormatter(settings); + String result = formatter.format("file.as", + // @formatter:off + "1.234e5;", + // @formatter:on + problems + ); + assertEquals( + // @formatter:off + "1.234e5;", + // @formatter:on + result); + } + + @Test + public void testNegativeExponential() { + FormatterSettings settings = new FormatterSettings(); + settings.insertSpaceBeforeAndAfterBinaryOperators = true; + settings.placeOpenBraceOnNewLine = false; + settings.insertSpaces = false; + ASTokenFormatter formatter = new ASTokenFormatter(settings); + String result = formatter.format("file.as", + // @formatter:off + "1.234e-5;", + // @formatter:on + problems + ); + assertEquals( + // @formatter:off + "1.234e-5;", + // @formatter:on + result); + } } diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestRegExp.java b/formatter/src/test/java/org/apache/royale/formatter/TestRegExp.java index cba6c2c66..f959b6b69 100644 --- a/formatter/src/test/java/org/apache/royale/formatter/TestRegExp.java +++ b/formatter/src/test/java/org/apache/royale/formatter/TestRegExp.java @@ -33,13 +33,13 @@ public class TestRegExp extends BaseFormatterTests { ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off - "/\\d/g;", + "/\\d+[a-z0-9]{1,2}/g;", // @formatter:on problems ); assertEquals( // @formatter:off - "/\\d/g;", + "/\\d+[a-z0-9]{1,2}/g;", // @formatter:on result); }
