Project

General

Profile

« Previous | Next » 

Revision cd9d6a50

Added by Andreas Müller over 6 years ago

cleanup

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaUtilsTest.java
58 58

  
59 59
        mediaAudio1 = Media.NewInstance();
60 60
        mediaAudio1.addRepresentation(bigMP3Representation);
61

  
62

  
63 61
    }
64 62

  
65 63
    private Media findMediaByUUID(Collection<Media> mediaList, UUID uuid){
......
74 72
    @Test
75 73
    public void testFindPreferredMedia(){
76 74

  
77
        ArrayList<Media> imageList = new ArrayList<Media>();
75
        ArrayList<Media> imageList = new ArrayList<>();
78 76
        imageList.add(mediaImage1);
79 77
        imageList.add(mediaImage2);
80 78
        imageList.add(mediaImage3);
81 79

  
82
        Map<Media, MediaRepresentation> filteredList = MediaUtils.findPreferredMedia(imageList, ImageFile.class, null, null, null, null, null);
80
        Map<Media, MediaRepresentation> filteredList = MediaUtils.findPreferredMedia(
81
                imageList, ImageFile.class, null, null, null, null, null);
83 82

  
84 83
        Assert.assertNotNull(findMediaByUUID(filteredList.keySet(), mediaImage1.getUuid()));
85 84
        Assert.assertNotNull(findMediaByUUID(filteredList.keySet(), mediaImage2.getUuid()));
86 85
        Assert.assertNotNull(findMediaByUUID(filteredList.keySet(), mediaImage3.getUuid()));
87 86

  
88
        ArrayList<Media> mixedMediaList =  new ArrayList<Media>();
87
        ArrayList<Media> mixedMediaList =  new ArrayList<>();
89 88
        mixedMediaList.add(mediaImage1);
90 89
        mixedMediaList.add(mediaImage2);
91 90
        mixedMediaList.add(mediaImage3);
......
111 110

  
112 111
        String[] mimetypes = {".*"};
113 112

  
114
        Assert.assertEquals(smallJPGRepresentation, MediaUtils.findBestMatchingRepresentation(mediaImage1, null, null, 200, 300, mimetypes));
115
        Assert.assertEquals(bigJPGRepresentation, MediaUtils.findBestMatchingRepresentation(mediaImage1, null, null, 1500, 1500, mimetypes));
113
        Assert.assertEquals(smallJPGRepresentation, MediaUtils.findBestMatchingRepresentation(
114
                mediaImage1, null, null, 200, 300, mimetypes));
115
        Assert.assertEquals(bigJPGRepresentation, MediaUtils.findBestMatchingRepresentation(
116
                mediaImage1, null, null, 1500, 1500, mimetypes));
116 117

  
117
        Assert.assertEquals(smallJPGRepresentation, MediaUtils.findBestMatchingRepresentation(mediaImage1, null, 300, null, null, mimetypes));
118
        Assert.assertEquals(bigJPGRepresentation, MediaUtils.findBestMatchingRepresentation(mediaImage1, null, 1500, null, null, mimetypes));
118
        Assert.assertEquals(smallJPGRepresentation, MediaUtils.findBestMatchingRepresentation(
119
                mediaImage1, null, 300, null, null, mimetypes));
120
        Assert.assertEquals(bigJPGRepresentation, MediaUtils.findBestMatchingRepresentation(
121
                mediaImage1, null, 1500, null, null, mimetypes));
119 122

  
120 123
    }
121 124

  
122

  
123

  
124 125
}

Also available in: Unified diff