no-jira: fix week format for MySQL and for PostgreSQL (different format for each database)

src/test/java/org/olat/course/certificate/manager/CertificatesManagerTest.java

@@ -95,7 +95,7 @@ public class CertificatesManagerTest extends OlatTestCase {
 	@Test
 	public void createCertificate() throws URISyntaxException {
 		Identity identity = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-1");
-		RepositoryEntry entry = JunitTestHelper.deployDemoCourse(identity);
+		RepositoryEntry entry = JunitTestHelper.deployBasicCourse(identity);
 		dbInstance.commitAndCloseSession();
 		
 		CertificateInfos certificateInfos = new CertificateInfos(identity, null, null);
@@ -118,7 +118,7 @@ public class CertificatesManagerTest extends OlatTestCase {
 	@Test
 	public void loadCertificate() {
 		Identity identity = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-1");
-		RepositoryEntry entry = JunitTestHelper.deployDemoCourse(identity);
+		RepositoryEntry entry = JunitTestHelper.deployBasicCourse(identity);
 		dbInstance.commitAndCloseSession();
 		
 		CertificateInfos certificateInfos = new CertificateInfos(identity, 5.0f, Boolean.TRUE);
@@ -158,7 +158,7 @@ public class CertificatesManagerTest extends OlatTestCase {
 	@Test
 	public void loadLastCertificate() {
 		Identity identity = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-1");
-		RepositoryEntry entry = JunitTestHelper.deployDemoCourse(identity);
+		RepositoryEntry entry = JunitTestHelper.deployBasicCourse(identity);
 		dbInstance.commitAndCloseSession();
 		
 		CertificateInfos certificateInfos = new CertificateInfos(identity, 5.0f, Boolean.TRUE);
@@ -188,7 +188,7 @@ public class CertificatesManagerTest extends OlatTestCase {
 		Identity coach = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-3");
 		Identity participant1 = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-4");
 		Identity participant2 = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-4");
-		RepositoryEntry entry = JunitTestHelper.deployDemoCourse(owner);
+		RepositoryEntry entry = JunitTestHelper.deployBasicCourse(owner);
 		repositoryEntryRelationDao.addRole(coach, entry, GroupRoles.coach.name());
 		repositoryEntryRelationDao.addRole(participant1, entry, GroupRoles.participant.name());
 		repositoryEntryRelationDao.addRole(participant2, entry, GroupRoles.participant.name());
@@ -228,7 +228,7 @@ public class CertificatesManagerTest extends OlatTestCase {
 		Identity coach = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-6");
 		Identity participant1 = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-7");
 		Identity participant2 = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-8");
-		RepositoryEntry entry = JunitTestHelper.deployDemoCourse(owner);
+		RepositoryEntry entry = JunitTestHelper.deployBasicCourse(owner);
 		BusinessGroup group = businessGroupService.createBusinessGroup(null, "certified-group", "Group with certification", null, null, false, false, entry);
 	    businessGroupRelationDao.addRole(coach, group, GroupRoles.coach.name());
 	    businessGroupRelationDao.addRole(participant1, group, GroupRoles.participant.name());
@@ -247,6 +247,9 @@ public class CertificatesManagerTest extends OlatTestCase {
 		waitCertificate(certificate1.getKey());
 		waitCertificate(certificate2.getKey());
 
+		dbInstance.commitAndCloseSession();
+		sleep(2000);
+
 		Calendar lastestNews = Calendar.getInstance();
 		lastestNews.add(Calendar.DATE, -1);
 		
@@ -265,7 +268,7 @@ public class CertificatesManagerTest extends OlatTestCase {
 	@Test
 	public void uploadCertificate() throws URISyntaxException {
 		Identity identity = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-1");
-		RepositoryEntry entry = JunitTestHelper.deployDemoCourse(identity);
+		RepositoryEntry entry = JunitTestHelper.deployBasicCourse(identity);
 		dbInstance.commitAndCloseSession();
 		
 		Calendar cal = Calendar.getInstance();
@@ -360,7 +363,7 @@ public class CertificatesManagerTest extends OlatTestCase {
 	public void deleteCourse()  throws URISyntaxException  {
 		//create a course with a certificate
 		Identity identity = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-del-2");
-		RepositoryEntry entry = JunitTestHelper.deployDemoCourse(identity);
+		RepositoryEntry entry = JunitTestHelper.deployBasicCourse(identity);
 		dbInstance.commitAndCloseSession();
 		Long resourceKey = entry.getOlatResource().getKey();
 		
@@ -399,8 +402,8 @@ public class CertificatesManagerTest extends OlatTestCase {
 	public void deleteCourse_paranoiaCheck()  throws URISyntaxException  {
 		//create a course with a certificate
 		Identity identity = JunitTestHelper.createAndPersistIdentityAsRndUser("cer-del-3");
-		RepositoryEntry entryToDelete = JunitTestHelper.deployDemoCourse(identity);
-		RepositoryEntry entry = JunitTestHelper.deployDemoCourse(identity);
+		RepositoryEntry entryToDelete = JunitTestHelper.deployBasicCourse(identity);
+		RepositoryEntry entry = JunitTestHelper.deployBasicCourse(identity);
 		dbInstance.commitAndCloseSession();
 		Long resourceKeyToDelete = entryToDelete.getOlatResource().getKey();
 		Long resourceKey = entry.getOlatResource().getKey();

src/test/java/org/olat/course/statistic/WeeklyStatisticUpdateManagerTest.java

@@ -45,6 +45,8 @@ import org.olat.test.JunitTestHelper;
 public class WeeklyStatisticUpdateManagerTest extends AbstractStatisticUpdateManagerTest {
 
 	private final SimpleDateFormat weeklyFormat = new SimpleDateFormat("yyyy-w");
+	private final SimpleDateFormat weeklyMySQLFormat = new SimpleDateFormat("yyyy-ww");
+	
 	private final WeeklyStatisticManager weeklyStatisticManager = new WeeklyStatisticManager();
 
 	@Test
@@ -124,6 +126,10 @@ public class WeeklyStatisticUpdateManagerTest extends AbstractStatisticUpdateMan
 		cal.set(Calendar.MINUTE, 0);
 		cal.set(Calendar.SECOND, 0);
 		cal.set(Calendar.MILLISECOND, 0);
+		
+		if(dbInstance.isMySQL()) {
+			return weeklyMySQLFormat.format(cal.getTime());
+		}
 		return weeklyFormat.format(cal.getTime());
 	}