Repository: openmeetings Updated Branches: refs/heads/3.3.x a0bd6ee7d -> bc6f857d2
[OPENMEETINGS-1612] surefire version is updated, Jenkins build is speed up Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/bc6f857d Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/bc6f857d Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/bc6f857d Branch: refs/heads/3.3.x Commit: bc6f857d2c9077c3d798f6d0133f5881d0abc9cf Parents: a0bd6ee Author: Maxim Solodovnik <[email protected]> Authored: Wed Jun 14 16:58:21 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Jun 14 16:58:21 2017 +0700 ---------------------------------------------------------------------- openmeetings-util/pom.xml | 4 +--- .../openmeetings/util/NonJenkinsTests.java | 23 ++++++++++++++++++++ .../openmeetings/util/TestStoredFile.java | 6 ++--- .../openmeetings/test/user/TestUserGroup.java | 7 +++--- pom.xml | 2 +- 5 files changed, 32 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bc6f857d/openmeetings-util/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml index 3ded5ff..fabf192 100644 --- a/openmeetings-util/pom.xml +++ b/openmeetings-util/pom.xml @@ -52,9 +52,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> - <exclude>**/TestStoredFile.java</exclude> - </excludes> + <excludedGroups>org.apache.openmeetings.util.NonJenkinsTests</excludedGroups> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bc6f857d/openmeetings-util/src/test/java/org/apache/openmeetings/util/NonJenkinsTests.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/test/java/org/apache/openmeetings/util/NonJenkinsTests.java b/openmeetings-util/src/test/java/org/apache/openmeetings/util/NonJenkinsTests.java new file mode 100644 index 0000000..16d8aa9 --- /dev/null +++ b/openmeetings-util/src/test/java/org/apache/openmeetings/util/NonJenkinsTests.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License") + you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openmeetings.util; + +public @interface NonJenkinsTests { + +} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bc6f857d/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestStoredFile.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestStoredFile.java b/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestStoredFile.java index 534bb8a..6e1df19 100644 --- a/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestStoredFile.java +++ b/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestStoredFile.java @@ -18,14 +18,14 @@ */ package org.apache.openmeetings.util; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; -import org.apache.openmeetings.util.StoredFile; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category({NonJenkinsTests.class}) public class TestStoredFile { - @Test public void testAudio() { final String[] exts = {"aif", "aifc", "aiff", "au", "mp3", "flac", "wav"}; //TODO enlarge http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bc6f857d/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java index 52f2702..e084165 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java @@ -35,6 +35,7 @@ import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.apache.openmeetings.test.selenium.HeavyTests; import org.apache.openmeetings.util.OmException; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.springframework.beans.factory.annotation.Autowired; public class TestUserGroup extends AbstractJUnitDefaults { @@ -62,7 +63,7 @@ public class TestUserGroup extends AbstractJUnitDefaults { Long groupId = u.getGroupUsers().get(0).getGroup().getId(); List<GroupUser> ul = groupUserDao.get(groupId, 0, 9999); assertTrue("Default Group should contain at least 1 user: " + ul.size(), ul.size() > 0); - + GroupUser ou = groupUserDao.getByGroupAndUser(groupId, u.getId()); assertNotNull("Unable to find [group, user] pair - [" + groupId + "," + u.getId() + "]", ou); } @@ -73,7 +74,7 @@ public class TestUserGroup extends AbstractJUnitDefaults { g.setName(GROUP_NAME); Long groupId = groupDao.update(g, null).getId(); //inserted by not checked assertNotNull("New Group have valid id", groupId); - + List<GroupUser> ul = groupUserDao.get(groupId, 0, 9999); assertTrue("New Group should contain NO users: " + ul.size(), ul.size() == 0); } @@ -111,7 +112,7 @@ public class TestUserGroup extends AbstractJUnitDefaults { } @Test - @HeavyTests + @Category(HeavyTests.class) public void add10kUsers() throws Exception { List<Group> groups = groupDao.get(GROUP_NAME, 0, 1, null); Group g = null; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bc6f857d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8914574..86d2a02 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ <db>derby</db> <junit.version>4.12</junit.version> <maven.javadoc.version>2.10.3</maven.javadoc.version> - <maven.surefire.version>2.19.1</maven.surefire.version> + <maven.surefire.version>2.20</maven.surefire.version> <maven-site.version>3.3</maven-site.version> <wicket.version>8.0.0-M6</wicket.version> <wicketju.version>8.0.0-M6</wicketju.version>
