Merge changes from origin/7.1

5b56eeb Changed the rendering order of TabSheet tabs to prevent an NPE in isClipped (#12343)
9026cef Make VTreeTableScrollBody extendable (#13054)
b5a080c Provides error location for ArithmeticException. (#11877)
a494133 Fixed TabSheet tab bar sizing by removing an obsolete Safari hack (#12343)
1dd2ed3 Changes padding for Textfields with Chameleon theme. (#12974)

Change-Id: I44e168176753ed4228002ac11fbd214ee369131a

1 files changed, 12 insertions, 0 deletions

diff --git a/theme-compiler/tests/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluatorTest.java b/theme-compiler/tests/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluatorTest.java
index 8978eb812e..c408255d0e 100644
--- a/theme-compiler/tests/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluatorTest.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/internal/expression/ArithmeticExpressionEvaluatorTest.java
@@ -19,6 +19,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.w3c.css.sac.LexicalUnit;
 
+import com.vaadin.sass.internal.expression.exception.ArithmeticException;
 import com.vaadin.sass.internal.expression.exception.IncompatibleUnitsException;
 import com.vaadin.sass.internal.parser.LexicalUnitImpl;
 
@@ -122,4 +123,15 @@ public class ArithmeticExpressionEvaluatorTest {
         Assert.assertEquals(LexicalUnit.SAC_CENTIMETER,
                 result.getLexicalUnitType());
     }
+
+    @Test(expected = ArithmeticException.class)
+    public void testNonExistingSignal() {
+        LexicalUnitImpl operand2Integer = LexicalUnitImpl.createInteger(2, 3,
+                null, 2);
+        LexicalUnitImpl operatorComma = LexicalUnitImpl.createComma(2, 3,
+                operand2Integer);
+        LexicalUnitImpl operand3Integer = LexicalUnitImpl.createInteger(2, 3,
+                operatorComma, 3);
+        LexicalUnitImpl result = evaluator.evaluate(operand2Integer);
+    }
 }