java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java |
3 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java |
3 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java |
9 +++
java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java |
24 +++++-----
4 files changed, 26 insertions(+), 13 deletions(-)
New commits:
commit 06934155e560c703dcf30a5d91b59c31986c3dc8
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Jan 15 11:10:16 2010 -0500
unit test fixes
diff --git a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java
b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java
index 18185e9..35777e4 100644
--- a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java
+++ b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java
@@ -127,7 +127,8 @@ public class ActivationKeyTest extends BaseTestCaseWithUser {
String keyName = " Test Space ";
ActivationKey k = manager.createNewActivationKey
(user, keyName, "Cool Duplicate", null, null, false);
- assertEquals(ActivationKey.makePrefix(user.getOrg()) + keyName.trim(),
k.getKey());
+ assertEquals(ActivationKey.makePrefix(user.getOrg()) +
+ keyName.trim().replace(" ", ""), k.getKey());
String newKey = keyName + " FOO ";
manager.changeKey(newKey , k, user);
assertNotNull(ActivationKey.makePrefix(user.getOrg()) + newKey.trim());
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
index d0a0818..1b37474 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
@@ -527,7 +527,8 @@ public class ConfigChannelHandler extends BaseHandler {
ConfigChannel channel = configHelper.lookupGlobal(loggedInUser,
channelLabel);
- List<ConfigSystemDto> dtos = manager.listChannelSystems(loggedInUser,
channel, null);
+ List<ConfigSystemDto> dtos = manager.listChannelSystems(loggedInUser,
channel,
+ null);
List<Server> servers = new ArrayList<Server>();
for (ConfigSystemDto m : dtos) {
Server s = SystemManager.lookupByIdAndUser((Long) m.getId(), loggedInUser);
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
index a2b3db4..a9be3bb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
@@ -78,6 +78,7 @@ import com.redhat.rhn.frontend.dto.PackageMetadata;
import com.redhat.rhn.frontend.dto.ScheduledAction;
import com.redhat.rhn.frontend.dto.ServerPath;
import com.redhat.rhn.frontend.dto.SystemOverview;
+import com.redhat.rhn.frontend.xmlrpc.ChannelSubscriptionException;
import com.redhat.rhn.frontend.xmlrpc.InvalidActionTypeException;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelException;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelLabelException;
@@ -270,6 +271,10 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
catch (InvalidChannelException e) {
//success
}
+ catch (ChannelSubscriptionException e) {
+ //success
+ }
+
server = (Server) reload(server);
assertEquals(2, server.getChannels().size());
@@ -360,6 +365,10 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
catch (InvalidChannelException e) {
//success
}
+ catch (ChannelSubscriptionException e) {
+ //success
+ }
+
server = (Server) reload(server);
assertEquals(2, server.getChannels().size());
diff --git a/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java
b/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java
index 21a6288..9059f59 100644
--- a/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java
@@ -82,17 +82,19 @@ public class UpdateChildChannelsCommand extends
BaseUpdateChannelCommand {
}
}
- // Check whether channelsIds are childs of the current base
- Set subscribableChannelIds = SystemManager.subscribableChannelIds(
- server.getId(), user.getId(), server.getBaseChannel().getId());
- for (Long channelId : cids) {
- if (!subscribableChannelIds.contains(channelId)) {
- Channel channel = ChannelFactory.lookupById(channelId);
- if (channel == null) {
- throw new InvalidChannelException();
- }
- else {
- throw new ChannelSubscriptionException(channel.getLabel());
+ // Check whether channelsIds are childs of the current base if the system has a
base
+ if (server.getBaseChannel() != null) {
+ Set subscribableChannelIds = SystemManager.subscribableChannelIds(
+ server.getId(), user.getId(),
server.getBaseChannel().getId());
+ for (Long channelId : cids) {
+ if (!subscribableChannelIds.contains(channelId)) {
+ Channel channel = ChannelFactory.lookupById(channelId);
+ if (channel == null) {
+ throw new InvalidChannelException();
+ }
+ else {
+ throw new ChannelSubscriptionException(channel.getLabel());
+ }
}
}
}
Show replies by date