Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 17:26:22 +01:00
Code Issues Packages Projects Releases Activity

renamed PluginWrapper to InstalledPlugin

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-08-20 07:54:00 +02:00
parent 056a81d9f9
commit ae19ad9327
20 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-webapp/src/test/java/sonia/scm/api/v2/resources/InstalledPluginResourceTest.java
View File

@@ -20,7 +20,7 @@ import sonia.scm.plugin.Plugin;
import sonia.scm.plugin.PluginInformation;
import sonia.scm.plugin.PluginLoader;
import sonia.scm.plugin.PluginState;
import sonia.scm.plugin.PluginWrapper;
import sonia.scm.plugin.InstalledPlugin;
import sonia.scm.web.VndMediaType;
import javax.inject.Provider;
@@ -86,9 +86,9 @@ class InstalledPluginResourceTest {
@Test
void getInstalledPlugins() throws URISyntaxException, UnsupportedEncodingException {
PluginWrapper pluginWrapper = new PluginWrapper(null, null, null, null);
when(pluginLoader.getInstalledPlugins()).thenReturn(Collections.singletonList(pluginWrapper));
when(collectionMapper.map(Collections.singletonList(pluginWrapper))).thenReturn(new MockedResultDto());
InstalledPlugin installedPlugin = new InstalledPlugin(null, null, null, null);
when(pluginLoader.getInstalledPlugins()).thenReturn(Collections.singletonList(installedPlugin));
when(collectionMapper.map(Collections.singletonList(installedPlugin))).thenReturn(new MockedResultDto());
MockHttpRequest request = MockHttpRequest.get("/v2/plugins/installed");
request.accept(VndMediaType.PLUGIN_COLLECTION);
@@ -107,12 +107,12 @@ class InstalledPluginResourceTest {
pluginInformation.setName("pluginName");
pluginInformation.setState(PluginState.INSTALLED);
Plugin plugin = new Plugin(2, pluginInformation, null, null, false, null);
PluginWrapper pluginWrapper = new PluginWrapper(plugin, null, null, null);
when(pluginLoader.getInstalledPlugins()).thenReturn(Collections.singletonList(pluginWrapper));
InstalledPlugin installedPlugin = new InstalledPlugin(plugin, null, null, null);
when(pluginLoader.getInstalledPlugins()).thenReturn(Collections.singletonList(installedPlugin));
PluginDto pluginDto = new PluginDto();
pluginDto.setName("pluginName");
when(mapper.map(pluginWrapper)).thenReturn(pluginDto);
when(mapper.map(installedPlugin)).thenReturn(pluginDto);
MockHttpRequest request = MockHttpRequest.get("/v2/plugins/installed/pluginName");
request.accept(VndMediaType.PLUGIN);

8
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UIRootResourceTest.java
View File

@@ -170,7 +170,7 @@ public class UIRootResourceTest {
assertTrue(response.getContentAsString().contains("/scm/my/bundle.js"));
}
private void mockPlugins(PluginWrapper... plugins) {
private void mockPlugins(InstalledPlugin... plugins) {
when(pluginLoader.getInstalledPlugins()).thenReturn(Lists.newArrayList(plugins));
}
@@ -180,12 +180,12 @@ public class UIRootResourceTest {
return new PluginResources(scripts, styles);
}
private PluginWrapper mockPlugin(String id) {
private InstalledPlugin mockPlugin(String id) {
return mockPlugin(id, id, null);
}
private PluginWrapper mockPlugin(String id, String name, PluginResources pluginResources) {
PluginWrapper wrapper = mock(PluginWrapper.class);
private InstalledPlugin mockPlugin(String id, String name, PluginResources pluginResources) {
InstalledPlugin wrapper = mock(InstalledPlugin.class);
when(wrapper.getId()).thenReturn(id);
Plugin plugin = mock(Plugin.class);

28
scm-webapp/src/test/java/sonia/scm/plugin/DefaultUberWebResourceLoaderTest.java
View File

@@ -102,7 +102,7 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
public void testGetResourceFromCache() {
DefaultUberWebResourceLoader resourceLoader =
new DefaultUberWebResourceLoader(servletContext,
new ArrayList<PluginWrapper>(), Stage.PRODUCTION);
new ArrayList<InstalledPlugin>(), Stage.PRODUCTION);
resourceLoader.getCache().put("/myresource", GITHUB);
@@ -131,8 +131,8 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
{
File directory = temp.newFolder();
File file = file(directory, "myresource");
PluginWrapper wrapper = createPluginWrapper(directory);
List<PluginWrapper> plugins = Lists.newArrayList(wrapper);
InstalledPlugin wrapper = createPluginWrapper(directory);
List<InstalledPlugin> plugins = Lists.newArrayList(wrapper);
WebResourceLoader resourceLoader =
new DefaultUberWebResourceLoader(servletContext, plugins);
@@ -170,8 +170,8 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
File directory = temp.newFolder();
File file = file(directory, "myresource");
PluginWrapper wrapper = createPluginWrapper(directory);
List<PluginWrapper> plugins = Lists.newArrayList(wrapper);
InstalledPlugin wrapper = createPluginWrapper(directory);
List<InstalledPlugin> plugins = Lists.newArrayList(wrapper);
UberWebResourceLoader resourceLoader =
new DefaultUberWebResourceLoader(servletContext, plugins);
@@ -197,11 +197,11 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
WebResourceLoader loader = mock(WebResourceLoader.class);
when(loader.getResource("/myresource")).thenReturn(url);
PluginWrapper pluginWrapper = mock(PluginWrapper.class);
when(pluginWrapper.getWebResourceLoader()).thenReturn(loader);
InstalledPlugin installedPlugin = mock(InstalledPlugin.class);
when(installedPlugin.getWebResourceLoader()).thenReturn(loader);
WebResourceLoader resourceLoader =
new DefaultUberWebResourceLoader(servletContext, Lists.newArrayList(pluginWrapper));
new DefaultUberWebResourceLoader(servletContext, Lists.newArrayList(installedPlugin));
assertNull(resourceLoader.getResource("/myresource"));
}
@@ -214,11 +214,11 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
WebResourceLoader loader = mock(WebResourceLoader.class);
when(loader.getResource("/myresource")).thenReturn(url);
PluginWrapper pluginWrapper = mock(PluginWrapper.class);
when(pluginWrapper.getWebResourceLoader()).thenReturn(loader);
InstalledPlugin installedPlugin = mock(InstalledPlugin.class);
when(installedPlugin.getWebResourceLoader()).thenReturn(loader);
UberWebResourceLoader resourceLoader =
new DefaultUberWebResourceLoader(servletContext, Lists.newArrayList(pluginWrapper));
new DefaultUberWebResourceLoader(servletContext, Lists.newArrayList(installedPlugin));
List<URL> resources = resourceLoader.getResources("/myresource");
Assertions.assertThat(resources).isEmpty();
@@ -232,7 +232,7 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
*
* @return
*/
private PluginWrapper createPluginWrapper(File directory)
private InstalledPlugin createPluginWrapper(File directory)
{
return createPluginWrapper(directory.toPath());
}
@@ -245,9 +245,9 @@ public class DefaultUberWebResourceLoaderTest extends WebResourceLoaderTestBase
*
* @return
*/
private PluginWrapper createPluginWrapper(Path directory)
private InstalledPlugin createPluginWrapper(Path directory)
{
return new PluginWrapper(null, null, new PathWebResourceLoader(directory),
return new InstalledPlugin(null, null, new PathWebResourceLoader(directory),
directory);
}

32
scm-webapp/src/test/java/sonia/scm/plugin/PluginProcessorTest.java
View File

@@ -129,7 +129,7 @@ public class PluginProcessorTest
{
copySmp(PLUGIN_A);
PluginWrapper plugin = collectAndGetFirst();
InstalledPlugin plugin = collectAndGetFirst();
assertThat(plugin.getId(), is(PLUGIN_A.id));
}
@@ -145,15 +145,15 @@ public class PluginProcessorTest
{
copySmps(PLUGIN_A, PLUGIN_B);
Set<PluginWrapper> plugins = collectPlugins();
Set<InstalledPlugin> plugins = collectPlugins();
assertThat(plugins, hasSize(2));
PluginWrapper a = findPlugin(plugins, PLUGIN_A.id);
InstalledPlugin a = findPlugin(plugins, PLUGIN_A.id);
assertNotNull(a);
PluginWrapper b = findPlugin(plugins, PLUGIN_B.id);
InstalledPlugin b = findPlugin(plugins, PLUGIN_B.id);
assertNotNull(b);
}
@@ -178,7 +178,7 @@ public class PluginProcessorTest
{
copySmp(PLUGIN_A);
PluginWrapper plugin = collectAndGetFirst();
InstalledPlugin plugin = collectAndGetFirst();
ClassLoader cl = plugin.getClassLoader();
// load parent class
@@ -216,9 +216,9 @@ public class PluginProcessorTest
{
copySmps(PLUGIN_A, PLUGIN_B);
Set<PluginWrapper> plugins = collectPlugins();
Set<InstalledPlugin> plugins = collectPlugins();
PluginWrapper plugin = findPlugin(plugins, PLUGIN_B.id);
InstalledPlugin plugin = findPlugin(plugins, PLUGIN_B.id);
ClassLoader cl = plugin.getClassLoader();
// load parent class
@@ -247,7 +247,7 @@ public class PluginProcessorTest
{
copySmp(PLUGIN_A);
PluginWrapper plugin = collectAndGetFirst();
InstalledPlugin plugin = collectAndGetFirst();
WebResourceLoader wrl = plugin.getWebResourceLoader();
assertNotNull(wrl);
@@ -269,7 +269,7 @@ public class PluginProcessorTest
{
copySmp(PLUGIN_F_1_0_0);
PluginWrapper plugin = collectAndGetFirst();
InstalledPlugin plugin = collectAndGetFirst();
assertThat(plugin.getId(), is(PLUGIN_F_1_0_0.id));
copySmp(PLUGIN_F_1_0_1);
@@ -302,9 +302,9 @@ public class PluginProcessorTest
*
* @throws IOException
*/
private PluginWrapper collectAndGetFirst() throws IOException
private InstalledPlugin collectAndGetFirst() throws IOException
{
Set<PluginWrapper> plugins = collectPlugins();
Set<InstalledPlugin> plugins = collectPlugins();
assertThat(plugins, hasSize(1));
@@ -319,7 +319,7 @@ public class PluginProcessorTest
*
* @throws IOException
*/
private Set<PluginWrapper> collectPlugins() throws IOException
private Set<InstalledPlugin> collectPlugins() throws IOException
{
return processor.collectPlugins(PluginProcessorTest.class.getClassLoader());
}
@@ -368,14 +368,14 @@ public class PluginProcessorTest
*
* @return
*/
private PluginWrapper findPlugin(Iterable<PluginWrapper> plugin,
final String id)
private InstalledPlugin findPlugin(Iterable<InstalledPlugin> plugin,
final String id)
{
return Iterables.find(plugin, new Predicate<PluginWrapper>()
return Iterables.find(plugin, new Predicate<InstalledPlugin>()
{
@Override
public boolean apply(PluginWrapper input)
public boolean apply(InstalledPlugin input)
{
return id.equals(input.getId());
}