Skip to content
Snippets Groups Projects
Commit 80862f06 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

link to overview images is case insensitive

parent 9d6aa87e
No related branches found
No related tags found
1 merge request!330Resolve "NPE on map upload"
Pipeline #
...@@ -31,6 +31,7 @@ import lcsb.mapviewer.model.map.model.ModelFullIndexed; ...@@ -31,6 +31,7 @@ import lcsb.mapviewer.model.map.model.ModelFullIndexed;
public class OverviewParserTest { public class OverviewParserTest {
private static final String TEST_FILES_VALID_OVERVIEW_ZIP = "testFiles/valid_overview.zip"; private static final String TEST_FILES_VALID_OVERVIEW_ZIP = "testFiles/valid_overview.zip";
private static final String TEST_FILES_VALID_OVERVIEW_CASE_SENSITIVE_ZIP = "testFiles/valid_overview_case_sensitive.zip";
Logger logger = Logger.getLogger(OverviewParserTest.class); Logger logger = Logger.getLogger(OverviewParserTest.class);
OverviewParser parser = new OverviewParser(); OverviewParser parser = new OverviewParser();
...@@ -78,6 +79,45 @@ public class OverviewParserTest { ...@@ -78,6 +79,45 @@ public class OverviewParserTest {
} }
} }
@Test
public void testParsingValidCaseSensitiveFile() throws Exception {
try {
Set<Model> models = createValidTestMapModel();
List<ImageZipEntryFile> imageEntries = createImageEntries(TEST_FILES_VALID_OVERVIEW_CASE_SENSITIVE_ZIP);
for (ImageZipEntryFile imageZipEntryFile : imageEntries) {
imageZipEntryFile.setFilename(imageZipEntryFile.getFilename().toLowerCase());
}
List<OverviewImage> result = parser.parseOverviewLinks(models, imageEntries, null,
new ZipFile(TEST_FILES_VALID_OVERVIEW_CASE_SENSITIVE_ZIP));
assertNotNull(result);
assertEquals(1, result.size());
OverviewImage img = result.get(0);
assertEquals("test.png", img.getFilename());
assertEquals((Integer) 639, img.getHeight());
assertEquals((Integer) 963, img.getWidth());
assertEquals(2, img.getLinks().size());
OverviewLink link = img.getLinks().get(0);
List<Point2D> polygon = link.getPolygonCoordinates();
assertEquals(4, polygon.size());
assertTrue(link instanceof OverviewModelLink);
OverviewModelLink mLink = (OverviewModelLink) link;
Model mainModel = models.iterator().next();
assertEquals(mainModel.getModelData(), mLink.getLinkedModel());
assertEquals((Integer) 10, mLink.getxCoord());
assertEquals((Integer) 10, mLink.getyCoord());
assertEquals((Integer) 3, mLink.getZoomLevel());
} catch (Exception e) {
e.printStackTrace();
throw e;
}
}
private List<ImageZipEntryFile> createImageEntries(String string) throws IOException { private List<ImageZipEntryFile> createImageEntries(String string) throws IOException {
List<ImageZipEntryFile> result = new ArrayList<>(); List<ImageZipEntryFile> result = new ArrayList<>();
......
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment