Add possibility to run callTomcat.sh from gui-tests in oder to check …

…is tomcat setuped or not
qreal · Nov 8, 2016 · 909b31a · 909b31a
1 parent 659b460
commit 909b31a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 6 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ before_install:
 install:
   #install and run tests
   - mvn install -P travis
-  - cd UI-testing
+  - cd ui-testing
   - mvn install -DskipTests
   - cd ..
 
@@ -79,7 +79,7 @@ script:
 
   - ../Travis/callTomcat.sh
 
-  - cd ../UI-testing
+  - cd ../ui-testing
   - mvn test -P travis &
   - sleep 30
 

diff --git a/Travis/callTomcat.sh b/Travis/callTomcat.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 iter=1
 all=120
-until [ "`curl --silent --show-error --connect-timeout 1 -I http://localhost:8080/auth | grep '302 Found'`" != "" ];
+until [ "`curl --silent --show-error --connect-timeout 1 -I http://localhost:"${1:-"8080"}"/auth | grep '302 Found'`" != "" ];
 do
   if [ "$iter" -lt "$all" ]
   then
@@ -16,7 +16,7 @@ done
 echo "auth-service found"
 iter=1
 all=120
-until [ "`curl --silent --show-error --connect-timeout 1 -I http://localhost:8082/dashboard | grep '302 Found'`" != "" ];
+until [ "`curl --silent --show-error --connect-timeout 1 -I http://localhost:"${2:-"8082"}"/dashboard | grep '302 Found'`" != "" ];
 do
   if [ "$iter" -lt "$all" ]
   then
@@ -31,7 +31,7 @@ done
 echo "dashboard-service found"
 iter=1
 all=120
-until [ "`curl --silent --show-error --connect-timeout 1 -I http://localhost:8081/editor | grep '302 Found'`" != "" ];
+until [ "`curl --silent --show-error --connect-timeout 1 -I http://localhost:"${3:-"8082"}"/editor | grep '302 Found'`" != "" ];
 do
   if [ "$iter" -lt "$all" ]
   then

diff --git a/ui-testing/pom.xml b/ui-testing/pom.xml
@@ -15,6 +15,10 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <scanner>true</scanner> <!-- default -->
+    </properties>
+
     <build>
 
         <resources>
@@ -44,6 +48,31 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <executions>
+                    <execution><!-- Run our version calculation script -->
+                        <id>Check services</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${scanner}</skip>
+                            <executable>${basedir}/../Travis/callTomcat.sh</executable>
+                            <arguments>
+                                <argument>8080</argument>
+                                <argument>8080</argument>
+                                <argument>8080</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+
         </plugins>
     </build>
     <dependencies>

diff --git a/ui-testing/UI-testing.iml → ui-testing/ui-testing.iml b/ui-testing/UI-testing.iml → ui-testing/ui-testing.iml
@@ -11,7 +11,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.codeborne:selenide:4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.seleniumhq.selenium:selenium-java:3.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:3.0.0" level="project" />