From 6b3ebeebbc85a0700956218586e0cfc6e9e80fe1 Mon Sep 17 00:00:00 2001
From: uhensler <none@none>
Date: Tue, 15 May 2018 10:01:37 +0200
Subject: [PATCH] no-jira: Fix unit tests
---
.../resources/database/mysql/setupDatabase.sql | 14 +-------------
.../resources/database/oracle/setupDatabase.sql | 1 -
.../license/manager/ResourceLicenseDAOTest.java | 2 +-
.../nodes/gta/manager/GTAIdentityMarkDAOTest.java | 4 ++--
.../forms/manager/EvaluationFormReportDAOTest.java | 2 +-
5 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/database/mysql/setupDatabase.sql b/src/main/resources/database/mysql/setupDatabase.sql
index fdff0153bea..ad9b3077393 100644
--- a/src/main/resources/database/mysql/setupDatabase.sql
+++ b/src/main/resources/database/mysql/setupDatabase.sql
@@ -1896,7 +1896,7 @@ create table o_eva_form_session (
e_submission_date datetime,
e_first_submission_date datetime,
fk_survey bigint,
- fk_participation bigint unique
+ fk_participation bigint unique,
fk_identity bigint,
fk_page_body bigint,
fk_form_entry bigint,
@@ -1916,17 +1916,6 @@ create table o_eva_form_response (
primary key (id)
);
-create table o_eva_form_survey (
- id bigint not null auto_increment,
- creationdate datetime not null,
- lastmodified datetime not null,
- e_resname varchar(50),
- e_resid bigint,
- e_sub_ident varchar(2048),
- fk_form_entry bigint not null,
- primary key (id)
-);
-
-- lti
create table o_lti_outcome (
id bigint not null,
@@ -3292,7 +3281,6 @@ alter table o_eva_form_session add constraint eva_sess_to_part_idx foreign key (
alter table o_eva_form_session add constraint eva_sess_to_ident_idx foreign key (fk_identity) references o_bs_identity (id);
alter table o_eva_form_session add constraint eva_sess_to_body_idx foreign key (fk_page_body) references o_pf_page_body (id);
alter table o_eva_form_session add constraint eva_sess_to_form_idx foreign key (fk_form_entry) references o_repositoryentry (repositoryentry_id);
-create index idx_eva_surv_ores_idx on o_eva_form_session (e_resid, e_resname, e_sub_ident(255));
alter table o_eva_form_response add constraint eva_resp_to_sess_idx foreign key (fk_session) references o_eva_form_session (id);
create index idx_eva_resp_report_idx on o_eva_form_response (fk_session, e_responseidentifier, e_no_response);
diff --git a/src/main/resources/database/oracle/setupDatabase.sql b/src/main/resources/database/oracle/setupDatabase.sql
index 26b1ece1687..c738febb6e7 100644
--- a/src/main/resources/database/oracle/setupDatabase.sql
+++ b/src/main/resources/database/oracle/setupDatabase.sql
@@ -3426,7 +3426,6 @@ alter table o_eva_form_session add constraint eva_session_to_body_idx foreign ke
create index idx_eva_session_to_body_idx on o_eva_form_session (fk_page_body);
alter table o_eva_form_session add constraint eva_session_to_form_idx foreign key (fk_form_entry) references o_repositoryentry (repositoryentry_id);
create index idx_eva_session_to_form_idx on o_eva_form_session (fk_form_entry);
-create index idx_eva_sess_ores_idx on o_eva_form_session (e_resid, e_resname, e_sub_ident);
alter table o_eva_form_response add constraint eva_resp_to_sess_idx foreign key (fk_session) references o_eva_form_session (id);
create index idx_eva_resp_to_sess_idx on o_eva_form_response (fk_session);
diff --git a/src/test/java/org/olat/core/commons/services/license/manager/ResourceLicenseDAOTest.java b/src/test/java/org/olat/core/commons/services/license/manager/ResourceLicenseDAOTest.java
index 6999fd162d8..6404dd47379 100644
--- a/src/test/java/org/olat/core/commons/services/license/manager/ResourceLicenseDAOTest.java
+++ b/src/test/java/org/olat/core/commons/services/license/manager/ResourceLicenseDAOTest.java
@@ -153,7 +153,7 @@ public class ResourceLicenseDAOTest extends OlatTestCase {
List<ResourceLicense> loadedLicenses = licenseDao.loadLicenses(Arrays.asList(ores1, ores2, ores3));
- assertThat(loadedLicenses).containsExactly(license1, license2, license3);
+ assertThat(loadedLicenses).containsExactlyInAnyOrder(license1, license2, license3);
}
@Test
diff --git a/src/test/java/org/olat/course/nodes/gta/manager/GTAIdentityMarkDAOTest.java b/src/test/java/org/olat/course/nodes/gta/manager/GTAIdentityMarkDAOTest.java
index 0639480752f..9bbe4d7348c 100644
--- a/src/test/java/org/olat/course/nodes/gta/manager/GTAIdentityMarkDAOTest.java
+++ b/src/test/java/org/olat/course/nodes/gta/manager/GTAIdentityMarkDAOTest.java
@@ -95,7 +95,7 @@ public class GTAIdentityMarkDAOTest extends OlatTestCase {
List<IdentityMark> marks = sut.loadMarks(taskList, marker);
assertThat(marks).hasSize(3);
- assertThat(marks).containsExactly(mark1, mark2, mark3);
+ assertThat(marks).containsExactlyInAnyOrder(mark1, mark2, mark3);
}
@Test
@@ -177,7 +177,7 @@ public class GTAIdentityMarkDAOTest extends OlatTestCase {
List<IdentityMark> marks = sut.loadMarks(taskList, marker);
assertThat(marks).hasSize(2);
- assertThat(marks).containsExactly(mark1, mark3);
+ assertThat(marks).containsExactlyInAnyOrder(mark1, mark3);
}
@Test
diff --git a/src/test/java/org/olat/modules/forms/manager/EvaluationFormReportDAOTest.java b/src/test/java/org/olat/modules/forms/manager/EvaluationFormReportDAOTest.java
index 53824b80b1f..30e9d3a2679 100644
--- a/src/test/java/org/olat/modules/forms/manager/EvaluationFormReportDAOTest.java
+++ b/src/test/java/org/olat/modules/forms/manager/EvaluationFormReportDAOTest.java
@@ -91,7 +91,7 @@ public class EvaluationFormReportDAOTest extends OlatTestCase {
List<EvaluationFormResponse> responses = sut.getResponses(responseIdentifiers, sessions);
assertThat(responses)
- .containsExactly(response111, response112, response121, response221)
+ .containsExactlyInAnyOrder(response111, response112, response121, response221)
.doesNotContain(responseOtherIdentifier, responseOtherSession, noResponse);
}
--
GitLab