java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
| 31 +++++++---
1 file changed, 24 insertions(+), 7 deletions(-)
New commits:
commit b41a2aeb1c8ae6b47492b881d87cfef41d525199
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 18 11:32:25 2010 +0100
fixing ConfigureCertificateCommandTest
com.redhat.rhn.manager.satellite.test.ConfigureCertificateCommandTest.testCreateCommand
com.redhat.rhn.manager.satellite.test.ConfigureCertificateCommandTest.testCreateCommandIgnoreMismatch
diff --git
a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
index db36c76..ebb6365 100644
---
a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
+++
b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java
@@ -30,10 +30,12 @@ public class ConfigureCertificateCommandTest extends
BaseTestCaseWithUser {
private ConfigureCertificateCommand cmd;
public void testCreateCommand() throws Exception {
- String originalConfig = Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
+ String originalConfigParent =
Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
+ String originalConfigDisconnected =
Config.get().getString(ConfigDefaults.DISCONNECTED);
Config.get().setString(ConfigDefaults.SATELLITE_PARENT,
"satellite.webqa.redhat.com");
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED, "1");
user.addRole(RoleFactory.SAT_ADMIN);
cmd = new ConfigureCertificateCommand(user) {
protected Executor getExecutor() {
@@ -47,18 +49,27 @@ public class ConfigureCertificateCommandTest extends
BaseTestCaseWithUser {
assertNotNull(cmd.getCertificateText());
assertNull(cmd.storeConfiguration());
- if (originalConfig == null) {
+ if (originalConfigParent == null) {
Config.get().setString(ConfigDefaults.SATELLITE_PARENT, "");
}
else {
- Config.get().setString(ConfigDefaults.SATELLITE_PARENT, originalConfig);
+ Config.get().setString(ConfigDefaults.SATELLITE_PARENT,
originalConfigParent);
+ }
+ if (originalConfigDisconnected == null) {
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED, "");
+ }
+ else {
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED,
originalConfigDisconnected);
}
}
public void testCreateCommandIgnoreMismatch() throws Exception {
- String originalConfig = Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
- Config.get().setString(ConfigDefaults.SATELLITE_PARENT,
+ String originalConfigParent =
Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
+ String originalConfigDisconnected =
Config.get().getString(ConfigDefaults.DISCONNECTED);
+
+ Config.get().setString(ConfigDefaults.SATELLITE_PARENT,
"satellite.webqa.redhat.com");
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED, "1");
user.addRole(RoleFactory.SAT_ADMIN);
cmd = new ConfigureCertificateCommand(user) {
protected Executor getExecutor() {
@@ -75,11 +86,17 @@ public class ConfigureCertificateCommandTest extends
BaseTestCaseWithUser {
assertNotNull(cmd.getCertificateText());
assertNull(cmd.storeConfiguration());
- if (originalConfig == null) {
+ if (originalConfigParent == null) {
Config.get().setString(ConfigDefaults.SATELLITE_PARENT, "");
}
else {
- Config.get().setString(ConfigDefaults.SATELLITE_PARENT, originalConfig);
+ Config.get().setString(ConfigDefaults.SATELLITE_PARENT,
originalConfigParent);
+ }
+ if (originalConfigDisconnected == null) {
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED, "");
+ }
+ else {
+ Config.get().setBoolean(ConfigDefaults.DISCONNECTED,
originalConfigDisconnected);
}
}
Show replies by date