Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
folder: [jdk_8_maven, jdk_11_maven, jdk_17_maven, jdk_21_maven, jdk_8_gradle, jdk_11_gradle, jdk_17_gradle]
folder: [jdk_8_maven, jdk_11_maven, jdk_17_maven, jdk_21_maven, jdk_25_maven, jdk_8_gradle, jdk_11_gradle, jdk_17_gradle]
include:
# Maven
- folder: jdk_8_maven
Expand All @@ -40,6 +40,9 @@ jobs:
- folder: jdk_21_maven
jdk-version: 21
command: mvn clean install -DskipTests
- folder: jdk_25_maven
jdk-version: 25
command: mvn clean install -DskipTests
# Gradle
- folder: jdk_8_gradle
jdk-version: 8
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,8 @@ scripts/dockerize/dockerfiles
/jdk_21_maven/cs/rest/person-controller/target/
/jdk_21_maven/em/embedded/rest/person-controller/target/
/jdk_21_maven/em/external/rest/person-controller/target/
/jdk_25_maven/em/external/rest/commafeed/target/
/jdk_25_maven/em/embedded/rest/commafeed/target/
/jdk_11_maven/em/embedded/rest/tracking-system/target/
/jdk_11_maven/em/external/rest/tracking-system/target/
/jdk_17_maven/em/embedded/rest/tiltaksgjennomforing/target/
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,16 @@ How to setup authentication information, based on the current content of the ini
Auth configuration files can found in the [auth](auth) folder.


### REST: Java/Kotlin (36)
### REST: Java/Kotlin (37)

* **Bibliothek** (MIT), [jdk_17_gradle/cs/rest/bibliothek](jdk_17_gradle/cs/rest/bibliothek), from [https://github.com/PaperMC/bibliothek](https://github.com/PaperMC/bibliothek)

* **Blog** (AGPL), [jdk_8_maven/cs/rest/original/blogapi](jdk_8_maven/cs/rest/original/blogapi), from [https://github.com/osopromadze/Spring-Boot-Blog-REST-API](https://github.com/osopromadze/Spring-Boot-Blog-REST-API)

* **CatWatch** (Apache), [jdk_8_maven/cs/rest/original/catwatch](jdk_8_maven/cs/rest/original/catwatch), from [https://github.com/zalando-incubator/catwatch](https://github.com/zalando-incubator/catwatch)

* **CommaFeed** (Apache), [jdk_25_maven/cs/rest/commafeed](jdk_25_maven/cs/rest/commafeed), from [https://github.com/Athou/commafeed](https://github.com/Athou/commafeed)

* **CWA-Verification-Server** (Apache), [jdk_11_maven/cs/rest/cwa-verification-server](jdk_11_maven/cs/rest/cwa-verification-server), from [https://github.com/corona-warn-app/cwa-verification-server](https://github.com/corona-warn-app/cwa-verification-server)

* **ERC20 Rest Service** (not-known license), [jdk_8_gradle/cs/rest/erc20-rest-service](jdk_8_gradle/cs/rest/erc20-rest-service), from [https://github.com/web3labs/erc20-rest-service](https://github.com/web3labs/erc20-rest-service)
Expand Down Expand Up @@ -263,8 +265,8 @@ docker-compose -f dockerfiles/reservations-api.yaml up
```

_White-box_ testing: everything can be setup by running the script `scripts/dist.py`.
Note that you will need installed at least Maven, Gradle, JDK 8, JDK 11, JDK 17, JDK 21, NPM, as well as Docker.
Also, you will need to setup environment variables like `JAVA_HOME_8`, `JAVA_HOME_11`, `JAVA_HOME_17` and `JAVA_HOME_21`.
Note that you will need installed at least Maven, Gradle, JDK 8, JDK 11, JDK 17, JDK 21, JDK 25, NPM, as well as Docker.
Also, you will need to setup environment variables like `JAVA_HOME_8`, `JAVA_HOME_11`, `JAVA_HOME_17`, `JAVA_HOME_21` and `JAVA_HOME_25`.
The script will issue error messages if any prerequisite is missing.
Once the script is completed, not only all the SUTs will be available under the `dist` folder, but also all the _driver_ executables for _EvoMaster_.

Expand Down
13 changes: 13 additions & 0 deletions auth/commafeed-auth.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
auth:
- name: admin
fixedHeaders:
- name: Authorization
value: Basic YWRtaW46YWRtaW4xMjM=
- name: user1
fixedHeaders:
- name: Authorization
value: Basic dXNlcjE6dXNlcjExMjM=
- name: user2
fixedHeaders:
- name: Authorization
value: Basic dXNlcjI6dXNlcjIxMjM=
17 changes: 17 additions & 0 deletions dockerfiles/commafeed.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM amazoncorretto:25-alpine-jdk

COPY ./dist/commafeed-sut.jar .
COPY ./dist/jacocoagent.jar .



#ENV TOOL="undefined"
#ENV RUN="0"

ENTRYPOINT \
java \
# unfortunately dumponexit is completely unreliable in Docker :(
# -javaagent:jacocoagent.jar=destfile=./jacoco/commafeed__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
-javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
-Dquarkus.http.port=8080 -Dquarkus.datasource.db-kind=h2 -Dquarkus.datasource.jdbc.url="jdbc:h2:mem:commafeed;DB_CLOSE_DELAY=-1" -Dquarkus.datasource.username=sa -Dquarkus.datasource.password=sa -jar commafeed-sut.jar \

29 changes: 29 additions & 0 deletions dockerfiles/commafeed.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
services:
mitmproxy:
image: mitmproxy/mitmproxy:10.2.4
user: "0:0"
environment:
MITM_LOG_DIR: /custom-logs
MITM_LOG_FILE: ${MITM_LOG_FILE:-minlog.csv}
command: >
mitmdump
--mode reverse:http://sut-commafeed:8080
--listen-host 0.0.0.0
--listen-port 8080
--set keep_host_header=true
-s /addons/minlog.py
volumes:
- ${HOST_LOG_DIR:-./mitm-logs}:/custom-logs
- ./addons:/addons:ro
ports:
- "${HOST_PORT:-8080}:8080"
depends_on:
- sut-commafeed
sut-commafeed:
build:
dockerfile: ./dockerfiles/commafeed.dockerfile
context: ..
environment:
AUTH_PORT: ${AUTH_PORT:-8081}
ports:
- "${JACOCO_PORT:-6300}:6300"
3 changes: 3 additions & 0 deletions experiments/wb-exp.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,14 @@
JDK_11 = "JDK_11"
JDK_17 = "JDK_17"
JDK_21 = "JDK_21"
JDK_25 = "JDK_25"

def isJava(sut):
return (sut.platform == JDK_8
or sut.platform == JDK_11
or sut.platform == JDK_17
or sut.platform == JDK_21
or sut.platform == JDK_25
)

class Sut:
Expand All @@ -183,6 +185,7 @@ def __init__(self, name, platform):
Sut("bibliothek", JDK_17),
Sut("blogapi",JDK_8),
Sut("catwatch", JDK_8),
Sut("commafeed", JDK_25),
Sut("cwa-verification", JDK_11),
Sut("erc20-rest-service", JDK_8),
Sut("familie-ba-sak",JDK_17),
Expand Down
Binary file modified jacoco/jacocoagent.jar
Binary file not shown.
Binary file modified jacoco/jacococli.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion jacoco/version.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
https://www.jacoco.org/jacoco/

0.8.12
0.8.14
19 changes: 19 additions & 0 deletions jdk_25_maven/cs/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.evomaster</groupId>
<artifactId>evomaster-benchmark-jdk25</artifactId>
<version>4.3.1-SNAPSHOT</version>
</parent>

<artifactId>evomaster-benchmark-jdk25-cs</artifactId>
<packaging>pom</packaging>

<modules>
<module>rest</module>
</modules>


</project>
1 change: 1 addition & 0 deletions jdk_25_maven/cs/rest/commafeed/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
commafeed-client
3 changes: 3 additions & 0 deletions jdk_25_maven/cs/rest/commafeed/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* text eol=lf
*.cmd text eol=crlf
*.png binary
5 changes: 5 additions & 0 deletions jdk_25_maven/cs/rest/commafeed/.github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
github: [ athou ]
custom: [
'https://github.com/sponsors/Athou',
'https://www.paypal.com/donate/?business=9CNQHMJG2ZJVY&no_recurring=0&item_name=CommaFeed&currency_code=EUR'
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Bug report
about: Create a report to help us improve
title: ""
labels: ""
assignees: ""
---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Environment (please complete the following information):**

- commafeed.com or self-hosted:
- If self-hosted, CommaFeed version [e.g. 5.1.0 (a3dcb2c)]:
- Browser [e.g. chrome, firefox]:
- Device [e.g. desktop, mobile]:

**Additional context**
Add any other context about the problem here.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
20 changes: 20 additions & 0 deletions jdk_25_maven/cs/rest/commafeed/.github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
- enhancement
- feature-request
- bug
# Label to use when marking an issue as stale
staleLabel: wontfix
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
Loading
Loading