Project

General

Profile

« Previous | Next » 

Revision f2716206

Added by Katja Luther almost 6 years ago

fix #7433: get specimen by genetic accession number

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
926 926
        UUID derivedUnit1Uuid = UUID.fromString("843bc8c9-c0fe-4735-bf40-82f1996dcefb");
927 927
        UUID derivedUnit2Uuid = UUID.fromString("40cd9cb1-7c74-4e7d-a1f8-8a1e0314e940");
928 928
        UUID dnaSampleUuid = UUID.fromString("364969a6-2457-4e2e-ae1e-29a6fcaa741a");
929
        UUID dnaSampleWithSequenceUuid = UUID.fromString("571d4e9a-0736-4da3-ad4a-a2df427a1f01");
929 930
        UUID tissueUuid = UUID.fromString("b608613c-1b5a-4882-8b14-d643b6fc5998");
930 931

  
931 932
        UUID taxonUuid = UUID.fromString("dfca7629-8a60-4d51-998d-371897f725e9");
......
999 1000
        SpecimenOrObservationBase derivedUnit2 = occurrenceService.load(derivedUnit2Uuid);
1000 1001
        SpecimenOrObservationBase tissue = occurrenceService.load(tissueUuid);
1001 1002
        SpecimenOrObservationBase dnaSample = occurrenceService.load(dnaSampleUuid);
1003
        SpecimenOrObservationBase dnaSampleWithSequence = occurrenceService.load(dnaSampleWithSequenceUuid);
1002 1004
        Taxon taxon = (Taxon) taxonService.load(taxonUuid);
1003 1005

  
1004 1006
        assertNotNull(derivedUnit1);
......
1010 1012
        // wildcard search => all derivates
1011 1013
        FindOccurrencesConfigurator config = new FindOccurrencesConfigurator();
1012 1014
        config.setTitleSearchString("*");
1013
        assertEquals(4, occurrenceService.countOccurrences(config));
1015
        assertEquals(5, occurrenceService.countOccurrences(config));
1014 1016
        List<SpecimenOrObservationBase> allDerivates = occurrenceService.findByTitle(config).getRecords();
1015
        assertEquals(4, allDerivates.size());
1017
        assertEquals(5, allDerivates.size());
1016 1018
        assertTrue(allDerivates.contains(derivedUnit1));
1017 1019
        assertTrue(allDerivates.contains(derivedUnit2));
1018 1020
        assertTrue(allDerivates.contains(tissue));
......
1031 1033
        // class search => 4 results
1032 1034
        config = new FindOccurrencesConfigurator();
1033 1035
        config.setClazz(SpecimenOrObservationBase.class);
1034
        assertEquals(4, occurrenceService.countOccurrences(config));
1036
        assertEquals(5, occurrenceService.countOccurrences(config));
1035 1037
        List<SpecimenOrObservationBase> specimenOrObservationBases = occurrenceService.findByTitle(config).getRecords();
1036
        assertEquals(4, specimenOrObservationBases.size());
1038
        assertEquals(5, specimenOrObservationBases.size());
1037 1039

  
1038 1040
        // class search => 0 results
1039 1041
        config = new FindOccurrencesConfigurator();
......
1045 1047
        // class search => 4 results
1046 1048
        config = new FindOccurrencesConfigurator();
1047 1049
        config.setClazz(DerivedUnit.class);
1048
        assertEquals(4, occurrenceService.countOccurrences(config));
1050
        assertEquals(5, occurrenceService.countOccurrences(config));
1049 1051
        List<SpecimenOrObservationBase> derivedUnits = occurrenceService.findByTitle(config).getRecords();
1050
        assertEquals(4, derivedUnits.size());
1052
        assertEquals(5, derivedUnits.size());
1051 1053
        assertTrue(derivedUnits.contains(derivedUnit1));
1052 1054
        assertTrue(derivedUnits.contains(derivedUnit2));
1053 1055
        assertTrue(derivedUnits.contains(tissue));
......
1122 1124
        //all specimen
1123 1125
        config = new FindOccurrencesConfigurator();
1124 1126
        config.setAssignmentStatus(AssignmentStatus.ALL_SPECIMENS);
1125
        assertEquals(4, occurrenceService.countOccurrences(config));
1127
        assertEquals(5, occurrenceService.countOccurrences(config));
1126 1128
        List<SpecimenOrObservationBase> allSpecimens = occurrenceService.findByTitle(config).getRecords();
1127
        assertEquals(4, allSpecimens.size());
1129
        assertEquals(5, allSpecimens.size());
1128 1130
        assertTrue(allSpecimens.contains(derivedUnit1));
1129 1131
        assertTrue(allSpecimens.contains(derivedUnit2));
1130 1132
        assertTrue(allSpecimens.contains(tissue));
......
1142 1144
        //unassigned specimen
1143 1145
        config = new FindOccurrencesConfigurator();
1144 1146
        config.setAssignmentStatus(AssignmentStatus.UNASSIGNED_SPECIMENS);
1145
        assertEquals(2, occurrenceService.countOccurrences(config));
1147
        assertEquals(3, occurrenceService.countOccurrences(config));
1146 1148
        List<SpecimenOrObservationBase> unAssignedSpecimens = occurrenceService.findByTitle(config).getRecords();
1147
        assertEquals(2, unAssignedSpecimens.size());
1149
        assertEquals(3, unAssignedSpecimens.size());
1148 1150
        assertTrue(unAssignedSpecimens.contains(derivedUnit2));
1149 1151
        assertTrue(unAssignedSpecimens.contains(dnaSample));
1150 1152

  
......
1159 1161
        assertTrue(ignoreAssignmentStatusSpecimens.contains(tissue));
1160 1162

  
1161 1163

  
1164

  
1165
        List<DerivedUnit> findByAccessionNumber = occurrenceService.findByAccessionNumber("ACC_DNA", 10, 1, null, null);
1166

  
1167
        assertEquals(1, findByAccessionNumber.size());
1168
       // assertTrue(findByAccessionNumber.contains(derivedUnit1));
1169
        assertTrue(findByAccessionNumber.contains(dnaSampleWithSequence));
1170

  
1171

  
1162 1172
    }
1163 1173

  
1164 1174
    @Test

Also available in: Unified diff