From a8b1f24a577acf3d2bd1154974d6bbe86ddf460b Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 07 Feb 2014 10:16:32 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1306 - Removed default CLI value from ListenerSettings. - Modified CLI to add default values to ldap port, admin port, etc... and unit tests.
---
opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java
index ea9134b..98996b1 100644
--- a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java
+++ b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java
@@ -25,6 +25,7 @@
*/
package org.forgerock.opendj.server.setup.model;
+import static com.forgerock.opendj.cli.CliConstants.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -66,13 +67,13 @@
ds.getListenerSettings().setPassword("password");
// Verify ports
- assertThat(dsSettings.getAdminPort()).isEqualTo(ListenerSettings.DEFAULT_ADMIN_PORT);
- assertThat(dsSettings.getHTTPPort()).isEqualTo(ListenerSettings.DEFAULT_HTTP_PORT);
- assertThat(dsSettings.getJMXPort()).isEqualTo(ListenerSettings.DEFAULT_JMX_PORT);
- assertThat(dsSettings.getLdapPort()).isEqualTo(ListenerSettings.DEFAULT_LDAP_PORT);
- assertThat(dsSettings.getLdapsPort()).isEqualTo(ListenerSettings.DEFAULT_LDAPS_PORT);
- assertThat(dsSettings.getSNMPPort()).isEqualTo(ListenerSettings.DEFAULT_SNMP_PORT);
- assertThat(dsSettings.getSSLPortNumber()).isEqualTo(ListenerSettings.DEFAULT_SSL_PORT);
+ assertThat(dsSettings.getAdminPort()).isEqualTo(DEFAULT_ADMIN_PORT);
+ assertThat(dsSettings.getHTTPPort()).isEqualTo(DEFAULT_HTTP_PORT);
+ assertThat(dsSettings.getJMXPort()).isEqualTo(DEFAULT_JMX_PORT);
+ assertThat(dsSettings.getLdapPort()).isEqualTo(DEFAULT_LDAP_PORT);
+ assertThat(dsSettings.getLdapsPort()).isEqualTo(DEFAULT_LDAPS_PORT);
+ assertThat(dsSettings.getSNMPPort()).isEqualTo(DEFAULT_SNMP_PORT);
+ assertThat(dsSettings.getSSLPortNumber()).isEqualTo(DEFAULT_SSL_PORT);
assertFalse(ds.isService());
assertTrue(ds.isStartingServerAfterSetup());
--
Gitblit v1.10.0