89 fix next release setting (#95)

* Testcase cleanup Signed-off-by: John Eberhard <[email protected]> * Change to compile with JDK 6 * Another compile fix Signed-off-by: John Eberhard <[email protected]> * Fix Debugger in JDSQL400. Reduce warnings in Native driver. Signed-off-by: John Eberhard <[email protected]> * Fix permissions for INetServer testcases Signed-off-by: John Eberhard <[email protected]> * More INetServer fixes Signed-off-by: John Eberhard <[email protected]> --------- Signed-off-by: John Eberhard <[email protected]>
IBM · Apr 5, 2024 · fe2eef6 · fe2eef6
1 parent b22e0cf
commit fe2eef6
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 78 deletions.
diff --git a/src/test/DDM/DDMRegressionTestcase.java b/src/test/DDM/DDMRegressionTestcase.java
@@ -1871,7 +1871,7 @@ else if (systemObject_.getVRM() >= AS400.generateVRM(5, 1, 0))
           systemObject_.connectService(AS400.RECORDACCESS);
           systemObject_.disconnectService(AS400.RECORDACCESS);
         }
-        else if (i == 2 || i == 3)
+        else if (i == 2 || i == 3 || i == 4 || i == 5)
         {
           systemObject_.connectService(AS400.RECORDACCESS);
           systemObject_.disconnectService(AS400.RECORDACCESS);

diff --git a/src/test/INet/INetServerTestcase.java b/src/test/INet/INetServerTestcase.java
@@ -75,7 +75,7 @@ protected void setup ()
       super.setup();
       netserver_ = new ISeriesNetServer(systemObject_);
       netserverPwr_ = new ISeriesNetServer(pwrSys_);
-      original_NetServer_Name = netserver_.getName();
+      original_NetServer_Name = netserverPwr_.getName();
       if (original_NetServer_Name != null) {
         original_NetServer_Name = original_NetServer_Name.toUpperCase();
       }
@@ -238,7 +238,7 @@ public void Var001()
     {
         try
         {
-            ISeriesNetServer netser = new ISeriesNetServer(systemObject_);
+            ISeriesNetServer netser = new ISeriesNetServer(pwrSys_);
             if (validateAttributeValues(netser)) succeeded();
             else failed();
         }
@@ -520,8 +520,8 @@ public void Var008()
     {
         try
         {
-            netserver_.refresh();
-            String value = netserver_.getName();
+            netserverPwr_.refresh();
+            String value = netserverPwr_.getName();
 
             ///System.out.println(value + ", " + original_NetServer_NamePending);
             assertCondition(value.equalsIgnoreCase(original_NetServer_Name));
@@ -540,9 +540,9 @@ public void Var009()
     {
         try
         {
-            netserver_.refresh();
-            netserver_.getName();
-            String value = netserver_.getName();
+            netserverPwr_.refresh();
+            netserverPwr_.getName();
+            String value = netserverPwr_.getName();
 
             assertCondition(value.equalsIgnoreCase(original_NetServer_Name));
         }
@@ -559,8 +559,8 @@ public void Var010()
     {
         try
         {
-            netserver_.setName("TOOLBOX");
-            String value = netserver_.getName();
+            netserverPwr_.setName("TOOLBOX");
+            String value = netserverPwr_.getName();
 
             assertCondition(value.equalsIgnoreCase(original_NetServer_Name));
             cleanup();
@@ -578,10 +578,10 @@ public void Var011()
     {
         try
         {
-            netserver_.setName("TOOLBOX");
-            netserver_.refresh();
+            netserverPwr_.setName("TOOLBOX");
+            netserverPwr_.refresh();
 
-            String value = netserver_.getName();
+            String value = netserverPwr_.getName();
 
             assertCondition(value.equalsIgnoreCase(original_NetServer_Name));
         }
@@ -1050,10 +1050,10 @@ public void Var019()
         try
         {
             startIfStopped(false);
-            netserver_.refresh();
-            String asString = netserver_.toString();
+            netserverPwr_.refresh();
+            String asString = netserverPwr_.toString();
             ///System.out.println("DEBUG: toString() returned: |" + asString + "|");
-            String expected = "ISeriesNetServer (system: "+systemObject_.getSystemName()+"; name: "+netserver_.getName()+"):";
+            String expected = "ISeriesNetServer (system: "+pwrSys_.getSystemName()+"; name: "+netserverPwr_.getName()+"):";
             ///System.out.println("DEBUG: expected: |" + expected +"|");
             assertCondition(asString.startsWith(expected));
         }
@@ -1092,7 +1092,7 @@ public void Var020()
     {
         try
         {
-            ISeriesNetServer netser = new ISeriesNetServer(systemObject_);
+            ISeriesNetServer netser = new ISeriesNetServer(pwrSys_);
             ISeriesNetServerFileShare[] fileSharesList = netser.listFileShares();
             long listLength = fileSharesList.length;
             String[] s = new String[(int)listLength];
@@ -1137,7 +1137,7 @@ public void Var021()
         try
         {
 
-            ISeriesNetServer netser = new ISeriesNetServer(systemObject_);
+            ISeriesNetServer netser = new ISeriesNetServer(pwrSys_);
 
 	    // 04/05/2022 list all 
             ISeriesNetServerFileShare[] fileSharesList = netser.listFileShares("*ALL" /* "QIBM" */);
@@ -1205,7 +1205,7 @@ public void Var022()
     {
         try
         {
-            ISeriesNetServer netser = new ISeriesNetServer(systemObject_);
+            ISeriesNetServer netser = new ISeriesNetServer(pwrSys_);
             ISeriesNetServerPrintShare[] printSharesList = netser.listPrintShares();
             long listLength = printSharesList.length;
             String[] s = new String[(int)listLength];
@@ -1241,9 +1241,9 @@ public void Var023()
     {
       try
       {
-        ISeriesNetServerShare[] allShares = netserver_.listShares();
-        ISeriesNetServerFileShare[] fileShares = netserver_.listFileShares();
-        ISeriesNetServerPrintShare[] printShares = netserver_.listPrintShares();
+        ISeriesNetServerShare[] allShares = netserverPwr_.listShares();
+        ISeriesNetServerFileShare[] fileShares = netserverPwr_.listFileShares();
+        ISeriesNetServerPrintShare[] printShares = netserverPwr_.listPrintShares();
         if (DEBUG) {
           System.out.println("Total shares: " + allShares.length +"; file shares: " + fileShares.length+"; print shares: " + printShares.length);
         }
@@ -1308,7 +1308,7 @@ public void Var024()
     {
         try
         {
-            ISeriesNetServer netser = new ISeriesNetServer(systemObject_);
+            ISeriesNetServer netser = new ISeriesNetServer(pwrSys_);
             ISeriesNetServerPrintShare[] printSharesList = netser.listPrintShares("BOGUSTOOLBOX");
             long listLength = printSharesList.length;
             String[] s = new String[(int)listLength];
@@ -1763,7 +1763,7 @@ public void Var031()
     {
         try
         {
-           ISeriesNetServer ns = new ISeriesNetServer(systemObject_);
+           ISeriesNetServer ns = new ISeriesNetServer(pwrSys_);
 
            if (ns.getDescription().length() > 0  )
               succeeded();
@@ -1811,7 +1811,7 @@ public void Var032()
     {
         try
         {
-           ISeriesNetServer ns = new ISeriesNetServer(systemObject_);
+           ISeriesNetServer ns = new ISeriesNetServer(pwrSys_);
            if (ns.getDomainName().length() > 0)
               succeeded();
             else
@@ -1862,7 +1862,7 @@ public void Var033()
     {
         try
         {
-           ISeriesNetServer ns = new ISeriesNetServer(systemObject_);
+           ISeriesNetServer ns = new ISeriesNetServer(pwrSys_);
 
            if (ns.getGuestUserProfile().length() >= 0  )
               succeeded();
@@ -1940,13 +1940,13 @@ public void Var035()
     {
         try
         {
-           ISeriesNetServer ns = new ISeriesNetServer(systemObject_);
+           ISeriesNetServer ns = new ISeriesNetServer(pwrSys_);
 
            if (ns.getIdleTimeout() > 0 ||
                ns.getIdleTimeout() == -1)
               succeeded();
             else
-              failed("ISeriesNetServer idle timeout is not valid.");
+              failed("ISeriesNetServer idle timeout is not valid but is "+ns.getIdleTimeout());
         }
         catch (Exception e)
         {
@@ -2053,7 +2053,7 @@ public void Var037()
     {
         try
         {
-           ISeriesNetServer ns = new ISeriesNetServer(systemObject_);
+           ISeriesNetServer ns = new ISeriesNetServer(pwrSys_);
 
            if (ns.getName().length() > 0 )
               succeeded();
@@ -2165,7 +2165,7 @@ public void Var039()
     {
         try
         {
-           ISeriesNetServer ns = new ISeriesNetServer(systemObject_);
+           ISeriesNetServer ns = new ISeriesNetServer(pwrSys_);
 
            if (ns.getWINSPrimaryAddress().length() >= 0 )
               succeeded();
@@ -2214,7 +2214,7 @@ public void Var040()
     {
         try
         {
-           ISeriesNetServer ns = new ISeriesNetServer(systemObject_);
+           ISeriesNetServer ns = new ISeriesNetServer(pwrSys_);
 
            if (ns.getWINSScopeID().length() >= 0 )
               succeeded();
@@ -2264,7 +2264,7 @@ public void Var041()
     {
         try
         {
-           ISeriesNetServer ns = new ISeriesNetServer(systemObject_);
+           ISeriesNetServer ns = new ISeriesNetServer(pwrSys_);
 
            if (ns.getWINSSecondaryAddress().length() >= 0 )
               succeeded();
@@ -2398,7 +2398,7 @@ public void Var043()
           return;
         }
 
-        ISeriesNetServer ns = new ISeriesNetServer(systemObject_);
+        ISeriesNetServer ns = new ISeriesNetServer(pwrSys_);
         int authMethod = ns.getAuthenticationMethod();
         assertCondition(authMethod >= ISeriesNetServerFileShare.NOT_ENABLED &&
                         authMethod  <= ISeriesNetServerFileShare.ENABLED_AND_MIXED,

diff --git a/src/test/MiscAH/FATestcase.java b/src/test/MiscAH/FATestcase.java
@@ -2124,7 +2124,14 @@ public void Var082()
             String testValue = "*NONE";
 
             String returnValue = fa.getAudit();
-            assertCondition(returnValue.equals(testValue));
+            // Auditing can be enabled on a system, so we should support the values
+            // that can be seen. 
+            boolean passed = returnValue.equals(testValue);
+            if (!passed) {
+                testValue="*ALL";
+              passed = returnValue.equals(testValue);
+            }
+            assertCondition(returnValue.equals(testValue), "Got '"+returnValue+"' sb '"+testValue+"'");
         }
         catch (Exception e)
         {