Changeset 17383 in josm

Timestamp:

2020-12-01T20:59:49+01:00 (3 years ago)

Author:

Don-vip

Message:

see #16567 - better assertion error messages for rules/plugins integration tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/preferences/validator/ValidatorTagCheckerRulesPreferenceTestIT.java (modified) (4 diffs)
• plugins/PluginHandlerTestIT.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreferenceTestIT.java

@@ -9 +9 @@
 import java.util.Collection;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
@@ -38 +38 @@
         Collection<ExtendedSourceEntry> sources = new ValidatorTagCheckerRulesPreference.TagCheckerRulesSourceEditor()
                 .loadAndGetAvailableSources();
-        assertFalse(sources.isEmpty());
+        assertFalse(sources.isEmpty(), sources::toString);
         Collection<Throwable> allErrors = new ArrayList<>();
         MapCSSTagChecker tagChecker = new MapCSSTagChecker();
@@ -45 +45 @@
             try {
                 ParseResult result = tagChecker.addMapCSS(source.url);
-                assertFalse(result.parseChecks.isEmpty());
+                assertFalse(result.parseChecks.isEmpty(), result::toString);
                 System.out.println(result.parseErrors.isEmpty() ? " => OK" : " => KO");
                 allErrors.addAll(result.parseErrors);
@@ -54 +54 @@
             }
         }
-        assertTrue(allErrors.isEmpty());
+        assertTrue(allErrors.isEmpty(), allErrors::toString);
     }
 }

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java

@@ -36 +36 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Destroyable;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -121 +122 @@
             // removed and readded)
             for (int i = 0; i < 2; i++) {
-                assertFalse(PluginHandler.removePlugins(restartable));
-                assertTrue(restartable.stream().noneMatch(info -> PluginHandler.getPlugins().contains(info)));
+                assertFalse(PluginHandler.removePlugins(restartable), () -> Logging.getLastErrorAndWarnings().toString());
+                List<PluginInformation> notRemovedPlugins = restartable.stream()
+                        .filter(info -> PluginHandler.getPlugins().contains(info)).collect(Collectors.toList());
+                assertTrue(notRemovedPlugins.isEmpty(), notRemovedPlugins::toString);
                 loadPlugins(restartable);
             }
 
-            assertTrue(PluginHandler.removePlugins(loadedPlugins));
+            assertTrue(PluginHandler.removePlugins(loadedPlugins), () -> Logging.getLastErrorAndWarnings().toString());
             assertTrue(restartable.parallelStream().noneMatch(info -> PluginHandler.getPlugins().contains(info)));
         } catch (Exception | LinkageError t) {
@@ -162 +165 @@
         List<PluginInformation> plugins = pluginInfoDownloadTask.getAvailablePlugins();
         System.out.println("Original plugin list contains " + plugins.size() + " plugins");
-        assertFalse(plugins.isEmpty());
+        assertFalse(plugins.isEmpty(), plugins::toString);
         PluginInformation info = plugins.get(0);
-        assertFalse(info.getName().isEmpty());
-        assertFalse(info.getClass().getName().isEmpty());
+        assertFalse(info.getName().isEmpty(), info::toString);
+        assertFalse(info.getClass().getName().isEmpty(), info::toString);
 
         // Filter deprecated and unmaintained ones, or those not responsive enough to match our continuous integration needs