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)
---
/dev/null | 435 ------------------------------------------------
opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java | 38 +++
opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java | 6
opends/build.xml | 1
opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java | 4
opends/build.properties | 2
opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 37 +++
7 files changed, 73 insertions(+), 450 deletions(-)
diff --git a/opends/build.properties b/opends/build.properties
index 1c30b84..8036528 100644
--- a/opends/build.properties
+++ b/opends/build.properties
@@ -1,2 +1,4 @@
opendmk.lib.dir=
+
+
diff --git a/opends/build.xml b/opends/build.xml
index f4494f0..accd3bc 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -1911,6 +1911,7 @@
<jvmarg value="-Demma.coverage.out.merge=false" />
<jvmarg value="-Dorg.opends.server.BuildRoot=${basedir}" />
<jvmarg value="-Dorg.opends.server.RunningUnitTests=true" />
+ <jvmarg value="-Dorg.opends.server.snmp.opendmk=${opendmk.lib.dir}"/>
<jvmarg value="-Dorg.opends.test.suppressOutput=${org.opends.test.suppressOutput}" />
<jvmarg value="-Dorg.opends.test.pauseOnFailure=${org.opends.test.pauseOnFailure}" />
<jvmarg value="-Dorg.opends.test.debug.target=${org.opends.test.debug.target}" />
diff --git a/opends/nbproject/genfiles.properties b/opends/nbproject/genfiles.properties
deleted file mode 100644
index 3c5d60b..0000000
--- a/opends/nbproject/genfiles.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/jdk.xml.data.CRC32=f285a38e
-nbproject/jdk.xml.script.CRC32=5342cb35
-nbproject/jdk.xml.stylesheet.CRC32=c45af3dc
diff --git a/opends/nbproject/ide-file-targets.xml b/opends/nbproject/ide-file-targets.xml
deleted file mode 100644
index bb8f6a4..0000000
--- a/opends/nbproject/ide-file-targets.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir=".." name="Directory Server-IDE">
-
- <!-- Import build.xml properties and targets -->
- <import file="../build.xml"/>
-
- <path id="opends.path">
- <pathelement path="build/classes:build/build-tools/classes:lib/activation.jar:lib/aspectjrt.jar:lib/je.jar:lib/mail.jar:build/quicksetup/classes:build/build-tools/build-tools.jar:build/unit-tests/classes:ext/testng/lib/testng-5.7b-jdk15.jar:ext/ant/lib/ant.jar:ext/svnkit/svnkit.jar:ext/emma/lib/emma.jar:build/dsml/classes:resource/dsml/lib/jaxb-api.jar:resource/dsml/lib/jaxb-impl.jar:resource/dsml/lib/jsr173_1.0_api.jar:resource/dsml/lib/saaj-1.3.jar:resource/dsml/lib/saaj-impl-1.3.jar:resource/dsml/lib/j2ee.jar"/>
- <pathelement location="build/build-tools/classes"/>
- <pathelement location="build/classes"/>
- <pathelement location="build/quicksetup/classes"/>
- <pathelement location="build/unit-tests/classes"/>
- <pathelement location="build/dsml/classes"/>
- <fileset dir="${opendmk.lib.dir}">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- Prepare testng unit tests environment -->
- <taskdef resource="testngtasks">
- <classpath>
- <fileset dir="${testng.lib.dir}">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </taskdef>
-
- <target name="prepare-test">
- <delete failonerror="false">
- <fileset dir="${unittest.report.dir}" includes="*"/>
- </delete>
- <mkdir dir="${unittest.report.dir}"/>
- </target>
-
- <!-- -->
- <!-- Run a selected testng file -->
- <!-- -->
- <target depends="prepare-test" name="run-selected-testng-file">
- <fail unless="run.class">Must set property 'run.class'</fail>
- <echo message="Running test (normal): ${run.class}"/>
- <testng dumpCommand="true" enableAssert="false" haltonfailure="false" listeners="org.opends.server.TestListener org.testng.reporters.FailedReporter" outputdir="${unittest.report.dir}" suiteRunnerClass="org.opends.server.SuiteRunner" useDefaultListeners="false" verbose="0">
- <classpath refid="opends.path"/>
- <jvmarg value="-Dorg.opends.server.BuildRoot=${basedir}"/>
- <jvmarg value="-Dorg.opends.server.RunningUnitTests=true"/>
- <jvmarg value="-Dorg.opends.test.suppressOutput=false"/>
- <jvmarg value="-Dorg.opends.test.pauseOnFailure=false"/>
- <jvmarg value="-Dorg.opends.test.debug.target=false"/>
- <jvmarg value="-Dorg.opends.test.copyClassesToTestPackage=true"/>
- <jvmarg value="-Dtest.progress=all"/>
- <jvmarg value="-Xms192M"/>
- <jvmarg value="-Xmx192M"/>
- <classfileset file="${unittest.classes.dir}/${run.class}.class"/>
- </testng>
- </target>
-
- <!-- -->
- <!-- Debug a selected file in testng unit tests sources -->
- <!-- -->
- <target name="debug-selected-testng-file">
- <fail unless="debug.class">Must set property 'debug.class'</fail>
- <echo message="Debugging test (normal): ${debug.class}"/>
- <ant antfile="build.xml" inheritall="false" target="dynamicconstants"/>
- <nbjpdastart addressproperty="jpda.address" name="Directory Server" transport="dt_socket">
- <classpath refid="opends.path"/>
- </nbjpdastart>
- <testng enableAssert="false" haltonfailure="false" listeners="org.opends.server.TestListener org.testng.reporters.FailedReporter" outputdir="${unittest.report.dir}" suiteRunnerClass="org.opends.server.SuiteRunner" useDefaultListeners="false" verbose="5">
- <classpath refid="opends.path"/>
- <jvmarg value="-Dorg.opends.server.LdapPort=1389"/>
- <jvmarg value="-Dorg.opends.server.BuildRoot=${basedir}"/>
- <jvmarg value="-Dorg.opends.server.RunningUnitTests=true"/>
- <jvmarg value="-Dorg.opends.test.suppressOutput=false"/>
- <jvmarg value="-Dorg.opends.test.pauseOnFailure=false"/>
- <jvmarg value="-Dorg.opends.test.debug.target=false"/>
- <jvmarg value="-Dorg.opends.test.copyClassesToTestPackage=true"/>
- <jvmarg value="-Dtest.progress=all"/>
- <jvmarg value="-Xms192M"/>
- <jvmarg value="-Xmx192M"/>
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- <classfileset file="${unittest.classes.dir}/${debug.class}.class"/>
- </testng>
- </target>
-
- <!-- -->
- <!-- Compile a selected file in src/server folder -->
- <!-- -->
- <target name="compile-selected-files-in-server">
- <fail unless="files">Must set property 'files'</fail>
- <echo message="Compiling source (normal): ${files}"/>
- <!-- TODO decide on and define some value for ${build.classes.dir} -->
- <mkdir dir="${classes.dir}"/>
- <javac destdir="${classes.dir}" includes="${files}" source="1.5" srcdir="src/server">
- <classpath refid="opends.path"/>
- </javac>
- </target>
-
- <!-- -->
- <!-- Compile a selected file in testng unit tests source folder -->
- <!-- -->
- <target name="compile-selected-testng-file">
- <!-- Compile the test cases -->
- <echo message="Compiling test (normal): ${files}"/>
- <mkdir dir="${unittest.classes.dir}"/>
- <javac debug="on" debuglevel="${build.debuglevel}" deprecation="true" destdir="${unittest.classes.dir}" fork="true" includes="${files}" memoryInitialSize="${MEM}" memoryMaximumSize="${MEM}" source="1.5" srcdir="${unittest.testng.src.dir}" target="1.5">
- <compilerarg value="-Xlint:all"/>
- <classpath refid="opends.path"/>
- </javac>
- </target>
-
- <!-- -->
- <!-- Run a selected class in src/server folder -->
- <!-- -->
- <target depends="dynamicconstants" name="run-selected-file-in-server">
- <fail unless="run.class">Must set property 'run.class'</fail>
- <property location="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" name="pdir"/>
- <ant antfile="build.xml" inheritall="false" target="dynamicconstants"/>
- <java classname="${run.class}" failonerror="true" fork="true">
- <classpath refid="opends.path"/>
- <jvmarg value="-Dorg.opends.server.BuildRoot=${pdir}"/>
- <jvmarg value="-Dorg.opends.server.scriptName=start-ds"/>
- <jvmarg value="-Dorg.opends.server.ServerRoot=${pdir}"/>
- <arg value="--configClass=org.opends.server.extensions.ConfigFileHandler"/>
- <arg value="--configFile=${pdir}/config/config.ldif"/>
- <arg value="--nodetach"/>
- </java>
- </target>
-
- <!-- -->
- <!-- Debug a selected file in src/server folder -->
- <!-- -->
- <target depends="dynamicconstants" name="debug-selected-file-in-server">
- <fail unless="debug.class">Must set property 'debug.class'</fail>
- <property location="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" name="pdir"/>
- <ant antfile="build.xml" inheritall="false" target="dynamicconstants"/>
- <nbjpdastart addressproperty="jpda.address" name="Directory Server" transport="dt_socket">
- <classpath refid="opends.path"/>
- </nbjpdastart>
- <java classname="${debug.class}" fork="true">
- <classpath refid="cp"/>
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- <jvmarg value="-Dorg.opends.server.BuildRoot=${pdir}"/>
- <jvmarg value="-Dorg.opends.server.scriptName=start-ds"/>
- <jvmarg value="-Dorg.opends.server.ServerRoot=${pdir}"/>
- <jvmarg value="-Dorg.opends.server.debug.enabled=true"/>
- <arg value="--configClass=org.opends.server.extensions.ConfigFileHandler"/>
- <arg value="--configFile=${pdir}/config/config.ldif"/>
- <arg value="--nodetach"/>
- </java>
- </target>
-
- <!-- -->
- <!-- Compile a selected file in src/ads folder -->
- <!-- -->
- <target name="compile-selected-files-in-ads">
- <fail unless="files">Must set property 'files'</fail>
- <echo message="Compiling source (normal): ${files}"/>
- <mkdir dir="${classes.dir}"/>
- <javac debug="on" debuglevel="${build.debuglevel}" destdir="${classes.dir}" includes="${files}" source="1.5" srcdir="src/ads">
- <classpath refid="opends.path"/>
- </javac>
- </target>
-
- <!-- -->
- <!-- Compile a selected file in src/build-tools folder -->
- <!-- -->
- <target name="compile-selected-files-in-build-tools">
- <fail unless="files">Must set property 'files'</fail>
- <echo message="Compiling source (normal): ${files}"/>
- <mkdir dir="${buildtools.classes.dir}"/>
- <javac debug="on" debuglevel="${build.debuglevel}" destdir="${buildtools.classes.dir}" includes="${files}" source="1.5" srcdir="src/build-tools">
- <classpath refid="opends.path"/>
- </javac>
- </target>
-
- <!-- -->
- <!-- Compile a selected file in src/guitools folder -->
- <!-- -->
- <target name="compile-selected-files-in-guitools">
- <fail unless="files">Must set property 'files'</fail>
- <echo message="Compiling source (normal): ${files}"/>
- <mkdir dir="${classes.dir}"/>
- <javac debug="on" debuglevel="${build.debuglevel}" destdir="${classes.dir}" includes="${files}" source="1.5" srcdir="src/guitools">
- <classpath refid="opends.path"/>
- </javac>
- </target>
-
- <!-- -->
- <!-- Compile a selected file in src/messages/src folder -->
- <!-- -->
- <target name="compile-selected-files-in-messages-src">
- <fail unless="files">Must set property 'files'</fail>
- <echo message="Compiling source (normal): ${files}"/>
- <mkdir dir="${classes.dir}"/>
- <javac debug="on" debuglevel="${build.debuglevel}" destdir="${classes.dir}" includes="${files}" source="1.5" srcdir="src/messages/src">
- <classpath refid="opends.path"/>
- </javac>
- </target>
-
- <!-- -->
- <!-- Compile a selected file in src/quicksetup folder -->
- <!-- -->
- <target name="compile-selected-files-in-quicksetup">
- <fail unless="files">Must set property 'files'</fail>
- <mkdir dir="${quicksetup.classes.dir}"/>
- <javac debug="on" debuglevel="${build.debuglevel}" destdir="${quicksetup.classes.dir}" includes="${files}" source="1.5" srcdir="src/quicksetup">
- <classpath refid="opends.path"/>
- </javac>
- </target>
-
- <!-- -->
- <!-- Compile a selected file in src/dsml folder -->
- <!-- -->
- <target name="compile-selected-files-in-dsml">
- <fail unless="files">Must set property 'files'</fail>
- <echo message="Compiling source (normal): ${files}"/>
- <mkdir dir="${dsml.classes.dir}"/>
- <javac debug="on" debuglevel="${build.debuglevel}" destdir="${dsml.classes.dir}" includes="${files}" source="1.5" srcdir="src/dsml">
- <classpath refid="opends.path"/>
- </javac>
- </target>
-
- <!-- -->
- <!-- Compile a selected file in src/snmp/src folder -->
- <!-- -->
- <target name="compile-selected-files-in-snmp">
- <fail unless="files">Must set property 'files'</fail>
- <mkdir dir="${classes.dir}"/>
- <javac debug="on" debuglevel="${build.debuglevel}" destdir="${classes.dir}" includes="${files}" source="1.5" srcdir="src/snmp/src">
- <classpath refid="opends.path"/>
- </javac>
- </target>
-
-</project>
diff --git a/opends/nbproject/ide-targets.xml b/opends/nbproject/ide-targets.xml
deleted file mode 100644
index b733c70..0000000
--- a/opends/nbproject/ide-targets.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir=".." name="Directory Server-IDE">
-
- <!-- Import build.xml definitions -->
- <import file="../build.xml"/>
-
- <!-- OpenDS path -->
- <path id="opends.path">
- <pathelement path="build/classes:build/build-tools/classes:lib/activation.jar:lib/aspectjrt.jar:lib/je.jar:lib/mail.jar:build/quicksetup/classes:build/build-tools/build-tools.jar:build/unit-tests/classes:ext/testng/lib/testng-5.7b-jdk15.jar:ext/ant/lib/ant.jar:ext/svnkit/svnkit.jar:ext/emma/lib/emma.jar:build/dsml/classes:resource/dsml/lib/jaxb-api.jar:resource/dsml/lib/jaxb-impl.jar:resource/dsml/lib/jsr173_1.0_api.jar:resource/dsml/lib/saaj-1.3.jar:resource/dsml/lib/saaj-impl-1.3.jar:resource/dsml/lib/j2ee.jar"/>
- <pathelement location="build/build-tools/classes"/>
- <pathelement location="build/classes"/>
- <pathelement location="build/quicksetup/classes"/>
- <pathelement location="build/unit-tests/classes"/>
- <pathelement location="build/dsml/classes"/>
- </path>
-
- <!-- -->
- <!-- Debug target call by NetBeans IDE -->
- <!-- -->
- <target depends="dynamicconstants" name="debug-nb">
- <!-- Set properties needed to find the packaged files -->
- <property location="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" name="pdir"/>
- <nbjpdastart addressproperty="jpda.address" name="Directory Server" transport="dt_socket">
- <classpath refid="opends.path"/>
- </nbjpdastart>
- <java classname="org.opends.server.core.DirectoryServer" failonerror="true" fork="true">
- <classpath refid="opends.path"/>
- <jvmarg value="-Dorg.opends.server.BuildRoot=${pdir}"/>
- <jvmarg value="-Dorg.opends.server.scriptName=start-ds"/>
- <jvmarg value="-Dorg.opends.server.ServerRoot=${pdir}"/>
- <arg value="--configClass=org.opends.server.extensions.ConfigFileHandler"/>
- <arg value="--configFile=${pdir}/config/config.ldif"/>
- <arg value="--nodetach"/>
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- </java>
- </target>
-</project>
diff --git a/opends/nbproject/project.xml b/opends/nbproject/project.xml
deleted file mode 100644
index 3fa6a21..0000000
--- a/opends/nbproject/project.xml
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <name>Directory Server</name>
- </general-data>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
- <!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>Directory Server</name>
- <properties/>
- <folders>
- <source-folder>
- <label>Directory Server</label>
- <location>.</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/admin/defn</label>
- <type>java</type>
- <location>src/admin/defn</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/admin/generated</label>
- <type>java</type>
- <location>src/admin/generated</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/ads</label>
- <type>java</type>
- <location>src/ads</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/build-tools</label>
- <type>java</type>
- <location>src/build-tools</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/guitools</label>
- <type>java</type>
- <location>src/guitools</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/messages/src</label>
- <type>java</type>
- <location>src/messages/src</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/messages/generated</label>
- <type>java</type>
- <location>src/messages/generated</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/quicksetup</label>
- <type>java</type>
- <location>src/quicksetup</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/server</label>
- <type>java</type>
- <location>src/server</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/snmp/src</label>
- <type>java</type>
- <location>src/snmp/src</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/snmp/generated</label>
- <type>java</type>
- <location>src/snmp/generated</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>tests/unit-tests-testng/src/server</label>
- <type>java</type>
- <location>tests/unit-tests-testng/src/server</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/messages/messages</label>
- <type>java</type>
- <location>src/messages/messages</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>src/dsml</label>
- <type>java</type>
- <location>src/dsml</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <script>build.xml</script>
- <target>package</target>
- </action>
- <action name="clean">
- <script>build.xml</script>
- <target>clean</target>
- </action>
- <action name="javadoc">
- <script>build.xml</script>
- <target>javadoc</target>
- </action>
- <action name="run">
- <script>build.xml</script>
- <target>run-server</target>
- </action>
- <action name="test">
- <script>build.xml</script>
- <target>test</target>
- </action>
- <action name="rebuild">
- <script>build.xml</script>
- <target>clean</target>
- <target>package</target>
- </action>
- <action name="debug">
- <script>nbproject/ide-targets.xml</script>
- <target>debug-nb</target>
- </action>
- <action name="run.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>run-selected-testng-file</target>
- <context>
- <property>run.class</property>
- <folder>tests/unit-tests-testng/src/server</folder>
- <pattern>\.java$</pattern>
- <format>relative-path-noext</format>
- <arity>
- <one-file-only/>
- </arity>
- </context>
- </action>
- <action name="debug.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>debug-selected-testng-file</target>
- <context>
- <property>debug.class</property>
- <folder>tests/unit-tests-testng/src/server</folder>
- <pattern>\.java$</pattern>
- <format>relative-path-noext</format>
- <arity>
- <one-file-only/>
- </arity>
- </context>
- </action>
- <action name="compile.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>compile-selected-files-in-server</target>
- <context>
- <property>files</property>
- <folder>src/server</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- <action name="compile.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>compile-selected-testng-file</target>
- <context>
- <property>files</property>
- <folder>tests/unit-tests-testng/src/server</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- <action name="run.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>run-selected-file-in-server</target>
- <context>
- <property>run.class</property>
- <folder>src/server</folder>
- <pattern>\.java$</pattern>
- <format>java-name</format>
- <arity>
- <one-file-only/>
- </arity>
- </context>
- </action>
- <action name="debug.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>debug-selected-file-in-server</target>
- <context>
- <property>debug.class</property>
- <folder>src/server</folder>
- <pattern>\.java$</pattern>
- <format>java-name</format>
- <arity>
- <one-file-only/>
- </arity>
- </context>
- </action>
- <action name="compile.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>compile-selected-files-in-ads</target>
- <context>
- <property>files</property>
- <folder>src/ads</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- <action name="compile.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>compile-selected-files-in-build-tools</target>
- <context>
- <property>files</property>
- <folder>src/build-tools</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- <action name="compile.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>compile-selected-files-in-guitools</target>
- <context>
- <property>files</property>
- <folder>src/guitools</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- <action name="compile.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>compile-selected-files-in-messages-src</target>
- <context>
- <property>files</property>
- <folder>src/messages/src</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- <action name="compile.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>compile-selected-files-in-quicksetup</target>
- <context>
- <property>files</property>
- <folder>src/quicksetup</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- <action name="compile.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>compile-selected-files-in-dsml</target>
- <context>
- <property>files</property>
- <folder>src/dsml</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- <action name="compile.single">
- <script>nbproject/ide-file-targets.xml</script>
- <target>compile-selected-files-in-snmp</target>
- <context>
- <property>files</property>
- <folder>src/snmp/src</folder>
- <pattern>\.java$</pattern>
- <format>relative-path</format>
- <arity>
- <separated-files>,</separated-files>
- </arity>
- </context>
- </action>
- </ide-actions>
- <export>
- <type>folder</type>
- <location>build/build-tools/classes</location>
- <script>build.xml</script>
- <build-target>package</build-target>
- </export>
- <export>
- <type>folder</type>
- <location>build/classes</location>
- <script>build.xml</script>
- <build-target>package</build-target>
- </export>
- <export>
- <type>folder</type>
- <location>build/quicksetup/classes</location>
- <script>build.xml</script>
- <build-target>package</build-target>
- </export>
- <export>
- <type>folder</type>
- <location>build/unit-tests/classes</location>
- <script>build.xml</script>
- <build-target>package</build-target>
- </export>
- <export>
- <type>folder</type>
- <location>build/dsml/classes</location>
- <script>build.xml</script>
- <build-target>package</build-target>
- </export>
- <view>
- <items>
- <source-folder style="packages">
- <label>src/admin/defn</label>
- <location>src/admin/defn</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/admin/generated</label>
- <location>src/admin/generated</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/ads</label>
- <location>src/ads</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/build-tools</label>
- <location>src/build-tools</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/guitools</label>
- <location>src/guitools</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/messages/src</label>
- <location>src/messages/src</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/messages/generated</label>
- <location>src/messages/generated</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/quicksetup</label>
- <location>src/quicksetup</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/server</label>
- <location>src/server</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/snmp/src</label>
- <location>src/snmp/src</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/snmp/generated</label>
- <location>src/snmp/generated</location>
- </source-folder>
- <source-folder style="packages">
- <label>tests/unit-tests-testng/src/server</label>
- <location>tests/unit-tests-testng/src/server</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/messages/messages</label>
- <location>src/messages/messages</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/dsml</label>
- <location>src/dsml</location>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="rebuild"/>
- <ide-action name="clean"/>
- <ide-action name="javadoc"/>
- <ide-action name="run"/>
- <ide-action name="test"/>
- <ide-action name="debug"/>
- </context-menu>
- </view>
- <subprojects>
- <project>.</project>
- </subprojects>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
- <compilation-unit>
- <package-root>src/admin/defn</package-root>
- <package-root>src/admin/generated</package-root>
- <package-root>src/ads</package-root>
- <package-root>src/build-tools</package-root>
- <package-root>src/guitools</package-root>
- <package-root>src/messages/src</package-root>
- <package-root>src/messages/generated</package-root>
- <package-root>src/quicksetup</package-root>
- <package-root>src/server</package-root>
- <package-root>src/snmp/src</package-root>
- <package-root>src/snmp/generated</package-root>
- <package-root>tests/unit-tests-testng/src/server</package-root>
- <package-root>src/messages/messages</package-root>
- <package-root>src/dsml</package-root>
- <classpath mode="compile">build/classes:build/build-tools/classes:lib/activation.jar:lib/aspectjrt.jar:lib/je.jar:lib/mail.jar:lib/jdmkrt.jar:lib/jdmktk.jar:build/quicksetup/classes:build/build-tools/build-tools.jar:build/unit-tests/classes:ext/testng/lib/testng-5.7b-jdk15.jar:ext/ant/lib/ant.jar:ext/svnkit/svnkit.jar:ext/emma/lib/emma.jar:build/dsml/classes:resource/dsml/lib/jaxb-api.jar:resource/dsml/lib/jaxb-impl.jar:resource/dsml/lib/jsr173_1.0_api.jar:resource/dsml/lib/saaj-1.3.jar:resource/dsml/lib/saaj-impl-1.3.jar:resource/dsml/lib/j2ee.jar</classpath>
- <built-to>build/build-tools/classes</built-to>
- <built-to>build/classes</built-to>
- <built-to>build/quicksetup/classes</built-to>
- <built-to>build/unit-tests/classes</built-to>
- <built-to>build/dsml/classes</built-to>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
- </configuration>
-</project>
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index 822809f..10ad394 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -135,7 +135,13 @@
* cases that depend on this specific value of "o=test".
*/
public static final String TEST_ROOT_DN_STRING = "o=test";
-
+
+ /**
+ * The string representation of the OpenDMK jar file location
+ * that will be used as base to determine if snmp is included or not
+ */
+ public static final String PROPERTY_OPENDMK_LOCATION =
+ "org.opends.server.snmp.opendmk";
/**
* The test text writer for the Debug Logger
@@ -254,13 +260,20 @@
File testBinDir = new File(testRoot, "bin");
// Snmp resource
+ String opendmkJarFileLocation =
+ System.getProperty(PROPERTY_OPENDMK_LOCATION);
+
+ File opendmkJar = new File(opendmkJarFileLocation, "jdmkrt.jar");
+
File snmpResourceDir = new File(buildRoot + File.separator + "src" +
File.separator + "snmp" + File.separator +
"resource");
+ File snmpConfigDir = new File(snmpResourceDir, "config");
+
File testSnmpResourceDir = new File (testConfigDir + File.separator +
"snmp");
-
+
if (Boolean.getBoolean(PROPERTY_COPY_CLASSES_TO_TEST_PKG)) {
copyDirectory(serverClassesDir, testClassesDir);
copyDirectory(unitClassesDir, testClassesDir);
@@ -287,6 +300,11 @@
new File(testConfigDir, "server-cert.p12"));
copyFile(new File(testResourceDir, "client-cert.p12"),
new File(testConfigDir, "client-cert.p12"));
+
+ if (opendmkJar.exists()) {
+ appendFile(new File(snmpConfigDir, "config.snmp.ldif"),
+ new File(testConfigDir,"config.ldif"));
+ }
for (File f : testBinDir.listFiles())
{
@@ -814,6 +832,21 @@
in.close();
out.close();
}
+
+ public static void appendFile(File src, File dst) throws IOException {
+ InputStream in = new FileInputStream(src);
+ OutputStream out = new FileOutputStream(dst, true);
+
+ // Transfer bytes from in to out
+ byte[] buf = new byte[8192];
+ int len;
+ while ((len = in.read(buf)) > 0) {
+ out.write(buf, 0, len);
+ }
+ in.close();
+ out.close();
+ }
+
/**
* Get the LDAP port the test environment Directory Server instance is
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();
}
/**
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
index 7bf58f9..277079e 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
@@ -60,7 +60,7 @@
* A simple test for : - JMX connection establishment withou using SSL -
* JMX get and set - configuration change
*/
-@Test(enabled=false, groups = {"precommit", "snmp"}, sequential = true)
+@Test(enabled=true, groups = {"precommit", "snmp"}, sequential = true)
public class SNMPSyncManagerV2AccessTest extends SNMPConnectionManager {
@BeforeClass
@@ -86,7 +86,7 @@
{"dsSlaveHits"}};
}
- @Test(enabled=false,dataProvider = "listAttributes")
+ @Test(enabled=true,dataProvider = "listAttributes")
public void checkAttribute(String attributeName) {
// get the SNMP peer agent
@@ -194,7 +194,7 @@
{"", false}};
}
- @Test(enabled = false,dataProvider = "listCommunities")
+ @Test(enabled = true,dataProvider = "listCommunities")
public void checkCommunity(String community, boolean expectedResult) {
try {
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java
index 63d5eaa..c436bde 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java
@@ -54,7 +54,7 @@
* <p>As a reminder, if you wish to query the SNMP agent example provided
* as part of Java DMK, use port 8085.
*/
-@Test(enabled=false, groups = {"precommit", "snmp"}, sequential = true)
+@Test(enabled=true, groups = {"precommit", "snmp"}, sequential = true)
public class SNMPTrapManagerTest extends SNMPConnectionManager {
@BeforeClass
@@ -63,7 +63,7 @@
super.setUp();
}
- @Test(enabled = false)
+ @Test(enabled = true)
public void checkTraps() {
try {
--
Gitblit v1.10.0