Skip to content

Commit 017fde6

Browse files
arcuri82arcuri82
authored
Merge pull request #1385 from WebFuzzing/refactor-module-v4
refactor-module-v4
2 parents 0bf19a9 + 38f40d9 commit 017fde6

1,948 files changed

Lines changed: 261 additions & 183 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ jobs:
349349
CI_env: GithubAction
350350
- name: Run BB E2E tests
351351
# important that what we run here does not use Docker
352-
working-directory: core-tests/e2e-tests/spring-rest-bb
352+
working-directory: core-tests/e2e-tests/spring/spring-rest-bb
353353
run: mvn clean verify --fae
354354
env:
355355
CI_env: GithubAction

‎.gitignore‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ client-java/ci-utils/target
3535
core/target/
3636
/core-tests/e2e-tests/dropwizard-examples/target/
3737
/core-tests/e2e-tests/e2e-tests-utils/target/
38-
/core-tests/e2e-tests/spring-rest-openapi-v2/target/
38+
/core-tests/e2e-tests/spring/spring-rest-openapi-v2/target/
3939
experiments/target/
40-
/core-tests/e2e-tests/spring-rest-openapi-v2/src/em/EvoMasterTest.java
40+
/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/em/EvoMasterTest.java
4141
/core-tests/e2e-tests/dropwizard-examples/src/em/
4242
/snapshot.csv
4343
*.lst
4444
/report/target/
4545
/extra_heuristics.csv
4646
/core-extra/dbconstraint/target/
47-
/core-tests/e2e-tests/spring-rest-postgres/target/
48-
/core-tests/e2e-tests/spring-rest-postgres-data-types/target/
47+
/core-tests/e2e-tests/spring/spring-rest-postgres/target/
48+
/core-tests/e2e-tests/spring/spring-rest-postgres-data-types/target/
4949
/core/testWithEMB.sh
5050
/resource-rest-experiments/api-generator/target/
5151

52-
/core-tests/e2e-tests/spring-rest-openapi-v3/target
53-
/core-tests/e2e-tests/spring-graphql/target
52+
/core-tests/e2e-tests/spring/spring-rest-openapi-v3/target
53+
/core-tests/e2e-tests/spring/spring-graphql/target
5454
/core-tests/e2e-tests/ci-utils/target
5555

5656
/core-tests/core-it/target/
@@ -90,73 +90,72 @@ Migrations/
9090

9191

9292
/release/
93-
/core-tests/e2e-tests/spring-rpc-thrift/target/
94-
/core-tests/e2e-tests/spring-rpc/spring-rpc-thrift/target/
93+
/core-tests/e2e-tests/spring/spring-rpc-thrift/target/
94+
/core-tests/e2e-tests/spring/spring-rpc-grpc/target/
9595
/core-tests/e2e-tests/micronaut-latest/target/
9696
/core-tests/e2e-tests/wiremock/target/
9797

9898

99-
/core-tests/e2e-tests/spring-rest-h2-v1/target/
100-
/core-tests/e2e-tests/spring-rest-mysql-column-types/target/
101-
/core-tests/e2e-tests/spring-rest-postgres-column-types/target/
102-
/core-tests/e2e-tests/spring-rest-h2-column-types/target/
103-
/core-tests/e2e-tests/spring-rest-h2-z3solver/target/
99+
/core-tests/e2e-tests/spring/spring-rest-h2-v1/target/
100+
/core-tests/e2e-tests/spring/spring-rest-mysql-column-types/target/
101+
/core-tests/e2e-tests/spring/spring-rest-postgres-column-types/target/
102+
/core-tests/e2e-tests/spring/spring-rest-h2-column-types/target/
103+
/core-tests/e2e-tests/spring/spring-rest-h2-z3solver/target/
104104
/core-tests/client-java/test-old-libraries/target/
105-
/core-tests/e2e-tests/spring-web/target/
106-
/core-tests/e2e-tests/spring-rest-mongo/target/
107-
/core-tests/e2e-tests/spring-rest-opensearch/target/
105+
/core-tests/e2e-tests/spring/spring-web/target/
106+
/core-tests/e2e-tests/spring/spring-rest-mongo/target/
107+
/core-tests/e2e-tests/spring/spring-rest-opensearch/target/
108108
/core-tests/client-java/target/
109109
/core-tests/client-java/dependencies/target/
110110
/core-tests/client-java/sql-dto/target/
111111
/core-tests/client-java/sql/target/
112112
/core-tests/client-java/distance-heuristics/target/
113-
/core-tests/e2e-tests/spring-rpc/spring-rpc-grpc/target/
114113
/em.toml
115114

116115
/core-extra/solver/target/
117116
/em.yaml
118-
/core-tests/e2e-tests/spring-rest-openapi-v2/em.yaml
119-
/core-tests/e2e-tests/spring-rest-openapi-v3/em.yaml
117+
/core-tests/e2e-tests/spring/spring-rest-openapi-v2/em.yaml
118+
/core-tests/e2e-tests/spring/spring-rest-openapi-v3/em.yaml
120119
/core-tests/core-it/em.yaml
121120

122121
/test-utils/test-utils-js/coverage/
123122
/test-utils/test-utils-js/node_modules/
124123
/test-utils/test-utils-js/target/
125124
/core/em.yaml
126125

127-
/core-tests/e2e-tests/spring-rest-bb/target/
128-
/core-tests/e2e-tests/spring-rest-bb/javascript/node_modules/
129-
/core-tests/e2e-tests/spring-rest-bb/javascript/generated/
130-
/core-tests/e2e-tests/spring-rest-bb/python/generated/
126+
/core-tests/e2e-tests/spring/spring-rest-bb/target/
127+
/core-tests/e2e-tests/spring/spring-rest-bb/javascript/node_modules/
128+
/core-tests/e2e-tests/spring/spring-rest-bb/javascript/generated/
129+
/core-tests/e2e-tests/spring/spring-rest-bb/python/generated/
131130

132131
/client-java/test-utils-java/target/
133132

134133
/test-utils/test-utils-py/target/
135134
/test-utils/test-utils-py/src/main/resources/__pycache__/
136135
/test-utils/test-utils-py/src/test/__pycache__/
137136

138-
/core-tests/e2e-tests/spring-graphql-bb/javascript/generated/
139-
/core-tests/e2e-tests/spring-graphql-bb/javascript/node_modules/
140-
/core-tests/e2e-tests/spring-graphql-bb/python/generated/
141-
/core-tests/e2e-tests/spring-graphql-bb/target/
137+
/core-tests/e2e-tests/spring/spring-graphql-bb/javascript/generated/
138+
/core-tests/e2e-tests/spring/spring-graphql-bb/javascript/node_modules/
139+
/core-tests/e2e-tests/spring/spring-graphql-bb/python/generated/
140+
/core-tests/e2e-tests/spring/spring-graphql-bb/target/
142141

143142
/generated_tests/
144-
/core-tests/e2e-tests/spring-rest-bb/maven/src/
145-
/core-tests/e2e-tests/spring-rest-bb/maven/target/
143+
/core-tests/e2e-tests/spring/spring-rest-bb/maven/src/
144+
/core-tests/e2e-tests/spring/spring-rest-bb/maven/target/
146145
/target/
147146
/wfc/target/
148147

149-
/core-tests/e2e-tests/emb-json/target/
148+
/core-tests/e2e-tests/spring/emb-json/target/
150149
/process_data/
151-
/core-tests/e2e-tests/spring-rest-multidb/target/
152-
/core-tests/e2e-tests/spring-rest-h2-v2/target/
153-
/core-tests/e2e-tests/spring-rest-rsa/target/
154-
/core-tests/e2e-tests/spring-rest-h2-v1/em.yaml
150+
/core-tests/e2e-tests/spring/spring-rest-multidb/target/
151+
/core-tests/e2e-tests/spring/spring-rest-h2-v2/target/
152+
/core-tests/e2e-tests/spring/spring-rest-rsa/target/
153+
/core-tests/e2e-tests/spring/spring-rest-h2-v1/em.yaml
155154
/core-tests/integration-tests/core-it/target/
156155
/core-tests/integration-tests/core-it/em.yaml
157156

158157
client-java/sql/target
159158
client-java/sql-dto/target
160159
client-java/distance-heuristics/target
161160
client-java/test-old-libraries/target
162-
core-tests/e2e-tests/spring-rest-mysql/target
161+
core-tests/e2e-tests/spring/spring-rest-mysql/target

‎core-tests/e2e-tests/pom.xml‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,7 @@
1616
<module>e2e-tests-utils</module>
1717
<module>dropwizard-examples</module>
1818
<module>micronaut-latest</module>
19-
<module>spring-rest-postgres</module>
20-
<module>spring-rest-openapi-v2</module>
21-
<module>spring-rest-openapi-v3</module>
22-
<module>spring-graphql</module>
23-
<module>spring-rest-mysql</module>
24-
<module>spring-rpc</module>
25-
<module>spring-rest-h2-v1</module>
26-
<module>spring-rest-h2-v2</module>
27-
<module>spring-rest-h2-z3solver</module>
28-
<module>spring-web</module>
29-
<module>spring-rest-mongo</module>
30-
<module>spring-rest-bb</module>
31-
<module>spring-graphql-bb</module>
32-
<module>emb-json</module>
33-
<module>spring-rest-multidb</module>
34-
<module>spring-rest-opensearch</module>
35-
<module>spring-rest-rsa</module>
36-
19+
<module>spring</module>
3720
</modules>
3821

3922

‎core-tests/e2e-tests/spring-rpc/pom.xml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

core-tests/e2e-tests/emb-json/pom.xml renamed to core-tests/e2e-tests/spring/emb-json/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
77
<groupId>org.evomaster</groupId>
8-
<artifactId>evomaster-e2e-tests</artifactId>
8+
<artifactId>evomaster-e2e-tests-spring</artifactId>
99
<version>4.0.1-SNAPSHOT</version>
1010
</parent>
1111

core-tests/e2e-tests/emb-json/src/main/java/com/foo/rest/emb/json/SwaggerConfiguration.java renamed to core-tests/e2e-tests/spring/emb-json/src/main/java/com/foo/rest/emb/json/SwaggerConfiguration.java

File renamed without changes.

core-tests/e2e-tests/emb-json/src/main/java/com/foo/rest/emb/json/genome/GenomeNexusExampleApplication.java renamed to core-tests/e2e-tests/spring/emb-json/src/main/java/com/foo/rest/emb/json/genome/GenomeNexusExampleApplication.java

File renamed without changes.

core-tests/e2e-tests/emb-json/src/main/java/com/foo/rest/emb/json/genome/GenomeNexusExampleEndpoints.java renamed to core-tests/e2e-tests/spring/emb-json/src/main/java/com/foo/rest/emb/json/genome/GenomeNexusExampleEndpoints.java

File renamed without changes.

core-tests/e2e-tests/emb-json/src/main/java/com/foo/rest/emb/json/genome/TokenMapConverter.java renamed to core-tests/e2e-tests/spring/emb-json/src/main/java/com/foo/rest/emb/json/genome/TokenMapConverter.java

File renamed without changes.

core-tests/e2e-tests/emb-json/src/main/java/com/foo/rest/emb/json/gestaohospital/GestaoHospitalExampleApplication.java renamed to core-tests/e2e-tests/spring/emb-json/src/main/java/com/foo/rest/emb/json/gestaohospital/GestaoHospitalExampleApplication.java

File renamed without changes.

0 commit comments

Comments
 (0)