Add mechanism to recognize Application Server #605

terasoluna-gfw-functionaltest-env/configs/interstage11-oracle/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=interstage
+application.server.version=11

terasoluna-gfw-functionaltest-env/configs/jboss-postgresql/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=jboss
+application.server.version=6

terasoluna-gfw-functionaltest-env/configs/jboss7-postgresql/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=jboss
+application.server.version=7

terasoluna-gfw-functionaltest-env/configs/tomcat-oracle/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=tomcat
+application.server.version=7

terasoluna-gfw-functionaltest-env/configs/tomcat-postgresql/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=tomcat
+application.server.version=7

terasoluna-gfw-functionaltest-env/configs/tomcat8-oracle/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=tomcat
+application.server.version=8.0

terasoluna-gfw-functionaltest-env/configs/tomcat8-postgresql/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=tomcat
+application.server.version=8.0

terasoluna-gfw-functionaltest-env/configs/tomcat85-oracle/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=tomcat
+application.server.version=8.5

terasoluna-gfw-functionaltest-env/configs/tomcat85-postgresql/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=tomcat
+application.server.version=8.5

terasoluna-gfw-functionaltest-env/configs/weblogic-oracle/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=weblogic
+application.server.version=12

terasoluna-gfw-functionaltest-env/configs/webotx-oracle/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+application.server.name=webotx
+application.server.version=9

terasoluna-gfw-functionaltest-env/configs/webspherelp-db2/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=System Error...
+application.server.name=webspherelp
+application.server.version=16

terasoluna-gfw-functionaltest-env/configs/webspheretr-db2/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,4 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=System Error...
+application.server.name=webspheretr
+application.server.version=9

terasoluna-gfw-functionaltest-env/src/main/resources/META-INF/spring/application-env.properties

@@ -1,2 +1,7 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
 app.redirect.pageTitle.404Error=Page Not Found
+## application server name and version properties are used in order to
+## change the assertions in test which depends on application server.
+## when the new profile is added, set appropriate values.
+application.server.name=tomcat
+application.server.version=8.0

terasoluna-gfw-functionaltest-selenium/src/test/java/org/terasoluna/gfw/functionaltest/app/ApServerName.java

@@ -0,0 +1,12 @@
+package org.terasoluna.gfw.functionaltest.app;
+
+/**
+ * Enumeration class for identifying application server.
+ * <p>
+ * If application server name is not set in application.env.properties, <br/>
+ * UNKNOWN is set.
+ * </p>
+ */
+public enum ApServerName {
+	UNKNOWN, INTERSTAGE, JBOSS, TOMCAT, WEBLOGIC, WEBOTX, WEBSPHERELP, WEBSPHERETR
+}

terasoluna-gfw-functionaltest-selenium/src/test/java/org/terasoluna/gfw/functionaltest/app/WebDriverOperations.java

@@ -20,6 +20,8 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebDriver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class that provides a (logic for WebDriver) browser operation.
@@ -30,6 +32,8 @@ public class WebDriverOperations {
 
     protected long defaultTimeoutSecForImplicitlyWait = 5;
 
+    private static final Logger logger = LoggerFactory.getLogger(WebDriverOperations.class);
+
     public WebDriverOperations(WebDriver webDriver) {
         this.webDriver = webDriver;
     }
@@ -43,6 +47,15 @@ public void setDefaultTimeoutForImplicitlyWait(
         this.defaultTimeoutSecForImplicitlyWait = defaultTimeoutSecForImplicitlyWait;
     }
 
+    /**
+     * Get the text (display value) set for the specified element.
+     * @param by Identifier to look for elements
+     * @return And returns the text (display value)
+     */
+    public String getText(By by) {
+    	return webDriver.findElement(by).getText();
+    }
+
     /**
      * Check the specified element exists.
      * @param by Identifier to look for elements
@@ -76,4 +89,27 @@ public void setDefaultTimeoutForImplicitlyWait() {
     public void setTimeoutForImplicitlyWait(long timeout, TimeUnit timeUnit) {
         webDriver.manage().timeouts().implicitlyWait(timeout, timeUnit);
     }
+
+    /**
+     * Get application server name.
+     * @return application server name
+     */
+    public ApServerName getApServerName() {
+        String serverName = getText(By.id("apServerName")).toUpperCase();
+        try {
+    	    return ApServerName.valueOf(serverName);
+        } catch (IllegalArgumentException e) {
+            logger.warn("Unkown application server name:{} is detected.", serverName);
+            // If server name not defined in the ApServerName class, set it to UNKNOWN.
+            return ApServerName.UNKNOWN;
+        }
+    }
+
+    /**
+     * Get application server version.
+     * @return application server version
+     */
+    public String getApServerVersion() {
+    	return getText(By.id("apServerVersion"));
+    }
 }

terasoluna-gfw-functionaltest-web/src/main/java/org/terasoluna/gfw/functionaltest/config/PropertySourceConfig.java

@@ -0,0 +1,15 @@
+package org.terasoluna.gfw.functionaltest.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * Class that registers the value defined in application-env.properties of each profile in environment.
+ * <p>
+ * Passes application server information to WebDriver through JSP so that asserts can be changed for each application server.
+ * </p>
+ */
+@Configuration
+@PropertySource("classpath:/META-INF/spring/application-env.properties")
+public class PropertySourceConfig {
+}

terasoluna-gfw-functionaltest-web/src/main/resources/META-INF/spring/applicationContext.xml

@@ -103,4 +103,6 @@
         <property name="exceptionLogger" ref="variationExceptionLogger" />
     </bean>
 
+    <context:component-scan base-package="org.terasoluna.gfw.functionaltest.config" />
+
 </beans>

terasoluna-gfw-functionaltest-web/src/main/webapp/WEB-INF/views/layout/template.jsp

@@ -26,6 +26,11 @@
     <tiles:insertAttribute name="header" />
     <tiles:insertAttribute name="body" />
     <hr>
+    <p align="right">
+        Application Server : 
+            <span id="apServerName"><spring:eval expression="@environment.getProperty('application.server.name')"/></span>
+            <span id="apServerVersion"><spring:eval expression="@environment.getProperty('application.server.version')"/></span>
+    </p>
     <p style="text-align: center; background: #e5eCf9;">
         <spring:message code="copyright" htmlEscape="false" />
         <span id="xtrack">(X-Track:${f:h(requestScope["X-Track"])})</span></p>