From 7692235b2a9fc371f99d0ce0504c096a0aee9b29 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 10 Jun 2020 17:32:47 +0200
Subject: [PATCH] no-jira: replace e4 with a QTI 2.1 version in non QTI 1.2
test
---
.../org/olat/selenium/AssessmentTest.java | 29 ++++++++++--------
.../file_resources/qti21/e4_test_qti21.zip | Bin 0 -> 6599 bytes
2 files changed, 17 insertions(+), 12 deletions(-)
create mode 100644 src/test/java/org/olat/test/file_resources/qti21/e4_test_qti21.zip
diff --git a/src/test/java/org/olat/selenium/AssessmentTest.java b/src/test/java/org/olat/selenium/AssessmentTest.java
index 38ffea5ff45..4a1f956d0b4 100644
--- a/src/test/java/org/olat/selenium/AssessmentTest.java
+++ b/src/test/java/org/olat/selenium/AssessmentTest.java
@@ -495,7 +495,7 @@ public class AssessmentTest extends Deployments {
//upload a test
String qtiTestTitle = "QTI-Test-1.2-" + UUID.randomUUID();
- URL qtiTestUrl = JunitTestHelper.class.getResource("file_resources/e4_test.zip");
+ URL qtiTestUrl = JunitTestHelper.class.getResource("file_resources/qti21/e4_test_qti21.zip");
File qtiTestFile = new File(qtiTestUrl.toURI());
NavigationPage navBar = NavigationPage.load(browser);
navBar
@@ -503,14 +503,14 @@ public class AssessmentTest extends Deployments {
.uploadResource(qtiTestTitle, qtiTestFile);
//create a course
- String courseTitle = "Course-With-QTI-Test-1.2-" + UUID.randomUUID();
+ String courseTitle = "Course-With-QTI-Test-2.1-" + UUID.randomUUID();
navBar
.openAuthoringEnvironment()
.createCourse(courseTitle)
.clickToolbarBack();
- //create a course element of type CP with the CP that we create above
- String testNodeTitle = "Test-QTI-1.2";
+ //create a course element of type test with the QTI 2.1 test that we upload above
+ String testNodeTitle = "Test-QTI-2.1";
CourseEditorPageFragment courseEditor = CoursePageFragment.getCourse(browser)
.edit();
courseEditor
@@ -572,9 +572,11 @@ public class AssessmentTest extends Deployments {
.clickTree()
.selectWithTitle(testNodeTitle);
//pass the test
- QTI12Page.getQTI12Page(ryomouBrowser).passE4(ryomou);
+ QTI21Page.getQTI21Page(ryomouBrowser)
+ .passE4()
+ .assertOnCourseAssessmentTestScore(4);
-
+
//Kanu makes the test
AssessmentModePage kanuAssessment = new AssessmentModePage(kanuBrowser)
.startAssessment(true);
@@ -584,7 +586,9 @@ public class AssessmentTest extends Deployments {
.clickTree()
.selectWithTitle(testNodeTitle);
//pass the test
- QTI12Page.getQTI12Page(kanuBrowser).passE4(kanu);
+ QTI21Page.getQTI21Page(kanuBrowser)
+ .passE4()
+ .assertOnCourseAssessmentTestScore(4);
//Author ends the test
@@ -697,7 +701,6 @@ public class AssessmentTest extends Deployments {
.assertOnEfficiencyStatmentPage()
.assertOnCertificate(courseTitle);
}
-
/**
* An author create a course, set up the root node to make efficiency statement,
* add a test, publish it and add a participant. It set the certificate.<br>
@@ -719,7 +722,7 @@ public class AssessmentTest extends Deployments {
UserVO author = new UserRestClient(deploymentUrl).createAuthor();
UserVO rei = new UserRestClient(deploymentUrl).createRandomUser("Rei");
//deploy the test
- URL testUrl = ArquillianDeployments.class.getResource("file_resources/e4_test.zip");
+ URL testUrl = ArquillianDeployments.class.getResource("file_resources/qti21/e4_test_qti21.zip");
String testTitle = "E4Test-" + UUID.randomUUID();
new RepositoryRestClient(deploymentUrl, author).deployResource(new File(testUrl.toURI()), "-", testTitle);
@@ -733,8 +736,8 @@ public class AssessmentTest extends Deployments {
.createCourse(courseTitle)
.clickToolbarBack();
- //create a course element of type CP with the CP that we create above
- String testNodeTitle = "Test-QTI-1.2";
+ //create a course element of type test with the QTI 2.1 test that we upload above
+ String testNodeTitle = "Test-QTI-2.1";
CoursePageFragment courseRuntime = CoursePageFragment.getCourse(browser);
courseRuntime
.edit()
@@ -796,7 +799,9 @@ public class AssessmentTest extends Deployments {
.clickTree()
.selectWithTitle(testNodeTitle);
//pass the test
- QTI12Page.getQTI12Page(reiBrowser).passE4(rei);
+ QTI21Page.getQTI21Page(reiBrowser)
+ .passE4()
+ .assertOnCourseAssessmentTestScore(4);
//open the efficiency statements
UserToolsPage reiUserTools = new UserToolsPage(reiBrowser);
diff --git a/src/test/java/org/olat/test/file_resources/qti21/e4_test_qti21.zip b/src/test/java/org/olat/test/file_resources/qti21/e4_test_qti21.zip
new file mode 100644
index 0000000000000000000000000000000000000000..1013809972cd11b832c093188d8de0d418f642fe
GIT binary patch
literal 6599
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
G&i??fDYO*;
literal 0
HcmV?d00001
--
GitLab