From dd478a2fe680abfa7aae75ff1cbc1cc66a0693c8 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 27 Mar 2008 10:05:53 +0000
Subject: [PATCH] Fix snmp trap test and enable it.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java | 7 +++----
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java | 3 +--
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java | 18 +++++-------------
3 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
index 1a1c9ee..631af6d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
@@ -85,12 +85,11 @@
}
/**
- * Set Down the Directory Server
- * @param message
+ * Set Down the Directory Server.
* @throws java.lang.Exception
*/
- protected void setDown(String message) throws Exception {
- TestCaseUtils.shutdownServer(message);
+ protected void setDown() throws Exception {
+ TestCaseUtils.restartServer();
}
/**
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
index 7bf58f9..6daa483 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
@@ -57,8 +57,7 @@
import static org.testng.Assert.*;
/**
- * A simple test for : - JMX connection establishment withou using SSL -
- * JMX get and set - configuration change
+ * SNMP tests.
*/
@Test(enabled=false, groups = {"precommit", "snmp"}, sequential = true)
public class SNMPSyncManagerV2AccessTest extends SNMPConnectionManager {
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java
index 63d5eaa..39c827d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java
@@ -45,16 +45,9 @@
import org.testng.annotations.Test;
/**
- * The class is a simple example showing how to use the SNMP Manager API.
- *
- * <p>When calling the program, you must specify:
- * <br> - host: hostname of the SNMP agent you want to query.
- * <br> - port: port number to use.
- *
- * <p>As a reminder, if you wish to query the SNMP agent example provided
- * as part of Java DMK, use port 8085.
+ * SNMP trap test.
*/
-@Test(enabled=false, groups = {"precommit", "snmp"}, sequential = true)
+@Test(enabled=true, groups = {"precommit", "snmp"}, sequential = true)
public class SNMPTrapManagerTest extends SNMPConnectionManager {
@BeforeClass
@@ -63,7 +56,7 @@
super.setUp();
}
- @Test(enabled = false)
+ @Test(enabled = true)
public void checkTraps() {
try {
@@ -97,12 +90,11 @@
trapThread.start();
// One Trap
- this.setDown(
- "On demand from org.opends.server.snmp.SNMPTrapManagerTest");
+ this.setDown();
int trapNumbers = trapListener.getNumberV1Traps();
- // Should received 3 traps
+ // Should received 1 traps
assertEquals(trapNumbers, 1);
// Nicely stop the SnmpEventReportDispatcher.
--
Gitblit v1.10.0