diff --git a/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml b/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml
index 3cacc929df9a..bf04b8954c1b 100644
--- a/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml
+++ b/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/README.md b/README.md
index 3ad3b4f25acb..130935b23ba1 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):
```shell
-./artemis-server-cli deploy username@artemistest.ase.in.tum.de -w build/libs/Artemis-7.0.3.war
+./artemis-server-cli deploy username@artemistest.ase.in.tum.de -w build/libs/Artemis-7.0.4.war
```
## Architecture
diff --git a/build.gradle b/build.gradle
index d713f51dc37f..07ee7acd4b1e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ plugins {
}
group = "de.tum.in.www1.artemis"
-version = "7.0.3"
+version = "7.0.4"
description = "Interactive Learning with Individual Feedback"
java {
@@ -190,7 +190,7 @@ jacocoTestCoverageVerification {
counter = "CLASS"
value = "MISSEDCOUNT"
// TODO: in the future the following value should become less than 10
- maximum = 26
+ maximum = 27
}
}
}
diff --git a/docker/artemis/config/node1.env b/docker/artemis/config/node1.env
index 5db1cae1da99..65d16156ff29 100644
--- a/docker/artemis/config/node1.env
+++ b/docker/artemis/config/node1.env
@@ -1,4 +1,4 @@
-SPRING_PROFILES_ACTIVE='prod,localvc,localci,buildagent,core,scheduling,docker'
+SPRING_PROFILES_ACTIVE='prod,localvc,localci,core,scheduling,docker'
EUREKA_INSTANCE_INSTANCEID='Artemis:1'
EUREKA_INSTANCE_HOSTNAME='artemis-app-node-1'
SPRING_HAZELCAST_INTERFACE='artemis-app-node-1'
diff --git a/docker/artemis/config/node2.env b/docker/artemis/config/node2.env
index 8fe579d9d0d8..c8438fadc51f 100644
--- a/docker/artemis/config/node2.env
+++ b/docker/artemis/config/node2.env
@@ -2,3 +2,6 @@ SPRING_PROFILES_ACTIVE='prod,localvc,localci,buildagent,core,docker'
EUREKA_INSTANCE_INSTANCEID='Artemis:2'
EUREKA_INSTANCE_HOSTNAME='artemis-app-node-2'
SPRING_HAZELCAST_INTERFACE='artemis-app-node-2'
+
+ARTEMIS_VERSIONCONTROL_USER='artemis_admin'
+ARTEMIS_VERSIONCONTROL_PASSWORD='artemis_admin'
diff --git a/docker/artemis/config/node3.env b/docker/artemis/config/node3.env
index feeec81050dc..f0b2937cac32 100644
--- a/docker/artemis/config/node3.env
+++ b/docker/artemis/config/node3.env
@@ -1,4 +1,7 @@
-SPRING_PROFILES_ACTIVE='prod,localvc,localci,buildagent,core,docker'
+SPRING_PROFILES_ACTIVE='prod,buildagent'
EUREKA_INSTANCE_INSTANCEID='Artemis:3'
EUREKA_INSTANCE_HOSTNAME='artemis-app-node-3'
SPRING_HAZELCAST_INTERFACE='artemis-app-node-3'
+
+ARTEMIS_VERSIONCONTROL_USER='artemis_admin'
+ARTEMIS_VERSIONCONTROL_PASSWORD='artemis_admin'
diff --git a/docker/artemis/config/prod-multinode.env b/docker/artemis/config/prod-multinode.env
index 4ca433fa7fd8..5965e05a4e49 100755
--- a/docker/artemis/config/prod-multinode.env
+++ b/docker/artemis/config/prod-multinode.env
@@ -35,7 +35,7 @@ EUREKA_INSTANCE_APPNAME='Artemis'
JHIPSTER_REGISTRY_PASSWORD="admin"
JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64SECRET="bXktc2VjcmV0LWtleS13aGljaC1zaG91bGQtYmUtY2hhbmdlZC1pbi1wcm9kdWN0aW9uLWFuZC1iZS1iYXNlNjQtZW5jb2RlZAo="
-ARTEMIS_VERSIONCONTROL_URL='https://localhost'
+ARTEMIS_VERSIONCONTROL_URL='http://artemis-app-node-2:8080'
ARTEMIS_VERSIONCONTROL_USER='demo'
ARTEMIS_VERSIONCONTROL_PASSWORD='demo'
ARTEMIS_CONTINUOUSINTEGRATION_ARTEMISAUTHENTICATIONTOKENVALUE='demo'
diff --git a/docker/nginx/artemis-upstream-multi-node.conf b/docker/nginx/artemis-upstream-multi-node.conf
index f8d94a933494..1ea41db8232e 100644
--- a/docker/nginx/artemis-upstream-multi-node.conf
+++ b/docker/nginx/artemis-upstream-multi-node.conf
@@ -1,3 +1,2 @@
server artemis-app-node-1:8080;
server artemis-app-node-2:8080;
-server artemis-app-node-3:8080;
diff --git a/docs/admin/setup/distributed.rst b/docs/admin/setup/distributed.rst
index 00b21980bc57..f1bd48e0e7ec 100644
--- a/docs/admin/setup/distributed.rst
+++ b/docs/admin/setup/distributed.rst
@@ -43,6 +43,8 @@ have to be synchronized:
Each of these three aspects is synchronized using a different solution
+.. _Database Cache:
+
Database cache
^^^^^^^^^^^^^^
Artemis uses a cache provider that supports distributed caching: Hazelcast_.
@@ -281,6 +283,8 @@ This enables the registry in nginx
This will apply the config changes and the registry will be reachable.
+.. _WebSockets:
+
WebSockets
^^^^^^^^^^
@@ -652,3 +656,116 @@ different ports and a unique instance ID for each instance.
#. Start the remaining instances.
You should now be able to see all instances in the registry interface at ``http://localhost:8761``.
+
+.. _Running multiple instances locally with Docker:
+
+Running multiple instances locally with Docker
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can also run multiple instances of Artemis locally using Docker. This will start 3 Artemis instances, each running
+on a its own container. A load balancer (nginx) will be used to distribute the requests to the different instances. The
+load balancer will be running in a separate container and will be accessible on ports 80/443 of the host system. The
+instances will be registered in the registry service running on a separate container. The instances will use the registry
+service to discover each other and form a Hazelcast cluster. Further details can be found in :ref:`Database Cache`. The
+instances will also use a ActiveMQ Artemis broker to synchronize WebSocket messages. Further details can be found in
+:ref:`WebSockets`. In summary, the setup will look like this:
+
+* 3 Artemis instances:
+
+ * artemis-app-node-1: using following spring profile: ``prod,localvc,localci,core,scheduling,docker``
+ * artemis-app-node-2: using following profile: ``prod,localvc,localci,buildagent,core,docker``
+ * artemis-app-node-3: using following profile: ``prod,buildagent``
+* A MySQL database addressable on port 3306 of the host system
+* A Load balancer (nginx) addressable on ports 80/443 of the host system: ``http(s)://localhost``
+* A Registry service addressable on port 8761 of the host system: ``http://localhost:8761``
+* An ActiveMQ broker
+
+
+ .. figure:: distributed/multi-node-setup.drawio.png
+ :align: center
+
+
+
+.. note::
+
+ - You don't have to start the client manually. The client files are served by the Artemis instances and can be
+ accessed through the load balancer on ``http(s)://localhost``.
+
+ - You may run into the following error when starting the containers
+ ``No member group is available to assign partition ownership...``. This issue should resolve itself after a few
+ minutes. Otherwise, you can first start the following containers:
+ ``docker compose -f docker/test-server-multi-node-mysql-localci.yml up mysql jhipster-registry activemq-broker artemis-app-node-1``.
+ After these containers are up and running, you can start the remaining containers:
+ ``docker compose -f docker/test-server-multi-node-mysql-localci.yml up artemis-app-node-2 artemis-app-node-3 nginx``.
+
+
+Linux setup
+"""""""""""
+
+#. When running the Artemis container on a Unix system, you will have to give the user running in the container
+ permission to access the Docker socket by adding them to the docker group. You can find the group ID of the docker
+ group by running ``getent group docker | cut -d: -f3``. Afterwards, create a new file ``docker/.env`` with the
+ following content:
+
+ .. code:: bash
+
+ DOCKER_GROUP_ID=
+
+#. The docker compose setup which we will use will mount some local directories
+ (namely the ones under docker/.docker-data) into the containers. To ensure that the user running in the container has
+ the necessary permissions to these directories, you will have to change the owner of these directories to the
+ user running in the container (User with ID 1337). You can do this by running the following command:
+
+ .. code:: bash
+
+ sudo chown -R 1337:1337 docker/.docker-data
+
+ .. note::
+
+ - If you don't want to change the owner of the directories, you can create other directories with the necessary
+ permissions and adjust the paths in the docker-compose file accordingly.
+ - You could also use docker volumes instead of mounting local directories. You will have to adjust the docker-compose
+ file accordingly (`Docker docs `_).
+ However, this would make it more difficult to access the files on the host system.
+
+#. Start the docker containers by running the following command:
+
+ .. code:: bash
+
+ docker compose -f docker/test-server-multi-node-mysql-localci.yml up
+
+#. You can now access artemis on ``http(s)://localhost`` and the registry on ``http://localhost:8761``.
+
+Windows setup
+"""""""""""""
+
+#. When running the Artemis container on a Windows system, you will have to change the value for the Docker connection
+ URI. You need to change the value of the environment variable ``ARTEMIS_CONTINUOUSINTEGRATION_DOCKERCONNECTIONURI``
+ in the file ``docker/artemis/config/prod-multinode.env`` to ``tcp://host.docker.internal:2375``.
+
+ .. note::
+
+ - Make sure that option "Expose daemon on tcp://localhost:2375 without TLS" is enabled. This can be found under
+ Settings > General in Docker Desktop.
+
+#. Start the docker containers by running the following command:
+
+ .. code:: bash
+
+ docker compose -f docker/test-server-multi-node-mysql-localci.yml up
+
+#. You can now access artemis on ``http(s)://localhost`` and the registry on ``http://localhost:8761``.
+
+MacOS setup
+"""""""""""
+
+#. Make sure to enable "Allow the default Docker socket to be used (requires password)" in the Docker Desktop settings.
+ This can be found under Settings > Advanced in Docker Desktop.
+
+#. Start the docker containers by running the following command:
+
+ .. code:: bash
+
+ docker compose -f docker/test-server-multi-node-mysql-localci.yml up
+
+#. You can now access artemis on ``http(s)://localhost`` and the registry on ``http://localhost:8761``.
diff --git a/docs/admin/setup/distributed/multi-node-setup.drawio.png b/docs/admin/setup/distributed/multi-node-setup.drawio.png
new file mode 100644
index 000000000000..2ed573edef8c
Binary files /dev/null and b/docs/admin/setup/distributed/multi-node-setup.drawio.png differ
diff --git a/docs/dev/guidelines/language-guidelines.rst b/docs/dev/guidelines/language-guidelines.rst
index 5daef380fb07..e7a2bec778ff 100644
--- a/docs/dev/guidelines/language-guidelines.rst
+++ b/docs/dev/guidelines/language-guidelines.rst
@@ -52,6 +52,7 @@ The German language is mainly used for user interaction.
**Best practices** (written in German for demonstration purposes)
* **Nutze neutrale Formulierungen**: Wenn möglich ist es empfehlenswert, neutrale Formulierungen zu finden. Neben passiven Formen, wie z.B. Studierende, können auch aktive mit „Mensch“ bzw. „Person“ etc. verwendet werden. Das spart „der/die“ und inkludiert alle Menschen unabhängig davon, welche Eigenschaften/Kategorien diese Personen sonst noch mitbringen.
+* **Verwende die Anrede „du“**:Um eine persönliche und weniger formelle Atmosphäre zu schaffen, verwende „du“ statt „Sie".
* **Beschreibe Handlungen (aktiv oder passiv)**:
* „Automatisch generierte Ergebnisse werden am Ende des Bearbeitungszeitraums erstellt“. Statt „Die Studierenden erhalten am Ende des Bearbeitungszeitraums ein automisch generiertes Ergebnis.“)
diff --git a/gradle.properties b/gradle.properties
index 139855db4992..97ce34ef74a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -39,4 +39,10 @@ org.gradle.jvmargs=-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
- --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+ --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+ --add-modules java.se \
+ --add-exports java.base/jdk.internal.ref=ALL-UNNAMED \
+ --add-opens java.base/java.lang=ALL-UNNAMED \
+ --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
+ --add-opens java.management/sun.management=ALL-UNNAMED \
+ --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
diff --git a/package-lock.json b/package-lock.json
index fbbc7827b592..e31feab48511 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "artemis",
- "version": "7.0.3",
+ "version": "7.0.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "artemis",
- "version": "7.0.3",
+ "version": "7.0.4",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 1d63e654a779..3beddbdad865 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "artemis",
- "version": "7.0.3",
+ "version": "7.0.4",
"description": "Interactive Learning with Individual Feedback",
"private": true,
"license": "MIT",
diff --git a/src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java
index 206d1518cd2a..829f994a1a50 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java
@@ -188,7 +188,7 @@ public HazelcastInstance hazelcastInstance(JHipsterProperties jHipsterProperties
config.getSerializationConfig().addSerializerConfig(createPathSerializerConfig());
if (registration == null) {
- log.warn("No discovery service is set up, Hazelcast cannot create a cluster.");
+ log.info("No discovery service is set up, Hazelcast cannot create a cluster.");
hazelcastBindOnlyOnInterface("127.0.0.1", config);
}
else {
@@ -270,7 +270,7 @@ public HazelcastInstance hazelcastInstance(JHipsterProperties jHipsterProperties
private void configureQueueCluster(Config config, JHipsterProperties jHipsterProperties) {
// Queue specific configurations
- log.info("Configure Build Job Queue synchronization in Hazelcast for Local CI");
+ log.debug("Configure Build Job Queue synchronization in Hazelcast for Local CI");
QueueConfig queueConfig = new QueueConfig("buildJobQueue");
queueConfig.setBackupCount(jHipsterProperties.getCache().getHazelcast().getBackupCount());
queueConfig.setPriorityComparatorClassName("de.tum.in.www1.artemis.service.connectors.localci.LocalCIPriorityQueueComparator");
@@ -279,7 +279,7 @@ private void configureQueueCluster(Config config, JHipsterProperties jHipsterPro
private void hazelcastBindOnlyOnInterface(String hazelcastInterface, Config config) {
// Hazelcast should bind to the interface and use it as local and public address
- log.info("Binding Hazelcast to interface {}", hazelcastInterface);
+ log.debug("Binding Hazelcast to interface {}", hazelcastInterface);
System.setProperty("hazelcast.local.localAddress", hazelcastInterface);
System.setProperty("hazelcast.local.publicAddress", hazelcastInterface);
config.getNetworkConfig().getInterfaces().setEnabled(true).setInterfaces(Collections.singleton(hazelcastInterface));
diff --git a/src/main/java/de/tum/in/www1/artemis/config/EurekaClientRestTemplateConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/EurekaClientRestTemplateConfiguration.java
index 71ada032b59d..9c18d00f111d 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/EurekaClientRestTemplateConfiguration.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/EurekaClientRestTemplateConfiguration.java
@@ -49,7 +49,7 @@ public class EurekaClientRestTemplateConfiguration {
@Bean
public RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs(TlsProperties tlsProperties,
EurekaClientHttpRequestFactorySupplier eurekaClientHttpRequestFactorySupplier) throws GeneralSecurityException, IOException {
- log.info("Using RestTemplate for the Eureka client.");
+ log.debug("Using RestTemplate for the Eureka client.");
// The Eureka DiscoveryClientOptionalArgsConfiguration invokes a private method setupTLS.
// This code is taken from that method.
var args = new RestTemplateDiscoveryClientOptionalArgs(eurekaClientHttpRequestFactorySupplier);
diff --git a/src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java b/src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java
index 19e98b4f562b..d22025c09a0e 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java
@@ -357,7 +357,7 @@ public void calculateCachedActiveUserNames() {
cachedActiveUserNames = statisticsRepository.getActiveUserNames(ZonedDateTime.now().minusDays(14), ZonedDateTime.now());
- log.info("calculateCachedActiveUserLogins took {}ms", System.currentTimeMillis() - startDate);
+ log.debug("calculateCachedActiveUserLogins took {}ms", System.currentTimeMillis() - startDate);
}
/**
@@ -399,7 +399,7 @@ public void recalculateMetrics() {
updateMultiGaugeIntegerForMinuteRanges(releaseExamGauge, examRepository::countExamsWithStartDateBetween);
updateMultiGaugeIntegerForMinuteRanges(releaseExamStudentMultiplierGauge, examRepository::countExamUsersInExamsWithStartDateBetween);
- log.info("recalculateMetrics took {}ms", System.currentTimeMillis() - startDate);
+ log.debug("recalculateMetrics took {}ms", System.currentTimeMillis() - startDate);
}
@FunctionalInterface
@@ -546,7 +546,7 @@ public void updatePublicArtemisMetrics() {
activeExamsGauge.set(examRepository.countAllActiveExams(now));
examsGauge.set((int) examRepository.count());
- log.info("updatePublicArtemisMetrics took {}ms", System.currentTimeMillis() - startDate);
+ log.debug("updatePublicArtemisMetrics took {}ms", System.currentTimeMillis() - startDate);
}
private void updateActiveUserMultiGauge(ZonedDateTime now) {
diff --git a/src/main/java/de/tum/in/www1/artemis/config/ProgrammingLanguageConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/ProgrammingLanguageConfiguration.java
index 5cc5099a57a0..11150adf6762 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/ProgrammingLanguageConfiguration.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/ProgrammingLanguageConfiguration.java
@@ -49,7 +49,7 @@ public void setImages(final Map> buildImages) {
final var languageSpecificBuildImages = loadImages(buildImages);
checkImageForAllProgrammingLanguagesDefined(languageSpecificBuildImages);
images = languageSpecificBuildImages;
- log.info("Loaded Docker image configuration: {}", images);
+ log.debug("Loaded Docker image configuration: {}", images);
}
/**
@@ -77,7 +77,7 @@ private Stream buildDockerFlag(final DockerFlag dockerFlag) {
* @param dockerFlags key value pairs of run arguments
*/
public void setDefaultDockerFlags(final List dockerFlags) {
- log.info("Set Docker flags to {}", dockerFlags);
+ log.debug("Set Docker flags to {}", dockerFlags);
this.defaultDockerFlags = dockerFlags;
}
diff --git a/src/main/java/de/tum/in/www1/artemis/config/WebConfigurer.java b/src/main/java/de/tum/in/www1/artemis/config/WebConfigurer.java
index 18370c823e12..304ccd33b6be 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/WebConfigurer.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/WebConfigurer.java
@@ -52,10 +52,10 @@ public WebConfigurer(Environment env, JHipsterProperties jHipsterProperties) {
@Override
public void onStartup(ServletContext servletContext) {
if (env.getActiveProfiles().length != 0) {
- log.info("Web application configuration, using profiles: {}", (Object[]) env.getActiveProfiles());
+ log.debug("Web application configuration, using profiles: {}", (Object[]) env.getActiveProfiles());
}
setCachingHttpHeaders(servletContext);
- log.info("Web application fully configured");
+ log.debug("Web application fully configured");
}
/**
diff --git a/src/main/java/de/tum/in/www1/artemis/config/localvcci/JGitServletConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/localvcci/JGitServletConfiguration.java
index a07d099d2b40..679edeb377b5 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/localvcci/JGitServletConfiguration.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/localvcci/JGitServletConfiguration.java
@@ -31,7 +31,7 @@ public JGitServletConfiguration(LocalVCServletService localVCServletService) {
@Bean
public ServletRegistrationBean jgitServlet() {
ArtemisGitServlet gitServlet = new ArtemisGitServlet(localVCServletService);
- log.info("Registering ArtemisGitServlet for handling fetch and push requests to [Artemis URL]/git/[Project Key]/[Repository Slug].git");
+ log.debug("Registering ArtemisGitServlet for handling fetch and push requests to [Artemis URL]/git/[Project Key]/[Repository Slug].git");
return new ServletRegistrationBean<>(gitServlet, "/git/*");
}
}
diff --git a/src/main/java/de/tum/in/www1/artemis/config/localvcci/LocalCIConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/localvcci/LocalCIConfiguration.java
index 3a4c72700f0b..1b7fcdb9fe2e 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/localvcci/LocalCIConfiguration.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/localvcci/LocalCIConfiguration.java
@@ -86,12 +86,34 @@ public HostConfig hostConfig() {
}
}
- log.info("Using Build Job Container HostConfig with cpus {}, memory {}, memorySwap {}, pidsLimit {}.", cpuCount, memory, memorySwap, pidsLimit);
+ log.info("Using build job container docker host config with CPU(s): {}, memory: {}, memory swap: {}, pids limit: {}.", cpuCount, formatMemory(memory),
+ formatMemory(memorySwap), pidsLimit);
return HostConfig.newHostConfig().withCpuQuota(cpuCount * cpuPeriod).withCpuPeriod(cpuPeriod).withMemory(memory).withMemorySwap(memorySwap).withPidsLimit(pidsLimit)
.withAutoRemove(true);
}
+ /**
+ * Converts bytes into a human-readable format (KB, MB, or GB).
+ *
+ * @param bytes The number of bytes.
+ * @return A string representing the memory size in KB, MB, or GB.
+ */
+ public static String formatMemory(long bytes) {
+ if (bytes < 1024) {
+ return bytes + " Bytes";
+ }
+ else if (bytes < 1024 * 1024) {
+ return (bytes / 1024) + " KB";
+ }
+ else if (bytes < 1024 * 1024 * 1024) {
+ return (bytes / (1024 * 1024)) + " MB";
+ }
+ else {
+ return String.format("%.1f GB", bytes / (1024.0 * 1024.0 * 1024.0));
+ }
+ }
+
/**
* Creates an executor service that manages the queue of build jobs.
*
@@ -116,7 +138,7 @@ public ExecutorService localCIBuildExecutorService() {
throw new RejectedExecutionException("Task " + runnable.toString() + " rejected from " + executor.toString());
};
- log.info("Using ExecutorService with thread pool size {}.", threadPoolSize);
+ log.debug("Using ExecutorService with thread pool size {}.", threadPoolSize);
return new ThreadPoolExecutor(threadPoolSize, threadPoolSize, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(1), customThreadFactory, customRejectedExecutionHandler);
}
@@ -143,7 +165,7 @@ public DockerClient dockerClient() {
DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder().dockerHost(config.getDockerHost()).sslConfig(config.getSSLConfig()).build();
DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient);
- log.info("Docker client created with connection URI: {}", dockerConnectionUri);
+ log.debug("Docker client created with connection URI: {}", dockerConnectionUri);
return dockerClient;
}
diff --git a/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationService.java b/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationService.java
index f3dfa02215ed..8f88c73e4e26 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationService.java
@@ -63,7 +63,7 @@ public void execute(ApplicationReadyEvent event, SortedMap entryMap = instantiateEntryMap(entryClassMap);
@@ -72,7 +72,7 @@ public void execute(ApplicationReadyEvent event, SortedMap executedChanges = migrationChangeRepository.findAll().stream().map(MigrationChangelog::getDateString).collect(Collectors.toCollection(HashSet::new));
@@ -100,9 +100,9 @@ public void execute(ApplicationReadyEvent event, SortedMap instantiateEntryMap(SortedMap> entryClassMap) {
@@ -121,7 +121,7 @@ public SortedMap instantiateEntryMap(SortedMap entryMap) {
- log.info("Starting migration integrity check");
+ log.debug("Starting migration integrity check");
boolean passed = true;
Map brokenInstances = entryMap.entrySet().stream()
.filter(entry -> !StringUtils.hasLength(entry.getValue().date()) || !StringUtils.hasLength(entry.getValue().author()))
@@ -152,7 +152,7 @@ public boolean checkIntegrity(SortedMap entryMap) {
baseEntry = entry;
}
}
- log.info("Ending migration integrity check.");
+ log.debug("Ending migration integrity check.");
return passed;
}
diff --git a/src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketConfiguration.java
index 9b819a29194d..e4bbf50c3b79 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketConfiguration.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketConfiguration.java
@@ -126,7 +126,7 @@ protected void configureMessageBroker(@NotNull MessageBrokerRegistry config) {
// If tcpClient is null, there is no valid address specified in the config. This could be due to a development setup or a mistake in the config.
TcpOperations tcpClient = createTcpClient();
if (tcpClient != null) {
- log.info("Enabling StompBrokerRelay for WebSocket messages using {}", String.join(", ", brokerAddresses));
+ log.debug("Enabling StompBrokerRelay for WebSocket messages using {}", String.join(", ", brokerAddresses));
config
// Enable the relay for "/topic"
.enableStompBrokerRelay("/topic")
@@ -142,7 +142,7 @@ protected void configureMessageBroker(@NotNull MessageBrokerRegistry config) {
.setTcpClient(tcpClient);
}
else {
- log.info("Did NOT enable StompBrokerRelay for WebSocket messages");
+ log.debug("Did NOT enable StompBrokerRelay for WebSocket messages");
config.enableSimpleBroker("/topic").setHeartbeatValue(new long[] { 10000, 20000 }).setTaskScheduler(messageBrokerTaskScheduler);
}
}
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/BuildJob.java b/src/main/java/de/tum/in/www1/artemis/domain/BuildJob.java
index c367047ef0d0..fcf6ac5ba4a1 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/BuildJob.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/BuildJob.java
@@ -92,7 +92,7 @@ public BuildJob(LocalCIBuildJobQueueItem queueItem, BuildStatus buildStatus, Res
this.buildCompletionDate = queueItem.jobTimingInfo().buildCompletionDate();
this.repositoryType = queueItem.repositoryInfo().repositoryType();
this.repositoryName = queueItem.repositoryInfo().repositoryName();
- this.commitHash = queueItem.buildConfig().commitHash();
+ this.commitHash = queueItem.buildConfig().commitHashToBuild();
this.retryCount = queueItem.retryCount();
this.priority = queueItem.priority();
this.triggeredByPushTo = queueItem.repositoryInfo().triggeredByPushTo();
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Claims.java b/src/main/java/de/tum/in/www1/artemis/domain/lti/Claims.java
index be99b242aed2..ca5d8494cc74 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Claims.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lti/Claims.java
@@ -13,4 +13,10 @@ public class Claims extends uk.ac.ox.ctl.lti13.lti.Claims {
* Used to carry messages specific to LTI Deep Linking requests and responses.
*/
public static final String MSG = "https://purl.imsglobal.org/spec/lti-dl/claim/msg";
+
+ /**
+ * Constant for LTI Deep Linking return url claim.
+ * Used to carry url specific to LTI Deep Linking requests and responses.
+ */
+ public static final String DEEPLINK_RETURN_URL_CLAIM = "deep_link_return_url";
}
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13AgsClaim.java b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13AgsClaim.java
index 4196ce423889..62282902ae69 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13AgsClaim.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13AgsClaim.java
@@ -6,20 +6,13 @@
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
/**
- * A wrapper class for an LTI 1.3 Assignment and Grading Services Claim. We support the Score Publishing Service in order to transmit scores.
+ * A wrapper record for an LTI 1.3 Assignment and Grading Services Claim. We support the Score Publishing Service in order to transmit scores.
*/
-public class Lti13AgsClaim {
-
- private List scope;
-
- private String lineItem;
+public record Lti13AgsClaim(List scope, String lineItem) {
/**
* Returns an Ags-Claim representation if the provided idToken contains any.
@@ -34,53 +27,29 @@ public static Optional from(OidcIdToken idToken) {
}
try {
- JsonObject agsClaimJson = new Gson().toJsonTree(idToken.getClaim(Claims.AGS_CLAIM)).getAsJsonObject();
- Lti13AgsClaim agsClaim = new Lti13AgsClaim();
- JsonArray scopes = agsClaimJson.get("scope").getAsJsonArray();
-
- if (scopes == null) {
- return Optional.empty();
- }
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode agsClaimJson = objectMapper.convertValue(idToken.getClaim(Claims.AGS_CLAIM), JsonNode.class);
- if (scopes.contains(new JsonPrimitive(Scopes.AGS_SCORE))) {
- agsClaim.setScope(Collections.singletonList(Scopes.AGS_SCORE));
+ JsonNode scopes = agsClaimJson.get("scope");
+ List scopeList = null;
+ if (scopes != null && scopes.isArray() && scopes.has(Scopes.AGS_SCORE)) {
+ scopeList = Collections.singletonList(Scopes.AGS_SCORE);
}
// For moodle lineItem is stored in lineitem claim, for edX it is in lineitems
- JsonElement lineItem;
+ JsonNode lineItemNode;
if (agsClaimJson.get("lineitem") == null) {
- lineItem = agsClaimJson.get("lineitems");
+ lineItemNode = agsClaimJson.get("lineitems");
}
else {
- lineItem = agsClaimJson.get("lineitem");
+ lineItemNode = agsClaimJson.get("lineitem");
}
- if (lineItem != null) {
- agsClaim.setLineItem(lineItem.getAsString());
- }
- else {
- agsClaim.setLineItem(null);
- }
- return Optional.of(agsClaim);
+ String lineItem = lineItemNode != null ? lineItemNode.asText() : null;
+ return Optional.of(new Lti13AgsClaim(scopeList, lineItem));
}
catch (IllegalStateException | ClassCastException ex) {
throw new IllegalStateException("Failed to parse LTI 1.3 ags claim.", ex);
}
}
-
- public List getScope() {
- return scope;
- }
-
- private void setScope(List scope) {
- this.scope = scope;
- }
-
- public String getLineItem() {
- return lineItem;
- }
-
- private void setLineItem(String lineItem) {
- this.lineItem = lineItem;
- }
}
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13DeepLinkingResponse.java b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13DeepLinkingResponse.java
index ff9a101f27a2..9e89152aec91 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13DeepLinkingResponse.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13DeepLinkingResponse.java
@@ -1,67 +1,46 @@
package de.tum.in.www1.artemis.domain.lti;
-import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames;
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
/**
* Represents the LTI 1.3 Deep Linking Response.
* It encapsulates the necessary information to construct a valid deep linking response according to the LTI 1.3 specification.
* For more details, refer to LTI 1.3 Deep Linking Response Specification
+ *
+ * @param aud The 'aud' (Audience) field is used to specify the intended recipient of the response
+ * In the context of LTI Deep Linking, this field is set to the 'iss' (Issuer) value from the original request.
+ * This indicates that the response is specifically intended for the issuer of the original request.
+ * @param iss * The 'iss' (Issuer) field identifies the principal that issued the response.
+ * For LTI Deep Linking, this field is set to the 'aud' (Audience) value from the original request.
+ * This reversal signifies that the tool (originally the audience) is now the issuer of the response.
+ * @param exp Expiration time of the response.
+ * @param iat Issued at time of the response.
+ * @param nonce A string value used to associate a Client session with an ID Token.
+ * @param message A message included in the deep linking response.
+ * @param deploymentId The deployment ID from the LTI request.
+ * @param messageType The type of LTI message, for deep linking this is "LtiDeepLinkingResponse".
+ * @param ltiVersion The LTI version, for deep linking responses this is typically "1.3.0".
+ * @param contentItems The actual content items being linked.
+ * @param deepLinkingSettings A JSON object containing deep linking settings.
+ * @param clientRegistrationId The client registration ID.
+ * @param returnUrl The URL to return to after deep linking is completed.
*/
-public class Lti13DeepLinkingResponse {
+public record Lti13DeepLinkingResponse(@JsonProperty(IdTokenClaimNames.AUD) String aud, @JsonProperty(IdTokenClaimNames.ISS) String iss,
+ @JsonProperty(IdTokenClaimNames.EXP) String exp, @JsonProperty(IdTokenClaimNames.IAT) String iat, @JsonProperty(IdTokenClaimNames.NONCE) String nonce,
+ @JsonProperty(Claims.MSG) String message, @JsonProperty(Claims.LTI_DEPLOYMENT_ID) String deploymentId, @JsonProperty(Claims.MESSAGE_TYPE) String messageType,
+ @JsonProperty(Claims.LTI_VERSION) String ltiVersion, @JsonProperty(Claims.CONTENT_ITEMS) List> contentItems, JsonNode deepLinkingSettings,
+ String clientRegistrationId, String returnUrl) {
- /**
- * The 'aud' (Audience) field is used to specify the intended recipient of the response
- * In the context of LTI Deep Linking, this field is set to the 'iss' (Issuer) value from the original request.
- * This indicates that the response is specifically intended for the issuer of the original request.
- */
- @JsonProperty("aud")
- private String aud;
-
- /**
- * The 'iss' (Issuer) field identifies the principal that issued the response.
- * For LTI Deep Linking, this field is set to the 'aud' (Audience) value from the original request.
- * This reversal signifies that the tool (originally the audience) is now the issuer of the response.
- */
- @JsonProperty("iss")
- private String iss;
-
- @JsonProperty("exp")
- private String exp;
-
- @JsonProperty("iat")
- private String iat;
-
- @JsonProperty("nonce")
- private String nonce;
-
- @JsonProperty(Claims.MSG)
- private String message;
-
- @JsonProperty(Claims.LTI_DEPLOYMENT_ID)
- private String deploymentId;
-
- @JsonProperty(Claims.MESSAGE_TYPE)
- private String messageType;
-
- @JsonProperty(Claims.LTI_VERSION)
- private String ltiVersion;
-
- @JsonProperty(Claims.CONTENT_ITEMS)
- private ArrayList> contentItems;
-
- private JsonObject deepLinkingSettings;
-
- private String clientRegistrationId;
-
- private String returnUrl;
+ private static final ObjectMapper objectMapper = new ObjectMapper();
/**
* Constructs an Lti13DeepLinkingResponse from an OIDC ID token and client registration ID.
@@ -73,52 +52,18 @@ public class Lti13DeepLinkingResponse {
* @param ltiIdToken the OIDC ID token
* @param clientRegistrationId the client registration ID
*/
- public Lti13DeepLinkingResponse(OidcIdToken ltiIdToken, String clientRegistrationId) {
+ public static Lti13DeepLinkingResponse from(OidcIdToken ltiIdToken, String clientRegistrationId) {
validateClaims(ltiIdToken);
+ JsonNode deepLinkingSettingsJson = objectMapper.convertValue(ltiIdToken.getClaim(Claims.DEEP_LINKING_SETTINGS), JsonNode.class);
+ String returnUrl = deepLinkingSettingsJson.get(Claims.DEEPLINK_RETURN_URL_CLAIM).asText();
- Map deepLinkingSettings = ltiIdToken.getClaim(Claims.DEEP_LINKING_SETTINGS);
- // convert the map to json
- this.deepLinkingSettings = new Gson().toJsonTree(deepLinkingSettings).getAsJsonObject();
- this.setReturnUrl(this.deepLinkingSettings.get("deep_link_return_url").getAsString());
- this.clientRegistrationId = clientRegistrationId;
-
- // the issuer claim in the deep linking request becomes the audience claim in the response
- this.setAud(ltiIdToken.getClaim("iss").toString());
- // the audience claim in the request becomes the issuer claim in the response
- this.setIss(ltiIdToken.getClaim("aud").toString().replace("[", "").replace("]", ""));
-
- this.setExp(ltiIdToken.getClaim("exp").toString());
- this.setIat(ltiIdToken.getClaim("iat").toString());
- this.setNonce(ltiIdToken.getClaim("nonce").toString());
- this.setMessage("Content successfully linked");
- this.setDeploymentId(ltiIdToken.getClaim(Claims.LTI_DEPLOYMENT_ID).toString());
- this.setMessageType("LtiDeepLinkingResponse");
- this.setLtiVersion("1.3.0");
- }
-
- /**
- * Retrieves a map of claims to be included in the ID token.
- *
- * @return a map of claims
- */
- public Map getClaims() {
- Map claims = new HashMap<>();
-
- claims.put("aud", aud);
- claims.put("iss", iss);
- claims.put("exp", exp);
- claims.put("iat", iat);
- claims.put("nonce", nonce);
- claims.put(Claims.MSG, message);
- claims.put(Claims.LTI_DEPLOYMENT_ID, deploymentId);
- claims.put(Claims.MESSAGE_TYPE, messageType);
- claims.put(Claims.LTI_VERSION, ltiVersion);
- claims.put(Claims.CONTENT_ITEMS, contentItems);
-
- return claims;
+ return new Lti13DeepLinkingResponse(ltiIdToken.getIssuer().toString(), ltiIdToken.getAudience().getFirst(), String.valueOf(ltiIdToken.getExpiresAt()),
+ String.valueOf(ltiIdToken.getIssuedAt()), ltiIdToken.getClaimAsString(IdTokenClaimNames.NONCE), "Content successfully linked",
+ ltiIdToken.getClaimAsString(Claims.LTI_DEPLOYMENT_ID), "LtiDeepLinkingResponse", "1.3.0", null, // ContentItems needs to be set separately
+ deepLinkingSettingsJson, clientRegistrationId, returnUrl);
}
- private void validateClaims(OidcIdToken ltiIdToken) {
+ private static void validateClaims(OidcIdToken ltiIdToken) {
if (ltiIdToken == null) {
throw new IllegalArgumentException("The OIDC ID token must not be null.");
}
@@ -128,122 +73,50 @@ private void validateClaims(OidcIdToken ltiIdToken) {
throw new IllegalArgumentException("Missing or invalid deep linking settings in ID token.");
}
- ensureClaimPresent(ltiIdToken, "iss");
- ensureClaimPresent(ltiIdToken, "aud");
- ensureClaimPresent(ltiIdToken, "exp");
- ensureClaimPresent(ltiIdToken, "iat");
- ensureClaimPresent(ltiIdToken, "nonce");
+ ensureClaimPresent(ltiIdToken, IdTokenClaimNames.ISS);
+ ensureClaimPresent(ltiIdToken, IdTokenClaimNames.AUD);
+ ensureClaimPresent(ltiIdToken, IdTokenClaimNames.EXP);
+ ensureClaimPresent(ltiIdToken, IdTokenClaimNames.IAT);
+ ensureClaimPresent(ltiIdToken, IdTokenClaimNames.NONCE);
ensureClaimPresent(ltiIdToken, Claims.LTI_DEPLOYMENT_ID);
}
- private void ensureClaimPresent(OidcIdToken ltiIdToken, String claimName) {
+ private static void ensureClaimPresent(OidcIdToken ltiIdToken, String claimName) {
Object claimValue = ltiIdToken.getClaim(claimName);
if (claimValue == null) {
throw new IllegalArgumentException("Missing claim: " + claimName);
}
}
- public void setAud(String aud) {
- this.aud = aud;
- }
-
- public String getIss() {
- return iss;
- }
-
- public void setIss(String iss) {
- this.iss = iss;
- }
-
- public String getExp() {
- return exp;
- }
-
- public void setExp(String exp) {
- this.exp = exp;
- }
-
- public String getIat() {
- return iat;
- }
-
- public void setIat(String iat) {
- this.iat = iat;
- }
-
- public String getNonce() {
- return nonce;
- }
-
- public void setNonce(String nonce) {
- this.nonce = nonce;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public String getDeploymentId() {
- return deploymentId;
- }
-
- public void setDeploymentId(String deploymentId) {
- this.deploymentId = deploymentId;
- }
-
- public String getMessageType() {
- return messageType;
- }
-
- public void setMessageType(String messageType) {
- this.messageType = messageType;
- }
-
- public String getLtiVersion() {
- return ltiVersion;
- }
-
- public void setLtiVersion(String ltiVersion) {
- this.ltiVersion = ltiVersion;
- }
-
- public ArrayList> getContentItems() {
- return contentItems;
- }
-
- public void setContentItems(ArrayList> contentItems) {
- this.contentItems = contentItems;
- }
-
- public JsonObject getDeepLinkingSettings() {
- return deepLinkingSettings;
- }
-
- public void setDeepLinkingSettings(JsonObject deepLinkingSettings) {
- this.deepLinkingSettings = deepLinkingSettings;
- }
-
- public String getClientRegistrationId() {
- return clientRegistrationId;
- }
-
- public void setClientRegistrationId(String clientRegistrationId) {
- this.clientRegistrationId = clientRegistrationId;
- }
-
- public String getAud() {
- return aud;
- }
+ /**
+ * Retrieves a map of claims to be included in the ID token.
+ *
+ * @return a map of claims
+ */
+ public Map getClaims() {
+ Map claims = new HashMap<>();
+ claims.put(IdTokenClaimNames.AUD, aud());
+ claims.put(IdTokenClaimNames.ISS, iss());
+ claims.put(IdTokenClaimNames.EXP, exp());
+ claims.put(IdTokenClaimNames.IAT, iat());
+ claims.put(IdTokenClaimNames.NONCE, nonce());
+ claims.put(Claims.MSG, message());
+ claims.put(Claims.LTI_DEPLOYMENT_ID, deploymentId());
+ claims.put(Claims.MESSAGE_TYPE, messageType());
+ claims.put(Claims.LTI_VERSION, ltiVersion());
+ claims.put(Claims.CONTENT_ITEMS, contentItems());
- public String getReturnUrl() {
- return returnUrl;
+ return claims;
}
- public void setReturnUrl(String returnUrl) {
- this.returnUrl = returnUrl;
+ /**
+ * Returns a new Lti13DeepLinkingResponse instance with updated contentItems.
+ *
+ * @param contentItems The new contentItems value.
+ * @return A new Lti13DeepLinkingResponse instance.
+ */
+ public Lti13DeepLinkingResponse setContentItems(List> contentItems) {
+ return new Lti13DeepLinkingResponse(this.aud, this.iss, this.exp, this.iat, this.nonce, this.message, this.deploymentId, this.messageType, this.ltiVersion, contentItems,
+ this.deepLinkingSettings, this.clientRegistrationId, this.returnUrl);
}
}
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13LaunchRequest.java b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13LaunchRequest.java
index 12ab100e7e81..cc4ea50a6555 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13LaunchRequest.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13LaunchRequest.java
@@ -1,43 +1,59 @@
package de.tum.in.www1.artemis.domain.lti;
+import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames;
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
import org.springframework.util.Assert;
-import com.google.gson.Gson;
-
-public class Lti13LaunchRequest {
-
- private final String iss;
-
- private final String sub;
-
- private final String deploymentId;
-
- private final String resourceLinkId;
-
- private final String targetLinkUri;
-
- private final Lti13AgsClaim agsClaim;
-
- private final String clientRegistrationId;
-
- public Lti13LaunchRequest(OidcIdToken ltiIdToken, String clientRegistrationId) {
- this.iss = ltiIdToken.getClaim("iss");
- this.sub = ltiIdToken.getClaim("sub");
- this.deploymentId = ltiIdToken.getClaim(Claims.LTI_DEPLOYMENT_ID);
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Represents an LTI 1.3 Launch Request, encapsulating the necessary information
+ * from an OIDC ID token and additional parameters required for launching an LTI tool.
+ *
+ * @param iss The issuer identifier from the OIDC ID token, representing the platform.
+ * @param sub The subject identifier from the OIDC ID token, representing the user.
+ * @param deploymentId The deployment ID from the OIDC ID token, unique to the tool and platform pair.
+ * @param resourceLinkId The resource link ID, identifying the specific resource from the launch request.
+ * @param targetLinkUri The target link URI from the OIDC ID token, where the tool is expected to send the user.
+ * @param agsClaim An optional {@link Lti13AgsClaim} representing the Assignment and Grade Services claim, if present.
+ * @param clientRegistrationId The client registration ID, identifying the tool registration with the platform.
+ */
+public record Lti13LaunchRequest(String iss, String sub, String deploymentId, String resourceLinkId, String targetLinkUri, Lti13AgsClaim agsClaim, String clientRegistrationId) {
+
+ /**
+ * Factory method to create an instance of Lti13LaunchRequest from an OIDC ID token and client registration ID.
+ * Validates required fields and extracts information from the ID token.
+ *
+ * @param ltiIdToken the OIDC ID token containing the claims.
+ * @param clientRegistrationId the client registration ID for the request.
+ * @return an instance of Lti13LaunchRequest.
+ * @throws IllegalArgumentException if required fields are missing in the ID token.
+ */
+ public static Lti13LaunchRequest from(OidcIdToken ltiIdToken, String clientRegistrationId) {
+ String iss = ltiIdToken.getClaim(IdTokenClaimNames.ISS);
+ String sub = ltiIdToken.getClaim(IdTokenClaimNames.SUB);
+ String deploymentId = ltiIdToken.getClaim(Claims.LTI_DEPLOYMENT_ID);
+ String resourceLinkId = extractResourceLinkId(ltiIdToken);
+ String targetLinkUri = ltiIdToken.getClaim(Claims.TARGET_LINK_URI);
+ Lti13AgsClaim agsClaim = Lti13AgsClaim.from(ltiIdToken).orElse(null);
+
+ validateRequiredFields(iss, sub, deploymentId, resourceLinkId, targetLinkUri, clientRegistrationId);
+
+ return new Lti13LaunchRequest(iss, sub, deploymentId, resourceLinkId, targetLinkUri, agsClaim, clientRegistrationId);
+ }
- var resourceLinkClaim = ltiIdToken.getClaim(Claims.RESOURCE_LINK);
+ private static String extractResourceLinkId(OidcIdToken ltiIdToken) {
+ Object resourceLinkClaim = ltiIdToken.getClaim(Claims.RESOURCE_LINK);
if (resourceLinkClaim != null) {
- this.resourceLinkId = new Gson().toJsonTree(resourceLinkClaim).getAsJsonObject().get("id").getAsString();
- }
- else {
- this.resourceLinkId = null;
+ JsonNode resourceLinkJson = new ObjectMapper().convertValue(resourceLinkClaim, JsonNode.class);
+ JsonNode idNode = resourceLinkJson.get("id");
+ return idNode != null ? idNode.asText() : null;
}
- this.targetLinkUri = ltiIdToken.getClaim(Claims.TARGET_LINK_URI);
-
- this.agsClaim = Lti13AgsClaim.from(ltiIdToken).orElse(null);
- this.clientRegistrationId = clientRegistrationId;
+ return null;
+ }
+ private static void validateRequiredFields(String iss, String sub, String deploymentId, String resourceLinkId, String targetLinkUri, String clientRegistrationId) {
Assert.notNull(iss, "Iss must not be empty in LTI 1.3 launch request");
Assert.notNull(sub, "Sub must not be empty in LTI 1.3 launch request");
Assert.notNull(deploymentId, "DeploymentId must not be empty in LTI 1.3 launch request");
@@ -45,32 +61,4 @@ public Lti13LaunchRequest(OidcIdToken ltiIdToken, String clientRegistrationId) {
Assert.notNull(targetLinkUri, "TargetLinkUri must not be empty in LTI 1.3 launch request");
Assert.notNull(clientRegistrationId, "ClientRegistrationId must not be empty in LTI 1.3 launch request");
}
-
- public String getIss() {
- return iss;
- }
-
- public String getSub() {
- return sub;
- }
-
- public String getDeploymentId() {
- return deploymentId;
- }
-
- public String getResourceLinkId() {
- return resourceLinkId;
- }
-
- public String getTargetLinkUri() {
- return targetLinkUri;
- }
-
- public Lti13AgsClaim getAgsClaim() {
- return agsClaim;
- }
-
- public String getClientRegistrationId() {
- return clientRegistrationId;
- }
}
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13PlatformConfiguration.java b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13PlatformConfiguration.java
index 4b505d6a6e01..4428c38b9c05 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13PlatformConfiguration.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13PlatformConfiguration.java
@@ -2,59 +2,16 @@
import com.fasterxml.jackson.annotation.JsonProperty;
-public class Lti13PlatformConfiguration {
-
- private String issuer;
-
- @JsonProperty("token_endpoint")
- private String tokenEndpoint;
-
- @JsonProperty("authorization_endpoint")
- private String authorizationEndpoint;
-
- @JsonProperty("jwks_uri")
- private String jwksUri;
-
- @JsonProperty("registration_endpoint")
- private String registrationEndpoint;
-
- public String getIssuer() {
- return issuer;
- }
-
- public void setIssuer(String issuer) {
- this.issuer = issuer;
- }
-
- public String getTokenEndpoint() {
- return tokenEndpoint;
- }
-
- public void setTokenEndpoint(String tokenEndpoint) {
- this.tokenEndpoint = tokenEndpoint;
- }
-
- public String getAuthorizationEndpoint() {
- return authorizationEndpoint;
- }
-
- public void setAuthorizationEndpoint(String authorizationEndpoint) {
- this.authorizationEndpoint = authorizationEndpoint;
- }
-
- public String getJwksUri() {
- return jwksUri;
- }
-
- public void setJwksUri(String jwksUri) {
- this.jwksUri = jwksUri;
- }
-
- public String getRegistrationEndpoint() {
- return registrationEndpoint;
- }
-
- public void setRegistrationEndpoint(String registrationEndpoint) {
- this.registrationEndpoint = registrationEndpoint;
- }
+/**
+ * Represents the LTI 1.3 Platform Configuration, encapsulating various endpoints and keys for LTI platform communication.
+ *
+ * @param issuer The unique identifier for the issuer of the configuration.
+ * @param tokenEndpoint The endpoint URL for obtaining tokens.
+ * @param authorizationEndpoint The endpoint URL for authorization.
+ * @param jwksUri The URI for the JSON Web Key Set (JWKS).
+ * @param registrationEndpoint The endpoint URL for registration.
+ */
+public record Lti13PlatformConfiguration(@JsonProperty("issuer") String issuer, @JsonProperty("token_endpoint") String tokenEndpoint,
+ @JsonProperty("authorization_endpoint") String authorizationEndpoint, @JsonProperty("jwks_uri") String jwksUri,
+ @JsonProperty("registration_endpoint") String registrationEndpoint) {
}
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiAuthenticationResponseDTO.java b/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiAuthenticationResponse.java
similarity index 72%
rename from src/main/java/de/tum/in/www1/artemis/domain/lti/LtiAuthenticationResponseDTO.java
rename to src/main/java/de/tum/in/www1/artemis/domain/lti/LtiAuthenticationResponse.java
index 899db58f27d8..a89fa468c56d 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiAuthenticationResponseDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiAuthenticationResponse.java
@@ -7,5 +7,5 @@
* @param ltiIdToken LTI service provided ID token.
* @param clientRegistrationId Client's registration ID with LTI service.
*/
-public record LtiAuthenticationResponseDTO(String targetLinkUri, String ltiIdToken, String clientRegistrationId) {
+public record LtiAuthenticationResponse(String targetLinkUri, String ltiIdToken, String clientRegistrationId) {
}
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiResourceLaunch.java b/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiResourceLaunch.java
index bbf96a254db1..72af5948bee5 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiResourceLaunch.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiResourceLaunch.java
@@ -50,10 +50,10 @@ public class LtiResourceLaunch extends DomainObject {
*/
public static LtiResourceLaunch from(Lti13LaunchRequest launchRequest) {
LtiResourceLaunch launch = new LtiResourceLaunch();
- launch.iss = launchRequest.getIss();
- launch.sub = launchRequest.getSub();
- launch.deploymentId = launchRequest.getDeploymentId();
- launch.resourceLinkId = launchRequest.getResourceLinkId();
+ launch.iss = launchRequest.iss();
+ launch.sub = launchRequest.sub();
+ launch.deploymentId = launchRequest.deploymentId();
+ launch.resourceLinkId = launchRequest.resourceLinkId();
return launch;
}
diff --git a/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastEditorInCourse.java b/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastEditorInCourse.java
index 6dee338c4c4b..ca627e48cf95 100644
--- a/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastEditorInCourse.java
+++ b/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastEditorInCourse.java
@@ -5,6 +5,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.springframework.core.annotation.AliasFor;
import org.springframework.security.access.prepost.PreAuthorize;
import de.tum.in.www1.artemis.security.Role;
@@ -21,5 +22,6 @@
*
* @return the name of the field in the method parameters that contains the course id
*/
+ @AliasFor(annotation = EnforceRoleInCourse.class)
String resourceIdFieldName() default "courseId";
}
diff --git a/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastTutorInCourse.java b/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastTutorInCourse.java
index a7e26c406703..02be37aa7b16 100644
--- a/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastTutorInCourse.java
+++ b/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastTutorInCourse.java
@@ -5,6 +5,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.springframework.core.annotation.AliasFor;
import org.springframework.security.access.prepost.PreAuthorize;
import de.tum.in.www1.artemis.security.Role;
@@ -21,5 +22,6 @@
*
* @return the name of the field in the method parameters that contains the course id
*/
+ @AliasFor(annotation = EnforceRoleInCourse.class)
String resourceIdFieldName() default "courseId";
}
diff --git a/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInExercise/EnforceAtLeastInstructorInExercise.java b/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInExercise/EnforceAtLeastInstructorInExercise.java
index 6762b0321c81..fddbf2a8167f 100644
--- a/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInExercise/EnforceAtLeastInstructorInExercise.java
+++ b/src/main/java/de/tum/in/www1/artemis/security/annotations/enforceRoleInExercise/EnforceAtLeastInstructorInExercise.java
@@ -5,6 +5,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.springframework.core.annotation.AliasFor;
import org.springframework.security.access.prepost.PreAuthorize;
import de.tum.in.www1.artemis.security.Role;
@@ -21,5 +22,6 @@
*
* @return the name of the field in the method parameters that contains the exercise id
*/
+ @AliasFor(annotation = EnforceRoleInExercise.class)
String resourceIdFieldName() default "exerciseId";
}
diff --git a/src/main/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetriever.java b/src/main/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetriever.java
index b7d89ba7c97c..26dedc7a0d51 100644
--- a/src/main/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetriever.java
+++ b/src/main/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetriever.java
@@ -24,7 +24,8 @@
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
-import com.google.gson.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JOSEObjectType;
import com.nimbusds.jose.JWSAlgorithm;
@@ -87,9 +88,9 @@ public String getToken(ClientRegistration clientRegistration, String... scopes)
if (exchange.getBody() == null) {
return null;
}
- return JsonParser.parseString(exchange.getBody()).getAsJsonObject().get("access_token").getAsString();
+ return new ObjectMapper().readTree(exchange.getBody()).get("access_token").asText();
}
- catch (HttpClientErrorException e) {
+ catch (HttpClientErrorException | JsonProcessingException e) {
log.error("Could not retrieve access token for client {}: {}", clientRegistration.getClientId(), e.getMessage());
return null;
}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java b/src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java
index 99ddc29a99d1..a475ce401ebb 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java
@@ -52,11 +52,11 @@ private void ensureThemes() {
Stream.of(DARK_THEME_FILE_NAME, LIGHT_THEME_FILE_NAME).forEach(fileName -> {
final Path path = PATH_TMP_THEME.resolve(fileName);
if (!Files.exists(path)) {
- log.info("Storing UML theme to temporary directory");
+ log.debug("Storing UML theme to temporary directory");
final var themeResource = resourceLoaderService.getResource(Path.of("puml", fileName));
try (var inputStream = themeResource.getInputStream()) {
FileUtils.copyToFile(inputStream, path.toFile());
- log.info("UML theme stored successfully to {}", path);
+ log.debug("UML theme stored successfully to {}", path);
}
catch (IOException e) {
log.error("Unable to store UML dark theme", e);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/TitleCacheEvictionService.java b/src/main/java/de/tum/in/www1/artemis/service/TitleCacheEvictionService.java
index 4c4f712fd99e..b7fdb0e5c0ec 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/TitleCacheEvictionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/TitleCacheEvictionService.java
@@ -47,7 +47,7 @@ public TitleCacheEvictionService(EntityManagerFactory entityManagerFactory, Cach
var eventListenerRegistry = entityManagerFactory.unwrap(SessionFactoryImpl.class).getServiceRegistry().getService(EventListenerRegistry.class);
eventListenerRegistry.appendListeners(EventType.POST_UPDATE, this);
eventListenerRegistry.appendListeners(EventType.POST_DELETE, this);
- log.info("Registered Hibernate listeners");
+ log.debug("Registered Hibernate listeners");
}
@Override
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/GitService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/GitService.java
index fce6e3e29905..0ea9d2f6daf2 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/GitService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/GitService.java
@@ -168,10 +168,10 @@ public class GitService {
public GitService(Environment environment, ProfileService profileService, ZipFileService zipFileService) {
this.profileService = profileService;
- log.info("file.encoding={}", System.getProperty("file.encoding"));
- log.info("sun.jnu.encoding={}", System.getProperty("sun.jnu.encoding"));
- log.info("Default Charset={}", Charset.defaultCharset());
- log.info("Default Charset in Use={}", new OutputStreamWriter(new ByteArrayOutputStream()).getEncoding());
+ log.debug("file.encoding={}", Charset.defaultCharset().displayName());
+ log.debug("sun.jnu.encoding={}", System.getProperty("sun.jnu.encoding"));
+ log.debug("Default Charset={}", Charset.defaultCharset());
+ log.debug("Default Charset in Use={}", new OutputStreamWriter(new ByteArrayOutputStream()).getEncoding());
this.environment = environment;
this.zipFileService = zipFileService;
}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java
index 0fec1ada07d6..44228cc97328 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java
@@ -138,14 +138,6 @@ public void processResult() {
}
result = programmingExerciseGradingService.processNewProgrammingExerciseResult(participation, buildResult);
- if (result != null) {
- programmingMessagingService.notifyUserAboutNewResult(result, participation);
- addResultToBuildAgentsRecentBuildJobs(buildJob, result);
- }
- else {
- programmingMessagingService.notifyUserAboutSubmissionError((Participation) participation,
- new BuildTriggerWebsocketError("Result could not be processed", participation.getId()));
- }
}
else {
log.warn("Participation with id {} has been deleted. Cancelling the processing of the build result.", buildJob.participationId());
@@ -153,57 +145,56 @@ public void processResult() {
}
finally {
// save build job to database
- savedBuildJob = saveFinishedBuildJob(buildJob, BuildStatus.SUCCESSFUL, result);
- }
- }
- else {
- if (ex.getCause() instanceof CancellationException && ex.getMessage().equals("Build job with id " + buildJob.id() + " was cancelled.")) {
+ if (ex != null) {
+ if (ex.getCause() instanceof CancellationException && ex.getMessage().equals("Build job with id " + buildJob.id() + " was cancelled.")) {
+ savedBuildJob = saveFinishedBuildJob(buildJob, BuildStatus.CANCELLED, result);
+ }
+ else {
+ log.error("Error while processing build job: {}", buildJob, ex);
+ savedBuildJob = saveFinishedBuildJob(buildJob, BuildStatus.FAILED, result);
+ }
+ }
+ else {
+ savedBuildJob = saveFinishedBuildJob(buildJob, BuildStatus.SUCCESSFUL, result);
+ }
if (participationOptional.isPresent()) {
ProgrammingExerciseParticipation participation = (ProgrammingExerciseParticipation) participationOptional.get();
- programmingMessagingService.notifyUserAboutSubmissionError((Participation) participation,
- new BuildTriggerWebsocketError("Build job was cancelled", participation.getId()));
- }
- savedBuildJob = saveFinishedBuildJob(buildJob, BuildStatus.CANCELLED, null);
+ if (result != null) {
+ programmingMessagingService.notifyUserAboutNewResult(result, participation);
+ addResultToBuildAgentsRecentBuildJobs(buildJob, result);
+ }
+ else {
+ programmingMessagingService.notifyUserAboutSubmissionError((Participation) participation,
+ new BuildTriggerWebsocketError("Result could not be processed", participation.getId()));
+ }
+ }
}
- else {
- log.error("Error while processing build job: {}", buildJob, ex);
- if (participationOptional.isPresent()) {
- ProgrammingExerciseParticipation participation = (ProgrammingExerciseParticipation) participationOptional.get();
- programmingMessagingService.notifyUserAboutSubmissionError((Participation) participation,
- new BuildTriggerWebsocketError(ex.getMessage(), participation.getId()));
+ if (!buildLogs.isEmpty()) {
+ if (savedBuildJob != null) {
+ buildLogEntryService.saveBuildLogsToFile(buildLogs, savedBuildJob.getBuildJobId());
}
else {
- log.warn("Participation with id {} has been deleted. Cancelling the requeueing of the build job.", buildJob.participationId());
+ log.warn("Couldn't save build logs as build job {} was not saved", buildJob.id());
}
-
- savedBuildJob = saveFinishedBuildJob(buildJob, BuildStatus.FAILED, null);
}
- }
-
- if (!buildLogs.isEmpty()) {
- if (savedBuildJob != null) {
- buildLogEntryService.saveBuildLogsToFile(buildLogs, savedBuildJob.getBuildJobId());
- }
- else {
- log.warn("Couldn't save build logs as build job {} was not saved", buildJob.id());
- }
- }
- // If the build job is a solution build of a test or auxiliary push, we need to trigger the build of the corresponding template repository
- if (isSolutionBuildOfTestOrAuxPush(buildJob)) {
- log.debug("Triggering build of template repository for solution build with id {}", buildJob.id());
- try {
- programmingTriggerService.triggerTemplateBuildAndNotifyUser(buildJob.exerciseId(), buildJob.buildConfig().commitHash(), SubmissionType.TEST,
- buildJob.repositoryInfo().triggeredByPushTo());
- }
- catch (EntityNotFoundException e) {
- // Something went wrong while retrieving the template participation.
- // At this point, programmingMessagingService.notifyUserAboutSubmissionError() does not work, because the template participation is not available.
- // The instructor will see in the UI that no build of the template repository was conducted and will receive an error message when triggering the build manually.
- log.error("Something went wrong while triggering the template build for exercise {} after the solution build was finished.", buildJob.exerciseId(), e);
+ // If the build job is a solution build of a test or auxiliary push, we need to trigger the build of the corresponding template repository
+ if (isSolutionBuildOfTestOrAuxPush(buildJob)) {
+ log.debug("Triggering build of template repository for solution build with id {}", buildJob.id());
+ try {
+ programmingTriggerService.triggerTemplateBuildAndNotifyUser(buildJob.exerciseId(), buildJob.buildConfig().testCommitHash(), SubmissionType.TEST,
+ buildJob.repositoryInfo().triggeredByPushTo());
+ }
+ catch (EntityNotFoundException e) {
+ // Something went wrong while retrieving the template participation.
+ // At this point, programmingMessagingService.notifyUserAboutSubmissionError() does not work, because the template participation is not available.
+ // The instructor will see in the UI that no build of the template repository was conducted and will receive an error message when triggering the build
+ // manually.
+ log.error("Something went wrong while triggering the template build for exercise {} after the solution build was finished.", buildJob.exerciseId(), e);
+ }
}
}
}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCITriggerService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCITriggerService.java
index 2caf5f18af5c..0b4d956c0e80 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCITriggerService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCITriggerService.java
@@ -30,6 +30,7 @@
import de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException;
import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository;
import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository;
+import de.tum.in.www1.artemis.service.connectors.GitService;
import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusResult;
import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService;
import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile;
@@ -66,6 +67,8 @@ public class LocalCITriggerService implements ContinuousIntegrationTriggerServic
private final LocalCIBuildConfigurationService localCIBuildConfigurationService;
+ private final GitService gitService;
+
private IQueue queue;
private IMap dockerImageCleanupInfo;
@@ -74,7 +77,7 @@ public LocalCITriggerService(HazelcastInstance hazelcastInstance, AeolusTemplate
ProgrammingLanguageConfiguration programmingLanguageConfiguration, AuxiliaryRepositoryRepository auxiliaryRepositoryRepository,
LocalCIProgrammingLanguageFeatureService programmingLanguageFeatureService, Optional versionControlService,
SolutionProgrammingExerciseParticipationRepository solutionProgrammingExerciseParticipationRepository,
- LocalCIBuildConfigurationService localCIBuildConfigurationService) {
+ LocalCIBuildConfigurationService localCIBuildConfigurationService, GitService gitService) {
this.hazelcastInstance = hazelcastInstance;
this.aeolusTemplateService = aeolusTemplateService;
this.programmingLanguageConfiguration = programmingLanguageConfiguration;
@@ -83,6 +86,7 @@ public LocalCITriggerService(HazelcastInstance hazelcastInstance, AeolusTemplate
this.versionControlService = versionControlService;
this.solutionProgrammingExerciseParticipationRepository = solutionProgrammingExerciseParticipationRepository;
this.localCIBuildConfigurationService = localCIBuildConfigurationService;
+ this.gitService = gitService;
}
@PostConstruct
@@ -106,12 +110,31 @@ public void triggerBuild(ProgrammingExerciseParticipation participation) throws
* Add a new build job item containing all relevant information necessary for the execution to the distributed build job queue.
*
* @param participation the participation of the repository which should be built and tested
- * @param commitHash the commit hash of the commit that triggers the build. If it is null, the latest commit of the default branch will be built.
+ * @param commitHashToBuild the commit hash of the commit that triggers the build. If it is null, the latest commit of the default branch will be built.
* @param triggeredByPushTo type of the repository that was pushed to and triggered the build job
* @throws LocalCIException if the build job could not be added to the queue.
*/
@Override
- public void triggerBuild(ProgrammingExerciseParticipation participation, String commitHash, RepositoryType triggeredByPushTo) throws LocalCIException {
+ public void triggerBuild(ProgrammingExerciseParticipation participation, String commitHashToBuild, RepositoryType triggeredByPushTo) throws LocalCIException {
+
+ // Commit hash related to the repository that will be tested
+ String assignmentCommitHash;
+
+ // Commit hash related to the test repository
+ String testCommitHash;
+
+ if (triggeredByPushTo == null || triggeredByPushTo.equals(RepositoryType.AUXILIARY)) {
+ assignmentCommitHash = gitService.getLastCommitHash(participation.getVcsRepositoryUri()).getName();
+ testCommitHash = gitService.getLastCommitHash(participation.getProgrammingExercise().getVcsTestRepositoryUri()).getName();
+ }
+ else if (triggeredByPushTo.equals(RepositoryType.TESTS)) {
+ assignmentCommitHash = gitService.getLastCommitHash(participation.getVcsRepositoryUri()).getName();
+ testCommitHash = commitHashToBuild;
+ }
+ else {
+ assignmentCommitHash = commitHashToBuild;
+ testCommitHash = gitService.getLastCommitHash(participation.getProgrammingExercise().getVcsTestRepositoryUri()).getName();
+ }
ProgrammingExercise programmingExercise = participation.getProgrammingExercise();
@@ -128,7 +151,7 @@ public void triggerBuild(ProgrammingExerciseParticipation participation, String
RepositoryInfo repositoryInfo = getRepositoryInfo(participation, triggeredByPushTo);
- BuildConfig buildConfig = getBuildConfig(participation, commitHash);
+ BuildConfig buildConfig = getBuildConfig(participation, commitHashToBuild, assignmentCommitHash, testCommitHash);
LocalCIBuildJobQueueItem buildJobQueueItem = new LocalCIBuildJobQueueItem(buildJobId, participation.getBuildPlanId(), null, participation.getId(), courseId,
programmingExercise.getId(), 0, priority, null, repositoryInfo, jobTimingInfo, buildConfig, null);
@@ -211,7 +234,7 @@ else if (repositoryTypeOrUserName.equals("solution")) {
}
- private BuildConfig getBuildConfig(ProgrammingExerciseParticipation participation, String commitHash) {
+ private BuildConfig getBuildConfig(ProgrammingExerciseParticipation participation, String commitHashToBuild, String assignmentCommitHash, String testCommitHash) {
String branch;
try {
branch = versionControlService.orElseThrow().getOrRetrieveBranchOfParticipation(participation);
@@ -244,7 +267,7 @@ private BuildConfig getBuildConfig(ProgrammingExerciseParticipation participatio
// Todo: If build agent does not have access to filesystem, we need to send the build script to the build agent and execute it there.
String buildScript = localCIBuildConfigurationService.createBuildScript(participation);
- return new BuildConfig(buildScript, dockerImage, commitHash, branch, programmingLanguage, projectType, staticCodeAnalysisEnabled, sequentialTestRunsEnabled,
- testwiseCoverageEnabled, resultPaths);
+ return new BuildConfig(buildScript, dockerImage, commitHashToBuild, assignmentCommitHash, testCommitHash, branch, programmingLanguage, projectType,
+ staticCodeAnalysisEnabled, sequentialTestRunsEnabled, testwiseCoverageEnabled, resultPaths);
}
}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java
index 36162ede88db..f04abfd90d3d 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java
@@ -33,6 +33,7 @@
import com.github.dockerjava.api.command.ExecCreateCmdResponse;
import com.github.dockerjava.api.exception.ConflictException;
import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.exception.NotModifiedException;
import com.github.dockerjava.api.model.Container;
import com.github.dockerjava.api.model.Frame;
import com.github.dockerjava.api.model.HostConfig;
@@ -160,30 +161,29 @@ public TarArchiveInputStream getArchiveFromContainer(String containerId, String
/**
* Stops the container with the given name by creating a file "stop_container.txt" in its root directory.
* The container must be created in such a way that it waits for this file to appear and then stops running, causing it to be removed at the same time.
- * You could also use {@link DockerClient#stopContainerCmd(String)} to stop the container, but this takes significantly longer than using the approach with the file because of
- * increased overhead for the stopContainerCmd() method.
+ * In case the container is not responding, we can force remove it using {@link DockerClient#removeContainerCmd(String)}.
+ * This takes significantly longer than using the approach with the file because of increased overhead for the removeContainerCmd() method.
*
* @param containerName The name of the container to stop. Cannot use the container ID, because this method might have to be called from the main thread (not the thread started
* for the build job) where the container ID is not available.
*/
public void stopContainer(String containerName) {
// List all containers, including the non-running ones.
- List containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+ Container container = getContainerForName(containerName);
- // Check if there's a container with the given name.
- Optional containerOptional = containers.stream().filter(container -> container.getNames()[0].equals("/" + containerName)).findFirst();
- if (containerOptional.isEmpty()) {
+ // Check if the container exists. Return if it does not.
+ if (container == null) {
return;
}
// Check if the container is running. Return if it's not.
- boolean isContainerRunning = "running".equals(containerOptional.get().getState());
+ boolean isContainerRunning = "running".equals(container.getState());
if (!isContainerRunning) {
return;
}
// Get the container ID.
- String containerId = containerOptional.get().getId();
+ String containerId = container.getId();
// Create a file "stop_container.txt" in the root directory of the container to indicate that the test results have been extracted or that the container should be stopped
// for some other reason.
@@ -191,6 +191,46 @@ public void stopContainer(String containerName) {
executeDockerCommandWithoutAwaitingResponse(containerId, "touch", LOCALCI_WORKING_DIRECTORY + "/stop_container.txt");
}
+ /**
+ * Stops or kills a container in case a build job has failed or the container is unresponsive.
+ * Adding a file "stop_container.txt" like in {@link #stopContainer(String)} might not work for unresponsive containers, thus we use
+ * {@link DockerClient#stopContainerCmd(String)} and {@link DockerClient#killContainerCmd(String)} to stop or kill the container.
+ *
+ * @param containerId The ID of the container to stop or kill.
+ */
+ public void stopUnresponsiveContainer(String containerId) {
+ try {
+ // Attempt to stop the container. It should stop the container and auto-remove it.
+ // {@link DockerClient#stopContainerCmd(String)} first sends a SIGTERM command to the container to gracefully stop it,
+ // and if it does not stop within the timeout, it sends a SIGKILL command to kill the container.
+ dockerClient.stopContainerCmd(containerId).withTimeout(5).exec();
+ }
+ catch (NotFoundException | NotModifiedException e) {
+ log.debug("Container with id {} is already stopped: {}", containerId, e.getMessage());
+ }
+ catch (Exception e) {
+ // In case the stopContainerCmd fails, we try to forcefully kill the container
+ try {
+ dockerClient.killContainerCmd(containerId).exec();
+ }
+ catch (Exception killException) {
+ log.warn("Failed to kill container with id {}: {}", containerId, killException.getMessage());
+ }
+ }
+ }
+
+ /**
+ * Get the ID of a running container by its name.
+ *
+ * @param containerName The name of the container.
+ * @return The ID of the running container or null if no running container with the given name was found.
+ */
+ public String getIDOfRunningContainer(String containerName) {
+ Container container = getContainerForName(containerName);
+ // Return id if container not null
+ return Optional.ofNullable(container).map(Container::getId).orElse(null);
+ }
+
/**
* Prepares a Docker container for a build job by setting up the required directories and repositories within the container.
* This includes setting up directories for assignment, tests, solutions, and any auxiliary repositories provided.
@@ -365,4 +405,9 @@ private void checkPath(String path) {
throw new LocalCIException("Invalid path: " + path);
}
}
+
+ private Container getContainerForName(String containerName) {
+ List containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+ return containers.stream().filter(container -> container.getNames()[0].equals("/" + containerName)).findFirst().orElse(null);
+ }
}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java
index 78fa75eb484f..7e2136f7afe4 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java
@@ -7,7 +7,6 @@
import java.io.IOException;
import java.io.StringReader;
-import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -76,9 +75,6 @@ public class BuildJobExecutionService {
private final BuildLogsMap buildLogsMap;
- @Value("${artemis.version-control.url}")
- private URL localVCBaseUrl;
-
@Value("${artemis.version-control.default-branch:main}")
private String defaultBranch;
@@ -134,7 +130,7 @@ public LocalCIBuildResult runBuildJob(LocalCIBuildJobQueueItem buildJob, String
LocalVCRepositoryUri testsRepoUri = new LocalVCRepositoryUri(buildJob.repositoryInfo().testRepositoryUri());
// retrieve last commit hash from repositories
- String assignmentCommitHash = buildJob.buildConfig().commitHash();
+ String assignmentCommitHash = buildJob.buildConfig().assignmentCommitHash();
if (assignmentCommitHash == null) {
try {
assignmentCommitHash = gitService.getLastCommitHash(assignmentRepoUri).getName();
@@ -145,14 +141,16 @@ public LocalCIBuildResult runBuildJob(LocalCIBuildJobQueueItem buildJob, String
throw new LocalCIException(msg, e);
}
}
- String testCommitHash;
- try {
- testCommitHash = gitService.getLastCommitHash(testsRepoUri).getName();
- }
- catch (EntityNotFoundException e) {
- msg = "Could not find last commit hash for test repository " + testsRepoUri.repositorySlug();
- buildLogsMap.appendBuildLogEntry(buildJob.id(), msg);
- throw new LocalCIException(msg, e);
+ String testCommitHash = buildJob.buildConfig().testCommitHash();
+ if (testCommitHash == null) {
+ try {
+ testCommitHash = gitService.getLastCommitHash(testsRepoUri).getName();
+ }
+ catch (EntityNotFoundException e) {
+ msg = "Could not find last commit hash for test repository " + testsRepoUri.repositorySlug();
+ buildLogsMap.appendBuildLogEntry(buildJob.id(), msg);
+ throw new LocalCIException(msg, e);
+ }
}
Path assignmentRepositoryPath;
@@ -161,7 +159,7 @@ public LocalCIBuildResult runBuildJob(LocalCIBuildJobQueueItem buildJob, String
* If this build job is triggered by a push to the test repository, the commit hash reflects changes to the test repository.
* Thus, we do not checkout the commit hash of the test repository in the assignment repository.
*/
- if (buildJob.buildConfig().commitHash() != null && !isPushToTestOrAuxRepository) {
+ if (buildJob.buildConfig().assignmentCommitHash() != null && !isPushToTestOrAuxRepository) {
// Clone the assignment repository into a temporary directory with the name of the commit hash and then checkout the commit hash.
assignmentRepositoryPath = cloneRepository(assignmentRepoUri, assignmentCommitHash, true, buildJob.id());
}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java
index 49db77c518b0..91359efb3b14 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java
@@ -213,7 +213,10 @@ private void finishBuildJobExceptionally(String buildJobId, String containerName
buildLogsMap.appendBuildLogEntry(buildJobId, new BuildLogEntry(ZonedDateTime.now(), msg + "\n" + stackTrace));
log.error(msg);
- buildJobContainerService.stopContainer(containerName);
+ String containerId = buildJobContainerService.getIDOfRunningContainer(containerName);
+ if (containerId != null) {
+ buildJobContainerService.stopUnresponsiveContainer(containerId);
+ }
}
/**
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/LocalCIDockerService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/LocalCIDockerService.java
index ce5a4cce3860..c020b951704b 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/LocalCIDockerService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/LocalCIDockerService.java
@@ -53,6 +53,8 @@ public class LocalCIDockerService {
private final HazelcastInstance hazelcastInstance;
+ private final BuildJobContainerService buildJobContainerService;
+
private boolean isFirstCleanup = true;
@Value("${artemis.continuous-integration.image-cleanup.enabled:false}")
@@ -77,20 +79,21 @@ public class LocalCIDockerService {
@Value("${artemis.continuous-integration.image-architecture:amd64}")
private String imageArchitecture;
- public LocalCIDockerService(DockerClient dockerClient, HazelcastInstance hazelcastInstance) {
+ public LocalCIDockerService(DockerClient dockerClient, HazelcastInstance hazelcastInstance, BuildJobContainerService buildJobContainerService) {
this.dockerClient = dockerClient;
this.hazelcastInstance = hazelcastInstance;
+ this.buildJobContainerService = buildJobContainerService;
}
@EventListener(ApplicationReadyEvent.class)
public void applicationReady() {
- // Schedule the cleanup of stranded build containers once 10 seconds after the application has started and then every containerCleanupScheduleHour hours
+ // Schedule the cleanup of dangling build containers once 10 seconds after the application has started and then every containerCleanupScheduleHour hours
ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);
scheduledExecutorService.scheduleAtFixedRate(this::cleanUpContainers, 10, containerCleanupScheduleMinutes * 60L, TimeUnit.SECONDS);
}
/**
- * Cleans up stranded build containers from the system. This method differentiates between the initial cleanup
+ * Cleans up dangling build containers from the system. This method differentiates between the initial cleanup
* and subsequent cleanups to handle containers differently based on their age and status.
*
* For the initial cleanup, it removes all containers that match the build container prefix, assuming these containers
@@ -101,19 +104,19 @@ public void applicationReady() {
* - Logging the start of the cleanup process.
* - Determining whether it's the initial or a subsequent cleanup.
* - Listing all containers, filtering them based on name prefix and, for subsequent cleanups, their age.
- * - Forcibly removing the identified stranded containers.
+ * - Forcibly removing the identified dangling containers.
* - Logging the results and completion of the cleanup process.
*
* @implNote The method uses Docker commands to list and remove containers. It handles state changes using a flag
* (`isFirstCleanup`) to toggle the cleanup logic between the initial and subsequent runs.
*/
public void cleanUpContainers() {
- List buildContainers;
- log.info("Start cleanup stranded build containers");
+ List danglingBuildContainers;
+ log.debug("Start cleanup dangling build containers");
if (isFirstCleanup) {
- // Cleanup all stranded build containers after the application has started
+ // Cleanup all dangling build containers after the application has started
try {
- buildContainers = dockerClient.listContainersCmd().withShowAll(true).exec().stream()
+ danglingBuildContainers = dockerClient.listContainersCmd().withShowAll(true).exec().stream()
.filter(container -> container.getNames()[0].startsWith("/" + buildContainerPrefix)).toList();
}
finally {
@@ -121,20 +124,23 @@ public void cleanUpContainers() {
}
}
else {
- // Cleanup all containers that are older than 5 minutes for all subsequent cleanups
+ // Cleanup all containers that are older than 5 minutes (or ageThreshold) for all subsequent cleanups
// Get current time in seconds
long now = Instant.now().getEpochSecond();
// Threshold for "stuck" containers in seconds
long ageThreshold = containerExpiryMinutes * 60L;
- buildContainers = dockerClient.listContainersCmd().withShowAll(true).exec().stream().filter(container -> container.getNames()[0].startsWith("/" + buildContainerPrefix))
- .filter(container -> (now - container.getCreated()) > ageThreshold).toList();
+ danglingBuildContainers = dockerClient.listContainersCmd().withShowAll(true).exec().stream()
+ .filter(container -> container.getNames()[0].startsWith("/" + buildContainerPrefix)).filter(container -> (now - container.getCreated()) > ageThreshold)
+ .toList();
}
- log.info("Found {} stranded build containers", buildContainers.size());
- buildContainers.forEach(container -> dockerClient.removeContainerCmd(container.getId()).withForce(true).exec());
- log.info("Cleanup stranded build containers done");
+ if (!danglingBuildContainers.isEmpty()) {
+ log.info("Found {} dangling build containers", danglingBuildContainers.size());
+ danglingBuildContainers.forEach(container -> buildJobContainerService.stopUnresponsiveContainer(container.getId()));
+ }
+ log.debug("Cleanup dangling build containers done");
}
/**
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java
index c5ffa19e637a..27a5f73bd5b5 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java
@@ -311,7 +311,11 @@ private void processBuild(LocalCIBuildJobQueueItem buildJob) {
List buildLogs = buildLogsMap.getBuildLogs(buildJob.id());
buildLogsMap.removeBuildLogs(buildJob.id());
- ResultQueueItem resultQueueItem = new ResultQueueItem(null, job, buildLogs, ex);
+ LocalCIBuildResult failedResult = new LocalCIBuildResult(buildJob.buildConfig().branch(), buildJob.buildConfig().assignmentCommitHash(),
+ buildJob.buildConfig().testCommitHash(), false);
+ failedResult.setBuildLogEntries(buildLogs);
+
+ ResultQueueItem resultQueueItem = new ResultQueueItem(failedResult, job, buildLogs, ex);
resultQueue.add(resultQueueItem);
processingJobs.remove(buildJob.id());
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildConfig.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildConfig.java
index 063bc940bb27..284b5c383251 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildConfig.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildConfig.java
@@ -11,8 +11,9 @@
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public record BuildConfig(String buildScript, String dockerImage, String commitHash, String branch, ProgrammingLanguage programmingLanguage, ProjectType projectType,
- boolean scaEnabled, boolean sequentialTestRunsEnabled, boolean testwiseCoverageEnabled, List resultPaths) implements Serializable {
+public record BuildConfig(String buildScript, String dockerImage, String commitHashToBuild, String assignmentCommitHash, String testCommitHash, String branch,
+ ProgrammingLanguage programmingLanguage, ProjectType projectType, boolean scaEnabled, boolean sequentialTestRunsEnabled, boolean testwiseCoverageEnabled,
+ List resultPaths) implements Serializable {
@Override
public String dockerImage() {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/LocalCIBuildResult.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/LocalCIBuildResult.java
index d89094242004..10eb5e605b99 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/LocalCIBuildResult.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/LocalCIBuildResult.java
@@ -55,6 +55,16 @@ public LocalCIBuildResult(String assignmentRepoBranchName, String assignmentRepo
this.staticCodeAnalysisReports = staticCodeAnalysisReports;
}
+ public LocalCIBuildResult(String assignmentRepoBranchName, String assignmentRepoCommitHash, String testsRepoCommitHash, boolean isBuildSuccessful) {
+ this.assignmentRepoBranchName = assignmentRepoBranchName;
+ this.assignmentRepoCommitHash = assignmentRepoCommitHash;
+ this.testsRepoCommitHash = testsRepoCommitHash;
+ this.isBuildSuccessful = isBuildSuccessful;
+ this.buildRunDate = ZonedDateTime.now();
+ this.jobs = new ArrayList<>();
+ this.staticCodeAnalysisReports = new ArrayList<>();
+ }
+
@Override
public ZonedDateTime getBuildRunDate() {
return buildRunDate;
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCServletService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCServletService.java
index 34413ec7087a..a333bbd7f77b 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCServletService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCServletService.java
@@ -363,15 +363,21 @@ public void processNewPush(String commitHash, Repository repository) {
RepositoryType repositoryType = getRepositoryType(repositoryTypeOrUserName, exercise);
try {
- if (commitHash == null) {
- commitHash = getLatestCommitHash(repository);
+ if (repositoryType.equals(RepositoryType.TESTS)) {
+ processNewPushToTestOrAuxRepository(exercise, commitHash, (SolutionProgrammingExerciseParticipation) participation, repositoryType);
+ return;
}
- if (repositoryType.equals(RepositoryType.TESTS) || repositoryType.equals(RepositoryType.AUXILIARY)) {
- processNewPushToTestOrAuxRepository(exercise, commitHash, (SolutionProgrammingExerciseParticipation) participation, repositoryType);
+ if (repositoryType.equals(RepositoryType.AUXILIARY)) {
+ // Don't provide a commit hash because we want the latest test repo commit to be used
+ processNewPushToTestOrAuxRepository(exercise, null, (SolutionProgrammingExerciseParticipation) participation, repositoryType);
return;
}
+ if (commitHash == null) {
+ commitHash = getLatestCommitHash(repository);
+ }
+
Commit commit = extractCommitInfo(commitHash, repository);
// Process push to any repository other than the test repository.
@@ -434,7 +440,7 @@ private String getLatestCommitHash(Repository repository) throws GitAPIException
* Build and test the solution repository to make sure all tests are still passing.
*
* @param exercise the exercise for which the push was made.
- * @param commitHash the hash of the last commit to the test repository.
+ * @param commitHash the hash of the commit used as the last commit to the test repository.
* @param repositoryType type of repository that has been pushed to
* @throws VersionControlException if something unexpected goes wrong when creating the submission or triggering the build.
*/
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/Lti13Service.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/Lti13Service.java
index 2708355d0721..fdf6dc77680a 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/Lti13Service.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/Lti13Service.java
@@ -27,7 +27,9 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-import com.google.gson.JsonObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import de.tum.in.www1.artemis.domain.Course;
import de.tum.in.www1.artemis.domain.Exercise;
@@ -125,7 +127,8 @@ public void performLaunch(OidcIdToken ltiIdToken, String clientRegistrationId) {
throw new BadRequestAlertException("LTI is not configured for this course", "LTI", "ltiNotConfigured");
}
- Optional optionalUsername = artemisAuthenticationProvider.getUsernameForEmail(ltiIdToken.getEmail());
+ Optional optionalUsername = artemisAuthenticationProvider.getUsernameForEmail(ltiIdToken.getEmail())
+ .or(() -> userRepository.findOneByEmailIgnoreCase(ltiIdToken.getEmail()).map(User::getLogin));
if (!onlineCourseConfiguration.isRequireExistingUser() && optionalUsername.isEmpty()) {
SecurityContextHolder.getContext().setAuthentication(ltiService.createNewUserFromLaunchRequest(ltiIdToken.getEmail(),
@@ -172,7 +175,7 @@ else if (!StringUtils.isEmpty(ltiIdToken.getGivenName()) && !StringUtils.isEmpty
private Lti13LaunchRequest launchRequestFrom(OidcIdToken ltiIdToken, String clientRegistrationId) {
try {
- return new Lti13LaunchRequest(ltiIdToken, clientRegistrationId);
+ return Lti13LaunchRequest.from(ltiIdToken, clientRegistrationId);
}
catch (IllegalArgumentException ex) {
throw new IllegalArgumentException("Could not create LTI 1.3 launch request with provided idToken: " + ex.getMessage());
@@ -232,16 +235,16 @@ protected void submitScore(LtiResourceLaunch launch, ClientRegistration clientRe
return;
}
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.valueOf("application/vnd.ims.lis.v1.score+json"));
- headers.setBearerAuth(token);
- String body = getScoreBody(launch.getSub(), comment, score);
- HttpEntity httpRequest = new HttpEntity<>(body, headers);
try {
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.valueOf("application/vnd.ims.lis.v1.score+json"));
+ headers.setBearerAuth(token);
+ String body = getScoreBody(launch.getSub(), comment, score);
+ HttpEntity httpRequest = new HttpEntity<>(body, headers);
restTemplate.postForEntity(scoreLineItemUrl, httpRequest, Object.class);
log.info("Submitted score for {} to client {}", launch.getUser().getLogin(), clientRegistration.getClientId());
}
- catch (HttpClientErrorException e) {
+ catch (HttpClientErrorException | JsonProcessingException e) {
String message = "Could not submit score for " + launch.getUser().getLogin() + " to client " + clientRegistration.getClientId() + ": " + e.getMessage();
log.error(message);
}
@@ -259,16 +262,17 @@ private String getScoresUrl(String lineItemUrl) {
return builder.insert(index, "/scores").toString(); // Adds "/scores" before the "?" in case there are query parameters
}
- private String getScoreBody(String userId, String comment, Double score) {
- JsonObject requestBody = new JsonObject();
- requestBody.addProperty("userId", userId);
- requestBody.addProperty("timestamp", (new DateTime()).toString());
- requestBody.addProperty("activityProgress", "Submitted");
- requestBody.addProperty("gradingProgress", "FullyGraded");
- requestBody.addProperty("comment", comment);
- requestBody.addProperty("scoreGiven", score);
- requestBody.addProperty("scoreMaximum", 100D);
- return requestBody.toString();
+ private String getScoreBody(String userId, String comment, Double score) throws JsonProcessingException {
+ ObjectMapper objectMapper = new ObjectMapper();
+ ObjectNode requestBody = objectMapper.createObjectNode();
+ requestBody.put("userId", userId);
+ requestBody.put("timestamp", new DateTime().toString());
+ requestBody.put("activityProgress", "Submitted");
+ requestBody.put("gradingProgress", "FullyGraded");
+ requestBody.put("comment", comment);
+ requestBody.put("scoreGiven", score);
+ requestBody.put("scoreMaximum", 100D);
+ return new ObjectMapper().writeValueAsString(requestBody);
}
/**
@@ -308,21 +312,21 @@ private Optional getExerciseFromTargetLink(String targetLinkUrl) {
}
private void createOrUpdateResourceLaunch(Lti13LaunchRequest launchRequest, User user, Exercise exercise) {
- Optional launchOpt = launchRepository.findByIssAndSubAndDeploymentIdAndResourceLinkId(launchRequest.getIss(), launchRequest.getSub(),
- launchRequest.getDeploymentId(), launchRequest.getResourceLinkId());
+ Optional launchOpt = launchRepository.findByIssAndSubAndDeploymentIdAndResourceLinkId(launchRequest.iss(), launchRequest.sub(),
+ launchRequest.deploymentId(), launchRequest.resourceLinkId());
LtiResourceLaunch launch = launchOpt.orElse(LtiResourceLaunch.from(launchRequest));
- Lti13AgsClaim agsClaim = launchRequest.getAgsClaim();
+ Lti13AgsClaim agsClaim = launchRequest.agsClaim();
// we do support LTI 1.3 Assigment and Grading Services SCORE publish service
if (agsClaim != null) {
- launch.setScoreLineItemUrl(agsClaim.getLineItem());
+ launch.setScoreLineItemUrl(agsClaim.lineItem());
}
launch.setExercise(exercise);
launch.setUser(user);
- Optional ltiPlatformConfiguration = ltiPlatformConfigurationRepository.findByRegistrationId(launchRequest.getClientRegistrationId());
+ Optional ltiPlatformConfiguration = ltiPlatformConfigurationRepository.findByRegistrationId(launchRequest.clientRegistrationId());
ltiPlatformConfiguration.ifPresent(launch::setLtiPlatformConfiguration);
launchRepository.save(launch);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingService.java
index 144210503b59..946bb4be724d 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingService.java
@@ -59,10 +59,10 @@ public LtiDeepLinkingService(ExerciseRepository exerciseRepository, Lti13TokenRe
*/
public String performDeepLinking(OidcIdToken ltiIdToken, String clientRegistrationId, Long courseId, Set exerciseIds) {
// Initialize DeepLinkingResponse
- Lti13DeepLinkingResponse lti13DeepLinkingResponse = new Lti13DeepLinkingResponse(ltiIdToken, clientRegistrationId);
+ Lti13DeepLinkingResponse lti13DeepLinkingResponse = Lti13DeepLinkingResponse.from(ltiIdToken, clientRegistrationId);
// Fill selected exercise link into content items
ArrayList> contentItems = this.populateContentItems(String.valueOf(courseId), exerciseIds);
- lti13DeepLinkingResponse.setContentItems(contentItems);
+ lti13DeepLinkingResponse = lti13DeepLinkingResponse.setContentItems(contentItems);
// Prepare return url with jwt and id parameters
return this.buildLtiDeepLinkResponse(clientRegistrationId, lti13DeepLinkingResponse);
@@ -77,13 +77,13 @@ private String buildLtiDeepLinkResponse(String clientRegistrationId, Lti13DeepLi
UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(this.artemisServerUrl + "/lti/select-content");
String jwt = tokenRetriever.createDeepLinkingJWT(clientRegistrationId, lti13DeepLinkingResponse.getClaims());
- String returnUrl = lti13DeepLinkingResponse.getReturnUrl();
+ String returnUrl = lti13DeepLinkingResponse.returnUrl();
// Validate properties are set to create a response
- validateDeepLinkingResponseSettings(returnUrl, jwt, lti13DeepLinkingResponse.getDeploymentId());
+ validateDeepLinkingResponseSettings(returnUrl, jwt, lti13DeepLinkingResponse.deploymentId());
uriComponentsBuilder.queryParam("jwt", jwt);
- uriComponentsBuilder.queryParam("id", lti13DeepLinkingResponse.getDeploymentId());
+ uriComponentsBuilder.queryParam("id", lti13DeepLinkingResponse.deploymentId());
uriComponentsBuilder.queryParam("deepLinkUri", UriComponent.encode(returnUrl, UriComponent.Type.QUERY_PARAM));
return uriComponentsBuilder.build().toUriString();
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDynamicRegistrationService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDynamicRegistrationService.java
index 8649a8760f3a..b6b36a36a9b4 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDynamicRegistrationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDynamicRegistrationService.java
@@ -56,12 +56,12 @@ public void performDynamicRegistration(String openIdConfigurationUrl, String reg
String clientRegistrationId = "artemis-" + UUID.randomUUID();
- if (platformConfiguration.getAuthorizationEndpoint() == null || platformConfiguration.getTokenEndpoint() == null || platformConfiguration.getJwksUri() == null
- || platformConfiguration.getRegistrationEndpoint() == null) {
+ if (platformConfiguration.authorizationEndpoint() == null || platformConfiguration.tokenEndpoint() == null || platformConfiguration.jwksUri() == null
+ || platformConfiguration.registrationEndpoint() == null) {
throw new BadRequestAlertException("Invalid platform configuration", "LTI", "invalidPlatformConfiguration");
}
- Lti13ClientRegistration clientRegistrationResponse = postClientRegistrationToPlatform(platformConfiguration.getRegistrationEndpoint(), clientRegistrationId,
+ Lti13ClientRegistration clientRegistrationResponse = postClientRegistrationToPlatform(platformConfiguration.registrationEndpoint(), clientRegistrationId,
registrationToken);
LtiPlatformConfiguration ltiPlatformConfiguration = updateLtiPlatformConfiguration(clientRegistrationId, platformConfiguration, clientRegistrationResponse);
@@ -123,10 +123,10 @@ private LtiPlatformConfiguration updateLtiPlatformConfiguration(String registrat
LtiPlatformConfiguration ltiPlatformConfiguration = new LtiPlatformConfiguration();
ltiPlatformConfiguration.setRegistrationId(registrationId);
ltiPlatformConfiguration.setClientId(clientRegistrationResponse.getClientId());
- ltiPlatformConfiguration.setAuthorizationUri(platformConfiguration.getAuthorizationEndpoint());
- ltiPlatformConfiguration.setJwkSetUri(platformConfiguration.getJwksUri());
- ltiPlatformConfiguration.setTokenUri(platformConfiguration.getTokenEndpoint());
- ltiPlatformConfiguration.setOriginalUrl(platformConfiguration.getIssuer());
+ ltiPlatformConfiguration.setAuthorizationUri(platformConfiguration.authorizationEndpoint());
+ ltiPlatformConfiguration.setJwkSetUri(platformConfiguration.jwksUri());
+ ltiPlatformConfiguration.setTokenUri(platformConfiguration.tokenEndpoint());
+ ltiPlatformConfiguration.setOriginalUrl(platformConfiguration.issuer());
return ltiPlatformConfiguration;
}
}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java
index c161abc4d4f4..35dcc5f2a6f2 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java
@@ -98,8 +98,7 @@ public void authenticateLtiUser(String email, String username, String firstName,
}
// 2. Case: Lookup user with the LTI email address and make sure it's not in use
- final var usernameLookupByEmail = artemisAuthenticationProvider.getUsernameForEmail(email);
- if (usernameLookupByEmail.isPresent()) {
+ if (artemisAuthenticationProvider.getUsernameForEmail(email).isPresent() || userRepository.findOneByEmailIgnoreCase(email).isPresent()) {
throw new LtiEmailAlreadyInUseException();
}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java
index ddd15f3dda06..3abe2ae70d73 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java
@@ -35,7 +35,6 @@
import de.tum.in.www1.artemis.domain.notification.NotificationConstants;
import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase;
-import de.tum.in.www1.artemis.exception.ArtemisMailException;
import de.tum.in.www1.artemis.service.TimeService;
import tech.jhipster.config.JHipsterProperties;
@@ -133,7 +132,7 @@ public void sendEmail(User recipient, String subject, String content, boolean is
}
catch (MailException | MessagingException e) {
log.error("Email could not be sent to user '{}'", recipient, e);
- throw new ArtemisMailException("Email could not be sent to user", e);
+ // Note: we should not rethrow the exception here, as this would prevent sending out other emails in case multiple users are affected
}
}
@@ -246,7 +245,16 @@ private String createAnnouncementText(Object notificationSubject, Locale locale)
@Override
@Async
public void sendNotification(Notification notification, Set users, Object notificationSubject) {
- users.forEach(user -> sendNotification(notification, user, notificationSubject));
+ // TODO: we should track how many emails could not be sent and notify the instructors in case of announcements or other important notifications
+ users.forEach(user -> {
+ try {
+ sendNotification(notification, user, notificationSubject);
+ }
+ catch (Exception ex) {
+ // Note: we should not rethrow the exception here, as this would prevent sending out other emails in case multiple users are affected
+ log.error("Error while sending notification email to user '{}'", user.getLogin(), ex);
+ }
+ });
}
/**
@@ -259,12 +267,14 @@ public void sendNotification(Notification notification, Set users, Object
@Override
public void sendNotification(Notification notification, User user, Object notificationSubject) {
NotificationType notificationType = NotificationConstants.findCorrespondingNotificationType(notification.getTitle());
- log.debug("Sending \"{}\" notification email to '{}'", notificationType.name(), user.getEmail());
+ log.debug("Sending '{}' notification email to '{}'", notificationType.name(), user.getEmail());
String localeKey = user.getLangKey();
if (localeKey == null) {
- throw new IllegalArgumentException(
- "The user object has no language key defined. This can happen if you do not load the user object from the database but take it straight from the client");
+ log.error("The user '{}' object has no language key defined. This can happen if you do not load the user object from the database but take it straight from the client",
+ user.getLogin());
+ // use the default locale
+ localeKey = "en";
}
Locale locale = Locale.forLanguageTag(localeKey);
diff --git a/src/main/java/de/tum/in/www1/artemis/web/filter/Lti13LaunchFilter.java b/src/main/java/de/tum/in/www1/artemis/web/filter/Lti13LaunchFilter.java
index fe9a2b8580c9..9d699d4e94a9 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/filter/Lti13LaunchFilter.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/filter/Lti13LaunchFilter.java
@@ -23,7 +23,7 @@
import de.tum.in.www1.artemis.config.lti.CustomLti13Configurer;
import de.tum.in.www1.artemis.domain.lti.Claims;
-import de.tum.in.www1.artemis.domain.lti.LtiAuthenticationResponseDTO;
+import de.tum.in.www1.artemis.domain.lti.LtiAuthenticationResponse;
import de.tum.in.www1.artemis.exception.LtiEmailAlreadyInUseException;
import de.tum.in.www1.artemis.security.SecurityUtils;
import de.tum.in.www1.artemis.service.connectors.lti.Lti13Service;
@@ -119,7 +119,7 @@ private void writeResponse(String targetLinkUri, OidcIdToken ltiIdToken, String
if (SecurityUtils.isAuthenticated()) {
lti13Service.buildLtiResponse(uriBuilder, response);
}
- LtiAuthenticationResponseDTO jsonResponse = new LtiAuthenticationResponseDTO(uriBuilder.build().toUriString(), ltiIdToken.getTokenValue(), clientRegistrationId);
+ LtiAuthenticationResponse jsonResponse = new LtiAuthenticationResponse(uriBuilder.build().toUriString(), ltiIdToken.getTokenValue(), clientRegistrationId);
response.setContentType("application/json");
response.setCharacterEncoding("UTF-8");
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java
index 472d7add3bdc..cf5b3a4c9a82 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java
@@ -131,6 +131,8 @@ public class CourseResource {
private static final Logger log = LoggerFactory.getLogger(CourseResource.class);
+ private static final int MAX_TITLE_LENGTH = 255;
+
private final UserRepository userRepository;
private final CourseService courseService;
@@ -283,6 +285,10 @@ public ResponseEntity updateCourse(@PathVariable Long courseId, @Request
courseUpdate.setTutorialGroupsConfiguration(existingCourse.getTutorialGroupsConfiguration());
courseUpdate.setOnlineCourseConfiguration(existingCourse.getOnlineCourseConfiguration());
+ if (courseUpdate.getTitle().length() > MAX_TITLE_LENGTH) {
+ throw new BadRequestAlertException("The course title is too long", Course.ENTITY_NAME, "courseTitleTooLong");
+ }
+
courseUpdate.validateEnrollmentConfirmationMessage();
courseUpdate.validateComplaintsAndRequestMoreFeedbackConfig();
courseUpdate.validateOnlineCourseAndEnrollmentEnabled();
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/LtiResource.java
index 40873c3cd188..27099eea8e20 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/LtiResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/LtiResource.java
@@ -5,6 +5,10 @@
import java.util.Set;
import org.springframework.context.annotation.Profile;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
import org.springframework.web.bind.annotation.GetMapping;
@@ -13,8 +17,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-import com.google.gson.JsonObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.nimbusds.jwt.SignedJWT;
import de.tum.in.www1.artemis.domain.Course;
@@ -26,6 +32,8 @@
import de.tum.in.www1.artemis.service.AuthorizationCheckService;
import de.tum.in.www1.artemis.service.connectors.lti.LtiDeepLinkingService;
import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
+import io.swagger.annotations.ApiParam;
+import tech.jhipster.web.util.PaginationUtil;
/**
* REST controller to handle LTI13 launches.
@@ -85,20 +93,22 @@ public ResponseEntity lti13DeepLinking(@PathVariable Long courseId, @Req
String targetLink = ltiDeepLinkingService.performDeepLinking(idToken, clientRegistrationId, courseId, exerciseIds);
- JsonObject json = new JsonObject();
- json.addProperty("targetLinkUri", targetLink);
+ ObjectNode json = new ObjectMapper().createObjectNode();
+ json.put("targetLinkUri", targetLink);
return ResponseEntity.ok(json.toString());
}
/**
* GET lti platforms : Get all configured lti platforms
*
+ * @param pageable Pageable
* @return ResponseEntity containing a list of all lti platforms with status 200 (OK)
*/
@GetMapping("lti-platforms")
@EnforceAtLeastInstructor
- public ResponseEntity> getAllConfiguredLtiPlatforms() {
- List platforms = ltiPlatformConfigurationRepository.findAll();
- return ResponseEntity.ok(platforms);
+ public ResponseEntity> getAllConfiguredLtiPlatforms(@ApiParam Pageable pageable) {
+ Page platformsPage = ltiPlatformConfigurationRepository.findAll(pageable);
+ HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), platformsPage);
+ return new ResponseEntity<>(platformsPage.getContent(), headers, HttpStatus.OK);
}
}
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java
index ec82babb5301..8fcd97fdec90 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java
@@ -54,6 +54,8 @@ public class AdminCourseResource {
private static final Logger log = LoggerFactory.getLogger(AdminCourseResource.class);
+ private static final int MAX_TITLE_LENGTH = 255;
+
@Value("${jhipster.clientApp.name}")
private String applicationName;
@@ -118,6 +120,10 @@ public ResponseEntity createCourse(@RequestPart Course course, @RequestP
throw new BadRequestAlertException("A new course cannot already have an ID", Course.ENTITY_NAME, "idExists");
}
+ if (course.getTitle().length() > MAX_TITLE_LENGTH) {
+ throw new BadRequestAlertException("The course title is too long", Course.ENTITY_NAME, "courseTitleTooLong");
+ }
+
course.validateShortName();
List coursesWithSameShortName = courseRepository.findAllByShortName(course.getShortName());
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicOAuth2JWKSResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicOAuth2JWKSResource.java
index 2a9ca6594835..fb50ef5ce89d 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicOAuth2JWKSResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicOAuth2JWKSResource.java
@@ -1,12 +1,16 @@
package de.tum.in.www1.artemis.web.rest.open;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Profile;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.google.gson.GsonBuilder;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
import de.tum.in.www1.artemis.security.OAuth2JWKSService;
import de.tum.in.www1.artemis.security.annotations.EnforceNothing;
@@ -20,17 +24,30 @@
@RestController
public class PublicOAuth2JWKSResource {
+ private static final Logger log = LoggerFactory.getLogger(PublicOAuth2JWKSResource.class);
+
private final OAuth2JWKSService jwksService;
public PublicOAuth2JWKSResource(OAuth2JWKSService jwksService) {
this.jwksService = jwksService;
}
+ /**
+ * GET JWKS: Retrieves the JSON Web Key Set (JWKS).
+ *
+ * @return ResponseEntity containing the JWKS as a JSON string with status 200 (OK). If an error occurs, returns null.
+ */
@GetMapping("/.well-known/jwks.json")
@EnforceNothing
@ManualConfig
public ResponseEntity getJwkSet() {
- String keysAsJson = new GsonBuilder().setPrettyPrinting().create().toJson(jwksService.getJwkSet().toPublicJWKSet().toJSONObject());
+ String keysAsJson = null;
+ try {
+ keysAsJson = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT).writeValueAsString(jwksService.getJwkSet().toPublicJWKSet().toJSONObject());
+ }
+ catch (JsonProcessingException exception) {
+ log.debug("Error occurred parsing jwkSet: {}", exception.getMessage());
+ }
return new ResponseEntity<>(keysAsJson, HttpStatus.OK);
}
}
diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
index 4654cdf6b0b5..de97cfecd7ea 100644
--- a/src/main/resources/config/application.yml
+++ b/src/main/resources/config/application.yml
@@ -135,7 +135,7 @@ management:
enable:
http: true
jvm: true
- logback: false
+ logback: true
process: true
system: true
distribution:
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index cc167353223c..f8e054727323 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -4,18 +4,17 @@
-
-
+
+
+
+
+
+
+
+ -->
-
+ ERROR
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -56,6 +58,8 @@
+
+
@@ -66,22 +70,31 @@
+
+
+
+
-
+
+
+
+
+
+
+
-
- true
+
diff --git a/src/main/resources/templates/aeolus/ocaml/default.yaml b/src/main/resources/templates/aeolus/ocaml/default.yaml
index 7d7dc4cbdbf8..df5aef046d3a 100644
--- a/src/main/resources/templates/aeolus/ocaml/default.yaml
+++ b/src/main/resources/templates/aeolus/ocaml/default.yaml
@@ -12,6 +12,6 @@ actions:
runAlways: true
results:
- name: junit
- path: test-reports/results.xml
+ path: 'test-reports/*.xml'
type: junit
before: true
diff --git a/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html b/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html
index 049da31270b1..6e026c952a34 100644
--- a/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html
+++ b/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html
@@ -105,6 +105,23 @@
@if (sidebarData?.groupByCategory && sidebarData.groupedData) {
;
+export type AccordionGroups = Record;
export type ExerciseCollapseState = Record;
export interface SidebarData {
diff --git a/src/main/webapp/content/scss/global.scss b/src/main/webapp/content/scss/global.scss
index 970ecfe5e4b8..1882805d2d93 100644
--- a/src/main/webapp/content/scss/global.scss
+++ b/src/main/webapp/content/scss/global.scss
@@ -1029,3 +1029,24 @@ body.transparent-background {
max-width: 600px !important;
width: 600px !important;
}
+
+/* Course Overview Content Pages with Sidebar */
+.module-bg {
+ background-color: var(--module-bg);
+}
+
+.scrollable-content {
+ height: calc(100vh - var(--sidebar-footer-height-prod) - var(--header-height));
+ overflow-y: auto;
+
+ &.content-height-dev {
+ height: calc(100vh - var(--sidebar-footer-height-dev) - var(--header-height));
+ }
+ @media (max-width: 768px) {
+ height: calc(100vh - var(--sidebar-footer-height-prod) - var(--header-height)) !important;
+ }
+}
+
+.sidebar-collapsed {
+ display: none;
+}
diff --git a/src/main/webapp/content/scss/themes/_dark-variables.scss b/src/main/webapp/content/scss/themes/_dark-variables.scss
index bc2022bf0c31..792db0e64aab 100644
--- a/src/main/webapp/content/scss/themes/_dark-variables.scss
+++ b/src/main/webapp/content/scss/themes/_dark-variables.scss
@@ -127,9 +127,14 @@ $neutral-dark-l-20: lighten($neutral-dark, 20%);
// Footer
$footer-bg: $neutral-dark;
+$footer-height-dev: 3rem;
+$footer-height-prod: 2rem;
+$sidebar-footer-height-dev: 134px;
+$sidebar-footer-height-prod: 118px;
//Module and Navigationbar
$module-bg: $neutral-dark;
+$header-height: 68px;
$course-image-bg: $body-bg;
$link-item-bg: $gray-900;
$sidebar-card-selected-bg: #353d47;
diff --git a/src/main/webapp/content/scss/themes/_default-variables.scss b/src/main/webapp/content/scss/themes/_default-variables.scss
index ae099ddeac2b..f2190a6cc399 100644
--- a/src/main/webapp/content/scss/themes/_default-variables.scss
+++ b/src/main/webapp/content/scss/themes/_default-variables.scss
@@ -51,11 +51,12 @@ $border-color: #dee2e6;
$footer-bg: $white;
$footer-height-dev: 3rem;
$footer-height-prod: 2rem;
-$sidebar-footer-height-dev: 148px;
-$sidebar-footer-height-prod: 132px;
+$sidebar-footer-height-dev: 134px;
+$sidebar-footer-height-prod: 118px;
//Module and Navigationbar
$module-bg: $white;
+$header-height: 68px;
$course-image-bg: $body-bg;
$link-item-color: $primary;
$link-item-bg: $gray-100;
diff --git a/src/main/webapp/i18n/de/aboutUs.json b/src/main/webapp/i18n/de/aboutUs.json
index 43112e6bb220..58c6daa59491 100644
--- a/src/main/webapp/i18n/de/aboutUs.json
+++ b/src/main/webapp/i18n/de/aboutUs.json
@@ -51,7 +51,7 @@
"text": "Lernanalytik: Statistiken, mit denen sich die Studierenden mit dem Kursdurchschnitt vergleichen können. Bewerten der durchschnittliche Leistung der Studierenden anhand von Aufgaben und Kompetenzen."
},
"adaptiveLearning": {
- "text": "Adaptives Lernen: Definieren Sie Kompetenzen und Lernziele. Verfolgen Sie den Fortschritt der Studierenden und geben Sie individuelles Feedback."
+ "text": "Adaptives Lernen: Definiere Kompetenzen und Lernziele. Verfolge den Fortschritt der Studierenden und gib individuelles Feedback."
},
"tutorialGroups": {
"text": "Übungsgruppen: Verwaltung der Übungsgruppen eines Kurses. Planung der Sitzungen, Zuweisung der verantwortlichen Tutor:innen, Registrierung der Studierenden und Verfolgung der Anwesenheit."
diff --git a/src/main/webapp/i18n/de/conversation.json b/src/main/webapp/i18n/de/conversation.json
index 0a3cab64404b..5cab31c5438f 100644
--- a/src/main/webapp/i18n/de/conversation.json
+++ b/src/main/webapp/i18n/de/conversation.json
@@ -155,7 +155,7 @@
}
},
"addUsers": {
- "addUsersToGroupChat": "Fügen Sie Nutzer:innen zum Gruppenchat hinzu",
+ "addUsersToGroupChat": "Füge Nutzer:innen zum Gruppenchat hinzu",
"addUsersToChannel": "Nutzer:innen hinzufügen zu:",
"addUsersForm": {
"addUsersButton": "Nutzer:in hinzufügen",
diff --git a/src/main/webapp/i18n/de/course.json b/src/main/webapp/i18n/de/course.json
index b6cc1a28c7ba..9e97749509a5 100644
--- a/src/main/webapp/i18n/de/course.json
+++ b/src/main/webapp/i18n/de/course.json
@@ -1,7 +1,7 @@
{
"artemisApp": {
"course": {
- "searchForCourse": "Suchen Sie nach einem Kurs",
+ "searchForCourse": "Suche nach einem Kurs",
"home": {
"title": "Kurse",
"createLabel": "Kurs erstellen",
diff --git a/src/main/webapp/i18n/de/courseExamArchive.json b/src/main/webapp/i18n/de/courseExamArchive.json
index 58450e1c7c5c..7f209529303d 100644
--- a/src/main/webapp/i18n/de/courseExamArchive.json
+++ b/src/main/webapp/i18n/de/courseExamArchive.json
@@ -29,7 +29,7 @@
},
"confirmArchive": {
"title": "Achtung: Ein Archiv existiert bereits!",
- "message": "Warnung! Der Kurs wurde bereits archiviert. Wenn Sie fortfahren, wird das Archiv überschrieben! Sind Sie sicher, dass Sie fortfahren möchten?"
+ "message": "Warnung! Der Kurs wurde bereits archiviert. Wenn du fortfährst, wird das Archiv überschrieben! Bist du sicher, dass du fortfahren möchtest?"
}
}
}
diff --git a/src/main/webapp/i18n/de/courseTutorialGroups.json b/src/main/webapp/i18n/de/courseTutorialGroups.json
index d8f01331c4b9..4f469efac3fb 100644
--- a/src/main/webapp/i18n/de/courseTutorialGroups.json
+++ b/src/main/webapp/i18n/de/courseTutorialGroups.json
@@ -6,9 +6,7 @@
"pages": {
"courseTutorialGroups": {
"title": "Deine Übungsgruppen",
- "noRegistrations": "Du bist in keiner Übungsgruppe angemeldet.",
- "allFilter": "Alle Übungsgruppen anzeigen",
- "registeredFilter": "Meine Übungsgruppen anzeigen"
+ "noRegistrations": "Du bist in keiner Übungsgruppe angemeldet."
},
"courseTutorialGroupDetail": {
"title": "Übungsgruppen-Details",
diff --git a/src/main/webapp/i18n/de/error.json b/src/main/webapp/i18n/de/error.json
index d80d84009768..a1f8d3a79e70 100644
--- a/src/main/webapp/i18n/de/error.json
+++ b/src/main/webapp/i18n/de/error.json
@@ -93,6 +93,7 @@
"exportFailed": "Aufgabenexport fehlgeschlagen",
"unableToImportProgrammingExercise": "Fehler beim Importieren der Programmieraufgabe.",
"titleAlreadyExists": "Es existiert bereits eine Programmieraufgabe mit demselben Titel, bitte nutze einen anderen Titel.",
- "shortnameAlreadyExists": "Es existiert bereits eine Programmieraufgabe mit demselben Kurznamen, bitte nutze einen anderen Kurznamen."
+ "shortnameAlreadyExists": "Es existiert bereits eine Programmieraufgabe mit demselben Kurznamen, bitte nutze einen anderen Kurznamen.",
+ "courseTitleTooLong": "Der Kurstitel ist zu lang (max. 255 Zeichen), bitte nutze einen kürzeren Kurstitel."
}
}
diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json
index f96a7dfcad73..119a14cd35c7 100644
--- a/src/main/webapp/i18n/de/exam.json
+++ b/src/main/webapp/i18n/de/exam.json
@@ -14,7 +14,7 @@
"pdfExampleText": "Beispiel für ein gültiges PDF-Dateiformat:",
"pdfFile": {
"label": ".pdf-Datei auswählen",
- "tooltip": "Bitte wählen Sie eine .pdf-Datei aus, die das Bild des registrierten Studenten und seine Matrikelnummer enthält."
+ "tooltip": "Bitte wähle eine .pdf-Datei aus, die das Bild des registrierten Studenten und seine Matrikelnummer enthält."
},
"dialogTitle": "Bilder hochladen",
"allImagesSaved": "Alle Bilder wurden erfolgreich gespeichert.",
@@ -641,7 +641,7 @@
"resolveComplaints": "Beschwerden können im Bewertungs-Dashboard bearbeitet werden.",
"testRun": "Probiere verschiedene Kombinationen von Übungsvarianten aus Sicht der Studierenden aus.",
"exportResults": "Die Klausurergebnisse können in Form einer .csv Datei exportiert werden.",
- "editWorkingTime": "Bis zu einer Minute vor dem Ende der Prüfung können Sie deren Dauer verlängern.",
+ "editWorkingTime": "Bis zu einer Minute vor dem Ende der Prüfung kannst du deren Dauer verlängern.",
"createAnnouncement": "Um wichtige Informationen an alle Studierenden, die gerade an der Klausur arbeiten, zu kommunizieren, kannst du eine Ankündigung machen. Sie wird sofort an alle Studierenden verteilt und angezeigt.",
"suspiciousBehavior": "Verdächtiges Verhalten und Plagiatsfälle können in diesem Dashboard eingesehen werden."
},
@@ -681,7 +681,7 @@
"title": "Prüfungszeit bearbeiten",
"label": "Änderung der Prüfungszeit",
"duration": "Die neue Dauer der Prüfung beträgt {{ duration }}.",
- "question": "Die Prüfungszeit wird für alle Studierenden angepasst. Wollen Sie die Prüfungszeit für die Klausur {{ title }} wirklich ändern?",
+ "question": "Die Prüfungszeit wird für alle Studierenden angepasst. Willst du die Prüfungszeit für die Klausur {{ title }} wirklich ändern?",
"typeNameToConfirm": "Bitte gib den Namen der Klausur zur Bestätigung ein."
},
"announcementCreate": {
diff --git a/src/main/webapp/i18n/de/exercise.json b/src/main/webapp/i18n/de/exercise.json
index 797c81d89b93..4480649770ee 100644
--- a/src/main/webapp/i18n/de/exercise.json
+++ b/src/main/webapp/i18n/de/exercise.json
@@ -97,7 +97,7 @@
"assessmentDue": "Bewertungsfrist",
"assessmentDueDate": "Einreichungsfrist der Bewertung",
"assessmentDueDateError": "Einreichungsfrist der Bewertung muss nach dem Veröffentlichungsdatum, Startdatum und nach der Einreichungsfrist für Aufgaben sein. Bitte überprüfe deine Auswahl nochmal.",
- "noReleaseDateWarning": "Du hast kein Veröffentlichungsdatum definiert, daher wird die Aufgabe sofort veröffentlicht und sichtbar für die Studierenden sein. Sie können aber erst nach dem Startdatum an der Aufgabe teilnehmen.",
+ "noReleaseDateWarning": "Du hast kein Veröffentlichungsdatum definiert, daher wird die Aufgabe sofort veröffentlicht und sichtbar für die Studierenden sein. Du kannst aber erst nach dem Startdatum an der Aufgabe teilnehmen.",
"noReleaseAndStartDateWarning": "Du hast kein Veröffentlichungs- und Startdatum definiert, daher wird die Aufgabe sofort veröffentlicht und Studierende können direkt an der Aufgabe teilnehmen.",
"dateNotSet": "Kein Datum gesetzt",
"exampleSolutionPublicationDate": "Veröffentlichungsdatum der Beispiellösung",
diff --git a/src/main/webapp/i18n/de/exerciseChatbot.json b/src/main/webapp/i18n/de/exerciseChatbot.json
index 6265e81d5657..2f3b63c526a8 100644
--- a/src/main/webapp/i18n/de/exerciseChatbot.json
+++ b/src/main/webapp/i18n/de/exerciseChatbot.json
@@ -53,7 +53,7 @@
"irisNotAvailable": "Iris antwortet nicht. Bitte versuche es später!",
"rateLimitExceeded": "Du hast die maximale Anzahl von Nachrichten, die du in einem {{ hours }}-Stunden-Zeitfenster an Iris senden kannst, erreicht. Bitte versuche es später erneut!"
},
- "disclaimer": "Iris kann Fehler machen. Überprüfen Sie wichtige Informationen.",
+ "disclaimer": "Iris kann Fehler machen. Überprüfe wichtige Informationen.",
"tutorFirstMessage": "Hallo, ich bin Iris! Ich kann dir bei deiner Programmieraufgabe helfen. Du kannst hier mehr über mich erfahren.",
"codeEditorFirstMessage": "Hallo, ich bin Iris! Ich kann dir bei der Bearbeitung von Programmieraufgaben helfen. Ich kann zum Beispiel:
eine bestehende Aufgabe neuen Anforderungen anpassen
Du kannst hier mehr über mich erfahren.",
"rateLimitTooltip": "Dies ist die maximale Anzahl von Nachrichten, die du in einem {{ hours }}-Stunden-Zeitfenster an Iris senden kannst."
diff --git a/src/main/webapp/i18n/de/featureOverview.json b/src/main/webapp/i18n/de/featureOverview.json
index 76e910a696f4..4052d02f1e4d 100644
--- a/src/main/webapp/i18n/de/featureOverview.json
+++ b/src/main/webapp/i18n/de/featureOverview.json
@@ -39,7 +39,7 @@
"sessionMonitoring": {
"title": "Überwachung der Klausur",
"shortDescription": "Überwache die Klausursitzung, um ungewöhnliche Aktivitäten zu identifizieren.",
- "descriptionTextOne": "Ohne eine Aufsicht, kann es sich so anfühlen, als könntest du deine Studierenden nicht genau beobachten. Um dem entgegenzuwirken, beinhaltet Artemis eine Überwachung der Klausuren. Für alle Studierenden, die an der Klausur teilnehmen, generiert Artemis eine Klausursitzung. Die Klausursitzung enthält neben anderen Feldern, wann und wo die Klausur gestartet wurde, die öffentliche IP-Adresse und einen einzigartigen Fingerabdruck, der auf dem Browser und dem Betriebssystem basiert. Zusätzlich generiert die Klausur eine eindeutige Kennung, die mit jeder Anfrage gesendet wird. Studierende haben die Möglichkeit, während der Klausur zwischen den Computern zu wechseln und auch offline weiterzuarbeiten. Als Ausbilder haben Sie die Möglichkeit, alle Sitzungen und das Verhalten der Studierenden zu analysieren und verdächtig erscheinende Fälle zu markieren."
+ "descriptionTextOne": "Ohne eine Aufsicht kann es sich so anfühlen, als würdest du deine Studierenden nicht genau beobachten. Um dem entgegenzuwirken, beinhaltet Artemis eine Überwachung der Klausuren. Für alle Teilnehmenden generiert Artemis eine Klausursitzung. Diese Klausursitzung enthält unter anderem, wann und wo die Klausur gestartet wurde, die öffentliche IP-Adresse und einen einzigartigen Fingerabdruck, der auf dem Browser und dem Betriebssystem basiert. Zusätzlich generiert die Klausur eine eindeutige Kennung, die mit jeder Anfrage gesendet wird. Studierende haben die Möglichkeit, während der Klausur zwischen den Computern zu wechseln und auch offline weiterzuarbeiten. Als Ausbilder hast du die Möglichkeit, alle Sitzungen und das Verhalten der Studierenden zu analysieren und verdächtig erscheinende Fälle zu markieren."
},
"plagiarismDetection": {
"title": "Plagiatserkennung",
@@ -74,7 +74,7 @@
"statistics": {
"title": "Statistiken Erstellen",
"shortDescription": "Statistiken erstellen und Einblicke in die Leistungen der Studierenden gewinnen.",
- "descriptionTextOne": "Die Klausur ist vorbei, alle Klausuren wurden bewertet und die Beschwerden der Studierenden wurden ausgewertet. Was nun?\n\nDu kannst das Ergebnis der Klausur anhand der von Artemis generierten Statistiken auswerten. Überprüfe die Leistung der Studierenden anhand verschiedener Metriken wie Durchschnitt, Median und Standardabweichung. Überprüfen Sie die wahrgenommenen Schwierigkeiten der Studierenden bei jeder Aufgabe, um die Klausuren in Zukunft zu verbessern. Zusätzlich kannst du alle Ergebnisse in eine CSV-Datei herunterladen, um sie in externe Systeme zu exportieren und Diagramme und Grafiken zur weiteren Analyse zu erstellen."
+ "descriptionTextOne": "Die Klausur ist vorbei, alle Klausuren wurden bewertet und die Beschwerden der Studierenden wurden ausgewertet. Was nun?\n\nDu kannst das Ergebnis der Klausur anhand der von Artemis generierten Statistiken auswerten. Überprüfe die Leistung der Studierenden anhand verschiedener Metriken wie Durchschnitt, Median und Standardabweichung. Überprüfe die wahrgenommenen Schwierigkeiten der Studierenden bei jeder Aufgabe, um die Klausuren in Zukunft zu verbessern. Zusätzlich kannst du alle Ergebnisse in eine CSV-Datei herunterladen, um sie in externe Systeme zu exportieren und Diagramme und Grafiken zur weiteren Analyse zu erstellen."
},
"checklist": {
"title": "Checkliste Befolgen",
diff --git a/src/main/webapp/i18n/de/gradingSystem.json b/src/main/webapp/i18n/de/gradingSystem.json
index f408788dfce2..b6567439467a 100644
--- a/src/main/webapp/i18n/de/gradingSystem.json
+++ b/src/main/webapp/i18n/de/gradingSystem.json
@@ -18,7 +18,7 @@
},
"presentationType": {
"title": "Präsentationsmodus",
- "description": "Wählen Sie \"Einfach\", um die Anzahl der Präsentationen festzulegen, die ein Student halten muss, um den Notenbonus für den Kurs zu erhalten. Wählen Sie \"Benotet\", um die Anzahl der von Tutoren benoteten Präsentationen, die ein Student halten kann, und die Gewichtung der Präsentationen für die Kursnote festzulegen.",
+ "description": "Wähle \"Einfach\", um die Anzahl der Präsentationen festzulegen, die ein Student halten muss, um den Notenbonus für den Kurs zu erhalten. Wähle \"Benotet\", um die Anzahl der von Tutoren benoteten Präsentationen, die ein Student halten kann, und die Gewichtung der Präsentationen für die Kursnote festzulegen.",
"none": "Keine",
"basic": "Einfach",
"graded": "Benotet"
@@ -59,7 +59,7 @@
},
"maxPoints": {
"title": "Maximale Punktzahl",
- "explanation": "Legt die maximale Punktzahl für den gegebenen Kurs/die gegebene Prüfung fest. Der Wert wird benötigt, wenn ein Notenschlüssel mit absoluter Punktzahl als Schranke anstelle eines Prozentsatzes benötigt wird. Beachten Sie, dass die maximale Punktzahl keinen Einfluss auf die Notenberechnung für Kurse hat, für Prüfungen jedoch schon."
+ "explanation": "Legt die maximale Punktzahl für den gegebenen Kurs/die gegebene Prüfung fest. Der Wert wird benötigt, wenn ein Notenschlüssel mit absoluter Punktzahl als Schranke anstelle eines Prozentsatzes benötigt wird. Beachte, dass die maximale Punktzahl keinen Einfluss auf die Notenberechnung für Kurse hat, für Prüfungen jedoch schon."
},
"gradeType": {
"title": "Notentyp",
diff --git a/src/main/webapp/i18n/de/importUsers.json b/src/main/webapp/i18n/de/importUsers.json
index 2beb6f334349..9178ff7571f8 100644
--- a/src/main/webapp/i18n/de/importUsers.json
+++ b/src/main/webapp/i18n/de/importUsers.json
@@ -8,13 +8,13 @@
"csvExampleText": "Beispiel für eine gültige CSV Datei:",
"csvFile": {
"label": ".csv Datei auswählen",
- "tooltip": "Bitte wähle die .csv Datei mit den Nutzern zum Import aus. Pro Eintrag muss entweder die 'LOGIN', 'REGISTRATION_NUMBER' oder 'E-MAIL' Spalte ausgefüllt sein. Folgendes Format muss dabei beachtet werden: Login, Matrikelnummer, E-Mail, Vorname, Nachname. Sie müssen diese in der obersten Spalte angeben!"
+ "tooltip": "Bitte wähle die .csv Datei mit den Nutzern zum Import aus. Pro Eintrag muss entweder die 'LOGIN', 'REGISTRATION_NUMBER' oder 'E-MAIL' Spalte ausgefüllt sein. Folgendes Format muss dabei beachtet werden: Login, Matrikelnummer, E-Mail, Vorname, Nachname. Du musst diese in der obersten Spalte angeben!"
},
"usersForImport": {
"label": "Nutzer zum Importieren",
"tooltip": "Diese Nutzer werden importiert beim Klicken auf \"Importieren\".",
- "importFailed": "Bitte versuchen sie es nach dem reparieren der Datei erneut, die Datei konnte wegen folgendem Fehler nicht gelesen werden:",
- "failedRows": "Die folgenden Reihen in ihrer CSV sind ungültig und müssen entweder den Login, eine Matrikelnummer oder eine E-Mail enthalten:",
+ "importFailed": "Bitte versuche es nach dem reparieren der Datei erneut, die Datei konnte wegen folgendem Fehler nicht gelesen werden:",
+ "failedRows": "Die folgenden Reihen in deiner CSV sind ungültig und müssen entweder den Login, eine Matrikelnummer oder eine E-Mail enthalten:",
"noUsersFound": "Es wurden keine Benutzer zum Importieren gefunden"
},
"numberOfUsers": "Anzahl an Nutzern:",
diff --git a/src/main/webapp/i18n/de/instructorDashboard.json b/src/main/webapp/i18n/de/instructorDashboard.json
index c6449dd8af9e..09576a33510e 100644
--- a/src/main/webapp/i18n/de/instructorDashboard.json
+++ b/src/main/webapp/i18n/de/instructorDashboard.json
@@ -45,17 +45,17 @@
"title": "Abgaben herunterladen",
"titleSingle": "Abgabe herunterladen",
"questions": {
- "individual": "Tragen sie hier alle Kennungen der Studierenden ein, die heruntergeladen werden sollen getrennt durch ein Komma (z.B. ga87fix,ga63dut)",
- "team": "Tragen sie hier alle Kurznamen der Teams ein, die heruntergeladen werden sollen getrennt durch ein Komma (z.B. team1,team2)"
+ "individual": "Trag bitte hier alle Kennungen der Studierenden ein, die heruntergeladen werden sollen getrennt durch ein Komma (z.B. ga87fix,ga63dut)",
+ "team": "Trag bitte hier alle Kurznamen der Teams ein, die heruntergeladen werden sollen getrennt durch ein Komma (z.B. team1,team2)"
},
"timeWarning": "Achtung: Diese Aktion kann abhängig von Größe und Anzahl der Repositories mehrere Minuten dauern.",
- "currentlySelected": "Sie sind dabei die Abgaben aller Teams/Studierende von folgenden Aufgaben herunterzuladen:"
+ "currentlySelected": "Du bist dabei die Abgaben aller Teams/Studierende von folgenden Aufgaben herunterzuladen:"
},
"exportCSV": "Als CSV exportieren",
"exportSubmissions": {
"title": "Abgaben exportieren",
"downloadAllStudents": "Oder lade die Abgaben aller Studierenden herunter",
- "question": "Tragen sie hier alle Kennungen der Studierenden getrennt durch ein Komma ein, deren Abgaben heruntergeladen werden sollen (z.B. ga87fix,ga63dut)",
+ "question": "Trag bitte hier alle Kennungen der Studierenden getrennt durch ein Komma ein, deren Abgaben heruntergeladen werden sollen (z.B. ga87fix,ga63dut)",
"filterLateSubmissions": "Verspätete Abgaben herausfiltern",
"filterLateSubmissionsDate": {
"title": "Datum zum Filtern verspäteter Abgaben",
diff --git a/src/main/webapp/i18n/de/lectureUnit.json b/src/main/webapp/i18n/de/lectureUnit.json
index 0b9be573709f..aff8999839ee 100644
--- a/src/main/webapp/i18n/de/lectureUnit.json
+++ b/src/main/webapp/i18n/de/lectureUnit.json
@@ -120,7 +120,7 @@
"secondLine": "Artemis erwartet eine Wiederholung der Gliederungsfolie vor jeder Einheit.",
"note": "Hinweis: Du kannst die Informationen bearbeiten, bevor die angehängten Einheiten übermittelt werden."
},
- "noFile": "Es gibt keine Datei für die automatische Einheitenverarbeitung. Bitte gehen Sie einen Schritt zurück und versuchen Sie es erneut.",
+ "noFile": "Es gibt keine Datei für die automatische Einheitenverarbeitung. Bitte gehe einen Schritt zurück und versuche es erneut.",
"noUnitDetected": "Es wurde keine Einheit erkannt und konnte nicht automatisch geteilt werden. Bitte füge Informationen für jede Einheit hinzu!",
"pageTitle": "Einheiten",
"addUnit": "Einheit hinzufügen",
@@ -132,7 +132,7 @@
"secondLine": "Mehrere Schlüsselsätze werden mit einem Komma getrennt, zwischen Groß- und Kleinbuchstaben wird nicht unterschieden.",
"thirdLine": "Folgende Folien werden entfernt:"
},
- "timeout": "Zeitüberschreitung während der automatischen Einheitenverarbeitung. Bitte versuchen Sie es erneut.",
+ "timeout": "Zeitüberschreitung während der automatischen Einheitenverarbeitung. Bitte versuche es erneut.",
"removeSlidesPlaceholder": "Beispiel: 'Pause, Beispiellösungen'",
"validation": {
"invalidPages": "Die Startseite oder die letzte Seite von {{ unitName }} sind falsch eingestellt.",
@@ -155,7 +155,7 @@
"endPage": "Letzte Seite"
},
"lectureFileToolTip": "Bitte auswählen, um die automatischen Trennung von Vorlesungseinheiten zu aktivieren.",
- "processTimeInfo": "Die Verarbeitung der Vortragseinheiten kann einige Sekunden dauern. Bitte haben Sie etwas Geduld."
+ "processTimeInfo": "Die Verarbeitung der Vortragseinheiten kann einige Sekunden dauern. Habe bitte etwas Geduld."
},
"createAttachmentUnit": {
"title": "Dateieinheit erstellen",
diff --git a/src/main/webapp/i18n/de/lti.json b/src/main/webapp/i18n/de/lti.json
index c718eb68e52f..81c26d3a4d0d 100644
--- a/src/main/webapp/i18n/de/lti.json
+++ b/src/main/webapp/i18n/de/lti.json
@@ -47,7 +47,7 @@
"requestUsername": "Benutzernamen anfordern",
"requestEmail": "E-Mail des Benutzers anfordern",
"requireExistingUser": "Vorhandene:r Nutzer:in erforderlich",
- "dynamicRegistrationTooltip": "Sie können diese URL verwenden, um eine LTI 1.3-Plattform automatisch bei dieser Artemis-Instanz zu registrieren.",
+ "dynamicRegistrationTooltip": "Du kannst diese URL verwenden, um eine LTI 1.3-Plattform automatisch bei dieser Artemis-Instanz zu registrieren.",
"configuredPlatformsTooltip": "Anzeigen und Verwalten der LTI-Plattformen, die derzeit für die Integration konfiguriert sind. Diese Tabelle enthält wichtige Details wie Plattformnamen, Registrierungs-IDs, Client-IDs und Autorisierungsendpunkte, die für die sichere Kommunikation zwischen Artemis und den Plattformen erforderlich sind.",
"launchTargetTooltip": "Das empfohlene 'Launch Target' ist 'New Window', um eine optimale Benutzererfahrung zu gewährleisten",
"requestUserEmailTooltip": "Die E-Mail des Benutzers muss gesendet werden, da sie von Artemis benötigt wird, um den Benutzer zu erstellen oder zu finden",
@@ -55,14 +55,14 @@
"configurationForCourse": "LTI Konfiguration der Kurs {{ title }} bearbeiten",
"userPrefixTooltip": "Präfix für die neuen Benutzer, die für diesen Kurs erstellt werden. Es wird empfohlen, einen Wert zu verwenden, der die Benutzer eindeutig als Teil dieses Kurses identifiziert.",
"requireExistingUserTooltip": "Wenn ausgewählt, erfordert das Starten der Übung einen bestehenden Benutzer in Artemis. Wenn abgewählt, kann ein Benutzer beim ersten Start erstellt werden, wenn er noch nicht existiert",
- "registrationIdTooltip": "ID, die zur Identifizierung der Registrierung der Lernplattform verwendet wird. Diese muss für alle Kurse eindeutig sein. Sie können diesen Wert frei ändern, es wird jedoch empfohlen, den automatisch generierten Wert zu verwenden.",
+ "registrationIdTooltip": "ID, die zur Identifizierung der Registrierung der Lernplattform verwendet wird. Diese muss für alle Kurse eindeutig sein. Du kannst diesen Wert frei ändern, es wird jedoch empfohlen, den automatisch generierten Wert zu verwenden.",
"clientIdTooltip": "Es ist möglich, dieses Feld und die folgenden URI-Felder manuell zu konfigurieren, aber es wird dringend empfohlen, den Dynamic Registration Service zur automatischen Konfiguration zu verwenden.",
"form": {
"userPrefix": {
"forbidden": "Nutzer-Präfix darf keine Sonderzeichen beinhalten."
}
},
- "customNameIdTooltip": "Geben Sie einen erkennbaren Namen für die Plattform ein, um sie in der Liste leicht identifizieren zu können. Dieser Name dient nur als administrative Referenz und hat keinen Einfluss auf die tatsächliche Konfiguration oder Konnektivität der Plattform."
+ "customNameIdTooltip": "Gib einen erkennbaren Namen für die Plattform ein, um sie in der Liste leicht identifizieren zu können. Dieser Name dient nur als administrative Referenz und hat keinen Einfluss auf die tatsächliche Konfiguration oder Konnektivität der Plattform."
},
"configuredPlatforms": "Konfigurierte Plattformen",
"viewAdvancedSettings": "Erweiterte Einstellungen anzeigen",
@@ -73,7 +73,7 @@
"launch": {
"title": "Aufgabe starten",
"launching": "Am starten...",
- "launchFailed": "Die Übung konnte nicht gestartet werden. Bitte versuchen Sie es später noch einmal oder kontaktieren Sie den Administrator."
+ "launchFailed": "Die Übung konnte nicht gestartet werden. Bitte versuche es später noch einmal oder kontaktiere den Administrator."
},
"dynamicRegistration": {
"title": "Dynamische Registrierung",
@@ -89,14 +89,14 @@
"link": "Verlinken",
"unknownError": "Aufgrund eines unbekannten Fehlers nicht erfolgreich. Bitte kontaktiere einen Admin!"
},
- "missingConfigurationWarning": "Fehlende Werte in der LTI1.3-Konfiguration. Starts werden nicht funktionieren. Bitte wenden Sie sich für die Konfiguration an den Administrator.",
+ "missingConfigurationWarning": "Fehlende Werte in der LTI1.3-Konfiguration. Starts werden nicht funktionieren. Bitte wende dich für die Konfiguration an den Administrator.",
"selectContentFromCourse": "Wähle Inhalte aus dem Kurs {{ title }} aus",
"deletePlatformError": "Die LTI-Plattform konnte nicht gelöscht werden",
- "selectContentTooltip": "Wählen Sie einfach Ihre bevorzugten Übungen aus und klicken Sie dann auf die Schaltfläche Link, um sie in die Plattform zu integrieren.",
+ "selectContentTooltip": "Wähle deine bevorzugten Übungen aus und klicke dann auf die Schaltfläche Link, um diese in die Plattform zu integrieren.",
"externalToolSettings": "Externe Tool-Einstellungen",
"externalToolSettingsTooltip": "Ein Externes Tool ist für die Verknüpfung und Teilnahme an Übungen erforderlich und ermöglicht die nahtlose Integration mit externen Ressourcen und Aktivitäten",
- "editExternalToolSettingsTooltip": "Bitte wählen Sie ein Externes Tool für diesen Kurs, um eine erfolgreiche LTI-Kommunikation zu ermöglichen. Sobald ein vorkonfiguriertes Externes Tool ausgewählt wurde, ist dieser Online-Kurs für die Verknüpfung mit Übungen und die Teilnahme daran verfügbar.",
- "selectExternalTool": "Wählen Sie ein externes Tool",
+ "editExternalToolSettingsTooltip": "Bitte wähle ein Externes Tool für diesen Kurs, um eine erfolgreiche LTI-Kommunikation zu ermöglichen. Sobald ein vorkonfiguriertes Externes Tool ausgewählt wurde, ist dieser Online-Kurs für die Verknüpfung mit Übungen und die Teilnahme daran verfügbar.",
+ "selectExternalTool": "Wähle ein externes Tool",
"selectCourse": "Kurs wählen",
"addNewPlatform": "Neue Plattformkonfiguration hinzufügen"
},
diff --git a/src/main/webapp/i18n/de/metis.json b/src/main/webapp/i18n/de/metis.json
index d81a0aa99657..d0da540bab3d 100644
--- a/src/main/webapp/i18n/de/metis.json
+++ b/src/main/webapp/i18n/de/metis.json
@@ -18,7 +18,7 @@
"confirmDeletePost": "Bitte bestätige, dass du diese Nachricht löschen möchtest!",
"deleteAnswer": "Möchtest du diese Antwort löschen?",
"confirmDeleteAnswer": "Bitte bestätige, dass du diese Antwort löschen möchtest!",
- "removeLinkPreview": "Möchten Sie die Vorschau entfernen?",
+ "removeLinkPreview": "Möchtest du die Vorschau entfernen?",
"confirmRemoveLinkPreview": "Bitte bestätigen, dass du die Vorschau entfernen möchtest!",
"createModalTitlePost": "Nachricht erstellen",
"createModalTitleAnnouncement": "Ankündigung erstellen",
diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json
index cdf0f6e30eab..ca3ea320c34f 100644
--- a/src/main/webapp/i18n/de/programmingExercise.json
+++ b/src/main/webapp/i18n/de/programmingExercise.json
@@ -42,7 +42,7 @@
"deleteParticipationsSubmissionsAndResults": "Lösche Teilnahmen, Abgaben und Ergebnisse der Studierenden (in Artemis).",
"artefactsWarning": "Das Löschen von Teilnahmen, Abgaben und Ergebnissen von Studierenden, ohne dabei die zugehörigen Repositories und Build-Pläne zu entfernen, kann zu nicht gelöschten Artefakten auf {{ vcPlatform }} und {{ ciPlatform }} führen. Bitte überprüfe sorgfältig, ob dies die gewünschte Aktion ist, bevor du den Vorgang fortsetzt.",
"recreateBuildPlans": "Erstelle Build Pläne der Aufgabe (BASE und SOLUTION) erneut und überschreibe frühere Änderungen.",
- "question": "Warnung: Diese Aktion kann NICHT rückgängig gemacht werden! Um Ihre Auswahl zu bestätigen, gebe bitte den Namen der Übung ein: {{ title }}",
+ "question": "Warnung: Diese Aktion kann NICHT rückgängig gemacht werden! Um deine Auswahl zu bestätigen, gebe bitte den Namen der Übung ein: {{ title }}",
"successMessage": "Das Zurücksetzen war erfolgreich.",
"errorMessage": "Das Zurücksetzen war nicht erfolgreich."
},
diff --git a/src/main/webapp/i18n/de/quizExercise.json b/src/main/webapp/i18n/de/quizExercise.json
index 45cb4deaa2a0..7c36a6af3112 100644
--- a/src/main/webapp/i18n/de/quizExercise.json
+++ b/src/main/webapp/i18n/de/quizExercise.json
@@ -168,7 +168,7 @@
"no_changes": "Keine Änderungen, welche die bestehenden Ergebnisse beeinflussen",
"quizStatistic": "Die bestehende Statistiken müssen neu berechnet werden!",
"results": "Die bestehenden Ergebnisse müssen neu berechnet werden!",
- "exam": "Dieses Quiz ist eine Klausuraufgabe. Stellen Sie sicher, dass das Quiz bereits evaluiert wurde bevor eine Überarbeitung vorgenommen wird!",
+ "exam": "Dieses Quiz ist eine Klausuraufgabe. Stelle sicher, dass das Quiz bereits evaluiert wurde bevor eine Überarbeitung vorgenommen wird!",
"resulttext": {
"element_deleted": "Das Frage-Element wird aus allen Ergebnissen entfernt",
"element_invalid": "Alle Teilnehmenden erhalten die Punkte für das ungültige Frage-Element",
diff --git a/src/main/webapp/i18n/de/quizPool.json b/src/main/webapp/i18n/de/quizPool.json
index 9e70f7aed8fe..8384eb537c98 100644
--- a/src/main/webapp/i18n/de/quizPool.json
+++ b/src/main/webapp/i18n/de/quizPool.json
@@ -6,9 +6,9 @@
"groupName": "Gruppenname",
"addGroup": "Gruppe hinzufügen",
"delete": {
- "question": "Möchten Sie die Quizgruppe {{ title }} wirklich löschen? Alle zugewiesenen Fragen werden nicht zugeordnet."
+ "question": "Möchtest du die Quizgruppe {{ title }} wirklich löschen? Alle zugewiesenen Fragen werden nicht zugeordnet."
},
- "dragExplanation": "Ziehen Sie die Frage unten, um sie einer Gruppe zuzuordnen.",
+ "dragExplanation": "Ziehe die unten stehende Frage, um sie einer Gruppe zuzuordnen.",
"groupExplanation": "Fragen in der gleichen Gruppe werden für jeden Schüler nach dem Zufallsprinzip ausgewählt. Fragen, die nicht in einer Gruppe sind, werden allen Schülern zugewiesen.",
"updated": "Quiz Pool aktualisiert mit ID {{ param }}",
"invalidReasons": {
diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json
index 03e6080e350b..a2df843ae74e 100644
--- a/src/main/webapp/i18n/de/student-dashboard.json
+++ b/src/main/webapp/i18n/de/student-dashboard.json
@@ -34,6 +34,16 @@
"general": {
"noDataFound": "Keine Einträge gefunden."
},
+ "sidebar": {
+ "past": "Vorangegangen",
+ "current": "Aktuell",
+ "future": "Zukünftig",
+ "noDueDate": "Unbefristet",
+ "noDate": "Ohne Datum",
+ "all": "Übungsgruppen",
+ "registered": "Meine Übungsgruppen",
+ "further": "Weitere Übungsgruppen"
+ },
"menu": {
"exercises": "Aufgaben",
"statistics": "Statistiken",
diff --git a/src/main/webapp/i18n/de/textExercise.json b/src/main/webapp/i18n/de/textExercise.json
index 387a70541982..a4dae8698f68 100644
--- a/src/main/webapp/i18n/de/textExercise.json
+++ b/src/main/webapp/i18n/de/textExercise.json
@@ -37,7 +37,7 @@
"totalTimeSpent": "Gesamtdauer der Benotung (in Minuten)",
"averageTime": "Bewertungsgeschwindigkeit (Einreichungen/Minuten)",
"effortMedian": "Median des Aufwands (Minuten)",
- "noData": "Für diese Übung sind derzeit keine Datensätze vorhanden. Bitte versuchen Sie es später noch einmal.",
+ "noData": "Für diese Übung sind derzeit keine Datensätze vorhanden. Bitte versuche es später noch einmal.",
"minutes": "Minuten",
"tutors": "Tutor:innen",
"multipleTutors": "Tutor:innen korrigierten",
diff --git a/src/main/webapp/i18n/en/courseTutorialGroups.json b/src/main/webapp/i18n/en/courseTutorialGroups.json
index 4ed318decfa4..821df1da9772 100644
--- a/src/main/webapp/i18n/en/courseTutorialGroups.json
+++ b/src/main/webapp/i18n/en/courseTutorialGroups.json
@@ -6,9 +6,7 @@
"pages": {
"courseTutorialGroups": {
"title": "Your Tutorial Groups",
- "noRegistrations": "You are not registered to any tutorial group in this course.",
- "allFilter": "Show all Tutorial Groups",
- "registeredFilter": "Show my Tutorial Groups"
+ "noRegistrations": "You are not registered to any tutorial group in this course."
},
"courseTutorialGroupDetail": {
"title": "Tutorial Group Details",
diff --git a/src/main/webapp/i18n/en/error.json b/src/main/webapp/i18n/en/error.json
index b97c736acfa8..b7a08b0eaf7e 100644
--- a/src/main/webapp/i18n/en/error.json
+++ b/src/main/webapp/i18n/en/error.json
@@ -93,6 +93,7 @@
"exportFailed": "Exercise export failed",
"unableToImportProgrammingExercise": "Unable to import programming exercise.",
"titleAlreadyExists": "A programming exercise with the same title already exists. Please choose a different title.",
- "shortnameAlreadyExists": "A programming exercise with the same short name already exists. Please choose a different short name."
+ "shortnameAlreadyExists": "A programming exercise with the same short name already exists. Please choose a different short name.",
+ "courseTitleTooLong": "The course title is too long (max. 255 characters). Please choose a shorter title."
}
}
diff --git a/src/main/webapp/i18n/en/student-dashboard.json b/src/main/webapp/i18n/en/student-dashboard.json
index 06e941905c15..aff1835fe70c 100644
--- a/src/main/webapp/i18n/en/student-dashboard.json
+++ b/src/main/webapp/i18n/en/student-dashboard.json
@@ -34,6 +34,16 @@
"general": {
"noDataFound": "No data found."
},
+ "sidebar": {
+ "past": "Past",
+ "current": "Current",
+ "future": "Future",
+ "noDueDate": "No due date",
+ "noDate": "No date",
+ "all": "Tutorial Groups",
+ "registered": "My Tutorial Groups",
+ "further": "Further Tutorial Groups"
+ },
"menu": {
"exercises": "Exercises",
"statistics": "Statistics",
diff --git a/src/test/cypress/fixtures/exercise/programming/c/template.json b/src/test/cypress/fixtures/exercise/programming/c/template.json
index 4ecbd5f3c432..ee82b71a9be9 100644
--- a/src/test/cypress/fixtures/exercise/programming/c/template.json
+++ b/src/test/cypress/fixtures/exercise/programming/c/template.json
@@ -17,7 +17,7 @@
"noVersionControlAndContinuousIntegrationAvailable": false,
"packageName": "",
"presentationScoreEnabled": false,
- "problemStatement": "# Aufgabe (6 Punkte)\n\n## Beschreibung\n\nErstellen Sie ein C-Programm, welches das Ergebnis des Terms $$ x^2 + 5 \\cdot y - 4 $$ berechnet und auf der\nStandardausgabe ausgibt. Verwenden Sie für die Variablen `x` und `y` den Datentyp `int` und wählen Sie für beide\nVariablen einen beliebigen Wert!\n\n### Beispielausgaben\n\nBeispiel 1: `x = 3` und `y = 5`\n\n```text\n30\n```\n\nBeispiel 2: `x = -3` und `y = 5`\n\n```text\n30\n```\n\nBeispiel 3: `x = 5` und `y = -10`\n\n```text\n-29\n```\n\n## Hinweise\n\n- Bei den Ein-/Ausgabetests werden beim Testen die Werte der Variablen `x` und `y` in Ihrem Programm verändert!\n\n## Tests\n\n1. [task][Kompilieren](Compile)\n2. [task][Strukturtests](CodeStructure)\n3. [task][Ein-/Ausgabetests](InputOutput)\n",
+ "problemStatement": "# Aufgabe (6 Punkte)\n\n## Beschreibung\n\nErstelle ein C-Programm, welches das Ergebnis des Terms $$ x^2 + 5 \\cdot y - 4 $$ berechnet und auf der\nStandardausgabe ausgibt. Verwende für die Variablen `x` und `y` den Datentyp `int` und wähle für beide\nVariablen einen beliebigen Wert!\n\n### Beispielausgaben\n\nBeispiel 1: `x = 3` und `y = 5`\n\n```text\n30\n```\n\nBeispiel 2: `x = -3` und `y = 5`\n\n```text\n30\n```\n\nBeispiel 3: `x = 5` und `y = -10`\n\n```text\n-29\n```\n\n## Hinweise\n\n- Bei den Ein-/Ausgabetests werden beim Testen die Werte der Variablen `x` und `y` in Ihrem Programm verändert!\n\n## Tests\n\n1. [task][Kompilieren](Compile)\n2. [task][Strukturtests](CodeStructure)\n3. [task][Ein-/Ausgabetests](InputOutput)\n",
"programmingLanguage": "C",
"projectType": "FACT",
"secondCorrectionEnabled": false,
diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java
index d6a1d1d18c0a..b01bda5603eb 100644
--- a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java
@@ -114,6 +114,8 @@ public abstract class AbstractSpringIntegrationLocalCILocalVCTest extends Abstra
protected static final String DUMMY_COMMIT_HASH = "1234567890abcdef";
+ protected static final String DUMMY_COMMIT_HASH_VALID = "9b3a9bd71a0d80e5bbc42204c319ed3d1d4f0d6d";
+
private static final Path TEST_RESULTS_PATH = Path.of("src", "test", "resources", "test-data", "test-results");
private static final Path GRADLE_TEST_RESULTS_PATH = TEST_RESULTS_PATH.resolve("java-gradle");
diff --git a/src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java
index 56f8dfa326ae..e90a3bebf6c0 100644
--- a/src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java
@@ -12,7 +12,6 @@
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
@@ -20,6 +19,8 @@
import org.hibernate.Hibernate;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.security.test.context.support.WithMockUser;
@@ -60,13 +61,14 @@ void getAllConfiguredLtiPlatformsAsAdmin() throws Exception {
LtiPlatformConfiguration platform1 = new LtiPlatformConfiguration();
platform1.setId(1L);
fillLtiPlatformConfig(platform1);
+ ltiPlatformConfigurationRepository.save(platform1);
LtiPlatformConfiguration platform2 = new LtiPlatformConfiguration();
platform1.setId(2L);
fillLtiPlatformConfig(platform2);
+ ltiPlatformConfigurationRepository.save(platform2);
- List expectedPlatforms = Arrays.asList(platform1, platform2);
- doReturn(expectedPlatforms).when(ltiPlatformConfigurationRepository).findAll();
+ Page expectedPlatforms = ltiPlatformConfigurationRepository.findAll(Pageable.unpaged());
MvcResult mvcResult = request.performMvcRequest(get("/api/lti-platforms")).andExpect(status().isOk()).andReturn();
@@ -75,8 +77,7 @@ void getAllConfiguredLtiPlatformsAsAdmin() throws Exception {
// Empty block intended for type inference by Jackson's ObjectMapper
});
- assertThat(actualPlatforms).hasSize(expectedPlatforms.size());
- assertThat(actualPlatforms).usingRecursiveComparison().isEqualTo(expectedPlatforms);
+ assertThat(actualPlatforms).hasSize(expectedPlatforms.getSize());
}
@Test
diff --git a/src/test/java/de/tum/in/www1/artemis/OAuth2JWKSIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/OAuth2JWKSIntegrationTest.java
index 5a18c6e443c6..f1aee80325b8 100644
--- a/src/test/java/de/tum/in/www1/artemis/OAuth2JWKSIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/OAuth2JWKSIntegrationTest.java
@@ -7,9 +7,8 @@
import org.springframework.http.HttpStatus;
import org.springframework.security.test.context.support.WithAnonymousUser;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import de.tum.in.www1.artemis.course.CourseFactory;
import de.tum.in.www1.artemis.domain.Course;
@@ -33,8 +32,8 @@ class OAuth2JWKSIntegrationTest extends AbstractSpringIntegrationIndependentTest
void getKeysetIsPublicAndReturnsJson() throws Exception {
String keyset = request.get("/.well-known/jwks.json", HttpStatus.OK, String.class);
- JsonObject jsonKeyset = JsonParser.parseString(keyset).getAsJsonObject();
- assertThat(jsonKeyset).isNotNull();
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode jsonKeyset = objectMapper.readTree(keyset);
assertThat(jsonKeyset.get("keys")).isNotNull();
}
@@ -57,9 +56,11 @@ void getKeysetHasKey() throws Exception {
oAuth2JWKSService.updateKey(TEST_PREFIX + "registrationId");
String keyset = request.get("/.well-known/jwks.json", HttpStatus.OK, String.class);
- JsonObject jsonKeyset = JsonParser.parseString(keyset).getAsJsonObject();
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode jsonKeyset = objectMapper.readTree(keyset);
+
assertThat(jsonKeyset).isNotNull();
- JsonElement keys = jsonKeyset.get("keys");
+ JsonNode keys = jsonKeyset.get("keys");
assertThat(keys).isNotNull();
}
}
diff --git a/src/test/java/de/tum/in/www1/artemis/architecture/ArchitectureTest.java b/src/test/java/de/tum/in/www1/artemis/architecture/ArchitectureTest.java
index d5f6a746b323..8ef3a4e28bb1 100644
--- a/src/test/java/de/tum/in/www1/artemis/architecture/ArchitectureTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/architecture/ArchitectureTest.java
@@ -209,7 +209,7 @@ void testGsonExclusion() {
var gsonUsageRule = noClasses().should().accessClassesThat().resideInAnyPackage("com.google.gson..").because("we use an alternative JSON parsing library.");
var result = gsonUsageRule.evaluate(allClasses);
// TODO: reduce the following number to 0
- assertThat(result.getFailureReport().getDetails()).hasSizeLessThanOrEqualTo(816);
+ assertThat(result.getFailureReport().getDetails()).hasSize(733);
}
/**
diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/in/www1/artemis/connectors/Lti13ServiceTest.java
index 71e0092de3ee..79ec3ac7bace 100644
--- a/src/test/java/de/tum/in/www1/artemis/connectors/Lti13ServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/connectors/Lti13ServiceTest.java
@@ -38,8 +38,10 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import de.tum.in.www1.artemis.domain.Course;
import de.tum.in.www1.artemis.domain.Exercise;
@@ -144,8 +146,8 @@ void performLaunch_exerciseFound() {
when(oidcIdToken.getClaim("sub")).thenReturn("1");
when(oidcIdToken.getClaim("iss")).thenReturn("https://otherDomain.com");
when(oidcIdToken.getClaim(Claims.LTI_DEPLOYMENT_ID)).thenReturn("1");
- JsonObject jsonObject = new JsonObject();
- jsonObject.addProperty("id", "resourceLinkUrl");
+ ObjectNode jsonObject = new ObjectMapper().createObjectNode();
+ jsonObject.put("id", "resourceLinkUrl");
when(oidcIdToken.getClaim(Claims.RESOURCE_LINK)).thenReturn(jsonObject);
prepareForPerformLaunch(result.courseId(), result.exerciseId());
@@ -415,7 +417,7 @@ void onNewResultTokenFails() {
}
@Test
- void onNewResult() {
+ void onNewResult() throws JsonProcessingException {
Result result = new Result();
double scoreGiven = 60D;
result.setScore(scoreGiven);
@@ -463,15 +465,15 @@ void onNewResult() {
assertThat(authHeaders).as("Score publish request must contain an Authorization header").isNotNull();
assertThat(authHeaders).as("Score publish request must contain the corresponding Authorization Bearer token").contains("Bearer " + accessToken);
- JsonObject body = JsonParser.parseString(Objects.requireNonNull(httpEntity.getBody())).getAsJsonObject();
- assertThat(body.get("userId").getAsString()).as("Invalid parameter in score publish request: userId").isEqualTo(launch.getSub());
- assertThat(body.get("timestamp").getAsString()).as("Parameter missing in score publish request: timestamp").isNotNull();
- assertThat(body.get("activityProgress").getAsString()).as("Parameter missing in score publish request: activityProgress").isNotNull();
- assertThat(body.get("gradingProgress").getAsString()).as("Parameter missing in score publish request: gradingProgress").isNotNull();
+ JsonNode body = new ObjectMapper().readTree(Objects.requireNonNull(httpEntity.getBody()));
+ assertThat(body.get("userId").asText()).as("Invalid parameter in score publish request: userId").isEqualTo(launch.getSub());
+ assertThat(body.get("timestamp").asText()).as("Parameter missing in score publish request: timestamp").isNotNull();
+ assertThat(body.get("activityProgress").asText()).as("Parameter missing in score publish request: activityProgress").isNotNull();
+ assertThat(body.get("gradingProgress").asText()).as("Parameter missing in score publish request: gradingProgress").isNotNull();
- assertThat(body.get("comment").getAsString()).as("Invalid parameter in score publish request: comment").isEqualTo("Good job. Not so good");
- assertThat(body.get("scoreGiven").getAsDouble()).as("Invalid parameter in score publish request: scoreGiven").isEqualTo(scoreGiven);
- assertThat(body.get("scoreMaximum").getAsDouble()).as("Invalid parameter in score publish request: scoreMaximum").isEqualTo(100d);
+ assertThat(body.get("comment").asText()).as("Invalid parameter in score publish request: comment").isEqualTo("Good job. Not so good");
+ assertThat(body.get("scoreGiven").asDouble()).as("Invalid parameter in score publish request: scoreGiven").isEqualTo(scoreGiven);
+ assertThat(body.get("scoreMaximum").asDouble()).as("Invalid parameter in score publish request: scoreMaximum").isEqualTo(100d);
assertThat(launch.getScoreLineItemUrl() + "/scores").as("Score publish request was sent to a wrong URI").isEqualTo(urlCapture.getValue());
diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/connectors/LtiDynamicRegistrationServiceTest.java
index 635a0539d6cb..0879a4599d4e 100644
--- a/src/test/java/de/tum/in/www1/artemis/connectors/LtiDynamicRegistrationServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/connectors/LtiDynamicRegistrationServiceTest.java
@@ -67,12 +67,7 @@ void init() {
openIdConfigurationUrl = "url";
registrationToken = "token";
- platformConfiguration = new Lti13PlatformConfiguration();
- platformConfiguration.setTokenEndpoint("token");
- platformConfiguration.setAuthorizationEndpoint("auth");
- platformConfiguration.setRegistrationEndpoint("register");
- platformConfiguration.setJwksUri("jwks");
-
+ platformConfiguration = new Lti13PlatformConfiguration(null, "token", "auth", "jwks", "register");
clientRegistrationResponse = new Lti13ClientRegistration();
}
@@ -95,7 +90,7 @@ void badRequestWhenGetPlatformConfigurationFails() {
@Test
void badRequestWhenPlatformConfigurationEmpty() {
- Lti13PlatformConfiguration platformConfiguration = new Lti13PlatformConfiguration();
+ Lti13PlatformConfiguration platformConfiguration = new Lti13PlatformConfiguration(null, null, null, null, null);
when(restTemplate.getForEntity(openIdConfigurationUrl, Lti13PlatformConfiguration.class)).thenReturn(ResponseEntity.accepted().body(platformConfiguration));
assertThatExceptionOfType(BadRequestAlertException.class)
@@ -104,10 +99,7 @@ void badRequestWhenPlatformConfigurationEmpty() {
@Test
void badRequestWhenRegistrationEndpointEmpty() {
- Lti13PlatformConfiguration platformConfiguration = new Lti13PlatformConfiguration();
- platformConfiguration.setAuthorizationEndpoint("auth");
- platformConfiguration.setJwksUri("uri");
- platformConfiguration.setTokenEndpoint("token");
+ Lti13PlatformConfiguration platformConfiguration = new Lti13PlatformConfiguration(null, "token", "auth", "uri", null);
when(restTemplate.getForEntity(openIdConfigurationUrl, Lti13PlatformConfiguration.class)).thenReturn(ResponseEntity.accepted().body(platformConfiguration));
@@ -120,7 +112,7 @@ void badRequestWhenGetPostClientRegistrationFails() {
when(restTemplate.getForEntity(eq(openIdConfigurationUrl), any())).thenReturn(ResponseEntity.accepted().body(platformConfiguration));
- doThrow(HttpClientErrorException.class).when(restTemplate).postForEntity(eq(platformConfiguration.getRegistrationEndpoint()), any(), eq(Lti13ClientRegistration.class));
+ doThrow(HttpClientErrorException.class).when(restTemplate).postForEntity(eq(platformConfiguration.registrationEndpoint()), any(), eq(Lti13ClientRegistration.class));
assertThatExceptionOfType(BadRequestAlertException.class)
.isThrownBy(() -> ltiDynamicRegistrationService.performDynamicRegistration(openIdConfigurationUrl, registrationToken));
@@ -130,7 +122,7 @@ void badRequestWhenGetPostClientRegistrationFails() {
void performDynamicRegistrationSuccess() {
when(restTemplate.getForEntity(openIdConfigurationUrl, Lti13PlatformConfiguration.class)).thenReturn(ResponseEntity.accepted().body(platformConfiguration));
- when(restTemplate.postForEntity(eq(platformConfiguration.getRegistrationEndpoint()), any(), eq(Lti13ClientRegistration.class)))
+ when(restTemplate.postForEntity(eq(platformConfiguration.registrationEndpoint()), any(), eq(Lti13ClientRegistration.class)))
.thenReturn(ResponseEntity.accepted().body(clientRegistrationResponse));
ltiDynamicRegistrationService.performDynamicRegistration(openIdConfigurationUrl, registrationToken);
@@ -143,7 +135,7 @@ void performDynamicRegistrationSuccess() {
void performDynamicRegistrationSuccessWithoutToken() {
when(restTemplate.getForEntity(openIdConfigurationUrl, Lti13PlatformConfiguration.class)).thenReturn(ResponseEntity.accepted().body(platformConfiguration));
- when(restTemplate.postForEntity(eq(platformConfiguration.getRegistrationEndpoint()), any(), eq(Lti13ClientRegistration.class)))
+ when(restTemplate.postForEntity(eq(platformConfiguration.registrationEndpoint()), any(), eq(Lti13ClientRegistration.class)))
.thenReturn(ResponseEntity.accepted().body(clientRegistrationResponse));
ltiDynamicRegistrationService.performDynamicRegistration(openIdConfigurationUrl, null);
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestCaseServiceTest.java
index f42aedee7ffd..df2cefb9a0d5 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestCaseServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestCaseServiceTest.java
@@ -144,6 +144,9 @@ void shouldAllowTestCaseWeightSumZero(AssessmentType assessmentType) throws Exce
programmingExercise.setAssessmentType(assessmentType);
programmingExerciseRepository.save(programmingExercise);
+ String dummyHash = "9b3a9bd71a0d80e5bbc42204c319ed3d1d4f0d6d";
+ doReturn(ObjectId.fromString(dummyHash)).when(gitService).getLastCommitHash(any());
+
var result = ProgrammingExerciseFactory.generateTestResultDTO(null, "SOLUTION", null, programmingExercise.getProgrammingLanguage(), false,
List.of("test1", "test2", "test3"), Collections.emptyList(), null, null, null);
feedbackCreationService.generateTestCasesFromBuildResult(result, programmingExercise);
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/StaticCodeAnalysisIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/StaticCodeAnalysisIntegrationTest.java
index 5e6ca794d55c..bba5b9214f0f 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/StaticCodeAnalysisIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/StaticCodeAnalysisIntegrationTest.java
@@ -1,12 +1,15 @@
package de.tum.in.www1.artemis.exercise.programmingexercise;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+import org.eclipse.jgit.lib.ObjectId;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -148,6 +151,9 @@ void testGetStaticCodeAnalysisCategories_staticCodeAnalysisNotEnabled_badRequest
@EnumSource(value = ProgrammingLanguage.class, names = { "JAVA", "SWIFT", "C" })
@WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
void testUpdateStaticCodeAnalysisCategories(ProgrammingLanguage programmingLanguage) throws Exception {
+ String dummyHash = "9b3a9bd71a0d80e5bbc42204c319ed3d1d4f0d6d";
+ doReturn(ObjectId.fromString(dummyHash)).when(gitService).getLastCommitHash(any());
+
var programmingExSCAEnabled = programmingExerciseUtilService.addCourseWithOneProgrammingExerciseAndStaticCodeAnalysisCategories(programmingLanguage);
ProgrammingExercise exerciseWithSolutionParticipation = programmingExerciseRepository
.findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesById(programmingExSCAEnabled.getId()).orElseThrow();
@@ -195,6 +201,9 @@ void testResetCategories_instructorInWrongCourse_forbidden() throws Exception {
@EnumSource(value = ProgrammingLanguage.class, names = { "JAVA", "SWIFT", "C" })
@WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
void testResetCategories(ProgrammingLanguage programmingLanguage) throws Exception {
+ String dummyHash = "9b3a9bd71a0d80e5bbc42204c319ed3d1d4f0d6d";
+ doReturn(ObjectId.fromString(dummyHash)).when(gitService).getLastCommitHash(any());
+
// Create a programming exercise with real categories
var course = programmingExerciseUtilService.addCourseWithOneProgrammingExercise(true, false, programmingLanguage);
ProgrammingExercise exercise = programmingExerciseRepository
@@ -323,6 +332,9 @@ void shouldCategorizeFeedback() throws JsonProcessingException {
@Test
@WithMockUser(username = TEST_PREFIX + "editor1", roles = "EDITOR")
void testImportCategories() throws Exception {
+ String dummyHash = "9b3a9bd71a0d80e5bbc42204c319ed3d1d4f0d6d";
+ doReturn(ObjectId.fromString(dummyHash)).when(gitService).getLastCommitHash(any());
+
ProgrammingExercise sourceExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course, true);
staticCodeAnalysisService.createDefaultCategories(sourceExercise);
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIDockerServiceTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIDockerServiceTest.java
index 2c039a9a5054..f36deeb86c9c 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIDockerServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIDockerServiceTest.java
@@ -17,6 +17,7 @@
import com.github.dockerjava.api.command.InspectImageCmd;
import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
import com.github.dockerjava.api.exception.NotFoundException;
import com.github.dockerjava.api.model.Container;
import com.hazelcast.core.HazelcastInstance;
@@ -92,7 +93,7 @@ void testPullDockerImage() {
InspectImageCmd inspectImageCmd = mock(InspectImageCmd.class);
doReturn(inspectImageCmd).when(dockerClient).inspectImageCmd(anyString());
doThrow(new NotFoundException("")).when(inspectImageCmd).exec();
- BuildConfig buildConfig = new BuildConfig("echo 'test'", "test-image-name", "test", "test", null, null, false, false, false, null);
+ BuildConfig buildConfig = new BuildConfig("echo 'test'", "test-image-name", "test", "test", "test", "test", null, null, false, false, false, null);
var build = new LocalCIBuildJobQueueItem("1", "job1", "address1", 1, 1, 1, 1, 1, BuildStatus.SUCCESSFUL, null, null, buildConfig, null);
// Pull image
try {
@@ -127,7 +128,7 @@ void testRemoveStrandedContainers() {
localCIDockerService.cleanUpContainers();
// Verify that removeContainerCmd() was called
- verify(dockerClient, times(1)).removeContainerCmd(anyString());
+ verify(dockerClient, times(1)).stopContainerCmd(anyString());
// Mock container creation time to be younger than 5 minutes
doReturn(Instant.now().getEpochSecond()).when(mockContainer).getCreated();
@@ -135,6 +136,19 @@ void testRemoveStrandedContainers() {
localCIDockerService.cleanUpContainers();
// Verify that removeContainerCmd() was not called a second time
- verify(dockerClient, times(1)).removeContainerCmd(anyString());
+ verify(dockerClient, times(1)).stopContainerCmd(anyString());
+
+ // Mock container creation time to be older than 5 minutes
+ doReturn(Instant.now().getEpochSecond() - (6 * 60)).when(mockContainer).getCreated();
+
+ // Mock exception when stopping container
+ StopContainerCmd stopContainerCmd = mock(StopContainerCmd.class);
+ doReturn(stopContainerCmd).when(dockerClient).stopContainerCmd(anyString());
+ doThrow(new RuntimeException("Container stopping failed")).when(stopContainerCmd).exec();
+
+ localCIDockerService.cleanUpContainers();
+
+ // Verify that killContainerCmd() was called
+ verify(dockerClient, times(1)).killContainerCmd(anyString());
}
}
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java
index a95cade6c092..1a0aa59a1ddf 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java
@@ -27,6 +27,7 @@
import java.util.Optional;
import java.util.Set;
+import org.eclipse.jgit.lib.ObjectId;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -50,7 +51,6 @@
import de.tum.in.www1.artemis.domain.enumeration.BuildStatus;
import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode;
import de.tum.in.www1.artemis.domain.enumeration.RepositoryType;
-import de.tum.in.www1.artemis.domain.participation.Participation;
import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
import de.tum.in.www1.artemis.exception.VersionControlException;
import de.tum.in.www1.artemis.repository.BuildJobRepository;
@@ -59,7 +59,6 @@
import de.tum.in.www1.artemis.service.connectors.localci.dto.ResultBuildJob;
import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService;
import de.tum.in.www1.artemis.util.LocalRepository;
-import de.tum.in.www1.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError;
class LocalCIIntegrationTest extends AbstractLocalCILocalVCIntegrationTest {
@@ -272,6 +271,9 @@ void testCannotFindResults() {
@Test
@WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
void testIOExceptionWhenParsingTestResults() {
+ String dummyHash = "9b3a9bd71a0d80e5bbc42204c319ed3d1d4f0d6d";
+ doReturn(ObjectId.fromString(dummyHash)).when(gitService).getLastCommitHash(any());
+
ProgrammingExerciseStudentParticipation studentParticipation = localVCLocalCITestService.createParticipation(programmingExercise, student1Login);
// Return an InputStream from dockerClient.copyArchiveFromContainerCmd().exec() such that repositoryTarInputStream.getNextTarEntry() throws an IOException.
@@ -288,11 +290,10 @@ public int read() throws IOException {
localVCServletService.processNewPush(commitHash, studentAssignmentRepository.originGit.getRepository());
- await().untilAsserted(() -> verify(programmingMessagingService).notifyUserAboutSubmissionError(Mockito.eq(studentParticipation), any()));
+ await().untilAsserted(() -> verify(programmingMessagingService).notifyUserAboutNewResult(any(), Mockito.eq(studentParticipation)));
// Should notify the user.
- verifyUserNotification(studentParticipation,
- "java.util.concurrent.ExecutionException: de.tum.in.www1.artemis.exception.LocalCIException: Error while parsing test results");
+ verifyUserNotification(studentParticipation);
}
@Test
@@ -418,13 +419,10 @@ void testBuildLogs() throws IOException {
}
}
- private void verifyUserNotification(Participation participation, String errorMessage) {
- BuildTriggerWebsocketError expectedError = new BuildTriggerWebsocketError(errorMessage, participation.getId());
- await().untilAsserted(
- () -> verify(programmingMessagingService).notifyUserAboutSubmissionError(Mockito.eq(participation), argThat((BuildTriggerWebsocketError actualError) -> {
- assertThat(actualError.getError()).isEqualTo(expectedError.getError());
- assertThat(actualError.getParticipationId()).isEqualTo(expectedError.getParticipationId());
- return true;
- })));
+ private void verifyUserNotification(ProgrammingExerciseStudentParticipation participation) {
+ await().untilAsserted(() -> verify(programmingMessagingService).notifyUserAboutNewResult(argThat((Result result) -> {
+ assertThat(result.isSuccessful()).isFalse();
+ return true;
+ }), Mockito.eq(participation)));
}
}
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResourceIntegrationTest.java
index 5a784aa7a89e..1e856ecbd34d 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResourceIntegrationTest.java
@@ -80,7 +80,7 @@ void createJobs() {
sharedQueueProcessingService.removeListener();
JobTimingInfo jobTimingInfo = new JobTimingInfo(ZonedDateTime.now(), ZonedDateTime.now().plusMinutes(1), ZonedDateTime.now().plusMinutes(2));
- BuildConfig buildConfig = new BuildConfig("echo 'test'", "test", "test", "test", null, null, false, false, false, null);
+ BuildConfig buildConfig = new BuildConfig("echo 'test'", "test", "test", "test", "test", "test", null, null, false, false, false, null);
RepositoryInfo repositoryInfo = new RepositoryInfo("test", null, RepositoryType.USER, "test", "test", "test", null, null);
job1 = new LocalCIBuildJobQueueItem("1", "job1", "address1", 1, course.getId(), 1, 1, 1, BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null);
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCITestConfiguration.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCITestConfiguration.java
index 568d96b8304e..2b5f32a9786b 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCITestConfiguration.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCITestConfiguration.java
@@ -25,12 +25,14 @@
import com.github.dockerjava.api.command.ExecStartCmd;
import com.github.dockerjava.api.command.InspectImageCmd;
import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.api.command.KillContainerCmd;
import com.github.dockerjava.api.command.ListContainersCmd;
import com.github.dockerjava.api.command.ListImagesCmd;
import com.github.dockerjava.api.command.PullImageCmd;
import com.github.dockerjava.api.command.RemoveContainerCmd;
import com.github.dockerjava.api.command.RemoveImageCmd;
import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
import com.github.dockerjava.api.model.Container;
import com.github.dockerjava.api.model.Image;
@@ -137,7 +139,7 @@ public DockerClient dockerClient() throws InterruptedException {
doReturn(new String[] { "test-image-name" }).when(image).getRepoTags();
doReturn(List.of(image)).when(listImagesCmd).exec();
- // Mock removeContainer() method.
+ // Mock removeImageCmd method.
RemoveImageCmd removeImageCmd = mock(RemoveImageCmd.class);
doReturn(removeImageCmd).when(dockerClient).removeImageCmd(anyString());
doNothing().when(removeImageCmd).exec();
@@ -147,6 +149,15 @@ public DockerClient dockerClient() throws InterruptedException {
doReturn(removeContainerCmd).when(dockerClient).removeContainerCmd(anyString());
doReturn(removeContainerCmd).when(removeContainerCmd).withForce(true);
+ // Mock stopContainerCmd
+ StopContainerCmd stopContainerCmd = mock(StopContainerCmd.class);
+ doReturn(stopContainerCmd).when(dockerClient).stopContainerCmd(anyString());
+ doReturn(stopContainerCmd).when(stopContainerCmd).withTimeout(any());
+
+ // Mock killContainerCmd
+ KillContainerCmd killContainerCmd = mock(KillContainerCmd.class);
+ doReturn(killContainerCmd).when(dockerClient).killContainerCmd(anyString());
+
return dockerClient;
}
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java
index 777b192df63c..c3b8fa83cd07 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java
@@ -6,6 +6,7 @@
import static org.awaitility.Awaitility.await;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import java.io.IOException;
@@ -20,6 +21,7 @@
import javax.naming.ldap.LdapName;
import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.ObjectId;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -267,13 +269,9 @@ void testFetchPush_auxiliaryRepository() throws Exception {
// Instructors should be able to fetch and push.
localVCLocalCITestService.testFetchSuccessful(auxiliaryRepository.localGit, instructor1Login, projectKey1, auxiliaryRepositorySlug);
- String commitHash = localVCLocalCITestService.commitFile(auxiliaryRepository.localRepoFile.toPath(), auxiliaryRepository.localGit);
+ localVCLocalCITestService.commitFile(auxiliaryRepository.localRepoFile.toPath(), auxiliaryRepository.localGit);
- // Mock dockerClient.copyArchiveFromContainerCmd() such that it returns the commitHash of the tests repository for both the solution and the template repository.
- // Note: The stub needs to receive the same object twice. Usually, specifying one doReturn() is enough to make the stub return the same object on every subsequent call.
- // However, in this case we have it return an InputStream, which will be consumed after returning it the first time, so we need to create two separate ones.
- localVCLocalCITestService.mockInputStreamReturnedFromContainer(dockerClient, LOCALCI_WORKING_DIRECTORY + "/testing-dir/.git/refs/heads/[^/]+",
- Map.of("testCommitHash", commitHash), Map.of("testCommitHash", commitHash));
+ doReturn(ObjectId.fromString(DUMMY_COMMIT_HASH_VALID)).when(gitService).getLastCommitHash(eq(programmingExercise.getVcsTestRepositoryUri()));
// Mock dockerClient.copyArchiveFromContainerCmd() such that it returns the XMLs containing the test results.
// Mock the results for the solution repository build and for the template repository build that will both be triggered as a result of updating the tests.
@@ -284,9 +282,9 @@ void testFetchPush_auxiliaryRepository() throws Exception {
localVCLocalCITestService.testPushSuccessful(auxiliaryRepository.localGit, instructor1Login, projectKey1, auxiliaryRepositorySlug);
- // Solution submissions created as a result from a push to the auxiliary repository should contain the last commit of the tests repository.
- localVCLocalCITestService.testLatestSubmission(solutionParticipation.getId(), commitHash, 13, false);
- localVCLocalCITestService.testLatestSubmission(templateParticipation.getId(), commitHash, 0, false);
+ // Solution submissions created as a result from a push to the auxiliary repository should contain the last commit of the test repository.
+ localVCLocalCITestService.testLatestSubmission(solutionParticipation.getId(), DUMMY_COMMIT_HASH_VALID, 13, false);
+ localVCLocalCITestService.testLatestSubmission(templateParticipation.getId(), DUMMY_COMMIT_HASH_VALID, 0, false);
await().until(() -> {
Optional buildJobOptional = buildJobRepository.findFirstByParticipationIdOrderByBuildStartDateDesc(templateParticipation.getId());
diff --git a/src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java b/src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java
index 539a706b1fd2..3f650e76ee09 100644
--- a/src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java
@@ -13,6 +13,7 @@
import java.lang.reflect.Method;
import java.util.Set;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
@@ -40,14 +41,23 @@ class PostingServiceUnitTest {
private Method parseUserMentions;
+ private AutoCloseable closeable;
+
@BeforeEach
void initTestCase() throws NoSuchMethodException {
- MockitoAnnotations.openMocks(this);
+ closeable = MockitoAnnotations.openMocks(this);
parseUserMentions = PostingService.class.getDeclaredMethod("parseUserMentions", Course.class, String.class);
parseUserMentions.setAccessible(true);
}
+ @AfterEach
+ void tearDown() throws Exception {
+ if (closeable != null) {
+ closeable.close();
+ }
+ }
+
@Test
void testParseUserMentionsEmptyContent() throws InvocationTargetException, IllegalAccessException {
Course course = new Course();
diff --git a/src/test/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetrieverTest.java b/src/test/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetrieverTest.java
index 270187a16182..49eb3576fd4e 100644
--- a/src/test/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetrieverTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetrieverTest.java
@@ -36,6 +36,8 @@
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JOSEObjectType;
import com.nimbusds.jose.JWSAlgorithm;
@@ -156,13 +158,13 @@ void getTokenNoReturn() throws NoSuchAlgorithmException {
}
@Test
- void getToken() throws NoSuchAlgorithmException {
+ void getToken() throws NoSuchAlgorithmException, JsonProcessingException {
JWK jwk = generateKey();
when(oAuth2JWKSService.getJWK(any())).thenReturn(jwk);
Map map = new HashMap<>();
map.put("access_token", "result");
- ResponseEntity responseEntity = ResponseEntity.of(Optional.of(map.toString()));
+ ResponseEntity responseEntity = ResponseEntity.of(Optional.of(new ObjectMapper().writeValueAsString(map)));
when(restTemplate.exchange(any(), eq(String.class))).thenReturn(responseEntity);
String token = lti13TokenRetriever.getToken(clientRegistration, Scopes.AGS_SCORE);
diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java
index afffccd67126..f29e605c573d 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java
@@ -7,6 +7,11 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
@@ -66,7 +71,7 @@ void tearDown() throws Exception {
}
@Test
- void testPerformDeepLinking() {
+ void testPerformDeepLinking() throws MalformedURLException {
createMockOidcIdToken();
when(tokenRetriever.createDeepLinkingJWT(anyString(), anyMap())).thenReturn("test_jwt");
@@ -78,7 +83,7 @@ void testPerformDeepLinking() {
}
@Test
- void testEmptyJwtBuildLtiDeepLinkResponse() {
+ void testEmptyJwtBuildLtiDeepLinkResponse() throws MalformedURLException {
createMockOidcIdToken();
when(tokenRetriever.createDeepLinkingJWT(anyString(), anyMap())).thenReturn(null);
@@ -90,7 +95,7 @@ void testEmptyJwtBuildLtiDeepLinkResponse() {
}
@Test
- void testEmptyReturnUrlBuildLtiDeepLinkResponse() throws JsonProcessingException {
+ void testEmptyReturnUrlBuildLtiDeepLinkResponse() throws JsonProcessingException, MalformedURLException {
createMockOidcIdToken();
when(tokenRetriever.createDeepLinkingJWT(anyString(), anyMap())).thenReturn("test_jwt");
ObjectMapper mapper = new ObjectMapper();
@@ -129,7 +134,7 @@ void testEmptyReturnUrlBuildLtiDeepLinkResponse() throws JsonProcessingException
}
@Test
- void testEmptyDeploymentIdBuildLtiDeepLinkResponse() {
+ void testEmptyDeploymentIdBuildLtiDeepLinkResponse() throws MalformedURLException {
createMockOidcIdToken();
when(tokenRetriever.createDeepLinkingJWT(anyString(), anyMap())).thenReturn("test_jwt");
when(oidcIdToken.getClaim(de.tum.in.www1.artemis.domain.lti.Claims.LTI_DEPLOYMENT_ID)).thenReturn(null);
@@ -140,17 +145,22 @@ void testEmptyDeploymentIdBuildLtiDeepLinkResponse() {
.withMessage("Missing claim: " + Claims.LTI_DEPLOYMENT_ID);
}
- private void createMockOidcIdToken() {
+ private void createMockOidcIdToken() throws MalformedURLException {
Map mockSettings = new TreeMap<>();
mockSettings.put("deep_link_return_url", "test_return_url");
when(oidcIdToken.getClaim(Claims.DEEP_LINKING_SETTINGS)).thenReturn(mockSettings);
-
when(oidcIdToken.getClaim("iss")).thenReturn("http://artemis.com");
when(oidcIdToken.getClaim("aud")).thenReturn("http://moodle.com");
when(oidcIdToken.getClaim("exp")).thenReturn("12345");
when(oidcIdToken.getClaim("iat")).thenReturn("test");
when(oidcIdToken.getClaim("nonce")).thenReturn("1234-34535-abcbcbd");
+ when(oidcIdToken.getIssuer()).thenReturn(new URL("http://artemis.com"));
+ when(oidcIdToken.getAudience()).thenReturn(Arrays.asList("http://moodle.com"));
+ when(oidcIdToken.getExpiresAt()).thenReturn(Instant.now().plus(2, ChronoUnit.HOURS));
+ when(oidcIdToken.getIssuedAt()).thenReturn(Instant.now());
+ when(oidcIdToken.getNonce()).thenReturn("1234-34535-abcbcbd");
when(oidcIdToken.getClaim(Claims.LTI_DEPLOYMENT_ID)).thenReturn("1");
+ when(oidcIdToken.getClaimAsString(Claims.LTI_DEPLOYMENT_ID)).thenReturn("1");
}
private Exercise createMockExercise(long exerciseId, long courseId) {
diff --git a/src/test/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationServiceTest.java
index 13c229e0e7a1..275c2076d630 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationServiceTest.java
@@ -8,6 +8,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
@@ -44,9 +45,11 @@ class GeneralInstantNotificationServiceTest {
private Notification notification;
+ private AutoCloseable closeable;
+
@BeforeEach
void setUp() {
- MockitoAnnotations.openMocks(this);
+ closeable = MockitoAnnotations.openMocks(this);
student1 = new User();
student1.setId(1L);
student1.setLogin("1");
@@ -63,6 +66,13 @@ void setUp() {
when(notificationSettingsService.checkNotificationTypeForEmailSupport(any(NotificationType.class))).thenCallRealMethod();
}
+ @AfterEach
+ void tearDown() throws Exception {
+ if (closeable != null) {
+ closeable.close();
+ }
+ }
+
/**
* Very basic test that checks if emails and pushes are send for one user
*/
diff --git a/src/test/java/de/tum/in/www1/artemis/service/notifications/MailServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/notifications/MailServiceTest.java
index a8afcece758e..1af71cfe2c9a 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/notifications/MailServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/notifications/MailServiceTest.java
@@ -1,23 +1,36 @@
package de.tum.in.www1.artemis.service.notifications;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.time.ZonedDateTime;
+import java.util.Set;
+
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.springframework.context.MessageSource;
+import org.springframework.mail.MailSendException;
import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.test.util.ReflectionTestUtils;
import org.thymeleaf.spring6.SpringTemplateEngine;
+import de.tum.in.www1.artemis.domain.Course;
import de.tum.in.www1.artemis.domain.User;
-import de.tum.in.www1.artemis.exception.ArtemisMailException;
+import de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType;
+import de.tum.in.www1.artemis.domain.metis.Post;
+import de.tum.in.www1.artemis.domain.metis.conversation.Channel;
+import de.tum.in.www1.artemis.domain.notification.GroupNotification;
+import de.tum.in.www1.artemis.domain.notification.NotificationConstants;
import de.tum.in.www1.artemis.service.TimeService;
import tech.jhipster.config.JHipsterProperties;
@@ -53,6 +66,8 @@ class MailServiceTest {
private User student1;
+ private User student2;
+
private String subject;
private String content;
@@ -61,11 +76,17 @@ class MailServiceTest {
* Prepares the needed values and objects for testing
*/
@BeforeEach
- void setUp() {
+ void setUp() throws MalformedURLException, URISyntaxException {
student1 = new User();
+ student1.setLogin("student1");
student1.setId(555L);
- String EMAIL_ADDRESS_A = "benige8246@omibrown.com";
- student1.setEmail(EMAIL_ADDRESS_A);
+ student1.setEmail("benige8246@omibrown.com");
+ student1.setLangKey("de");
+
+ student2 = new User();
+ student2.setLogin("student2");
+ student2.setId(556L);
+ student2.setEmail("bege123@abc.com");
subject = "subject";
content = "content";
@@ -82,7 +103,14 @@ void setUp() {
jHipsterProperties = mock(JHipsterProperties.class);
when(jHipsterProperties.getMail()).thenReturn(mail);
+ messageSource = mock(MessageSource.class);
+ when(messageSource.getMessage(any(String.class), any(), any())).thenReturn("test");
+
+ templateEngine = mock(SpringTemplateEngine.class);
+ when(templateEngine.process(any(String.class), any())).thenReturn("test");
+
mailService = new MailService(jHipsterProperties, javaMailSender, messageSource, templateEngine, timeService);
+ ReflectionTestUtils.setField(mailService, "artemisServerUrl", new URI("http://localhost:8080").toURL());
}
/**
@@ -95,11 +123,34 @@ void testSendEmail() {
}
/**
- * When the javaMailSender returns an exception, that exception should be caught and an ArtemisMailException should be thrown instead.
+ * When the javaMailSender returns an exception, that exception should be caught and should not be thrown instead.
+ */
+ @Test
+ void testNoMailSendExceptionThrown() {
+ doThrow(new MailSendException("Some error occurred during mail send")).when(javaMailSender).send(any(MimeMessage.class));
+ assertThatNoException().isThrownBy(() -> mailService.sendEmail(student1, subject, content, false, true));
+ }
+
+ /**
+ * When the javaMailSender returns an exception, that exception should be caught and should not be thrown instead.
*/
@Test
- void testThrowException() {
- doThrow(new org.springframework.mail.MailSendException("Some error occurred")).when(javaMailSender).send(any(MimeMessage.class));
- assertThatExceptionOfType(ArtemisMailException.class).isThrownBy(() -> mailService.sendEmail(student1, subject, content, false, true));
+ void testNoExceptionThrown() {
+ doThrow(new RuntimeException("Some random error occurred")).when(javaMailSender).send(any(MimeMessage.class));
+ var notification = new GroupNotification(null, NotificationConstants.NEW_ANNOUNCEMENT_POST_TITLE, NotificationConstants.NEW_ANNOUNCEMENT_POST_TEXT, false, new String[0],
+ student1, GroupNotificationType.STUDENT);
+ Post post = new Post();
+ post.setAuthor(student1);
+ post.setCreationDate(ZonedDateTime.now());
+ post.setVisibleForStudents(true);
+ post.setContent("hi test");
+ post.setTitle("announcement");
+
+ Course course = new Course();
+ course.setId(141L);
+ Channel channel = new Channel();
+ channel.setCourse(course);
+ post.setConversation(channel);
+ assertThatNoException().isThrownBy(() -> mailService.sendNotification(notification, Set.of(student1, student2), post));
}
}
diff --git a/src/test/java/de/tum/in/www1/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java
index b0da4e33550a..c52848ac92ae 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java
@@ -14,6 +14,7 @@
import java.util.HexFormat;
import java.util.Optional;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
@@ -51,9 +52,11 @@ class AppleFirebasePushNotificationServiceTest {
private User student;
+ private AutoCloseable closeable;
+
@BeforeEach
void setUp() {
- MockitoAnnotations.openMocks(this);
+ closeable = MockitoAnnotations.openMocks(this);
student = new User();
student.setId(1L);
@@ -79,6 +82,13 @@ void setUp() {
ReflectionTestUtils.setField(firebasePushNotificationService, "relayServerBaseUrl", Optional.of("test"));
}
+ @AfterEach
+ void tearDown() throws Exception {
+ if (closeable != null) {
+ closeable.close();
+ }
+ }
+
@Test
void sendNotificationRequestsToEndpoint_shouldSendNotifications() throws InterruptedException {
// Given
diff --git a/src/test/java/de/tum/in/www1/artemis/staticcodeanalysis/StaticCodeAnalysisIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/staticcodeanalysis/StaticCodeAnalysisIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java
index 951a37187635..3b3d251ddf60 100644
--- a/src/test/java/de/tum/in/www1/artemis/staticcodeanalysis/StaticCodeAnalysisIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java
@@ -23,7 +23,7 @@
/**
* Tests each parser with an example file
*/
-class StaticCodeAnalysisIntegrationTest {
+class StaticCodeAnalysisParserUnitTest {
private static final Path EXPECTED_FOLDER_PATH = Paths.get("src", "test", "resources", "test-data", "static-code-analysis", "expected");
diff --git a/src/test/javascript/spec/component/admin/lti-configuration.component.spec.ts b/src/test/javascript/spec/component/admin/lti-configuration.component.spec.ts
index 4f4668c70318..b54d9a90ac6a 100644
--- a/src/test/javascript/spec/component/admin/lti-configuration.component.spec.ts
+++ b/src/test/javascript/spec/component/admin/lti-configuration.component.spec.ts
@@ -3,7 +3,6 @@ import { LtiConfigurationService } from 'app/admin/lti-configuration/lti-configu
import { Router } from '@angular/router';
import { SortService } from 'app/shared/service/sort.service';
import { LtiConfigurationComponent } from 'app/admin/lti-configuration/lti-configuration.component';
-import { MockLtiConfigurationService } from '../../helpers/mocks/service/mock-lti-configuration-service';
import { LtiPlatformConfiguration } from 'app/admin/lti-configuration/lti-configuration.model';
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
@@ -17,18 +16,45 @@ import { MockRouterLinkDirective } from '../../helpers/mocks/directive/mock-rout
import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive';
import { TranslateService } from '@ngx-translate/core';
import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
+import { ActivatedRoute } from '@angular/router';
+import { of, throwError } from 'rxjs';
+import { HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { AlertService } from 'app/core/util/alert.service';
+import { MockAlertService } from '../../helpers/mocks/service/mock-alert.service';
describe('LtiConfigurationComponent', () => {
let component: LtiConfigurationComponent;
let fixture: ComponentFixture;
let mockRouter: any;
+ let mockActivatedRoute: any;
let mockSortService: any;
- let ltiConfigurationService: LtiConfigurationService;
+ let mockLtiConfigurationService: any;
+ let mockAlertService: AlertService;
beforeEach(async () => {
mockRouter = { navigate: jest.fn() };
mockSortService = { sortByProperty: jest.fn() };
-
+ mockActivatedRoute = {
+ data: of({ defaultSort: 'id,desc' }),
+ queryParamMap: of(
+ new Map([
+ ['page', '1'],
+ ['sort', 'id,asc'],
+ ]),
+ ),
+ };
+ mockLtiConfigurationService = {
+ query: jest.fn().mockReturnValue(
+ of(
+ new HttpResponse({
+ body: [{ id: 1, registrationId: 'platform-1' }],
+ headers: new HttpHeaders({ 'X-Total-Count': '1' }),
+ }),
+ ),
+ ),
+ deleteLtiPlatform: jest.fn().mockReturnValue(of({})),
+ };
await TestBed.configureTestingModule({
imports: [NgbNavModule, FontAwesomeModule],
declarations: [
@@ -42,18 +68,21 @@ describe('LtiConfigurationComponent', () => {
MockRouterLinkDirective,
],
providers: [
- { provide: LtiConfigurationService, useClass: MockLtiConfigurationService },
{ provide: Router, useValue: mockRouter },
{ provide: SortService, useValue: mockSortService },
{ provide: TranslateService, useClass: MockTranslateService },
+ { provide: ActivatedRoute, useValue: mockActivatedRoute },
+ { provide: LtiConfigurationService, useValue: mockLtiConfigurationService },
+ { provide: AlertService, useClass: MockAlertService },
],
+ schemas: [NO_ERRORS_SCHEMA],
}).compileComponents();
fixture = TestBed.createComponent(LtiConfigurationComponent);
component = fixture.componentInstance;
- ltiConfigurationService = TestBed.inject(LtiConfigurationService);
fixture.detectChanges();
component.predicate = 'id';
+ mockAlertService = fixture.debugElement.injector.get(AlertService);
});
it('should create', () => {
@@ -62,7 +91,11 @@ describe('LtiConfigurationComponent', () => {
it('should initialize and load LTI platforms', () => {
expect(component.platforms).toBeDefined();
- expect(component.platforms).toHaveLength(2);
+ expect(component.page).toBe(1);
+ expect(component.predicate).toBe('id');
+ expect(component.ascending).toBeTrue();
+ expect(mockLtiConfigurationService.query).toHaveBeenCalled();
+ expect(component.platforms).toHaveLength(1);
});
it('should generate URLs correctly', () => {
@@ -111,11 +144,26 @@ describe('LtiConfigurationComponent', () => {
it('should delete an LTI platform and navigate', () => {
const platformIdToDelete = 1;
- const deleteSpy = jest.spyOn(ltiConfigurationService, 'deleteLtiPlatform');
-
component.deleteLtiPlatform(platformIdToDelete);
-
- expect(deleteSpy).toHaveBeenCalledWith(platformIdToDelete);
+ expect(mockLtiConfigurationService.deleteLtiPlatform).toHaveBeenCalledWith(platformIdToDelete);
expect(mockRouter.navigate).toHaveBeenCalledWith(['admin', 'lti-configuration']);
});
+
+ it('should handle navigation on transition', () => {
+ component.transition();
+ expect(mockRouter.navigate).toHaveBeenCalledWith(['/admin/lti-configuration'], {
+ queryParams: {
+ page: component.page,
+ sort: 'id,asc',
+ },
+ });
+ });
+
+ it('should handle errors on deleting LTI platform', () => {
+ const errorResponse = new HttpErrorResponse({ status: 500, statusText: 'Server Error', error: { message: 'Error occurred' } });
+ const errorSpy = jest.spyOn(mockAlertService, 'error');
+ mockLtiConfigurationService.deleteLtiPlatform.mockReturnValue(throwError(() => errorResponse));
+ component.deleteLtiPlatform(123);
+ expect(errorSpy).toHaveBeenCalled();
+ });
});
diff --git a/src/test/javascript/spec/component/course/edit-course-lti-configuration.component.spec.ts b/src/test/javascript/spec/component/course/edit-course-lti-configuration.component.spec.ts
index f344d9046bc0..1247723d25fa 100644
--- a/src/test/javascript/spec/component/course/edit-course-lti-configuration.component.spec.ts
+++ b/src/test/javascript/spec/component/course/edit-course-lti-configuration.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpResponse } from '@angular/common/http';
+import { HttpHeaders, HttpResponse } from '@angular/common/http';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { CourseManagementService } from 'app/course/manage/course-management.service';
import { HelpIconComponent } from 'app/shared/components/help-icon.component';
@@ -20,11 +20,13 @@ import { ArtemisTestModule } from '../../test.module';
import { regexValidator } from 'app/shared/form/shortname-validator.directive';
import { LOGIN_PATTERN } from 'app/shared/constants/input.constants';
import { MockHasAnyAuthorityDirective } from '../../helpers/mocks/directive/mock-has-any-authority.directive';
+import { LtiConfigurationService } from 'app/admin/lti-configuration/lti-configuration.service';
describe('Edit Course LTI Configuration Component', () => {
let comp: EditCourseLtiConfigurationComponent;
let fixture: ComponentFixture;
let courseService: CourseManagementService;
+ let ltiConfigService: { query: any };
const router = new MockRouter();
@@ -41,6 +43,17 @@ describe('Edit Course LTI Configuration Component', () => {
} as Course;
beforeEach(() => {
+ ltiConfigService = {
+ query: jest.fn().mockReturnValue(
+ of(
+ new HttpResponse({
+ body: [],
+ headers: new HttpHeaders({ 'X-Total-Count': '0' }),
+ }),
+ ),
+ ),
+ };
+
TestBed.configureTestingModule({
imports: [ArtemisTestModule, NgbNavModule, MockModule(ReactiveFormsModule)],
declarations: [
@@ -63,6 +76,7 @@ describe('Edit Course LTI Configuration Component', () => {
},
{},
),
+ { provide: LtiConfigurationService, useValue: ltiConfigService },
],
})
.compileComponents()
diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agents.component.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agents.component.spec.ts
index dbccad690049..59574d66ba3c 100644
--- a/src/test/javascript/spec/component/localci/build-agents/build-agents.component.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-agents/build-agents.component.spec.ts
@@ -56,7 +56,7 @@ describe('BuildAgentsComponent', () => {
const buildConfig: BuildConfig = {
dockerImage: 'someImage',
- commitHash: 'abc124',
+ commitHashToBuild: 'abc124',
branch: 'main',
programmingLanguage: 'Java',
projectType: 'Maven',
diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts
index 24b65d1bacaf..2b5899bc68d9 100644
--- a/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts
@@ -34,7 +34,7 @@ describe('BuildAgentsService', () => {
const buildConfig: BuildConfig = {
dockerImage: 'someImage',
- commitHash: 'abc124',
+ commitHashToBuild: 'abc124',
branch: 'main',
programmingLanguage: 'Java',
projectType: 'Maven',
diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts
index 981de88e55e1..48a69e0ccfa4 100644
--- a/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts
@@ -66,7 +66,7 @@ describe('BuildQueueComponent', () => {
},
buildConfig: {
dockerImage: 'someImage',
- commitHash: 'abc123',
+ commitHashToBuild: 'abc123',
branch: 'main',
programmingLanguage: 'Java',
projectType: 'Maven',
@@ -102,7 +102,7 @@ describe('BuildQueueComponent', () => {
},
buildConfig: {
dockerImage: 'someImage',
- commitHash: 'abc125',
+ commitHashToBuild: 'abc125',
branch: 'main',
programmingLanguage: 'Java',
projectType: 'Maven',
@@ -140,7 +140,7 @@ describe('BuildQueueComponent', () => {
},
buildConfig: {
dockerImage: 'someImage',
- commitHash: 'abc124',
+ commitHashToBuild: 'abc124',
branch: 'main',
programmingLanguage: 'Java',
projectType: 'Maven',
@@ -176,7 +176,7 @@ describe('BuildQueueComponent', () => {
},
buildConfig: {
dockerImage: 'someImage',
- commitHash: 'abc126',
+ commitHashToBuild: 'abc126',
branch: 'main',
programmingLanguage: 'Java',
projectType: 'Maven',
diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts
index 5a0f6a81df29..24bbf9a3de70 100644
--- a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts
@@ -53,7 +53,7 @@ describe('BuildQueueService', () => {
jobTimingInfo.buildCompletionDate = dayjs('2023-01-02');
buildConfig.dockerImage = 'image1';
- buildConfig.commitHash = 'hash1';
+ buildConfig.commitHashToBuild = 'hash1';
buildConfig.branch = 'branch1';
buildConfig.programmingLanguage = 'lang1';
buildConfig.projectType = 'type1';
diff --git a/src/test/javascript/spec/component/shared/sidebar/sidebar-card.component.spec.ts b/src/test/javascript/spec/component/shared/sidebar/sidebar-card.component.spec.ts
index ccb86f5d6d06..4a551dfeb965 100644
--- a/src/test/javascript/spec/component/shared/sidebar/sidebar-card.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/sidebar/sidebar-card.component.spec.ts
@@ -61,10 +61,12 @@ describe('SidebarCardComponent', () => {
it('should store route on click', () => {
jest.spyOn(component, 'emitStoreLastSelectedItem');
+ jest.spyOn(component, 'forceReload');
const element: HTMLElement = fixture.nativeElement.querySelector('#test-sidebar-card');
element.click();
fixture.detectChanges();
expect(component.emitStoreLastSelectedItem).toHaveBeenCalledWith(component.sidebarItem.id);
+ expect(component.forceReload).toHaveBeenCalled();
});
it('should navigate to the item URL on click', async () => {
diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-detail.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-detail.component.spec.ts
index f6e3f1db303b..1671d52febd5 100644
--- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-detail.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-detail.component.spec.ts
@@ -5,15 +5,15 @@ import { TutorialGroupDetailStubComponent } from '../stubs/tutorial-group-detail
import { TutorialGroupsService } from 'app/course/tutorial-groups/services/tutorial-groups.service';
import { MockProvider } from 'ng-mocks';
import { AlertService } from 'app/core/util/alert.service';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
import { MockRouter } from '../../../helpers/mocks/mock-router';
import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels';
import { HttpResponse } from '@angular/common/http';
import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model';
import { of } from 'rxjs';
-import { mockedActivatedRoute } from '../../../helpers/mocks/activated-route/mock-activated-route-query-param-map';
import { CourseManagementService } from 'app/course/manage/course-management.service';
import { Course } from 'app/entities/course.model';
+import { ArtemisTestModule } from '../../../test.module';
describe('CourseTutorialGroupDetailComponent', () => {
let fixture: ComponentFixture;
@@ -25,18 +25,20 @@ describe('CourseTutorialGroupDetailComponent', () => {
let findStub: jest.SpyInstance;
let findByIdStub: jest.SpyInstance;
+ const parentParams = { courseId: 2 };
+ const parentRoute = { parent: { params: of(parentParams) } } as any as ActivatedRoute;
+ const route = { params: of({ tutorialGroupId: 1 }), parent: parentRoute } as any as ActivatedRoute;
+
beforeEach(() => {
TestBed.configureTestingModule({
+ imports: [ArtemisTestModule],
declarations: [CourseTutorialGroupDetailComponent, TutorialGroupDetailStubComponent, LoadingIndicatorContainerStubComponent],
providers: [
MockProvider(TutorialGroupsService),
MockProvider(CourseManagementService),
MockProvider(AlertService),
{ provide: Router, useClass: MockRouter },
- mockedActivatedRoute({
- courseId: 2,
- tutorialGroupId: 1,
- }),
+ { provide: ActivatedRoute, useValue: route },
],
})
.compileComponents()
diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups-overview.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups-overview.component.spec.ts
deleted file mode 100644
index 060a1ee46550..000000000000
--- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups-overview.component.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { CourseTutorialGroupsOverviewComponent } from 'app/overview/course-tutorial-groups/course-tutorial-groups-overview/course-tutorial-groups-overview.component';
-import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model';
-import { TutorialGroupsService } from 'app/course/tutorial-groups/services/tutorial-groups.service';
-import { MockRouter } from '../../../helpers/mocks/mock-router';
-import { TutorialGroupsTableStubComponent } from '../stubs/tutorial-groups-table-stub.component';
-import { MockPipe, MockProvider } from 'ng-mocks';
-import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { AlertService } from 'app/core/util/alert.service';
-import { Router } from '@angular/router';
-import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels';
-import { By } from '@angular/platform-browser';
-import { Course } from 'app/entities/course.model';
-
-describe('CourseTutorialGroupsOverviewComponent', () => {
- let fixture: ComponentFixture;
- let component: CourseTutorialGroupsOverviewComponent;
-
- let tutorialGroupTwo: TutorialGroup;
- let tutorialGroupOne: TutorialGroup;
- const course = { id: 1 } as Course;
-
- const router = new MockRouter();
-
- beforeEach(() => {
- TestBed.configureTestingModule({
- declarations: [CourseTutorialGroupsOverviewComponent, TutorialGroupsTableStubComponent, MockPipe(ArtemisTranslatePipe)],
- providers: [MockProvider(TutorialGroupsService), MockProvider(AlertService), { provide: Router, useValue: router }],
- })
- .compileComponents()
- .then(() => {
- fixture = TestBed.createComponent(CourseTutorialGroupsOverviewComponent);
- component = fixture.componentInstance;
- tutorialGroupOne = generateExampleTutorialGroup({ id: 1, numberOfRegisteredUsers: 5 });
- tutorialGroupTwo = generateExampleTutorialGroup({ id: 2, numberOfRegisteredUsers: 10 });
- component.tutorialGroups = [tutorialGroupOne, tutorialGroupTwo];
- component.course = course;
- fixture.detectChanges();
- });
- });
-
- afterEach(() => {
- jest.restoreAllMocks();
- });
-
- it('should initialize', () => {
- expect(component).not.toBeNull();
- });
-
- it('should pass the tutorial group and course id to the table', () => {
- const tableComponentInstance = fixture.debugElement.query(By.directive(TutorialGroupsTableStubComponent)).componentInstance;
- expect(tableComponentInstance).not.toBeNull();
- expect(tableComponentInstance.tutorialGroups).toEqual([tutorialGroupOne, tutorialGroupTwo]);
- expect(tableComponentInstance.course).toEqual(course);
- });
-});
diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups-registered.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups-registered.component.spec.ts
deleted file mode 100644
index 1aae0089b3f3..000000000000
--- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups-registered.component.spec.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CourseTutorialGroupsRegisteredComponent } from 'app/overview/course-tutorial-groups/course-tutorial-groups-registered/course-tutorial-groups-registered.component';
-import { Component, Input } from '@angular/core';
-import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model';
-import { MockPipe } from 'ng-mocks';
-import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels';
-import { Course } from 'app/entities/course.model';
-
-@Component({ selector: 'jhi-course-tutorial-group-card', template: '' })
-class MockCourseTutorialGroupCardComponent {
- @Input()
- course: Course;
- @Input()
- tutorialGroup: TutorialGroup;
-
- @Input()
- showChannelLink = false;
-}
-
-describe('CourseTutorialGroupsRegisteredComponent', () => {
- let component: CourseTutorialGroupsRegisteredComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [CourseTutorialGroupsRegisteredComponent, MockCourseTutorialGroupCardComponent, MockPipe(ArtemisTranslatePipe)],
- }).compileComponents();
-
- fixture = TestBed.createComponent(CourseTutorialGroupsRegisteredComponent);
- component = fixture.componentInstance;
- component.course = { id: 1, postsEnabled: true } as Course;
- component.registeredTutorialGroups = [generateExampleTutorialGroup({})];
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts
index 9b4638d33de1..7a722cf69505 100644
--- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts
@@ -1,48 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Component, Input } from '@angular/core';
import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model';
import { TutorialGroupsService } from 'app/course/tutorial-groups/services/tutorial-groups.service';
import { MockRouter } from '../../../helpers/mocks/mock-router';
-import { MockPipe, MockProvider } from 'ng-mocks';
+import { MockModule, MockPipe, MockProvider } from 'ng-mocks';
import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
import { AlertService } from 'app/core/util/alert.service';
-import { ActivatedRoute, Params, Router, convertToParamMap } from '@angular/router';
+import { ActivatedRoute, Router, RouterModule, convertToParamMap } from '@angular/router';
import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels';
import { CourseTutorialGroupsComponent } from 'app/overview/course-tutorial-groups/course-tutorial-groups.component';
import { CourseManagementService } from 'app/course/manage/course-management.service';
import { BehaviorSubject, of } from 'rxjs';
import { HttpResponse } from '@angular/common/http';
import { Course } from 'app/entities/course.model';
-import { runOnPushChangeDetection } from '../../../helpers/on-push-change-detection.helper';
import { CourseStorageService } from 'app/course/manage/course-storage.service';
-import { TutorialGroupsConfiguration } from 'app/entities/tutorial-group/tutorial-groups-configuration.model';
-
-@Component({
- selector: 'jhi-course-tutorial-groups-overview',
- template: '