sovled master merge conflicts in dashboards EventLogo

This commit is contained in:
Alexander Ries committed 2015-06-16 22:43:12 +02:00
commit 79aeb1c8a6
175 files changed
+7566 -3882

No files matched your search

@@ -1,15 +1,11 @@
package com.sap.sailing.domain.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Iterator;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
@@ -17,8 +13,6 @@ import javax.imageio.stream.ImageInputStream;
import org.junit.Test;
import com.sap.sailing.domain.base.Event;
import com.sap.sailing.domain.base.impl.EventImpl;
import com.sap.sailing.domain.common.impl.ImageSizeImpl;
import com.sap.sse.common.media.ImageSize;
@@ -56,15 +50,4 @@ public class CalculateImageSizeFromUrlTest {
}
return null;
}
@Test
public void testEventImageSize() throws MalformedURLException, InterruptedException, ExecutionException {
Event e = new EventImpl("Event Name", /* startDate */ null, /* endDate */ null, "Kiel", /* isPublic */ true, UUID.randomUUID());
int width = Math.max(10, (int) (200. * Math.random()));
int height = Math.max(10, (int) (100. * Math.random()));
URL imageURL = new URL("http://placekitten.com/" + width + "/" + height);
e.addImageURL(imageURL);
ImageSize expectedSize = new ImageSizeImpl(width, height);
assertEquals(expectedSize, e.getImageSize(imageURL));
}
}