[roller] branch master updated: Attempt to fix tests that are broken on builds.apache.org but work on my machine.

[sn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/master by this push:
     new 0b22358  Attempt to fix tests that are broken on builds.apache.org but work on my machine.
0b22358 is described below

commit 0b22358fb22a60bcf5257b6df872b2000df513eb
Author: David M. Johnson <sn...@apache.org>
AuthorDate: Sun Mar 15 12:57:04 2020 -0400

    Attempt to fix tests that are broken on builds.apache.org but work on my machine.
---
 .../apache/roller/planet/business/SubscriptionFunctionalTests.java  | 5 ++---
 .../java/org/apache/roller/weblogger/business/WeblogStatsTest.java  | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java b/app/src/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java
index df0ebf1..0febf3b 100644
--- a/app/src/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java
+++ b/app/src/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java
@@ -21,9 +21,7 @@ import org.apache.roller.planet.pojos.PlanetGroup;
 import org.apache.roller.planet.pojos.Subscription;
 import org.apache.roller.weblogger.TestUtils;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -31,6 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 /**
  * Test Subscription functionality.
  */
+@TestMethodOrder(MethodOrderer.Alphanumeric.class)
 public class SubscriptionFunctionalTests  {
     
     private Planet testPlanet = null;
diff --git a/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java b/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
index c52ec69..ce16dc2 100644
--- a/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
+++ b/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
@@ -21,9 +21,7 @@ package org.apache.roller.weblogger.business;
 import org.apache.roller.util.RollerConstants;
 import org.apache.roller.weblogger.TestUtils;
 import org.apache.roller.weblogger.pojos.*;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 
 import java.util.List;
 import java.util.Map;
@@ -31,6 +29,8 @@ import java.util.Map;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+
+@TestMethodOrder(MethodOrderer.Alphanumeric.class)
 public class WeblogStatsTest  {
     
     private User user1, user2;