diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-06 11:56:53 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-06 12:29:24 +0200 |
| commit | 741e798633edd584e62bcb4e6a00911a86908cdf (patch) | |
| tree | 22d3b4c625376ba7f79ec82488a64f1696539d5b /uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java | |
| parent | 3c84a54591d792b69a4d6d736714941edb1d818a (diff) | |
| parent | 4db0b55aefd83d149e62a7fad2b14fb232d976c8 (diff) | |
| download | vaadin-framework-741e798633edd584e62bcb4e6a00911a86908cdf.tar.gz vaadin-framework-741e798633edd584e62bcb4e6a00911a86908cdf.zip | |
Merge branch 'master' into grid-columnreorder
Conflicts:
uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
Change-Id: Ic77c717b9bbdcc38585382d4944ee4491aba3f7d
Diffstat (limited to 'uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java')
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java b/uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java index 2200566b84..3c7030b1e9 100644 --- a/uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java +++ b/uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java @@ -15,6 +15,8 @@ */ package com.vaadin.tests.tb3; +import java.io.IOException; + import org.junit.runner.RunWith; import org.junit.runners.model.InitializationError; @@ -31,7 +33,8 @@ import com.vaadin.tests.tb3.ChangedTB3Tests.ChangedTB3TestsSuite; @RunWith(ChangedTB3TestsSuite.class) public class ChangedTB3Tests { public static class ChangedTB3TestsSuite extends TB3TestSuite { - public ChangedTB3TestsSuite(Class<?> klass) throws InitializationError { + public ChangedTB3TestsSuite(Class<?> klass) throws InitializationError, + IOException { super(klass, AbstractTB3Test.class, "com.vaadin.tests", new String[] { "com.vaadin.tests.integration" }, new ChangedTB3TestLocator()); |