diff options
author | Henri Sara <hesara@vaadin.com> | 2012-08-09 09:56:43 +0300 |
---|---|---|
committer | Henri Sara <hesara@vaadin.com> | 2012-08-09 09:56:43 +0300 |
commit | d5acf1169932fe1a36de0c4a09d91f76d47ec7dc (patch) | |
tree | dd53bf080168f34cb2c232d7826fbc8bd370a6b5 /tests | |
parent | 3580acbd26e877db0e79bb9fa5b46d947ce619c4 (diff) | |
download | vaadin-framework-d5acf1169932fe1a36de0c4a09d91f76d47ec7dc.tar.gz vaadin-framework-d5acf1169932fe1a36de0c4a09d91f76d47ec7dc.zip |
Remove SASS test suites and rename TestBase to AbstractTestBase (#9223)
Vaadin build script now ignores AbstractTestBase and executes each test
individually.
Diffstat (limited to 'tests')
22 files changed, 35 insertions, 102 deletions
diff --git a/tests/sass/src/com/vaadin/sass/TestBase.java b/tests/sass/src/com/vaadin/sass/AbstractTestBase.java index 6947d24961..f657ac797f 100644 --- a/tests/sass/src/com/vaadin/sass/TestBase.java +++ b/tests/sass/src/com/vaadin/sass/AbstractTestBase.java @@ -8,7 +8,7 @@ import java.net.URISyntaxException; import org.w3c.css.sac.CSSException; -public class TestBase { +public abstract class AbstractTestBase { protected ScssStylesheet stylesheet; protected String originalScss; diff --git a/tests/sass/src/com/vaadin/sass/AllTests.java b/tests/sass/src/com/vaadin/sass/AllTests.java deleted file mode 100644 index 574b1a4d93..0000000000 --- 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 index 0ee1f79450..0000000000 --- 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 index 5a5351577d..0000000000 --- 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/VisitorTestSuite.java b/tests/sass/src/com/vaadin/sass/VisitorTestSuite.java deleted file mode 100644 index 46dfce6fe1..0000000000 --- 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 c80ebeac56..1484c0703e 100644 --- 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 fd57f1c982..0d946c77b1 100644 --- 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 21ab421ce4..b96dc8bc5b 100644 --- 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 e140a40a97..daceb583ec 100644 --- 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 9a82096026..7370e33b16 100644 --- 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 f8259e85c3..6d81a75e42 100644 --- 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 bca87d268f..153f494f0d 100644 --- 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 d42199d1a6..1f89cdf0b2 100644 --- 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 fa0d323528..5ad4aacd23 100644 --- 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 d3085f675c..3a2bb9a4b6 100644 --- 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 bcee04f46f..49ac6e30ed 100644 --- 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 a4ecf75a35..cd4c0e2b10 100644 --- 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 a236eeac12..1c07188f56 100644 --- 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 1ca8bc762b..01d7e6e250 100644 --- 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 b25c8417b8..2eaecc319c 100644 --- 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 0df3fde8eb..8ed25151db 100644 --- 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 df6bd41fe1..1407bbd933 100644 --- 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"; |