I noticed that ConfigureSatelliteCommandTest makes an assertion that
depends on a HashMap key ordering, it was changed it to a SortedMap to
guarantee repeatability.

See attached patch.

Regards,
-- 
Silvio Moioli
SUSE LINUX Products GmbH
Maxfeldstraße 5, 90409 Nürnberg Germany

>From 005e216a8cba6ace617750dfb09dc170fbd60ac9 Mon Sep 17 00:00:00 2001
From: Silvio Moioli <smoi...@suse.de>
Date: Fri, 6 Sep 2013 08:23:06 +0200
Subject: [PATCH] ConfigureSatelliteCommandTest: do not rely on HashMap key
 ordering

---
 .../rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java
index 28904d0..95e5cb9 100644
--- a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java
@@ -28,10 +28,10 @@ import com.redhat.rhn.manager.satellite.Executor;
 import com.redhat.rhn.testing.BaseTestCaseWithUser;
 import com.redhat.rhn.testing.TestUtils;
 
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * ConfigureSatelliteCommandTest - test for ConfigureSatelliteCommand
@@ -73,7 +73,7 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser {
         assertTrue(cmd.getKeysToBeUpdated().contains(TEST_CONFIG_STRING));
         assertTrue(cmd.getKeysToBeUpdated().contains(TEST_CONFIG_NULL));
 
-        Map optionMap = new HashMap();
+        Map optionMap = new TreeMap();
         Iterator i = cmd.getKeysToBeUpdated().iterator();
         while (i.hasNext()) {
             String key = (String) i.next();
@@ -82,7 +82,7 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser {
         String[] cmdargs = cmd.getCommandArguments(Config.getDefaultConfigFilePath(),
                 optionMap);
 
-        assertEquals("--option=test.null_config.config_sat_test=", cmdargs[5]);
+        assertEquals("--option=test.null_config.config_sat_test=", cmdargs[4]);
         assertEquals(9, cmdargs.length);
         assertNull(cmd.storeConfiguration());
         assertTrue(cmd.getKeysToBeUpdated().size() == 0);
-- 
1.8.1.4


_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel

Reply via email to