RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix MySQL test failure bug.

Browse source
This commit is contained in:
Vova Perebykivskiy 2015-12-18 15:24:31 +02:00 • committed by Dgray16
parent afeea6823b
commit 36668ffeed
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-business/src/main/resources/org/libreplan/business/workreports/entities/WorkReports.hbm.xml
View file

@ -93,7 +93,7 @@
</set> </set>
<!-- Indexed on the other side --> <!-- Indexed on the other side -->
<set name="workReportLines" cascade="all-delete-orphan" inverse="true" batch-size="10"> <set name="workReportLines" cascade="all-delete-orphan" inverse="true" batch-size="10" fetch="join">
<key column="work_report_id"/> <key column="work_report_id"/>
<one-to-many class="WorkReportLine"/> <one-to-many class="WorkReportLine"/>
</set> </set>

28
libreplan-webapp/src/test/java/org/libreplan/web/test/ws/workreports/WorkReportServiceTest.java
View file

@ -32,6 +32,7 @@ import static org.libreplan.web.test.WebappGlobalNames.WEBAPP_SPRING_SECURITY_CO
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -44,7 +45,13 @@ import java.util.UUID;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.datatype.XMLGregorianCalendar;
import org.hibernate.CacheMode;
import org.hibernate.Hibernate;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.StatelessSession;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.joda.time.LocalTime; import org.joda.time.LocalTime;
import org.junit.Test; import org.junit.Test;
@ -576,11 +583,25 @@ public class WorkReportServiceTest {
instanceConstraintViolationsListDTO.instanceConstraintViolationsList instanceConstraintViolationsListDTO.instanceConstraintViolationsList
.size(), equalTo(0)); .size(), equalTo(0));
List<WorkReport> workReports = workReportDAO.getAll(); /**
* Default code that was before was not working with MySQL
* and works perfect with PostgreSQL
* For example: List<WorkReport> workReports = workReportDAO.getAll();
* was returning 0 but COUNT in DB was 1
* Also set workReportLines in WorkReports.hbm.xml has been changed to fetch='join'
* Possible reason: Hibernate 4.3.11.Final bug / caching
*/
StatelessSession statelessSession = sessionFactory.openStatelessSession();
List<WorkReport> workReports = statelessSession.createCriteria(WorkReport.class)
.addOrder(Order.asc("code")).list();
assertThat(workReports.size(), equalTo(previous + 1)); assertThat(workReports.size(), equalTo(previous + 1));
WorkReport imported = workReportDAO WorkReport imported = (WorkReport) statelessSession.createCriteria(WorkReport.class)
.findExistingEntityByCode(workReportDTO.code); .add(Restrictions.eq("code", workReportDTO.code.trim()).ignoreCase()).uniqueResult();
assertThat(imported.getDate(), equalTo(date)); assertThat(imported.getDate(), equalTo(date));
List<WorkReportLine> importedLines = new ArrayList<WorkReportLine>( List<WorkReportLine> importedLines = new ArrayList<WorkReportLine>(
@ -600,6 +621,7 @@ public class WorkReportServiceTest {
WorkReportLine line = importedLines.remove(0); WorkReportLine line = importedLines.remove(0);
assertThat(line.getDate().getTime(), equalTo(asTime(each.getDate()))); assertThat(line.getDate().getTime(), equalTo(asTime(each.getDate())));
} }
statelessSession.close();
} }
private long asTime(XMLGregorianCalendar date2) { private long asTime(XMLGregorianCalendar date2) {