java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 37
++++------
1 file changed, 18 insertions(+), 19 deletions(-)
New commits:
commit 8bbff5f02a384fc63e6d052e19d72901ad507688
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Nov 17 12:21:00 2009 -0500
unit test fix - kickstart compare packages was not working correctly
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index f5349b9..5d46ce3 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -823,34 +823,33 @@ public class ProfileHandler extends BaseHandler {
loggedInUser.getOrg().getId());
// Set operations to determine deltas
- Set<KickstartPackage> onlyInProfile1 =
- new TreeSet<KickstartPackage>(profile1.getKsPackages());
- onlyInProfile1.removeAll(profile2.getKsPackages());
- Set<KickstartPackage> onlyInProfile2 =
- new TreeSet<KickstartPackage>(profile2.getKsPackages());
- onlyInProfile2.removeAll(profile1.getKsPackages());
-
- // Convert the remaining into strings for return
- Set<String> profile1PackageNameStrings = new
HashSet<String>(onlyInProfile1.size());
- for (KickstartPackage ksPackage : onlyInProfile1) {
- profile1PackageNameStrings.add(ksPackage.getPackageName().getName());
- }
-
- Set<String> profile2PackageNameStrings = new
HashSet<String>(onlyInProfile2.size());
- for (KickstartPackage ksPackage : onlyInProfile2) {
- profile2PackageNameStrings.add(ksPackage.getPackageName().getName());
- }
+
+ Set<String> onlyInProfile1 = getPackageNamesForKS(profile1);
+ onlyInProfile1.removeAll(getPackageNamesForKS(profile2));
+
+ Set<String> onlyInProfile2 = getPackageNamesForKS(profile2);
+ onlyInProfile2.removeAll(getPackageNamesForKS(profile1));
+
// Package for return
Map<String, Set<String>> results = new HashMap<String,
Set<String>>(2);
- results.put(kickstartLabel1, profile1PackageNameStrings);
- results.put(kickstartLabel2, profile2PackageNameStrings);
+ results.put(kickstartLabel1, onlyInProfile1);
+ results.put(kickstartLabel2, onlyInProfile2);
return results;
}
+ private Set<String> getPackageNamesForKS(KickstartData ksdata) {
+ Set<String> toRet = new HashSet<String>();
+ for (KickstartPackage ksPack : ksdata.getKsPackages()) {
+ toRet.add(ksPack.getPackageName().getName());
+ }
+ return toRet;
+ }
+
+
/**
* Returns a list for each kickstart profile of properties that are different
between
* the profiles. Each property that is not equal between the two profiles will be
Show replies by date