From 9ffdbd2e693a9c6e1f3f9203295a490df03ad0cb Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Tue, 19 Mar 2013 21:23:17 +0000
Subject: [PATCH] CR-1441 Update snmp testscases: fix test step messages and remove known issues

---
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_customconf_tests.xml   |   26 ++++++------
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml        |   40 ++++++++------------
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_customconf_tests.xml |   26 ++++++------
 3 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
index d706989..00e0059 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
@@ -372,7 +372,7 @@
   <!--- Test Case information
     #@TestMarker          SNMP MIB values
     #@TestName            snmp_mibvalues: TODO
-    #@TestIssue           3862
+    #@TestIssue           none
     #@TestPurpose         TODO.
     #@TestPreamble        none
     #@TestStep            TODO.
@@ -432,7 +432,9 @@
               key = 'dsApplIfSearchOps.%s' % indexLDAP
               DEFAULT_VALUES[key] = \
                 str(int(DEFAULT_VALUES[key]) + nbLoop)
-              
+              key = 'dsApplIfWholeSubtreeSearchOps.%s' % indexLDAP
+              DEFAULT_VALUES[key] = \
+                str(int(DEFAULT_VALUES[key]) + nbLoop)
             </script>
               
             <call function="'testStep'">
@@ -444,8 +446,7 @@
               'snmpHost'      : DIRECTORY_INSTANCE_HOST ,
               'snmpPort'      : SNMP_PORT ,
               'snmpCommunity' : community ,
-              'index'         : indexLDAP ,
-              'knownIssue'    : '3862'
+              'index'         : indexLDAP
               }
             </call>
 
@@ -492,7 +493,7 @@
   <!--- Test Case information
     #@TestMarker          SNMP MIB values
     #@TestName            snmp_mibvalues: TODO
-    #@TestIssue           3862
+    #@TestIssue           none
     #@TestPurpose         TODO.
     #@TestPreamble        none
     #@TestStep            TODO.
@@ -574,8 +575,7 @@
               'snmpHost'      : DIRECTORY_INSTANCE_HOST ,
               'snmpPort'      : SNMP_PORT ,
               'snmpCommunity' : community ,
-              'index'         : indexLDAP ,
-              'knownIssue'    : '3862'
+              'index'         : indexLDAP
               }
             </call>
 
@@ -622,7 +622,7 @@
    <!--- Test Case information
     #@TestMarker          SNMP MIB values
     #@TestName            snmp_mibvalues: TODO
-    #@TestIssue           3862
+    #@TestIssue           none
     #@TestPurpose         TODO.
     #@TestPreamble        none
     #@TestStep            TODO.
@@ -693,8 +693,7 @@
               'snmpHost'      : DIRECTORY_INSTANCE_HOST ,
               'snmpPort'      : SNMP_PORT ,
               'snmpCommunity' : community ,
-              'index'         : indexLDAP ,
-              'knownIssue'    : '3862'
+              'index'         : indexLDAP
               }
             </call>
 
@@ -741,7 +740,7 @@
   <!--- Test Case information
     #@TestMarker          SNMP MIB values
     #@TestName            snmp_mibvalues: TODO
-    #@TestIssue           3862
+    #@TestIssue           none
     #@TestPurpose         TODO.
     #@TestPreamble        none
     #@TestStep            TODO.
@@ -811,8 +810,7 @@
               'snmpHost'      : DIRECTORY_INSTANCE_HOST ,
               'snmpPort'      : SNMP_PORT ,
               'snmpCommunity' : community ,
-              'index'         : indexLDAP ,
-              'knownIssue'    : '3862'
+              'index'         : indexLDAP
               }
             </call>
 
@@ -859,7 +857,7 @@
   <!--- Test Case information
     #@TestMarker          SNMP MIB values
     #@TestName            snmp_mibvalues: TODO
-    #@TestIssue           3862
+    #@TestIssue           none
     #@TestPurpose         TODO.
     #@TestPreamble        none
     #@TestStep            TODO.
@@ -931,8 +929,7 @@
               'snmpHost'      : DIRECTORY_INSTANCE_HOST ,
               'snmpPort'      : SNMP_PORT ,
               'snmpCommunity' : community ,
-              'index'         : indexLDAP ,
-              'knownIssue'    : '3862'
+              'index'         : indexLDAP
               }
             </call>
 
@@ -979,7 +976,7 @@
   <!--- Test Case information
     #@TestMarker          SNMP MIB values
     #@TestName            snmp_mibvalues: TODO
-    #@TestIssue           3862
+    #@TestIssue           none
     #@TestPurpose         TODO.
     #@TestPreamble        none
     #@TestStep            TODO.
@@ -1099,8 +1096,7 @@
               'snmpHost'      : DIRECTORY_INSTANCE_HOST ,
               'snmpPort'      : SNMP_PORT ,
               'snmpCommunity' : community ,
-              'index'         : indexLDAP ,
-              'knownIssue'    : '3862'
+              'index'         : indexLDAP
               }
             </call>
 
@@ -1634,7 +1630,7 @@
     #@TestName            status: check error message and status when
                           the opendmk-jarfile property is set to a
                           wrong value
-    #@TestIssue           3943
+    #@TestIssue           none
     #@TestPurpose         Check error message and status when
                           the opendmk-jarfile property is set to a
                           wrong value.
@@ -1725,10 +1721,6 @@
               }
             </call>
 
-            <call function="'setKnownIssue'">
-              { 'issueId' : '3943' }
-            </call>
-
             <call function="'testStep'">
               { 'stepMessage' : 'Get status when the server is started' }
             </call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_customconf_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_customconf_tests.xml
index d521ade..fa57b8b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_customconf_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_customconf_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
- !      Portions Copyright 2012 ForgeRock AS
+ !      Portions Copyright 2012-2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -250,9 +250,9 @@
               }
             </call>
 
-            <!-- @Step3: SNMPGet with the new community -->
+            <!-- @Step3: SNMPGet from an allowed manager -->
             <call function="'testStep'">
-              { 'stepMessage' : 'SNMPGet with the new community.' }
+              { 'stepMessage' : 'SNMPGet from an allowed manager.' }
             </call>
 
             <call function="'SNMPGet'">
@@ -266,9 +266,9 @@
               }
             </call>
 
-            <!-- @Step4: Restore the community property -->
+            <!-- @Step4: Restore the allowed-manager property -->
             <call function="'testStep'">
-              { 'stepMessage' : 'Restore the community property.' }
+              { 'stepMessage' : 'Restore the allowed-manager property.' }
             </call>
 
             <call function="'dsconfig'">
@@ -384,9 +384,9 @@
               }
             </call>
 
-            <!-- @Step3: SNMPGet with the old community -->
+            <!-- @Step3: SNMPGet from a not allowed manager -->
             <call function="'testStep'">
-              { 'stepMessage' : 'SNMPGet with the old community.' }
+              { 'stepMessage' : 'SNMPGet from a not allowed manager.' }
             </call>
 
             <call function="'SNMPGet'">
@@ -400,9 +400,9 @@
               }
             </call>
 
-            <!-- @Step4: Restore the community property -->
+            <!-- @Step4: Restore the allowed-manager property -->
             <call function="'testStep'">
-              { 'stepMessage' : 'Restore the community property.' }
+              { 'stepMessage' : 'Restore the allowed-manager property.' }
             </call>
 
             <call function="'dsconfig'">
@@ -531,9 +531,9 @@
               }
             </call>
 
-            <!-- @Step3: SNMPGet from a not allowed manager -->
+            <!-- @Step3: SNMPGet from an allowed manager -->
             <call function="'testStep'">
-              { 'stepMessage' : 'SNMPGet from a not allowed manager.' }
+              { 'stepMessage' : 'SNMPGet from an allowed manager.' }
             </call>
 
             <call function="'SNMPGet'">
@@ -547,9 +547,9 @@
               }
             </call>
 
-            <!-- @Step4: Restore the community property -->
+            <!-- @Step4: Restore the allowed-manager property -->
             <call function="'testStep'">
-              { 'stepMessage' : 'Restore the community property.' }
+              { 'stepMessage' : 'Restore the allowed-manager property.' }
             </call>
 
             <call function="'dsconfig'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_customconf_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_customconf_tests.xml
index 5a72392..4928565 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_customconf_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_customconf_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
- !      Portions Copyright 2012 ForgeRock AS
+ !      Portions Copyright 2012-2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -250,9 +250,9 @@
               }
             </call>
 
-            <!-- @Step3: SNMPGet with the new community -->
+            <!-- @Step3: SNMPGet from an allowed manager -->
             <call function="'testStep'">
-              { 'stepMessage' : 'SNMPGet with the new community.' }
+              { 'stepMessage' : 'SNMPGet from an allowed manager.' }
             </call>
 
             <call function="'SNMPGet'">
@@ -266,9 +266,9 @@
               }
             </call>
 
-            <!-- @Step4: Restore the community property -->
+            <!-- @Step4: Restore the allowed-manager property -->
             <call function="'testStep'">
-              { 'stepMessage' : 'Restore the community property.' }
+              { 'stepMessage' : 'Restore the allowed-manager property.' }
             </call>
 
             <call function="'dsconfig'">
@@ -384,9 +384,9 @@
               }
             </call>
 
-            <!-- @Step3: SNMPGet with the old community -->
+            <!-- @Step3: SNMPGet from a not allowed manager -->
             <call function="'testStep'">
-              { 'stepMessage' : 'SNMPGet with the old community.' }
+              { 'stepMessage' : 'SNMPGet from a not allowed manager.' }
             </call>
 
             <call function="'SNMPGet'">
@@ -400,9 +400,9 @@
               }
             </call>
 
-            <!-- @Step4: Restore the community property -->
+            <!-- @Step4: Restore the allowed-manager property -->
             <call function="'testStep'">
-              { 'stepMessage' : 'Restore the community property.' }
+              { 'stepMessage' : 'Restore the allowed-manager property.' }
             </call>
 
             <call function="'dsconfig'">
@@ -531,9 +531,9 @@
               }
             </call>
 
-            <!-- @Step3: SNMPGet from a not allowed manager -->
+            <!-- @Step3: SNMPGet from an allowed manager -->
             <call function="'testStep'">
-              { 'stepMessage' : 'SNMPGet from a not allowed manager.' }
+              { 'stepMessage' : 'SNMPGet from an allowed manager.' }
             </call>
 
             <call function="'SNMPGet'">
@@ -547,9 +547,9 @@
               }
             </call>
 
-            <!-- @Step4: Restore the community property -->
+            <!-- @Step4: Restore the allowed-manager property -->
             <call function="'testStep'">
-              { 'stepMessage' : 'Restore the community property.' }
+              { 'stepMessage' : 'Restore the allowed-manager property.' }
             </call>
 
             <call function="'dsconfig'">

--
Gitblit v1.10.0