diff options
author | Leif Åstrand <leif@vaadin.com> | 2014-01-16 07:03:16 +0000 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2014-01-16 07:32:07 +0000 |
commit | dd0479cdefa52091a33ff63f45fc32ae76c4b4f8 (patch) | |
tree | c341f505d616ed68695027d0ee192c6390ac969e /theme-compiler/tests | |
parent | 4d2f1477ab105476d79ad8a99397b1c3c55d14b1 (diff) | |
download | vaadin-framework-dd0479cdefa52091a33ff63f45fc32ae76c4b4f8.tar.gz vaadin-framework-dd0479cdefa52091a33ff63f45fc32ae76c4b4f8.zip |
Revert "Theme Parser is deleted, build procedure now generates it (#13161)."
Causes a multitude of compile errors on the build server.
This reverts commit d2874fde4b8c6afa24f0f6535e0d6fcabc489f51.
Change-Id: I49787b347944b614b9e98778b3219b7045cf2bfe
Diffstat (limited to 'theme-compiler/tests')
15 files changed, 16 insertions, 16 deletions
diff --git a/theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java b/theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java index e70201b11a..1ed5075bd5 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java +++ b/theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java @@ -34,7 +34,7 @@ public class ParserTest { @Test public void testParsePropertyValue() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); LexicalUnit value = parser.parsePropertyValue(new InputSource( new StringReader("$margin/2;"))); @@ -53,7 +53,7 @@ public class ParserTest { @Test public void testCanIngoreSingleLineComment() { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); try { diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java index 32c4c37ce7..d823ccf860 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java @@ -36,7 +36,7 @@ public class Interpolation extends AbstractTestBase { @Test public void testParser() throws CSSException, URISyntaxException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java index 9e110ecd97..6a09917d99 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java @@ -38,7 +38,7 @@ public class Comments extends AbstractTestBase { @Test public void testParser() throws CSSException, URISyntaxException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/CompassImports.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/CompassImports.java index 915bbb0f46..1e3eb09f0c 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/CompassImports.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/CompassImports.java @@ -42,7 +42,7 @@ public class CompassImports extends AbstractTestBase { @Test public void testParser() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scssOtherDirectory) diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java index e11cb854c9..14cac4bb19 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java @@ -43,7 +43,7 @@ public class ControlDirectives extends AbstractTestBase { @Test public void testParser() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java index 649a5777c3..b3c20b0ab6 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java @@ -37,7 +37,7 @@ public class Extends extends AbstractTestBase { @Test public void testParser() throws CSSException, URISyntaxException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java index ce0875a884..5c41494ac6 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java @@ -36,7 +36,7 @@ public class Functions extends AbstractTestBase { @Test public void testParser() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java index 128cc2fe06..aaa1a1439a 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java @@ -37,7 +37,7 @@ public class Imports extends AbstractTestBase { @Test public void testParser() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java index 0c441c7c2d..e4faee6e2a 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java @@ -42,7 +42,7 @@ public class Mixins extends AbstractTestBase { @Test public void testParser() throws CSSException, URISyntaxException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java index 26b61a0888..9a91df04ba 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java @@ -38,7 +38,7 @@ public class NestedProperties extends AbstractTestBase { @Test public void testParser() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java index cd213f9de4..04aca5e8d3 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java @@ -37,7 +37,7 @@ public class Nesting extends AbstractTestBase { @Test public void testParser() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java index 668d1e36f2..daa7dbbf07 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java @@ -37,7 +37,7 @@ public class ParentImports extends AbstractTestBase { @Test public void testParser() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java index a6608b75d6..443d4a1086 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java @@ -35,7 +35,7 @@ public class ParentSelector extends AbstractTestBase { @Test public void testParser() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java index 732426497f..a0727736e4 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java @@ -19,7 +19,7 @@ public class VariableGuarded extends AbstractTestBase { @Test public void testParser() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java index d623b00112..7f71d46f0d 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java @@ -40,7 +40,7 @@ public class Variables extends AbstractTestBase { @Test public void testParser() throws CSSException, IOException { - Parser parser = Parser.ParserAccessor.getParser(); + Parser parser = new Parser(); SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl(); parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); |