Merge remote-tracking branch 'origin/master' into development

Conflicts:
	.github/workflows/buildReporting_Java11.yml

.github/workflows/buildReporting.yml

@@ -1,15 +1,13 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Java CI with Maven
+name: build
 
 on:
   push:
-    branches: [main, development]
+    branches: [master, development]
   pull_request:
-    branches: [main, development]
+    branches: [master, development]
-  workflow_dispatch:
-  
 
 jobs:
   build:
@@ -25,3 +23,9 @@ jobs:
         distribution: 'adopt'
     - name: Build with Maven
       run: mvn clean install -e -P let_reporting
+    - uses: codecov/codecov-action@v1
+      with:
+        flags: unittests # optional
+        name: SEB Server Build # optional
+        fail_ci_if_error: false # optional (default = false)
+        verbose: false # optional (default = false)

.github/workflows/buildReporting_Java11.yml

@@ -1,27 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [main, development]
-  pull_request:
-    branches: [main, development]
-  workflow_dispatch:
-  
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-    - name: Build with Maven
-      run: mvn clean install

README.rst

@@ -1,7 +1,7 @@
 Master: 
 
-.. image:: https://travis-ci.com/SafeExamBrowser/seb-server.svg?branch=master
+.. image:: https://github.com/SafeExamBrowser/seb-server/actions/workflows/buildReporting.yml/badge.svg?branch=master
-    :target: https://travis-ci.com/SafeExamBrowser/seb-server
+    :target: https://github.com/SafeExamBrowser/seb-server/actions
 .. image:: https://readthedocs.org/projects/seb-server/badge/?version=latest
     :target: https://seb-server.readthedocs.io/en/latest/?badge=latest
 .. image:: https://codecov.io/gh/SafeExamBrowser/seb-server/branch/master/graph/badge.svg
@@ -11,8 +11,8 @@ Master:
 
 Development:
 
-.. image:: https://travis-ci.com/SafeExamBrowser/seb-server.svg?branch=development
+.. image:: https://github.com/SafeExamBrowser/seb-server/actions/workflows/buildReporting.yml/badge.svg?branch=development
-    :target: https://github.com/SafeExamBrowser/seb-server/tree/development
+    :target: https://github.com/SafeExamBrowser/seb-server/actions
 .. image:: https://codecov.io/gh/SafeExamBrowser/seb-server/branch/development/graph/badge.svg
     :target: https://codecov.io/gh/SafeExamBrowser/seb-server
 .. image:: https://img.shields.io/github/last-commit/SafeExamBrowser/seb-server/development?logo=github

src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java

@@ -763,9 +763,10 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
                 .getOrThrow();
 
         assertNotNull(testResult);
-        assertFalse(testResult.isOk());
+        System.out.print("********************** testResult: " + testResult);
-        assertEquals("[Error [errorType=TOKEN_REQUEST, message=Failed to gain access token from OpenEdX Rest API:\n" +
+//        assertFalse(testResult.isOk());
-                " tried token endpoints: [/oauth2/access_token]]]", String.valueOf(testResult.errors));
+//        assertEquals("[Error [errorType=TOKEN_REQUEST, message=Failed to gain access token from OpenEdX Rest API:\n" +
+//                " tried token endpoints: [/oauth2/access_token]]]", String.valueOf(testResult.errors));
 
         // TODO how to mockup an Open edX response
     }