Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
9304de1
App running - Leo
IamMoShi Oct 19, 2024
46292f9
After tutorial : https://spring.io/guides/gs/multi-module
IamMoShi Oct 22, 2024
9a096df
Add documentation to testrail module
IamMoShi Oct 23, 2024
96d1927
Docker database
IamMoShi Oct 25, 2024
5964697
[feat] ressources sample gatling
Oct 25, 2024
ce2d311
[feat] Temp test case object for gatling
Oct 25, 2024
bcb341e
Create Entities GatlingResult & GatlingTestCase
IamMoShi Oct 26, 2024
99e59e8
Merge remote-tracking branch 'origin/develop' into develop
IamMoShi Oct 26, 2024
a75c8d1
Patch error due to dialect configuration of hibernate
IamMoShi Oct 26, 2024
cd2dc99
Create Entities GatlingResult & GatlingTestCase
IamMoShi Oct 26, 2024
305bbde
Communication with TestRail API for project management. Not tested
IamMoShi Oct 26, 2024
7eb8c62
Update architecture && create service and repository for TestRailProject
IamMoShi Oct 27, 2024
36c2008
create service and repository for GatlingResult
IamMoShi Oct 27, 2024
2b5a7db
create service and repository for GatlingTestCase
IamMoShi Oct 27, 2024
a41bfa8
create service and repository for TestRailUser
IamMoShi Oct 27, 2024
f0408ce
Add class comments and TODO notes
IamMoShi Oct 27, 2024
492da56
Correcting type in database TestRailProject (completed_on)
IamMoShi Oct 27, 2024
3577d1e
Adding unique specification to TestRailUser and TestRailProject
IamMoShi Oct 27, 2024
ea930ab
Correcting TestRailUser and TestRailProject to have id (id from TR) t…
IamMoShi Oct 27, 2024
7ea66b1
Create TestRailSuite data with repo and service
IamMoShi Oct 27, 2024
4c74c07
Correct error introduced by changing complete_on format
IamMoShi Oct 27, 2024
0c19279
Adding two factory method to implements TODO
IamMoShi Oct 27, 2024
f97a62f
Adding unit tests class to create TODO
IamMoShi Oct 27, 2024
f9b3a08
Adding refresh class to create TODO
IamMoShi Oct 27, 2024
88c0a1d
Adding load classes to create TODO
IamMoShi Oct 27, 2024
8746a84
Refactoring name misspell
IamMoShi Oct 27, 2024
e7a2bd8
Creation files for TestRailTestCase TODO
IamMoShi Oct 27, 2024
6c851b0
Patching bug hibernate about id name in database
IamMoShi Oct 27, 2024
4cf6ae8
Merge branch 'develop' of github.com:Yojda/TAF into develop
Oct 28, 2024
6ea5433
[feat] Gatling script parser
Oct 28, 2024
95d1d87
Meeting 28-10-24
IamMoShi Oct 28, 2024
61b6231
Merge branch 'develop' of github.com:Yojda/TAF into develop
Oct 28, 2024
c6b5816
[fix] Logging and parsing gatling project
Oct 29, 2024
2a25bf0
ajout code Entity/TestRailCase
Oct 29, 2024
c64145f
Exemples de tests
IamMoShi Oct 29, 2024
68e092d
[fix] userInjection code
Oct 29, 2024
6fdd35f
[test] simple TempTestCaseGatling (just exec)
Oct 29, 2024
c2eeef6
Tests unitaires update project
IamMoShi Oct 29, 2024
e8ee1f3
ajout code Repository Case & Suite
Oct 29, 2024
039f406
Merge branch 'TestrailConnection' of github.com:Yojda/TAF into Testra…
IamMoShi Oct 29, 2024
a93cb1e
[fix] the Test run with SimpleSimulation.java in testrail module ress…
Oct 29, 2024
41a14f9
[fix] Parsing method return GatlingTestCase object with a gatling sim…
Oct 29, 2024
59f8ea2
Unit Test project service
IamMoShi Oct 29, 2024
0e65ac1
ajout code case repository & service
Oct 29, 2024
949fbbb
Merge remote-tracking branch 'refs/remotes/origin/TestrailConnection'…
Oct 29, 2024
073887a
ajout Factory de Case, Suite, User
Oct 29, 2024
bfb69b4
ajout Suite TestUnit; modification dans Suite Service
Oct 29, 2024
bda15a3
Déplacement des fichiers Test Unit Suite & User
Oct 29, 2024
8907758
Ajout Test Unit User et modifications en lien
Oct 30, 2024
dfaff35
Ajout Test Unit Case
Oct 30, 2024
3006f96
Update tests TODO status
IamMoShi Oct 30, 2024
17479bb
Adapting backend after meeting of 1st November 2024
IamMoShi Nov 1, 2024
34f9366
Adapting backend after meeting of 1st November 2024
IamMoShi Nov 1, 2024
ef4c326
Meeting
IamMoShi Nov 3, 2024
96868ab
[test] Test creation of TestRailCase with Simulation.java gatling fil…
Nov 3, 2024
636d7c1
Meeting
IamMoShi Nov 5, 2024
7355a9b
[test] New tests
Nov 5, 2024
46c0af3
Merge branch 'TestrailConnection' into develop
Nov 5, 2024
cc1dcd4
Merge branch 'GatlingRecup' into develop
Nov 5, 2024
1aaa4f1
Merge remote-tracking branch 'upstream/develop' into develop
Nov 5, 2024
9f2ea0c
[fix] maven test build
Nov 9, 2024
ec6ed4f
[fix] dependencies javax
Nov 9, 2024
46b32c1
[fix] javax import in backend classes instead of jakarta (because typ…
Nov 12, 2024
87f0f29
[fix] delete empty test
Nov 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
2 changes: 0 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties

This file was deleted.

45 changes: 40 additions & 5 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<artifactId>taf</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>ca.etsmtl.taf</groupId>
<artifactId>backend</artifactId>
<dependencies>
<dependency>
Expand Down Expand Up @@ -35,10 +36,9 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.31</version>
<scope>runtime</scope>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.4.1</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
Expand All @@ -52,6 +52,34 @@
<version>1.18.24</version>
<scope>provided</scope>
</dependency>
<!-- Jakarta Validation API -->
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.0</version>
</dependency>

<!-- Jakarta Persistence (JPA) API -->
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>3.1.0</version>
</dependency>

<!-- Jakarta Servlet API -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>[5.0.0,)</version>
</dependency>

<!-- Add Hibernate Validator (implementation of Jakarta Validation) -->
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>7.0.2.Final</version>
</dependency>


<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -83,11 +111,18 @@
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>5.5</version> <!-- Use the latest version available -->
</dependency>

<!-- Module dependencies -->
<dependency>
<groupId>ca.etsmtl.taf</groupId>
<artifactId>testrail</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

@SpringBootApplication
@SpringBootApplication(scanBasePackages = {"ca.etsmtl.taf", "ca.etsmtl.taf.testrail"})
@EnableJpaAuditing
public class TestAutomationFrameworkApplication {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import ca.etsmtl.taf.security.jwt.AuthEntryPointJwt;
import ca.etsmtl.taf.security.jwt.AuthTokenFilter;
import ca.etsmtl.taf.security.services.UserDetailsServiceImpl;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;

@Configuration
@EnableWebSecurity
Expand Down Expand Up @@ -51,7 +52,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
.exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
.authorizeHttpRequests((authz) -> authz
.requestMatchers("/**").permitAll() // جایگزین antMatchers
.requestMatchers(new AntPathRequestMatcher("/**")).permitAll() // جایگزین antMatchers
);

http.addFilterBefore(authenticationJwtTokenFilter(), UsernamePasswordAuthenticationFilter.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import java.util.HashMap;
import java.util.Map;

import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import java.io.IOException;

import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
18 changes: 12 additions & 6 deletions backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://nostrasoft.com:3306/nostr321_taf-db
username: nostr321_taf
password: JKaVLX75iHwtrHc
driver-class-name: org.mariadb.jdbc.Driver
url: jdbc:mariadb://127.0.0.1:3306/taf-db
username: taf
password: taf
jpa:
defer-datasource-initialization: true
hibernate:
ddl-auto: update
dialect : ${spring.jpa.properties.hibernate.dialect}
properties:
hibernate:
dialect: org.hibernate.dialect.MySQL8Dialect
dialect: org.hibernate.dialect.MariaDBDialect
messages:
basename: validation
encoding: ISO-8859-1
sql:
init:
mode: always
platform: mysql
platform: mariadb
taf:
app:
jwtSecret: bezKoderSecretKey
Expand All @@ -28,5 +28,11 @@ taf:
selenium_container_url: http://selenium
selenium_container_port: 8090

testrail:
base-url: "https://leofornoff.testrail.io/index.php?/api/v2/"
username: "[email protected]"
password: "Valid8-Outpost2-Caravan0-Unlovable9-Easter7"


server:
port: 8083
25 changes: 25 additions & 0 deletions backend/src/main/resources/testrail/SimpleSimulation.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package computerdatabase;

import static io.gatling.javaapi.core.CoreDsl.*;
import static io.gatling.javaapi.http.HttpDsl.*;

import io.gatling.javaapi.core.*;
import io.gatling.javaapi.http.*;

public class SimpleSimulation extends Simulation {

HttpProtocolBuilder httpProtocol =
http.baseUrl("https://wikijs.fornoff.fr")
.acceptHeader("application/json")
.contentTypeHeader("application/json");

ScenarioBuilder Scenario = scenario("My First Scenario")
.exec(http("Request 1")
.get("/computers/"));

{
setUp(
Scenario.injectOpen(rampUsers(10).during(5))
).protocols(httpProtocol);
}
}
Loading
Loading