diff --git a/.dockerignore b/.dockerignore index 31798ee..848cd11 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,7 +2,6 @@ /.idea /k8s /pulumi -/selenium /testapi /tests-ui /frontend/node_modules \ No newline at end of file diff --git a/backend/pom.xml b/backend/pom.xml index 6f7913d..d070ea3 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -9,6 +9,16 @@ backend + org.springframework.boot + spring-boot-starter-webflux + + + ca.etsmtl + frontend + ${project.version} + runtime + + org.springframework.boot spring-boot-starter-data-jpa @@ -76,6 +86,10 @@ junit junit + + com.squareup.okhttp3 + okhttp + diff --git a/backend/src/main/java/ca/etsmtl/taf/apiCommunication/SeleniumServiceRequester.java b/backend/src/main/java/ca/etsmtl/taf/apiCommunication/SeleniumServiceRequester.java new file mode 100644 index 0000000..5ac9c01 --- /dev/null +++ b/backend/src/main/java/ca/etsmtl/taf/apiCommunication/SeleniumServiceRequester.java @@ -0,0 +1,33 @@ +package ca.etsmtl.taf.apiCommunication; + +import ca.etsmtl.taf.dto.SeleniumCaseDto; +import ca.etsmtl.taf.entity.SeleniumActionRequest; +import ca.etsmtl.taf.entity.SeleniumCaseResponse; +import ca.etsmtl.taf.entity.SeleniumTestCase; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; +import org.springframework.web.reactive.function.client.WebClient; +import reactor.core.publisher.Mono; + +import java.util.List; + +@Component +public class SeleniumServiceRequester { + private final WebClient webClient; + + @Autowired + public SeleniumServiceRequester(WebClient webClient) { + this.webClient = webClient; + } + + public Mono sendTestCase(SeleniumCaseDto testCase) { + return webClient.post() + .uri("/microservice/selenium/test") + .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) + .body(Mono.just(testCase), SeleniumCaseDto.class) + .retrieve() + .bodyToMono(SeleniumCaseResponse.class); + } +} diff --git a/backend/src/main/java/ca/etsmtl/taf/config/WebConfigSelenium.java b/backend/src/main/java/ca/etsmtl/taf/config/WebConfigSelenium.java new file mode 100644 index 0000000..3d63530 --- /dev/null +++ b/backend/src/main/java/ca/etsmtl/taf/config/WebConfigSelenium.java @@ -0,0 +1,27 @@ +package ca.etsmtl.taf.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.web.reactive.function.client.WebClient; + +@Configuration +public class WebConfigSelenium { + + @Value("${taf.app.selenium_container_url}") + String SELENIUM_CONTAINER_URL; + + @Value("${taf.app.selenium_container_port}") + String SELENIUM_CONTAINER_PORT; + + @Bean + public WebClient webClient() { + return WebClient.builder() + .baseUrl(SELENIUM_CONTAINER_URL + ":" + SELENIUM_CONTAINER_PORT) + .defaultCookie("cookie-name", "cookie-value") + .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) + .build(); + } +} \ No newline at end of file diff --git a/backend/src/main/java/ca/etsmtl/taf/controller/TestSeleniumController.java b/backend/src/main/java/ca/etsmtl/taf/controller/TestSeleniumController.java new file mode 100644 index 0000000..d54af36 --- /dev/null +++ b/backend/src/main/java/ca/etsmtl/taf/controller/TestSeleniumController.java @@ -0,0 +1,28 @@ +package ca.etsmtl.taf.controller; + +import ca.etsmtl.taf.dto.SeleniumCaseDto; +import ca.etsmtl.taf.entity.SeleniumCaseResponse; +import ca.etsmtl.taf.service.SeleniumService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.List; + +@CrossOrigin(origins = "*", maxAge = 3600) +@RestController +@RequestMapping("/api") +public class TestSeleniumController { + private final SeleniumService seleniumService; + + public TestSeleniumController(SeleniumService seleniumService) { + this.seleniumService = seleniumService; + } + + @PostMapping("/testselenium") + public ResponseEntity> runTests(@RequestBody List seleniumCases) throws URISyntaxException, IOException, InterruptedException { + List response = seleniumService.sendTestCases(seleniumCases); + return ResponseEntity.ok(response); + } +} diff --git a/backend/src/main/java/ca/etsmtl/taf/dto/SeleniumCaseDto.java b/backend/src/main/java/ca/etsmtl/taf/dto/SeleniumCaseDto.java new file mode 100644 index 0000000..37ec921 --- /dev/null +++ b/backend/src/main/java/ca/etsmtl/taf/dto/SeleniumCaseDto.java @@ -0,0 +1,13 @@ +package ca.etsmtl.taf.dto; + +import ca.etsmtl.taf.entity.SeleniumActionRequest; +import lombok.Getter; + +import java.util.List; + +@Getter +public class SeleniumCaseDto { + int case_id; + String caseName; + List actions; +} diff --git a/backend/src/main/java/ca/etsmtl/taf/entity/SeleniumActionRequest.java b/backend/src/main/java/ca/etsmtl/taf/entity/SeleniumActionRequest.java new file mode 100644 index 0000000..f69fde9 --- /dev/null +++ b/backend/src/main/java/ca/etsmtl/taf/entity/SeleniumActionRequest.java @@ -0,0 +1,13 @@ +package ca.etsmtl.taf.entity; + +import lombok.Getter; + +@Getter +public class SeleniumActionRequest { + int action_id; + int action_type_id; + String action_type_name; + String object; + String input; + String target; +} diff --git a/backend/src/main/java/ca/etsmtl/taf/entity/SeleniumCaseResponse.java b/backend/src/main/java/ca/etsmtl/taf/entity/SeleniumCaseResponse.java new file mode 100644 index 0000000..812d436 --- /dev/null +++ b/backend/src/main/java/ca/etsmtl/taf/entity/SeleniumCaseResponse.java @@ -0,0 +1,17 @@ +package ca.etsmtl.taf.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class SeleniumCaseResponse implements Serializable { + int case_id; + String caseName; + public List seleniumActions; + public boolean success; + public long timestamp; + public long duration; + public String output; +} diff --git a/backend/src/main/java/ca/etsmtl/taf/entity/SeleniumTestCase.java b/backend/src/main/java/ca/etsmtl/taf/entity/SeleniumTestCase.java new file mode 100644 index 0000000..b2b411a --- /dev/null +++ b/backend/src/main/java/ca/etsmtl/taf/entity/SeleniumTestCase.java @@ -0,0 +1,10 @@ +package ca.etsmtl.taf.entity; + +import lombok.Getter; + +import java.util.List; + +@Getter +public class SeleniumTestCase { + List seleniumActionRequestList; +} diff --git a/backend/src/main/java/ca/etsmtl/taf/service/SeleniumService.java b/backend/src/main/java/ca/etsmtl/taf/service/SeleniumService.java new file mode 100644 index 0000000..a2d4cfc --- /dev/null +++ b/backend/src/main/java/ca/etsmtl/taf/service/SeleniumService.java @@ -0,0 +1,31 @@ +package ca.etsmtl.taf.service; + +import ca.etsmtl.taf.apiCommunication.SeleniumServiceRequester; +import ca.etsmtl.taf.dto.SeleniumCaseDto; +import ca.etsmtl.taf.entity.SeleniumActionRequest; +import ca.etsmtl.taf.entity.SeleniumCaseResponse; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.List; + +@Service +public class SeleniumService { + private final SeleniumServiceRequester seleniumServiceRequester; + + public SeleniumService(SeleniumServiceRequester seleniumServiceRequester) { + this.seleniumServiceRequester = seleniumServiceRequester; + } + + public List sendTestCases(List seleniumCases) throws URISyntaxException, IOException, InterruptedException { + List testResults = new ArrayList<>(); + for(SeleniumCaseDto seleniumCaseDto : seleniumCases) { + + SeleniumCaseResponse testCaseResult = seleniumServiceRequester.sendTestCase(seleniumCaseDto).block(); + testResults.add(testCaseResult); + } + return testResults; + } +} diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 34b99d0..d2ce2e7 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -24,4 +24,6 @@ taf: jwtSecret: bezKoderSecretKey jwtExpirationMs: 86400000 testAPI_url: http://localhost - testAPI_port: 8082 \ No newline at end of file + testAPI_port: 8082 + selenium_container_url: http://selenium + selenium_container_port: 8090 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 4755ec9..ecf8d6e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,5 @@ version: "3.9" services: - testapi: - image: testapi - container_name: testapi - build: - context: ./testapi - ports: - # TEST_API_SERVICE_PORT is defined as env variable in .docker_config.env - - "${TEST_API_SERVICE_PORT}:${TEST_API_SERVICE_PORT}" backend: image: back container_name: back @@ -15,10 +7,11 @@ services: context: ./ dockerfile: ./backend/Dockerfile ports: - - "9000:80" + - "8080:8080" env_file: # Specifying the env file with necessaries values - .docker_config.env + frontend: image: front container_name: front @@ -28,3 +21,12 @@ services: - "4200:80" depends_on: - backend + + selenium: + image: selenium + container_name: selenium + build: + context: ./ + dockerfile: ./selenium/Dockerfile + ports: + - "8090:8090" diff --git a/frontend/src/app/selenium/test-selenium.component.css b/frontend/src/app/selenium/test-selenium.component.css index e69de29..a1e7fb3 100644 --- a/frontend/src/app/selenium/test-selenium.component.css +++ b/frontend/src/app/selenium/test-selenium.component.css @@ -0,0 +1,7 @@ +.showModelResult{ + width: 100%; background-color: rgba(0, 0, 0, 0.4); height: 100vh;position: absolute;left: 0;top: 0; z-index: 9999; +} + +.hideIt{ + visibility: hidden; +} \ No newline at end of file diff --git a/frontend/src/app/selenium/test-selenium.component.html b/frontend/src/app/selenium/test-selenium.component.html index cd50b92..5b08d54 100644 --- a/frontend/src/app/selenium/test-selenium.component.html +++ b/frontend/src/app/selenium/test-selenium.component.html @@ -1,4 +1,53 @@

+ +
+
+
+
+ +
+
+
+
+
{{percentage}}%
+
+ + + + + + + + + + + + + + + + +
Case IDCase NameStatus
{{result.case_id}}{{result.caseName}} + success + failed +
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+ + +
- +


diff --git a/frontend/src/app/selenium/test-selenium.component.ts b/frontend/src/app/selenium/test-selenium.component.ts index b245361..b51379e 100644 --- a/frontend/src/app/selenium/test-selenium.component.ts +++ b/frontend/src/app/selenium/test-selenium.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, Renderer2, ElementRef } from '@angular/core'; import { HttpClient } from '@angular/common/http'; @Component({ @@ -7,8 +7,8 @@ import { HttpClient } from '@angular/common/http'; styleUrls: ['./test-selenium.component.css'] }) export class TestSeleniumComponent { - constructor(private http: HttpClient) { } - + constructor(private http: HttpClient,private renderer: Renderer2, private el: ElementRef) { } + testResult: any; counterAction: number=1; counterCase: number=0; cases : { @@ -23,43 +23,71 @@ export class TestSeleniumComponent { target: string; }[] ; }[] = []; + percentage=0; runMethod(cases: any) { - const apiUrl = '/api/testselenium'; - this.http.post(apiUrl, cases).subscribe( + let counterTrue=0; + const API_URL = 'http://localhost:8080/api/testselenium'; + this.showResultModal(); + this.showSpinner(); + this.http.post(API_URL, cases).subscribe( (response) => { console.log('tested successfully:', response); - + this.testResult=response; + // for calculate the percentage of the success cases + for(let result of this.testResult){ + if(result.success){ + counterTrue++; + } + } + this.percentage=(counterTrue / this.testResult.length) * 100; + this.hideSpinner(); }, (error) => { console.error('Error test:', error); } ); } - + showResultModal(): void { + const resultModal = this.el.nativeElement.querySelector('#modelResult'); + this.renderer.removeClass(resultModal, 'hideIt'); + } + hideResultModal(): void { + const resultModal = this.el.nativeElement.querySelector('#modelResult'); + this.renderer.addClass(resultModal, 'hideIt'); + } + showSpinner():void { + const resultModal = this.el.nativeElement.querySelector('#spinner'); + this.renderer.removeClass(resultModal, 'hideIt'); + } + hideSpinner():void { + const resultModal = this.el.nativeElement.querySelector('#spinner'); + this.renderer.addClass(resultModal, 'hideIt'); + } + // for enable and disable inputs needed in actions form actionChose(): void { - const action2 = (document.getElementById('action') as HTMLSelectElement); - const action =action2.options[action2.selectedIndex].text; + const action = (document.getElementById('action') as HTMLSelectElement).value; const object = document.getElementById('object') as HTMLInputElement; const input = document.getElementById('input') as HTMLInputElement; const target = document.getElementById('target') as HTMLInputElement; - + object.disabled = true; input.disabled = true; target.disabled = true; - - if (action === "GoToUrl" || action === "FillField") { + + if (action === "1" || action === "2" || action === "3") { input.disabled = false; } - - if (action === "GetAttribute" || action === "GetPageTitle") { + + if (action === "3" || action === "4") { target.disabled = false; } - - if (action === "Clear" || action === "Click" || action === "IsDisplayed" || action === "FillField") { + + if (action === "5" || action === "6" || action === "7" || action === "2" || action === "3") { object.disabled = false; } } + //add new case submitCase(){ this.counterCase++; let caseName = (document.getElementById('caseName') as HTMLSelectElement).value; @@ -70,8 +98,8 @@ export class TestSeleniumComponent { const addActionButton = document.getElementById('addActionButton') as HTMLInputElement; addActionButton.disabled = false; } - - + + public getCase(id: number) { return this.cases.find(obj => obj.case_id === id); } @@ -83,17 +111,18 @@ export class TestSeleniumComponent { this.cases.push(obj); } + // add new action submitAction(){ let action_id = parseInt((document.getElementById('action') as HTMLSelectElement).value); let action2 = (document.getElementById('action') as HTMLSelectElement); - let action =action2.options[action2.selectedIndex].text; + let action = action2.options[action2.selectedIndex].text; let object = (document.getElementById('object') as HTMLInputElement).value; let input = (document.getElementById('input') as HTMLInputElement).value; let target = (document.getElementById('target') as HTMLInputElement).value; this.addAction({ action_id: this.counterAction,action_type_id: action_id, action_type_name: action, object: object, input: input, target: target, }); console.log(this.getAction(this.counterAction)); this.counterAction++; - + // Clear the input fields (document.getElementById('object') as HTMLInputElement).value = ''; (document.getElementById('input') as HTMLInputElement).value = ''; @@ -103,7 +132,7 @@ export class TestSeleniumComponent { public addAction(obj: { action_id: number,action_type_id:number,action_type_name: string, object: string,input: string,target: string }) { this.getCase(this.counterCase)?.actions.push(obj); } - + public getAction(id: number) { return this.getCase(this.counterCase)?.actions.find(obj => obj.action_id === id); } @@ -114,7 +143,7 @@ export class TestSeleniumComponent { currentCase.actions = currentCase.actions.filter(item => item.action_id !== actionId); } } - - - + + + } diff --git a/pom.xml b/pom.xml index c607224..82c0537 100644 --- a/pom.xml +++ b/pom.xml @@ -22,5 +22,7 @@ pom backend + frontend + selenium \ No newline at end of file diff --git a/selenium/.gitignore b/selenium/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/selenium/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/selenium/.mvn/wrapper/maven-wrapper.jar b/selenium/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..bf82ff0 Binary files /dev/null and b/selenium/.mvn/wrapper/maven-wrapper.jar differ diff --git a/selenium/.mvn/wrapper/maven-wrapper.properties b/selenium/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..ca5ab4b --- /dev/null +++ b/selenium/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# https://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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/selenium/Dockerfile b/selenium/Dockerfile new file mode 100644 index 0000000..7cea648 --- /dev/null +++ b/selenium/Dockerfile @@ -0,0 +1,16 @@ +FROM maven:3.8.6-eclipse-temurin-11 as builder + +RUN apt-get update +# RUN apt-get install -y gconf-service libasound2 libatk1.0-0 libcairo2 libcups2 libfontconfig1 libgdk-pixbuf2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libxss1 fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils + +RUN apt-get install -y wget +RUN wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.198-1_amd64.deb +RUN apt-get install -y ./google-chrome-stable_114.0.5735.198-1_amd64.deb + +WORKDIR / +COPY pom.xml . +COPY selenium ./selenium +WORKDIR /selenium +RUN mvn clean install +EXPOSE 8090 +ENTRYPOINT ["mvn", "spring-boot:run" ] diff --git a/selenium/hub/Dockerfile b/selenium/hub/Dockerfile deleted file mode 100644 index 0fb8bd7..0000000 --- a/selenium/hub/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM selenium/hub:4.6.0 -#RUN npm install && npm run dev -#c'était car il ont mis dans le readme de faire ces cmd mais ça n'a pas l'air de marcher \ No newline at end of file diff --git a/selenium/mvnw b/selenium/mvnw new file mode 100644 index 0000000..8a8fb22 --- /dev/null +++ b/selenium/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# https://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/selenium/mvnw.cmd b/selenium/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/selenium/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/selenium/node/Dockerfile b/selenium/node/Dockerfile deleted file mode 100644 index eaa79bb..0000000 --- a/selenium/node/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM selenium/node-chrome:4.6.0 -#RUN npm install && npm run dev -#c'était car il ont mis dans le readme de faire ces cmd mais ça n'a pas l'air de marcher \ No newline at end of file diff --git a/selenium/pom.xml b/selenium/pom.xml new file mode 100644 index 0000000..358427a --- /dev/null +++ b/selenium/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + + ca.etsmtl + taf + 1.0.0-SNAPSHOT + + + selenium + + + 8 + 8 + UTF-8 + + ca.etsmtl.selenium.requests.SeleniumApplication + + + + + org.springframework.boot + spring-boot-starter-web + 2.7.0 + + + org.springframework.boot + spring-boot-starter-validation + 2.7.3 + + + org.springframework.boot + spring-boot-devtools + 2.7.0 + runtime + true + + + org.springframework.boot + spring-boot-starter-test + 2.7.0 + test + + + org.seleniumhq.selenium + selenium-java + 3.141.59 + + + org.projectlombok + lombok + provided + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.7.0 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + UTF-8 + + + + + + diff --git a/selenium/src/main/java/ca/etsmtl/selenium/config/DevCorsConfiguration.java b/selenium/src/main/java/ca/etsmtl/selenium/config/DevCorsConfiguration.java new file mode 100644 index 0000000..7b8fdca --- /dev/null +++ b/selenium/src/main/java/ca/etsmtl/selenium/config/DevCorsConfiguration.java @@ -0,0 +1,16 @@ +package org.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +@Profile("local") +public class DevCorsConfiguration implements WebMvcConfigurer { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/microservice/**").allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS") + .exposedHeaders("Authorization"); + } +} diff --git a/selenium/src/main/java/ca/etsmtl/selenium/requests/SeleniumApplication.java b/selenium/src/main/java/ca/etsmtl/selenium/requests/SeleniumApplication.java new file mode 100644 index 0000000..73d6f20 --- /dev/null +++ b/selenium/src/main/java/ca/etsmtl/selenium/requests/SeleniumApplication.java @@ -0,0 +1,13 @@ +package ca.etsmtl.selenium.requests; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SeleniumApplication { + + public static void main(String[] args) { + SpringApplication.run(SeleniumApplication.class, args); + } + +} diff --git a/selenium/src/main/java/ca/etsmtl/selenium/requests/UseSelenium.java b/selenium/src/main/java/ca/etsmtl/selenium/requests/UseSelenium.java new file mode 100644 index 0000000..060150e --- /dev/null +++ b/selenium/src/main/java/ca/etsmtl/selenium/requests/UseSelenium.java @@ -0,0 +1,142 @@ +package ca.etsmtl.selenium.requests; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.chrome.ChromeOptions; + +import java.time.Duration; +import java.util.concurrent.TimeUnit; +import java.util.Arrays; +import java.util.List; +import java.sql.Timestamp; + +import org.springframework.web.bind.annotation.*; + +import ca.etsmtl.selenium.requests.payload.request.*; + +@CrossOrigin(origins = "*", maxAge = 3600) +@RestController +@RequestMapping("/microservice/selenium") +public class UseSelenium { + @PostMapping("/test") + public SeleniumResponse testWithSelenium(@RequestBody SeleniumCase seleniumCase) { + List seleniumActions = seleniumCase.getActions(); + + SeleniumResponse seleniumResponse = new SeleniumResponse(); + seleniumResponse.setCase_id(seleniumCase.getCase_id()); + seleniumResponse.setCaseName(seleniumCase.getCaseName()); + seleniumResponse.setSeleniumActions(seleniumActions); + long currentTimestamp = (new Timestamp(System.currentTimeMillis())).getTime(); + seleniumResponse.setTimestamp(currentTimestamp/1000); + + try { + System.setProperty("webdriver.chrome.driver", "src/main/resources/chromedriver"); + + ChromeOptions options = new ChromeOptions(); + options.addArguments("--no-sandbox"); + options.addArguments("--headless"); + options.addArguments("--disable-dev-shm-usage"); + options.addArguments("--window-size=1920x1080"); + WebDriver driver = new ChromeDriver(options); + + long startTime = System.currentTimeMillis(); + + try { + for (SeleniumAction seleniumAction : seleniumActions) { + System.out.println("action type name : " + seleniumAction.getAction_type_name()); + + switch (seleniumAction.getAction_type_id()) { + case 1: //goToUrl + System.out.println("go to : " + seleniumAction.getInput()); + driver.get(seleniumAction.getInput()); + driver.manage().timeouts().implicitlyWait(1,TimeUnit.SECONDS); + break; + case 2: //FillField + System.out.println("fill : " + seleniumAction.getObject() + " with " + seleniumAction.getInput()); + WebElement textBox = driver.findElement(By.name(seleniumAction.getObject())); + textBox.sendKeys(seleniumAction.getInput()); + break; + case 3: //GetAttribute + WebElement webElement = driver.findElement(By.name(seleniumAction.getTarget())); + String pageAttribute = webElement.getAttribute(seleniumAction.getObject()); + if (!pageAttribute.equals(seleniumAction.getInput())) { + seleniumResponse.setSuccess(false); + seleniumResponse.setOutput("Attribute " + seleniumAction.getObject() + " of " + seleniumAction.getTarget() + " is " + pageAttribute + " instead of " + seleniumAction.getInput()); + driver.quit(); + long endTime = System.currentTimeMillis(); + long totalTime = endTime - startTime; + seleniumResponse.setDuration(totalTime); + return seleniumResponse; + } + break; + case 4: //GetPageTitle + String pageTitle = driver.getTitle(); + if (!pageTitle.equals(seleniumAction.getTarget())) { + seleniumResponse.setSuccess(false); + seleniumResponse.setOutput("Page title is " + pageTitle + " instead of " + seleniumAction.getTarget()); + driver.quit(); + long endTime = System.currentTimeMillis(); + long totalTime = endTime - startTime; + seleniumResponse.setDuration(totalTime); + return seleniumResponse; + } + break; + case 5: //Clear + WebElement textBoxToClear = driver.findElement(By.name(seleniumAction.getObject())); + textBoxToClear.clear(); + break; + case 6: //Click + WebElement submitButton = driver.findElement(By.name(seleniumAction.getObject())); + submitButton.click(); + break; + case 7: //isDisplayed + WebElement message = driver.findElement(By.name(seleniumAction.getObject())); + message.getText(); + break; + default: + System.out.println("action type id : " + seleniumAction.getAction_type_id() + " not found"); + break; + } + } + + driver.quit(); + + long endTime = System.currentTimeMillis(); + long totalTime = endTime - startTime; + seleniumResponse.setDuration(totalTime); + + seleniumResponse.setSuccess(true); + + } + + catch(Exception e) { + driver.quit(); + + long endTime = System.currentTimeMillis(); + long totalTime = endTime - startTime; + seleniumResponse.setDuration(totalTime); + + seleniumResponse.setSuccess(false); + seleniumResponse.setOutput(e.getMessage()); + return seleniumResponse; + } + + } + + catch(Exception e) { + System.out.println(e); + seleniumResponse.setSuccess(false); + seleniumResponse.setOutput(e.toString()); + return seleniumResponse; + } + + return seleniumResponse; + } + + @GetMapping("/all") + public String allAccess() { + return "Bienvenue au TAF."; + } +} diff --git a/selenium/src/main/java/ca/etsmtl/selenium/requests/payload/request/SeleniumAction.java b/selenium/src/main/java/ca/etsmtl/selenium/requests/payload/request/SeleniumAction.java new file mode 100644 index 0000000..a1ac4ff --- /dev/null +++ b/selenium/src/main/java/ca/etsmtl/selenium/requests/payload/request/SeleniumAction.java @@ -0,0 +1,13 @@ +package ca.etsmtl.selenium.requests.payload.request; + +import lombok.Data; + +@Data +public class SeleniumAction { + int action_id; + int action_type_id; + String action_type_name; + String object; + String input; + String target; +} diff --git a/selenium/src/main/java/ca/etsmtl/selenium/requests/payload/request/SeleniumCase.java b/selenium/src/main/java/ca/etsmtl/selenium/requests/payload/request/SeleniumCase.java new file mode 100644 index 0000000..aca1b9b --- /dev/null +++ b/selenium/src/main/java/ca/etsmtl/selenium/requests/payload/request/SeleniumCase.java @@ -0,0 +1,12 @@ +package ca.etsmtl.selenium.requests.payload.request; + +import java.util.List; + +import lombok.Data; + +@Data +public class SeleniumCase { + public int case_id; + public String caseName; + public List actions; +} diff --git a/selenium/src/main/java/ca/etsmtl/selenium/requests/payload/request/SeleniumResponse.java b/selenium/src/main/java/ca/etsmtl/selenium/requests/payload/request/SeleniumResponse.java new file mode 100644 index 0000000..385bdec --- /dev/null +++ b/selenium/src/main/java/ca/etsmtl/selenium/requests/payload/request/SeleniumResponse.java @@ -0,0 +1,17 @@ +package ca.etsmtl.selenium.requests.payload.request; + +import java.io.Serializable; +import java.util.List; + +import lombok.Data; + +@Data +public class SeleniumResponse implements Serializable { + public int case_id; + public String caseName; + public List seleniumActions; + public boolean success; + public long timestamp; + public long duration; + public String output; +} diff --git a/selenium/src/main/resources/application.yml b/selenium/src/main/resources/application.yml new file mode 100644 index 0000000..2b98cfb --- /dev/null +++ b/selenium/src/main/resources/application.yml @@ -0,0 +1,6 @@ +server: + port: 8090 + +logging: + level: + web: DEBUG \ No newline at end of file diff --git a/selenium/src/main/resources/chromedriver b/selenium/src/main/resources/chromedriver new file mode 100644 index 0000000..8da9ce4 Binary files /dev/null and b/selenium/src/main/resources/chromedriver differ diff --git a/selenium/src/test/java/ca/etsmtl/selenium/SeleniumApplicationTests.java b/selenium/src/test/java/ca/etsmtl/selenium/SeleniumApplicationTests.java new file mode 100644 index 0000000..3c40bd9 --- /dev/null +++ b/selenium/src/test/java/ca/etsmtl/selenium/SeleniumApplicationTests.java @@ -0,0 +1,9 @@ +package ca.etsmtl.selenium; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SeleniumApplicationTests { + +} diff --git a/testapi/Dockerfile b/testapi/Dockerfile index 6077536..60a5b26 100644 --- a/testapi/Dockerfile +++ b/testapi/Dockerfile @@ -3,5 +3,5 @@ WORKDIR /testapi COPY pom.xml ./ COPY ./src ./src RUN mvn clean install -EXPOSE 8082 +EXPOSE 8090 ENTRYPOINT ["mvn", "spring-boot:run" ] \ No newline at end of file