Skip to content

Commit b1820bc

Browse files
committed
Preparation for 2.5.0 release.
Moved Mixin TestSuite to MaterialWidgetTestSuite for performance improvement.
1 parent 3107d4e commit b1820bc

File tree

10 files changed

+23
-51
lines changed

10 files changed

+23
-51
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs
2828
<version>2.5.0</version>
2929
</dependency>
3030
```
31-
### Snapshot Version 2.5.0-SNAPSHOT
31+
### Snapshot Version 2.5.0
3232
```xml
3333
<dependency>
3434
<groupId>com.github.gwtmaterialdesign</groupId>
3535
<artifactId>gwt-material</artifactId>
36-
<version>2.5.0-SNAPSHOT</version>
36+
<version>2.5.0</version>
3737
</dependency>
3838
```
3939

gwt-material/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>gwt-material-parent</artifactId>
66
<groupId>com.github.gwtmaterialdesign</groupId>
7-
<version>2.5.0-SNAPSHOT</version>
7+
<version>2.5.0</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

@@ -137,7 +137,6 @@
137137
<exclude>**/ui/**.java</exclude>
138138
</excludes>
139139
<includes>
140-
<include>**/MixinTestSuite.java</include>
141140
<include>**/MaterialWidgetTestSuite.java</include>
142141
</includes>
143142
<!-- disable JVM asserts, but enable JS asserts for tests -->

gwt-material/src/test/java/gwt/material/design/client/MaterialWidgetTestSuite.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
package gwt.material.design.client;
2121

2222
import com.google.gwt.junit.tools.GWTTestSuite;
23+
import gwt.material.design.client.mixin.CopyCommandMixinTest;
24+
import gwt.material.design.client.mixin.StatusTextMixinTest;
25+
import gwt.material.design.client.mixin.TextMixinTest;
2326
import gwt.material.design.client.ui.*;
2427
import gwt.material.design.client.ui.animation.AnimationTest;
2528
import gwt.material.design.client.ui.helper.ColorHelperTest;
@@ -90,6 +93,10 @@ public static Test suite() {
9093
suite.addTestSuite(ScrollHelperTest.class);
9194
// Layout Tests
9295
suite.addTestSuite(GridLayoutTest.class);
96+
// Mixin Tests
97+
suite.addTestSuite(CopyCommandMixinTest.class);
98+
suite.addTestSuite(StatusTextMixinTest.class);
99+
suite.addTestSuite(TextMixinTest.class);
93100
return suite;
94101
}
95102
}

gwt-material/src/test/java/gwt/material/design/client/MixinTestSuite.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

gwt-material/src/test/java/gwt/material/design/client/mixin/AbstractMixinTest.java renamed to gwt-material/src/test/java/gwt/material/design/client/mixin/BaseMixinTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import gwt.material.design.client.base.mixin.AbstractMixin;
2323
import gwt.material.design.client.ui.base.BaseTestCase;
2424

25-
public abstract class AbstractMixinTest<M extends AbstractMixin> extends BaseTestCase {
25+
public class BaseMixinTest<M extends AbstractMixin> extends BaseTestCase {
2626

2727
protected M mixin;
2828

@@ -31,9 +31,13 @@ public void testMixin() {
3131
runTest(mixin);
3232
}
3333

34-
protected abstract void runTest(M mixin);
34+
protected void runTest(M mixin) {
3535

36-
protected abstract M setupMixin();
36+
}
37+
38+
protected M setupMixin() {
39+
return mixin;
40+
}
3741

3842
public M getMixin() {
3943
return mixin;

gwt-material/src/test/java/gwt/material/design/client/mixin/CopyCommandMixinTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import gwt.material.design.client.base.mixin.CopyCommandMixin;
2525
import gwt.material.design.client.ui.MaterialTextBox;
2626

27-
public class CopyCommandMixinTest extends AbstractMixinTest<CopyCommandMixin<MaterialTextBox>> {
27+
public class CopyCommandMixinTest extends BaseMixinTest<CopyCommandMixin<MaterialTextBox>> {
2828

2929
@Override
3030
protected void runTest(CopyCommandMixin<MaterialTextBox> mixin) {

gwt-material/src/test/java/gwt/material/design/client/mixin/StatusTextMixinTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import gwt.material.design.client.ui.MaterialLabel;
2525
import gwt.material.design.client.ui.MaterialTextBox;
2626

27-
public class StatusTextMixinTest extends AbstractMixinTest<StatusTextMixin<MaterialTextBox, MaterialLabel>> {
27+
public class StatusTextMixinTest extends BaseMixinTest<StatusTextMixin<MaterialTextBox, MaterialLabel>> {
2828

2929
@Override
3030
protected void runTest(StatusTextMixin<MaterialTextBox, MaterialLabel> mixin) {

gwt-material/src/test/java/gwt/material/design/client/mixin/TextMixinTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import gwt.material.design.client.ui.MaterialLabel;
2929
import gwt.material.design.client.ui.sanitizer.CustomSanitizer;
3030

31-
public class TextMixinTest extends AbstractMixinTest<TextMixin<MaterialLabel>> {
31+
public class TextMixinTest extends BaseMixinTest<TextMixin<MaterialLabel>> {
3232

3333
@Override
3434
protected void runTest(TextMixin<MaterialLabel> mixin) {

gwt-material/src/test/java/gwt/material/design/client/ui/MaterialSideNavMiniTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ protected MaterialSideNavMini createWidget() {
3434
@Override
3535
public void testInitialClasses() {
3636
super.testInitialClasses();
37-
checkInitialClasses(SideNavType.MINI.getCssName());
37+
checkInitialClasses(SideNavType.MINI_WITH_EXPAND.getCssName());
3838
}
3939
}

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.github.gwtmaterialdesign</groupId>
77
<artifactId>gwt-material-parent</artifactId>
8-
<version>2.5.0-SNAPSHOT</version>
8+
<version>2.5.0</version>
99
<packaging>pom</packaging>
1010
<modules>
1111
<module>gwt-material</module>
@@ -69,7 +69,7 @@
6969
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</connection>
7070
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</developerConnection>
7171
<url>http://github.com/GwtMaterialDesign/gwt-material</url>
72-
<tag>v2.5.0-SNAPSHOT</tag>
72+
<tag>v2.5.0</tag>
7373
</scm>
7474

7575
<licenses>

0 commit comments

Comments
 (0)