Remove SASS test suites and rename TestBase to AbstractTestBase (#9223)

Vaadin build script now ignores AbstractTestBase and executes each test
individually.

diff --git a/build/build.xml b/build/build.xml
index 39d27464fcbe430f4667c49ee3c3d1fea30994b3..5349dcf126e2ba18105afaf8a5c5a1f29f847f53 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -1252,7 +1252,7 @@
             </classpath>
 
             <batchtest fork="yes">
-                <fileset dir="${result-src-sass-junit}" includes="**/*.java" />
+                <fileset dir="${result-src-sass-junit}" includes="**/*.java" excludes="**/Abstract*.java" />
             </batchtest>
         </junit>
     </target>

diff --git a/tests/sass/src/com/vaadin/sass/AbstractTestBase.java b/tests/sass/src/com/vaadin/sass/AbstractTestBase.java
new file mode 100644 (file)
index 0000000..f657ac7
--- /dev/null
+++ b/tests/sass/src/com/vaadin/sass/AbstractTestBase.java
@@ -0,0 +1,84 @@
+package com.vaadin.sass;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+import org.w3c.css.sac.CSSException;
+
+public abstract class AbstractTestBase {
+
+    protected ScssStylesheet stylesheet;
+    protected String originalScss;
+    protected String parsedScss;
+    protected String comparisonCss;
+
+    public ScssStylesheet getStyleSheet(String filename)
+            throws URISyntaxException, CSSException, IOException {
+        File file = getFile(filename);
+        stylesheet = ScssStylesheet.get(file);
+        return stylesheet;
+    }
+
+    public File getFile(String filename) throws URISyntaxException,
+            CSSException, IOException {
+        return new File(getClass().getResource(filename).toURI());
+    }
+
+    public String getFileContent(String filename) throws IOException,
+            CSSException, URISyntaxException {
+        File file = getFile(filename);
+        return getFileContent(file);
+    }
+
+    /**
+     * Read in the full content of a file into a string.
+     * 
+     * @param file
+     *            the file to be read
+     * @return a String with the content of the
+     * @throws IOException
+     *             when file reading fails
+     */
+    public String getFileContent(File file) throws IOException {
+        StringBuilder content = new StringBuilder();
+
+        FileReader fileReader = new FileReader(file);
+        BufferedReader bufferedReader = new BufferedReader(fileReader);
+        String line = null;
+        // Handle the first line separately to get the right amount of line
+        // separators in the loop
+        if ((line = bufferedReader.readLine()) != null) {
+            content.append(line);
+        }
+        // Handle the rest of the lines
+        while ((line = bufferedReader.readLine()) != null) {
+            content.append(System.getProperty("line.separator"));
+            content.append(line);
+        }
+        bufferedReader.close();
+        return content.toString();
+    }
+
+    public boolean testParser(String file) throws CSSException, IOException,
+            URISyntaxException {
+        originalScss = getFileContent(file);
+        ScssStylesheet sheet = getStyleSheet(file);
+        parsedScss = sheet.toString();
+        return parsedScss.equals(originalScss);
+    }
+
+    public boolean testCompiler(String scss, String css) {
+        try {
+            comparisonCss = getFileContent(css);
+            ScssStylesheet sheet = getStyleSheet(scss);
+            sheet.compile();
+            parsedScss = sheet.toString();
+        } catch (Exception e) {
+            return false;
+        }
+        return parsedScss.equals(comparisonCss);
+    }
+}

diff --git a/tests/sass/src/com/vaadin/sass/AllTests.java b/tests/sass/src/com/vaadin/sass/AllTests.java
deleted file mode 100644 (file)
index 574b1a4..0000000
--- a/tests/sass/src/com/vaadin/sass/AllTests.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.vaadin.sass;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({ CssTestSuite.class, ScssTestSuite.class, VisitorTestSuite.class })
-public class AllTests {
-
-}

diff --git a/tests/sass/src/com/vaadin/sass/CssTestSuite.java b/tests/sass/src/com/vaadin/sass/CssTestSuite.java
deleted file mode 100644 (file)
index 0ee1f79..0000000
--- a/tests/sass/src/com/vaadin/sass/CssTestSuite.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.vaadin.sass;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-import com.vaadin.sass.testcases.css.Media;
-import com.vaadin.sass.testcases.css.Properties;
-import com.vaadin.sass.testcases.css.Reindeer;
-import com.vaadin.sass.testcases.css.Selectors;
-
-@RunWith(Suite.class)
-@SuiteClasses({ Selectors.class, Properties.class, Reindeer.class, Media.class, })
-public class CssTestSuite {
-}

diff --git a/tests/sass/src/com/vaadin/sass/ScssTestSuite.java b/tests/sass/src/com/vaadin/sass/ScssTestSuite.java
deleted file mode 100644 (file)
index 5a53515..0000000
--- a/tests/sass/src/com/vaadin/sass/ScssTestSuite.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.vaadin.sass;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-import com.vaadin.sass.testcases.scss.Comments;
-import com.vaadin.sass.testcases.scss.ControlDirectives;
-import com.vaadin.sass.testcases.scss.Extends;
-import com.vaadin.sass.testcases.scss.Functions;
-import com.vaadin.sass.testcases.scss.Imports;
-import com.vaadin.sass.testcases.scss.Mixins;
-import com.vaadin.sass.testcases.scss.NestedProperties;
-import com.vaadin.sass.testcases.scss.Nesting;
-import com.vaadin.sass.testcases.scss.ParentImports;
-import com.vaadin.sass.testcases.scss.ParentSelector;
-import com.vaadin.sass.testcases.scss.Variables;
-import com.vaadin.sass.tree.ImportNodeTest;
-
-@RunWith(Suite.class)
-@SuiteClasses({ ControlDirectives.class, Extends.class, Functions.class,
-        ImportNodeTest.class, Imports.class, Mixins.class,
-        NestedProperties.class, Nesting.class, ParentImports.class,
-        Variables.class, ParentSelector.class, Comments.class })
-public class ScssTestSuite {
-
-}

diff --git a/tests/sass/src/com/vaadin/sass/TestBase.java b/tests/sass/src/com/vaadin/sass/TestBase.java
deleted file mode 100644 (file)
index 6947d24..0000000
--- a/tests/sass/src/com/vaadin/sass/TestBase.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.vaadin.sass;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.w3c.css.sac.CSSException;
-
-public class TestBase {
-
-    protected ScssStylesheet stylesheet;
-    protected String originalScss;
-    protected String parsedScss;
-    protected String comparisonCss;
-
-    public ScssStylesheet getStyleSheet(String filename)
-            throws URISyntaxException, CSSException, IOException {
-        File file = getFile(filename);
-        stylesheet = ScssStylesheet.get(file);
-        return stylesheet;
-    }
-
-    public File getFile(String filename) throws URISyntaxException,
-            CSSException, IOException {
-        return new File(getClass().getResource(filename).toURI());
-    }
-
-    public String getFileContent(String filename) throws IOException,
-            CSSException, URISyntaxException {
-        File file = getFile(filename);
-        return getFileContent(file);
-    }
-
-    /**
-     * Read in the full content of a file into a string.
-     * 
-     * @param file
-     *            the file to be read
-     * @return a String with the content of the
-     * @throws IOException
-     *             when file reading fails
-     */
-    public String getFileContent(File file) throws IOException {
-        StringBuilder content = new StringBuilder();
-
-        FileReader fileReader = new FileReader(file);
-        BufferedReader bufferedReader = new BufferedReader(fileReader);
-        String line = null;
-        // Handle the first line separately to get the right amount of line
-        // separators in the loop
-        if ((line = bufferedReader.readLine()) != null) {
-            content.append(line);
-        }
-        // Handle the rest of the lines
-        while ((line = bufferedReader.readLine()) != null) {
-            content.append(System.getProperty("line.separator"));
-            content.append(line);
-        }
-        bufferedReader.close();
-        return content.toString();
-    }
-
-    public boolean testParser(String file) throws CSSException, IOException,
-            URISyntaxException {
-        originalScss = getFileContent(file);
-        ScssStylesheet sheet = getStyleSheet(file);
-        parsedScss = sheet.toString();
-        return parsedScss.equals(originalScss);
-    }
-
-    public boolean testCompiler(String scss, String css) {
-        try {
-            comparisonCss = getFileContent(css);
-            ScssStylesheet sheet = getStyleSheet(scss);
-            sheet.compile();
-            parsedScss = sheet.toString();
-        } catch (Exception e) {
-            return false;
-        }
-        return parsedScss.equals(comparisonCss);
-    }
-}

diff --git a/tests/sass/src/com/vaadin/sass/VisitorTestSuite.java b/tests/sass/src/com/vaadin/sass/VisitorTestSuite.java
deleted file mode 100644 (file)
index 46dfce6..0000000
--- a/tests/sass/src/com/vaadin/sass/VisitorTestSuite.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.vaadin.sass;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-import com.vaadin.sass.testcases.visitor.MixinVisitorTest;
-import com.vaadin.sass.testcases.visitor.NestedPropertiesVisitorTest;
-
-@RunWith(Suite.class)
-@SuiteClasses({ NestedPropertiesVisitorTest.class, MixinVisitorTest.class })
-public class VisitorTestSuite {
-
-}

diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/EmptyBlock.java b/tests/sass/src/com/vaadin/sass/testcases/css/EmptyBlock.java
index c80ebeac56bf3f65152640a6d1039a97616428bf..1484c0703eb23d246b1a85e97326fcd30fead4f3 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/css/EmptyBlock.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/css/EmptyBlock.java
@@ -8,9 +8,9 @@ import junit.framework.Assert;
 import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 
-public class EmptyBlock extends TestBase {
+public class EmptyBlock extends AbstractTestBase {
     String css = "/basic/empty_block.css";
 
     @Test

diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Interpolation.java b/tests/sass/src/com/vaadin/sass/testcases/css/Interpolation.java
index fd57f1c9821184caab0df654c03551128677ad2d..0d946c77b16edb9e0a9c01d8960a7b575776eb48 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/css/Interpolation.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/css/Interpolation.java
@@ -8,13 +8,13 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
 import com.vaadin.sass.tree.BlockNode;
 
-public class Interpolation extends TestBase {
+public class Interpolation extends AbstractTestBase {
     String scss = "/scss/interpolation.scss";
 
     @Test

diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Media.java b/tests/sass/src/com/vaadin/sass/testcases/css/Media.java
index 21ab421ce46fbe026bd11e6e0e9946f5ecea54fe..b96dc8bc5b62f1d26b057e6804b993cc5cf85242 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/css/Media.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/css/Media.java
@@ -8,9 +8,9 @@ import junit.framework.Assert;
 import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 
-public class Media extends TestBase {
+public class Media extends AbstractTestBase {
 
     String css = "/basic/media.css";
 

diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Properties.java b/tests/sass/src/com/vaadin/sass/testcases/css/Properties.java
index e140a40a97db3eed948406cd37843ee7c17622d4..daceb583ecfd6b149f9eab7f818e201ff3e497ba 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/css/Properties.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/css/Properties.java
@@ -8,9 +8,9 @@ import junit.framework.Assert;
 import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 
-public class Properties extends TestBase {
+public class Properties extends AbstractTestBase {
 
     String css = "/basic/properties.css";
 

diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Reindeer.java b/tests/sass/src/com/vaadin/sass/testcases/css/Reindeer.java
index 9a820960260b22602f57f04409b231611e95152b..7370e33b166623a1752f899e5aeb591a1687ffdf 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/css/Reindeer.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/css/Reindeer.java
@@ -8,9 +8,9 @@ import junit.framework.Assert;
 import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 
-public class Reindeer extends TestBase {
+public class Reindeer extends AbstractTestBase {
 
     String css = "/basic/reindeer.css";
 

diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Selectors.java b/tests/sass/src/com/vaadin/sass/testcases/css/Selectors.java
index f8259e85c3ff721aec349e3cc7b02f25efbc864f..6d81a75e4234ff6baf2420b88aa230b6c25e8011 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/css/Selectors.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/css/Selectors.java
@@ -8,9 +8,9 @@ import junit.framework.Assert;
 import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 
-public class Selectors extends TestBase {
+public class Selectors extends AbstractTestBase {
 
     String css = "/basic/selectors.css";
 

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java
index bca87d268f20e802fef885a6319cf239970d2306..153f494f0d699a6bc74750f7980d0e3fcd20b94c 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java
@@ -9,13 +9,13 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
 import com.vaadin.sass.tree.CommentNode;
 
-public class Comments extends TestBase {
+public class Comments extends AbstractTestBase {
     String scss = "/scss/comments.scss";
     String css = "/scss/comments.css";
 

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/ControlDirectives.java b/tests/sass/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
index d42199d1a6bf2e9cf073b273090cb298e6696f86..1f89cdf0b2b4d995049b24d4e559db3d298b533c 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
@@ -9,12 +9,12 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
 
-public class ControlDirectives extends TestBase {
+public class ControlDirectives extends AbstractTestBase {
 
     String scss = "/scss/control-directives.scss";
     String css = "/css/control-directives.css";

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Extends.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Extends.java
index fa0d3235287439630785604ae2167a037ba1f670..5ad4aacd234b33dea4a94baa92c2bb14f9b8a291 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Extends.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Extends.java
@@ -8,13 +8,13 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
 import com.vaadin.sass.tree.ExtendNode;
 
-public class Extends extends TestBase {
+public class Extends extends AbstractTestBase {
     String scss = "/scss/extends.scss";
     String css = "/css/extends.css";
 

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Functions.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Functions.java
index d3085f675c2d87ad19a2323edaa7fe6f06f8fc86..3a2bb9a4b6e0049833b22b628a31f05ff9198ac2 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Functions.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Functions.java
@@ -9,13 +9,13 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
 import com.vaadin.sass.tree.BlockNode;
 
-public class Functions extends TestBase {
+public class Functions extends AbstractTestBase {
 
     String scss = "/scss/functions.scss";
     String css = "/css/functions.css";

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Imports.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Imports.java
index bcee04f46fb2c3ac0fcdfe4db4e51c4af0753616..49ac6e30edebdfa5160abdd25166acc69d2715a6 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Imports.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Imports.java
@@ -9,13 +9,13 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
 import com.vaadin.sass.tree.ImportNode;
 
-public class Imports extends TestBase {
+public class Imports extends AbstractTestBase {
 
     String scss = "/scss/imports.scss";
     String css = "/css/imports.css";

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Mixins.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Mixins.java
index a4ecf75a35a281393342b073b87ceff69dc2c163..cd4c0e2b10b64163b6af3c790068b048c577ce81 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Mixins.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Mixins.java
@@ -10,7 +10,7 @@ import org.w3c.css.sac.CSSException;
 import org.w3c.css.sac.LexicalUnit;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
@@ -19,7 +19,7 @@ import com.vaadin.sass.tree.MediaNode;
 import com.vaadin.sass.tree.MixinDefNode;
 import com.vaadin.sass.tree.MixinNode;
 
-public class Mixins extends TestBase {
+public class Mixins extends AbstractTestBase {
 
     String scss = "/scss/mixins.scss";
     String css = "/css/mixins.css";

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/NestedProperties.java b/tests/sass/src/com/vaadin/sass/testcases/scss/NestedProperties.java
index a236eeac12e07d5b2802811df77ffd9a11d5b62d..1c07188f560164e12f98d98ec38842b08aa37c0a 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/NestedProperties.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/NestedProperties.java
@@ -9,7 +9,7 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
@@ -17,7 +17,7 @@ import com.vaadin.sass.tree.BlockNode;
 import com.vaadin.sass.tree.NestPropertiesNode;
 import com.vaadin.sass.tree.RuleNode;
 
-public class NestedProperties extends TestBase {
+public class NestedProperties extends AbstractTestBase {
     String scss = "/scss/nested-properties.scss";
     String css = "/css/nested-properties.css";
 

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Nesting.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Nesting.java
index 1ca8bc762b7cebb7b8858cb10abb9d7ec069f577..01d7e6e250ebe7eb6c935e72a916a09a36390891 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Nesting.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Nesting.java
@@ -9,13 +9,13 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
 import com.vaadin.sass.tree.BlockNode;
 
-public class Nesting extends TestBase {
+public class Nesting extends AbstractTestBase {
 
     String scss = "/scss/nesting.scss";
     String css = "/css/nesting.css";

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentImports.java b/tests/sass/src/com/vaadin/sass/testcases/scss/ParentImports.java
index b25c8417b8547ec3b23eb96647e05f6a9af84255..2eaecc319ccb5797f030032a9de61e420317912b 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentImports.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/ParentImports.java
@@ -9,13 +9,13 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
 import com.vaadin.sass.tree.ImportNode;
 
-public class ParentImports extends TestBase {
+public class ParentImports extends AbstractTestBase {
 
     String scss = "/scss/folder-test/parent-import.scss";
     String css = "/css/parent-import.css";

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentSelector.java b/tests/sass/src/com/vaadin/sass/testcases/scss/ParentSelector.java
index 0df3fde8ebff0f0a36e11e8d259b72e03ea972f3..8ed25151db4b37fdc59cd8f75a9143b4afae2f79 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentSelector.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/ParentSelector.java
@@ -9,14 +9,14 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
 import com.vaadin.sass.selector.SelectorUtil;
 import com.vaadin.sass.tree.BlockNode;
 
-public class ParentSelector extends TestBase {
+public class ParentSelector extends AbstractTestBase {
     String scss = "/scss/parent-selector.scss";
     String css = "/css/parent-selector.css";
 

diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java
index df6bd41fe184cb0662a2ffbf2a8c066afec316f2..1407bbd933e193e000d2025dde5ae719d6a95d20 100644 (file)
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java
+++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java
@@ -9,7 +9,7 @@ import org.junit.Test;
 import org.w3c.css.sac.CSSException;
 
 import com.vaadin.sass.ScssStylesheet;
-import com.vaadin.sass.TestBase;
+import com.vaadin.sass.AbstractTestBase;
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
@@ -18,7 +18,7 @@ import com.vaadin.sass.tree.BlockNode;
 import com.vaadin.sass.tree.RuleNode;
 import com.vaadin.sass.tree.VariableNode;
 
-public class Variables extends TestBase {
+public class Variables extends AbstractTestBase {
 
     String scss = "/scss/variables.scss";
     String css = "/css/variables.css";