Modify the signatures for verify methods

Author: sankarpn

integration-tests/src/test/resources/sitconfig/java/SitConfigTests.java

@@ -30,8 +30,6 @@
 import weblogic.j2ee.descriptor.wl.JMSBean;
 import weblogic.j2ee.descriptor.wl.UniformDistributedTopicBean;
 import weblogic.management.configuration.DomainMBean;
-import weblogic.management.mbeanservers.edit.EditServiceMBean;
-import weblogic.management.mbeanservers.edit.ConfigurationManagerMBean;
 import weblogic.management.configuration.JDBCSystemResourceMBean;
 import weblogic.management.configuration.JMSSystemResourceMBean;
 import weblogic.management.configuration.NetworkAccessPointMBean;
@@ -40,6 +38,8 @@
 import weblogic.management.configuration.WLDFSystemResourceMBean;
 import weblogic.management.jmx.MBeanServerInvocationHandler;
 import weblogic.management.mbeanservers.domainruntime.DomainRuntimeServiceMBean;
+import weblogic.management.mbeanservers.edit.ConfigurationManagerMBean;
+import weblogic.management.mbeanservers.edit.EditServiceMBean;
 import weblogic.management.mbeanservers.runtime.RuntimeServiceMBean;
 import weblogic.management.runtime.ServerRuntimeMBean;
 
@@ -75,6 +75,7 @@ public class SitConfigTests {
   private final String adminPort;
   private final String adminUser;
   private final String adminPassword;
+  private final String serverName;
 
   /**
    * Main method to create the SitConfigTests object and run the configuration override tests. To
@@ -94,27 +95,35 @@ public static void main(String args[]) throws Exception {
     String adminUser = args[2];
     String adminPassword = args[3];
     String testName = args[4];
+    String serverName = args[5];
 
-    SitConfigTests test = new SitConfigTests(adminHost, adminPort, adminUser, adminPassword);
+    SitConfigTests test =
+        new SitConfigTests(adminHost, adminPort, adminUser, adminPassword, serverName);
 
     ServerRuntimeMBean runtimeMBean = test.runtimeServiceMBean.getServerRuntime();
     println("Sitconfig State:" + runtimeMBean.isInSitConfigState());
 
     if (testName.equals("testCustomSitConfigOverridesForDomain")) {
       // the values passed to these verify methods are the attribute values overrrideen in the
       // config.xml. These are just randomly chosen attributes and values to override
-      test.verifyDebugFlagJMXCore(true);
-      test.verifyDebugFlagServerLifeCycle(true);
-      test.verifyMaxMessageSize(78787878);
-      test.verifyConnectTimeout(120);
-      test.verifyRestartMax(5);
-      test.verifyT3ChannelPublicAddress(adminHost);
-      test.verifyT3ChannelPublicPort(30091);
-      test.verifyMsSeverMaxMessageSize(77777777,"managed-server1");
+      test.verifyDebugFlagJMXCore(serverName, true);
+      test.verifyDebugFlagServerLifeCycle(serverName, true);
+      test.verifyMaxMessageSize(serverName, 78787878);
+      test.verifyMaxMessageSize(serverName, 77777777);
+      test.verifyConnectTimeout(serverName, 120);
+      test.verifyRestartMax(serverName, 5);
+      test.verifyT3ChannelPublicAddress(serverName, adminHost);
+      test.verifyT3ChannelPublicPort(serverName, 30091);
+    }
+
+    if (testName.equals("testCustomSitConfigOverridesForDomainMS")) {
+      // the values passed to these verify methods are the attribute values overrrideen in the
+      // config.xml. These are just randomly chosen attributes and values to override
+      test.verifyMaxMessageSize(serverName, 77777777);
     }
 
     if (testName.equals("testCustomSitConfigOverridesForJdbc")) {
-      String JDBC_URL = args[5];
+      String JDBC_URL = args[6];
       test.testSystemResourcesJDBCAttributeChange("JdbcTestDataSource-0", JDBC_URL);
     }
 
@@ -133,16 +142,19 @@ public static void main(String args[]) throws Exception {
    * @param adminHost - administration server t3 public address
    * @param adminPort - administration server t3 public port
    * @param adminUser - administration server user name
-   * @param adminPassword - - administration server password
+   * @param adminPassword - administration server password
+   * @param serverName - name of the server for which the configuration values to be checked
    * @throws Exception when connection cannot be created for reasons like incorrect administration
    *     server name, port , user name , password or administration server not running
    */
-  public SitConfigTests(String adminHost, String adminPort, String adminUser, String adminPassword)
+  public SitConfigTests(
+      String adminHost, String adminPort, String adminUser, String adminPassword, String serverName)
       throws Exception {
     this.adminHost = adminHost;
     this.adminPort = adminPort;
     this.adminUser = adminUser;
     this.adminPassword = adminPassword;
+    this.serverName = serverName;
     createConnections();
   }
 
@@ -165,9 +177,8 @@ private void createConnections() throws Exception {
     runtimeServiceMBean =
         (RuntimeServiceMBean)
             MBeanServerInvocationHandler.newProxyInstance(runtimeMbs, runtimeserviceObjectName);
-    
-    ObjectName domainServiceObjectName = new ObjectName(DomainRuntimeServiceMBean.OBJECT_NAME);
 
+    ObjectName domainServiceObjectName = new ObjectName(DomainRuntimeServiceMBean.OBJECT_NAME);
   }
 
   /**
@@ -227,9 +238,11 @@ private MBeanServerConnection lookupMBeanServerConnection(
    *
    * @param expectedValue - boolean value to be checked in the debug-jmx-core attribute in
    *     ServerMBean in ServerConfig tree.
+   * @param serverName - name of the weblogic server instance for which the debug flag to be checked
+   *     as a String
    */
-  protected void verifyDebugFlagJMXCore(boolean expectedValue) {
-    ServerMBean serverMBean = getServerMBean();
+  protected void verifyDebugFlagJMXCore(String serverName, boolean expectedValue) {
+    ServerMBean serverMBean = getServerMBean(serverName);
     ServerDebugMBean serverDebugMBean = serverMBean.getServerDebug();
     boolean debugFlag = serverDebugMBean.getDebugJMXCore();
     assert expectedValue == debugFlag
@@ -242,10 +255,11 @@ protected void verifyDebugFlagJMXCore(boolean expectedValue) {
    * Java assertions to verify if both the values match.
    *
    * @param expectedValue - boolean value to be checked in the debug-server-life-cycle attribute in
-   *     ServerMBean in ServerConfig MBean tree
+   *     ServerMBean in ServerConfig MBean tree * @param serverName - name of the weblogic server
+   *     instance for which the debug flag to be checked as a String
    */
-  protected void verifyDebugFlagServerLifeCycle(boolean expectedValue) {
-    ServerMBean serverMBean = getServerMBean();
+  protected void verifyDebugFlagServerLifeCycle(String serverName, boolean expectedValue) {
+    ServerMBean serverMBean = getServerMBean(serverName);
     ServerDebugMBean serverDebugMBean = serverMBean.getServerDebug();
     boolean debugFlag = serverDebugMBean.getDebugServerLifeCycle();
     assert expectedValue == debugFlag
@@ -259,9 +273,11 @@ protected void verifyDebugFlagServerLifeCycle(boolean expectedValue) {
    *
    * @param expectedValue - integer value to be checked in the connect-timeout attribute in
    *     ServerMBean in ServerConfig tree.
+   * @param serverName - name of the weblogic server instance for which the connect timeout to be
+   *     checked as a String
    */
-  protected void verifyConnectTimeout(int expectedValue) {
-    ServerMBean serverMBean = getServerMBean();
+  protected void verifyConnectTimeout(String serverName, int expectedValue) {
+    ServerMBean serverMBean = getServerMBean(serverName);
     int got = serverMBean.getConnectTimeout();
     assert expectedValue == got
         : "Didn't get the expected value " + expectedValue + " for ConnectTimeout";
@@ -274,9 +290,11 @@ protected void verifyConnectTimeout(int expectedValue) {
    *
    * @param expectedValue - integer value to be checked in the restart-max attribute in ServerMBean
    *     in ServerConfig tree.
+   * @param serverName - name of the weblogic server instance for which the restart max to be
+   *     checked as a String
    */
-  protected void verifyRestartMax(int expectedValue) {
-    ServerMBean serverMBean = getServerMBean();
+  protected void verifyRestartMax(String serverName, int expectedValue) {
+    ServerMBean serverMBean = getServerMBean(serverName);
     int got = serverMBean.getRestartMax();
     assert expectedValue == got
         : "Didn't get the expected value " + expectedValue + " for RestartMax";
@@ -289,38 +307,43 @@ protected void verifyRestartMax(int expectedValue) {
    *
    * @param expectedValue - integer value to be checked in the max-message-size attribute in
    *     ServerMBean in ServerConfig tree
+   * @param serverName - name of the weblogic server instance for which the max message size to be
+   *     checked as a String
    */
-  protected void verifyMaxMessageSize(int expectedValue) {
-    ServerMBean serverMBean = getServerMBean();
+  protected void verifyMaxMessageSize(String serverName, int expectedValue) {
+    ServerMBean serverMBean = getServerMBean(serverName);
     int got = serverMBean.getMaxMessageSize();
     assert expectedValue == got
         : "Didn't get the expected value " + expectedValue + " for MaxMessageSize";
   }
-  
+
   /**
-   * A utility method to check if the max-message-size in the ServerConfig tree of a managed server matches with the
-   * expected value, a integer value set in the configuration override file config.xml. Uses Java
-   * assertions to verify if both the values match.
+   * A utility method to check if the max-message-size in the ServerConfig tree of a managed server
+   * matches with the expected value, a integer value set in the configuration override file
+   * config.xml. Uses Java assertions to verify if both the values match.
    *
    * @param expectedValue - integer value to be checked in the max-message-size attribute in
    *     EditMBean in ServerConfig tree
    */
-  protected void verifyMsSeverMaxMessageSize(int expectedValue,String serverName) {
-	  
-	  try {
-	  EditServiceMBean editSvc = getEditService();
-	  ConfigurationManagerMBean cfgMgr = editSvc.getConfigurationManager();
+  protected void verifyMsSeverMaxMessageSize(int expectedValue, String serverName) {
+
+    try {
+      EditServiceMBean editSvc = getEditService();
+      ConfigurationManagerMBean cfgMgr = editSvc.getConfigurationManager();
       cfgMgr.startEdit(-1, -1);
       DomainMBean editDomainMBean = editSvc.getDomainConfiguration();
-      
+
       ServerMBean serverMbean = editDomainMBean.lookupServer(serverName);
-	  int got = serverMbean.getMaxMessageSize();
-	  assert expectedValue == got
-		 : "Didn't get the expected value " + expectedValue + " for " + serverName + " MaxMessageSize";
-	  }
-      catch (Exception e) {
-	    e.printStackTrace();
-      }
+      int got = serverMbean.getMaxMessageSize();
+      assert expectedValue == got
+          : "Didn't get the expected value "
+              + expectedValue
+              + " for "
+              + serverName
+              + " MaxMessageSize";
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
   }
 
   /**
@@ -331,9 +354,9 @@ protected void verifyMsSeverMaxMessageSize(int expectedValue,String serverName)
    * @param expectedValue - string value to be checked in the public-address attribute in
    *     ServerMBean in ServerConfig tree.
    */
-  protected void verifyT3ChannelPublicAddress(String expectedValue) {
+  protected void verifyT3ChannelPublicAddress(String serverName, String expectedValue) {
     boolean got = false;
-    ServerMBean serverMBean = getServerMBean();
+    ServerMBean serverMBean = getServerMBean(serverName);
     NetworkAccessPointMBean[] networkAccessPoints = serverMBean.getNetworkAccessPoints();
 
     for (NetworkAccessPointMBean networkAccessPoint : networkAccessPoints) {
@@ -350,10 +373,12 @@ protected void verifyT3ChannelPublicAddress(String expectedValue) {
    *
    * @param expectedValue - integer value to be checked in the public-port attribute in ServerMBean
    *     in ServerConfig tree
+   * @param serverName - name of the weblogic server instance for which the t3 port to be checked as
+   *     a String
    */
-  protected void verifyT3ChannelPublicPort(int expectedValue) {
+  protected void verifyT3ChannelPublicPort(String serverName, int expectedValue) {
     boolean got = false;
-    ServerMBean serverMBean = getServerMBean();
+    ServerMBean serverMBean = getServerMBean(serverName);
     NetworkAccessPointMBean[] networkAccessPoints = serverMBean.getNetworkAccessPoints();
 
     for (NetworkAccessPointMBean networkAccessPoint : networkAccessPoints) {
@@ -367,27 +392,39 @@ protected void verifyT3ChannelPublicPort(int expectedValue) {
   /**
    * Looks up the ServerMBean from RuntimeServiceMBean.
    *
+   * @param the name weblogic server instance for which to lookup the ServerMBean
    * @return the ServerMBean reference
    */
-  private ServerMBean getServerMBean() {
-    ServerMBean serverMBean = runtimeServiceMBean.getServerConfiguration();
-    println("ServerMBean: " + serverMBean);
-
-    return serverMBean;
+  private ServerMBean getServerMBean(String serverName) {
+    ServerMBean servermbean = null;
+    ServerMBean[] servers = runtimeServiceMBean.getDomainConfiguration().getServers();
+    for (ServerMBean server : servers) {
+      if (server.getName().equals(serverName)) {
+        servermbean = server;
+      }
+    }
+    println("ServerMBean: " + servermbean);
+    return servermbean;
   }
-  
+
   /**
    * Looks up the EditServiceMBean from MBeanServerConnection.
    *
    * @return the EditServiceMBean reference
    */
-  //Get edit Service
+  // Get edit Service
   private EditServiceMBean getEditService() throws Exception {
-      MBeanServerConnection msc = lookupMBeanServerConnection(adminHost, adminPort, adminUser, adminPassword, "weblogic.management.mbeanservers.edit");
-      ObjectName serviceObjectName = new ObjectName(EditServiceMBean.OBJECT_NAME);
-      EditServiceMBean editSvc = (EditServiceMBean)
-             MBeanServerInvocationHandler.newProxyInstance(msc, serviceObjectName);
-     return editSvc;
+    MBeanServerConnection msc =
+        lookupMBeanServerConnection(
+            adminHost,
+            adminPort,
+            adminUser,
+            adminPassword,
+            "weblogic.management.mbeanservers.edit");
+    ObjectName serviceObjectName = new ObjectName(EditServiceMBean.OBJECT_NAME);
+    EditServiceMBean editSvc =
+        (EditServiceMBean) MBeanServerInvocationHandler.newProxyInstance(msc, serviceObjectName);
+    return editSvc;
   }
 
   /**