Project

General

Profile

« Previous | Next » 

Revision ba38e16d

Added by Andreas Kohlbecker over 6 years ago

ref #7114 fixing probelms of test in suite (relates also to ref #7138)

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/utility/DerivedUnitConverterIntegrationTest.java
12 12

  
13 13
import java.io.FileNotFoundException;
14 14

  
15
import org.junit.Ignore;
16 15
import org.junit.Test;
16
import org.unitils.dbunit.annotation.DataSet;
17 17
import org.unitils.spring.annotation.SpringBeanByType;
18 18

  
19 19
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
......
28 28
 * @since Jun 23, 2017
29 29
 *
30 30
 */
31
@Ignore
31
@DataSet // the dataset cleans up the DerivedUnits created in the tests
32 32
public class DerivedUnitConverterIntegrationTest extends CdmTransactionalIntegrationTest {
33 33

  
34 34
    @SpringBeanByType
......
37 37
    @Test
38 38
    public void toMediaSpecimen_issue7114() throws DerivedUnitConversionException {
39 39

  
40
        // NOTE:
41
        // normally we would run this test as CdmIntegrationTest, but due to bug #7138
42
        // this is not possible, so we use CdmTransactionalIntegrationTest as super class
43
        // and stop the transaction at the beginning of the test
44
        commit();
45

  
40 46
        assertEquals(0, service.list(null, null, null, null, null).size());
41 47

  
42 48
        DerivedUnit du = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);
......
53 59
    @Test
54 60
    public void toDerivedUnit_issue7114() throws DerivedUnitConversionException {
55 61

  
62
        // NOTE:
63
        // normally we would run this test as CdmIntegrationTest, but due to bug #7138
64
        // this is not possible, so we use CdmTransactionalIntegrationTest as super class
65
        // and stop the transaction at the beginning of the test
66
        commit();
67

  
56 68
        assertEquals(0, service.list(null, null, null, null, null).size());
57 69

  
58 70
        MediaSpecimen du = MediaSpecimen.NewInstance(SpecimenOrObservationType.StillImage);

Also available in: Unified diff