[roller] branch master updated: fixes the failing SubscriptionFunctionalTest by removing subs added by PlanetManagerLocalTest.

[mbien]

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

mbien 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 0434cb3  fixes the failing SubscriptionFunctionalTest by removing subs 
added by PlanetManagerLocalTest.
0434cb3 is described below

commit 0434cb30b49113f0d855739abe4b8ef243daab5e
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Fri Mar 26 11:27:09 2021 +0100

    fixes the failing SubscriptionFunctionalTest by removing subs added by 
PlanetManagerLocalTest.
---
 .../apache/roller/weblogger/business/PlanetManagerLocalTest.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git 
a/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
 
b/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
index c957e0e..ed73115 100644
--- 
a/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
+++ 
b/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
@@ -20,6 +20,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.planet.pojos.Planet;
 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.planet.tasks.RefreshRollerPlanetTask;
 import org.apache.roller.weblogger.planet.tasks.SyncWebsitesTask;
@@ -119,6 +120,14 @@ public class PlanetManagerLocalTest  {
         try {
             TestUtils.teardownWeblog(testWeblog.getId());
             TestUtils.teardownUser(testUser.getUserName());
+            
+            // remove subscriptions which were added in testRefreshEntries()
+            PlanetManager m = 
WebloggerFactory.getWeblogger().getPlanetManager();
+            PlanetGroup all = 
m.getGroup(m.getWebloggerById("zzz_default_planet_zzz"), "all");
+            for (Subscription sub : all.getSubscriptions()) {
+                m.deleteSubscription(sub);
+            }
+
             TestUtils.endSession(true);
         } catch (Exception ex) {
             log.error(ex);