MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[platform] ignores malformed repository files (EA-80904)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-03-23 18:50:29 +01:00
parent a5efcce3ed
commit 55c03fb6f1
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java
+2 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -264,10 +264,7 @@ public class RepositoryHelper {
parser.parse(new InputSource(reader), handler);
return handler.getPluginsList();
}
catch (ParserConfigurationException e) {
throw new IOException(e);
}
catch (SAXException e) {
catch (ParserConfigurationException | SAXException | RuntimeException e) {
throw new IOException(e);
}
finally {
platform/platform-tests/testSrc/com/intellij/ide/plugins/RepositoryHelperTest.java
+14 -18
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
package com.intellij.ide.plugins;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.IoTestUtil;
import org.junit.After;
import org.junit.Before;
import com.intellij.testFramework.rules.TempDirectory;
import org.junit.Rule;
import org.junit.Test;
import java.io.File;
@@ -28,17 +27,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
public class RepositoryHelperTest {
private File myTempFile;
@Before
public void setUp() throws Exception {
myTempFile = IoTestUtil.createTestFile("repo.xml");
}
@After
public void tearDown() throws Exception {
FileUtil.delete(myTempFile);
}
@Rule public TempDirectory tempDir = new TempDirectory();
@Test(expected = IOException.class)
public void testEmpty() throws IOException {
@@ -51,6 +40,12 @@ public class RepositoryHelperTest {
assertEquals(0, list.size());
}
@Test(expected = IOException.class)
public void testFormatErrors() throws IOException {
List<IdeaPluginDescriptor> list = loadPlugins("<?xml version=\"1.0\" encoding=\"UTF-8\"?><id>42</id>");
assertEquals(0, list.size());
}
@Test
public void testFullFormat() throws IOException {
List<IdeaPluginDescriptor> list = loadPlugins(
@@ -112,8 +107,9 @@ public class RepositoryHelperTest {
}
private List<IdeaPluginDescriptor> loadPlugins(String data) throws IOException {
FileUtil.writeToFile(myTempFile, data);
String url = myTempFile.toURI().toURL().toString();
File tempFile = tempDir.newFile("repo.xml");
FileUtil.writeToFile(tempFile, data);
String url = tempFile.toURI().toURL().toString();
return RepositoryHelper.loadPlugins(url, null);
}
}
}