Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-06 04:10:52 +01:00
Code Issues Packages Projects Releases Activity

Fix class name

Browse Source
This commit is contained in:
Rene Pfeuffer
2020-01-24 12:01:21 +01:00
parent c0fd9b97b4
commit 868cfb4a0a
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java
View File

@@ -19,13 +19,13 @@ class PluginInstaller {
private final SCMContextProvider context;
private final AdvancedHttpClient client;
private final SmpDDescriptorExtractor smpDDescriptorExtractor;
private final SmpDescriptorExtractor smpDescriptorExtractor;
@Inject
public PluginInstaller(SCMContextProvider context, AdvancedHttpClient client, SmpDDescriptorExtractor smpDDescriptorExtractor) {
public PluginInstaller(SCMContextProvider context, AdvancedHttpClient client, SmpDescriptorExtractor smpDescriptorExtractor) {
this.context = context;
this.client = client;
this.smpDDescriptorExtractor = smpDDescriptorExtractor;
this.smpDescriptorExtractor = smpDescriptorExtractor;
}
@SuppressWarnings("squid:S4790") // hashing should be safe
@@ -68,7 +68,7 @@ class PluginInstaller {
}
private void verifyConditions(AvailablePlugin plugin, Path file) throws IOException {
InstalledPluginDescriptor pluginDescriptor = smpDDescriptorExtractor.extractPluginDescriptor(file);
InstalledPluginDescriptor pluginDescriptor = smpDescriptorExtractor.extractPluginDescriptor(file);
if (!pluginDescriptor.getCondition().isSupported()) {
cleanup(file);
throw new PluginConditionFailedException(

2
scm-webapp/src/main/java/sonia/scm/plugin/SmpDDescriptorExtractor.java → scm-webapp/src/main/java/sonia/scm/plugin/SmpDescriptorExtractor.java
View File

@@ -9,7 +9,7 @@ import java.nio.file.Path;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
class SmpDDescriptorExtractor {
class SmpDescriptorExtractor {
InstalledPluginDescriptor extractPluginDescriptor(Path file) throws IOException {
try (ZipInputStream zipInputStream = new ZipInputStream(Files.newInputStream(file), StandardCharsets.UTF_8)) {

2
scm-webapp/src/test/java/sonia/scm/plugin/PluginInstallerTest.java
View File

@@ -33,7 +33,7 @@ class PluginInstallerTest {
private AdvancedHttpClient client;
@Mock
private SmpDDescriptorExtractor extractor;
private SmpDescriptorExtractor extractor;
@InjectMocks
private PluginInstaller installer;

8
scm-webapp/src/test/java/sonia/scm/plugin/SmpDDescriptorExtractorTest.java → scm-webapp/src/test/java/sonia/scm/plugin/SmpDescriptorExtractorTest.java
View File

@@ -15,7 +15,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertThrows;
@ExtendWith(TempDirectory.class)
class SmpDDescriptorExtractorTest {
class SmpDescriptorExtractorTest {
private static final String PLUGIN_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
"<plugin>\n" +
@@ -45,7 +45,7 @@ class SmpDDescriptorExtractorTest {
void shouldExtractPluginXml(@TempDirectory.TempDir Path tempDir) throws IOException {
Path pluginFile = createZipFile(tempDir, "META-INF/scm/plugin.xml", PLUGIN_XML);
InstalledPluginDescriptor installedPluginDescriptor = new SmpDDescriptorExtractor().extractPluginDescriptor(pluginFile);
InstalledPluginDescriptor installedPluginDescriptor = new SmpDescriptorExtractor().extractPluginDescriptor(pluginFile);
Assertions.assertThat(installedPluginDescriptor.getInformation().getName()).isEqualTo("scm-test-plugin");
}
@@ -54,14 +54,14 @@ class SmpDDescriptorExtractorTest {
void shouldFailWithoutPluginXml(@TempDirectory.TempDir Path tempDir) throws IOException {
Path pluginFile = createZipFile(tempDir, "META-INF/wrong/plugin.xml", PLUGIN_XML);
assertThrows(IOException.class, () -> new SmpDDescriptorExtractor().extractPluginDescriptor(pluginFile));
assertThrows(IOException.class, () -> new SmpDescriptorExtractor().extractPluginDescriptor(pluginFile));
}
@Test
void shouldFailWithIllegalPluginXml(@TempDirectory.TempDir Path tempDir) throws IOException {
Path pluginFile = createZipFile(tempDir, "META-INF/scm/plugin.xml", "<not><parsable>content</parsable></not>");
assertThrows(IOException.class, () -> new SmpDDescriptorExtractor().extractPluginDescriptor(pluginFile));
assertThrows(IOException.class, () -> new SmpDescriptorExtractor().extractPluginDescriptor(pluginFile));
}
Path createZipFile(Path tempDir, String internalFileName, String content) throws IOException {