diff options
| author | Marc Englund <marc@vaadin.com> | 2012-11-20 14:19:47 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-20 14:19:47 +0000 |
| commit | d00c06a5801c5e1a1b5b2627805180490e1b191b (patch) | |
| tree | e8a5788daec7d41a00bc05296251defd7ea5089f /theme-compiler/tests | |
| parent | 6d2f957ef989ab36d80c7e4a6fbb13380d9f1265 (diff) | |
| parent | 0bfa96ee1e05ad0867eb22e05a44e3a4290ec586 (diff) | |
| download | vaadin-framework-d00c06a5801c5e1a1b5b2627805180490e1b191b.tar.gz vaadin-framework-d00c06a5801c5e1a1b5b2627805180490e1b191b.zip | |
Merge "(#10174) Value of a variable cannot be assigned to another variable"
Diffstat (limited to 'theme-compiler/tests')
3 files changed, 7 insertions, 3 deletions
diff --git a/theme-compiler/tests/resources/css/variables.css b/theme-compiler/tests/resources/css/variables.css index d54ae6cd30..ae5ac5e01c 100644 --- a/theme-compiler/tests/resources/css/variables.css +++ b/theme-compiler/tests/resources/css/variables.css @@ -3,6 +3,7 @@ color: #0000ff; color1: #0000d1; font-family: Arial, Helvetica, "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font-size: 12px; } .border { diff --git a/theme-compiler/tests/resources/scss/variables.scss b/theme-compiler/tests/resources/scss/variables.scss index 60acc5dd10..2448aaddb9 100644 --- a/theme-compiler/tests/resources/scss/variables.scss +++ b/theme-compiler/tests/resources/scss/variables.scss @@ -1,6 +1,7 @@ $blue: #3bbfce; $margin: 8px; $chameleon-font-family: Arial, Helvetica, "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; +$font: 12px; .content-navigation { border-color: $blue; @@ -8,6 +9,8 @@ $chameleon-font-family: Arial, Helvetica, "Lucida Grande", "Lucida Sans Unicode" color: $blue; color1: darken($blue, 9%); font-family: $chameleon-font-family; + $font-size: $font; + font-size: $font-size; } .border { 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 d56a9dee9d..32984c53ec 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 @@ -45,7 +45,7 @@ public class Variables extends AbstractTestBase { parser.setDocumentHandler(handler); parser.parseStyleSheet(getClass().getResource(scss).getPath()); ScssStylesheet root = handler.getStyleSheet(); - Assert.assertEquals(5, root.getChildren().size()); + Assert.assertEquals(6, root.getChildren().size()); VariableNode varNode1 = (VariableNode) root.getChildren().get(0); Assert.assertEquals("blue", varNode1.getName()); @@ -58,7 +58,7 @@ public class Variables extends AbstractTestBase { Assert.assertEquals(8f, varNode2.getExpr().getFloatValue()); Assert.assertEquals("px", varNode2.getExpr().getDimensionUnitText()); - BlockNode blockNode1 = (BlockNode) root.getChildren().get(4); + BlockNode blockNode1 = (BlockNode) root.getChildren().get(5); Assert.assertEquals(3, blockNode1.getChildren().size()); RuleNode ruleNode1Block1 = (RuleNode) blockNode1.getChildren().get(2); Assert.assertEquals("border-color", ruleNode1Block1.getVariable()); @@ -72,7 +72,7 @@ public class Variables extends AbstractTestBase { .getValue().getLexicalUnitType()); Assert.assertEquals("blue", ruleNode2Block1.getValue().getStringValue()); - BlockNode blockNode2 = (BlockNode) root.getChildren().get(4); + BlockNode blockNode2 = (BlockNode) root.getChildren().get(5); RuleNode ruleNode1Block2 = (RuleNode) blockNode2.getChildren().get(0); Assert.assertEquals("padding", ruleNode1Block2.getVariable()); Assert.assertEquals(SCSSLexicalUnit.SCSS_VARIABLE, ruleNode1Block2 |