From 2e2410712c7a0cbc20122f05c728e4f07dd1fdda Mon Sep 17 00:00:00 2001
From: fguigues <fguigues@localhost>
Date: Thu, 20 Mar 2008 17:34:28 +0000
Subject: [PATCH] Update the SNMP Unit tests. Delete the nbproject (will be available as a zip on https://www.opends.org/wiki/page/BuildingAndRunningOpenDSWithinNetbeans)
---
opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
index b811614..1a1c9ee 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
@@ -32,6 +32,7 @@
import com.sun.management.snmp.manager.SnmpPeer;
import com.sun.management.snmp.manager.SnmpSession;
import com.sun.management.snmp.manager.usm.SnmpUsmPeer;
+import java.io.File;
import java.net.InetAddress;
import static org.testng.Assert.*;
@@ -53,7 +54,7 @@
/**
* An abstract class that all SNMP unit test should extend.
*/
-@Test(enabled=false, groups = {"precommit", "snmp"}, sequential = true)
+@Test(enabled=true, groups = {"precommit", "snmp"}, sequential = true)
public abstract class SNMPConnectionManager extends DirectoryServerTestCase {
/**
@@ -74,7 +75,7 @@
// Make sure that the server is up and running.
TestCaseUtils.restartServer();
- synchronized (this) {
+ synchronized (this) {
this.wait(500);
}
SNMPConnectionHandler snmpHandler = getSNMPConnectionHandler();
@@ -152,7 +153,7 @@
* @return an SNMP Connection handler
* @throws an Exception is something went wrong.
*/
- public SNMPConnectionHandler getSNMPConnectionHandler() throws Exception {
+ protected SNMPConnectionHandler getSNMPConnectionHandler() throws Exception {
List<ConnectionHandler> handlers =
DirectoryServer.getConnectionHandlers();
assertNotNull(handlers);
@@ -197,10 +198,7 @@
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- mods.add(new Modification(ModificationType.REPLACE,
- new org.opends.server.types.Attribute(
- "ds-cfg-enabled", "true")));
-
+
mods.add(new Modification(ModificationType.REPLACE,
new org.opends.server.types.Attribute(
"ds-cfg-listen-port", String.valueOf(this.snmpPort))));
@@ -215,7 +213,15 @@
new org.opends.server.types.Attribute(
"ds-cfg-traps-destination", hosts)));
- ModifyOperationBasis op = new ModifyOperationBasis(
+ String jarFileLocation =
+ System.getProperty("org.opends.server.snmp.opendmk");
+
+ mods.add(new Modification(ModificationType.ADD,
+ new org.opends.server.types.Attribute(
+ "ds-cfg-opendmk-jarfile", jarFileLocation + File.separator +
+ "jdmkrt.jar")));
+
+ ModifyOperationBasis op = new ModifyOperationBasis(
conn,
conn.nextOperationID(),
conn.nextMessageID(),
@@ -223,6 +229,22 @@
DN.decode("cn=SNMP Connection Handler,cn=Connection Handlers,cn=config"),
mods);
op.run();
+
+ mods.clear();
+
+ mods.add(new Modification(ModificationType.REPLACE,
+ new org.opends.server.types.Attribute(
+ "ds-cfg-enabled", "true")));
+
+ op = new ModifyOperationBasis(
+ conn,
+ conn.nextOperationID(),
+ conn.nextMessageID(),
+ new ArrayList<Control>(),
+ DN.decode("cn=SNMP Connection Handler,cn=Connection Handlers,cn=config"),
+ mods);
+
+ op.run();
}
/**
--
Gitblit v1.10.0