Merge pull request #634 from terasolunaorg/issues/605_recognize_ap_se…

…rver_5.0.x

[5.0.x]recognize ap server #605

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

@@ -1,2 +1,3 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
-
+application.server.name=jboss
+application.server.version=6

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

@@ -1,2 +1,3 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
-
+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,3 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
-
+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,3 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
-
+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,3 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
-
+application.server.name=tomcat
+application.server.version=8.0

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

@@ -1,2 +1,3 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
-
+application.server.name=weblogic
+application.server.version=12

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

@@ -1,2 +1,6 @@
 app.redirect.allowed.externalUrl=http://terasolunaorg.github.io
-
+## 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,26 @@
+/*
+ * Copyright (C) 2013-2017 NTT DATA Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.terasoluna.gfw.functionaltest.app;
+
+/**
+ * Enumeration class for identifying application server.
+ * <p>
+ * If application server name is not set in application-env.properties, {@code UNKNOWN} is set.
+ * </p>
+ */
+public enum ApServerName {
+    UNKNOWN, JBOSS, TOMCAT, WEBLOGIC
+}

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

@@ -20,12 +20,17 @@
 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.
  */
 public class WebDriverOperations {
 
+    private static final Logger logger = LoggerFactory
+            .getLogger(WebDriverOperations.class);
+
     protected final WebDriver webDriver;
 
     protected long defaultTimeoutSecForImplicitlyWait = 5;
@@ -76,4 +81,29 @@ 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 = webDriver.findElement(By.id("apServerName"))
+                .getText().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 webDriver.findElement(By.id("apServerVersion")).getText();
+    }
 }

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

@@ -50,7 +50,7 @@ public void test01_01_createDefaultXTrackMDC() {
 
         // cut x-Track MDC
         String targetMdc = driver.findElement(By.id("xTrackMDC")).getText();
-        String footerMdc = driver.findElement(By.cssSelector("p")).getText();
+        String footerMdc = driver.findElement(By.id("xtrack")).getText();
         footerMdc = footerMdc.substring(footerMdc.indexOf(":") + 1, footerMdc
                 .indexOf(":") + 33);
         // check default x-Track MDC
@@ -67,7 +67,7 @@ public void test01_02_createCustomXTrackMDC() {
 
         // cut x-Track MDC
         String targetMdc = driver.findElement(By.id("xTrackMDC")).getText();
-        String footerMdc = driver.findElement(By.cssSelector("p")).getText();
+        String footerMdc = driver.findElement(By.id("xtrack")).getText();
         footerMdc = footerMdc.substring(footerMdc.indexOf(":") + 1, footerMdc
                 .indexOf(":") + 33);
         // check custom x-Track MDC

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013-2017 NTT DATA Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+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

@@ -15,6 +15,8 @@
     <context:property-placeholder
         location="classpath*:/META-INF/spring/*.properties" />
 
+    <context:component-scan base-package="org.terasoluna.gfw.functionaltest.config" />
+
     <bean class="org.dozer.spring.DozerBeanMapperFactoryBean">
         <property name="mappingFiles"
             value="classpath*:/META-INF/dozer/**/*-mapping.xml" />

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>