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

#809 fix order of script resources in production stage

Browse Source
This commit is contained in:
Sebastian Sdorra
2016-05-25 08:41:47 +02:00
parent 9497d88ee3
commit 8475acbba0
4 changed files with 248 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
scm-webapp/src/test/java/sonia/scm/resources/AbstractResourceManagerTest.java Normal file
View File

@@ -0,0 +1,93 @@
/***
* Copyright (c) 2015, Sebastian Sdorra
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. Neither the name of SCM-Manager; nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* https://bitbucket.org/sdorra/scm-manager
*
*/
package sonia.scm.resources;
import com.google.common.collect.ImmutableSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.servlet.ServletContext;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.hamcrest.Matchers.*;
import org.mockito.runners.MockitoJUnitRunner;
import sonia.scm.plugin.PluginLoader;
/**
* Unit tests for {@link AbstractResourceManager}.
*
* @author Sebastian Sdorra
*/
@RunWith(MockitoJUnitRunner.class)
public class AbstractResourceManagerTest extends ResourceManagerTestBase
{
private DummyResourceManager resourceManager;
@Before
public void setUp()
{
Set<ResourceHandler> resourceHandlers = ImmutableSet.of(resourceHandler);
resourceManager = new DummyResourceManager(servletContext, pluginLoader, resourceHandlers);
}
/**
* Test {@link AbstractResourceManager#getScriptResources()} in the correct order.
*
* @see <a href="https://goo.gl/ok03l4">Issue 809</a>
*/
@Test
public void testGetScriptResources()
{
appendScriptResources("a/b.js", "z/a.js", "a/a.js");
List<String> scripts = resourceManager.getScriptResources();
assertThat(scripts, contains("a/a.js", "a/b.js", "z/a.js"));
}
private static class DummyResourceManager extends AbstractResourceManager
{
public DummyResourceManager(ServletContext servletContext, PluginLoader pluginLoader, Set<ResourceHandler> resourceHandlers)
{
super(servletContext, pluginLoader, resourceHandlers);
}
@Override
protected void collectResources(Map<ResourceKey, Resource> resourceMap)
{
}
}
}

74
scm-webapp/src/test/java/sonia/scm/resources/DefaultResourceManagerTest.java Normal file
View File

@@ -0,0 +1,74 @@
/***
* Copyright (c) 2015, Sebastian Sdorra
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. Neither the name of SCM-Manager; nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* https://bitbucket.org/sdorra/scm-manager
*
*/
package sonia.scm.resources;
import com.google.common.collect.ImmutableSet;
import java.util.List;
import java.util.Set;
import org.junit.Test;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
/**
* Unit tests for {@link DefaultResourceManager}.
*
* @author Sebastian Sdorra
*/
@RunWith(MockitoJUnitRunner.class)
public class DefaultResourceManagerTest extends ResourceManagerTestBase {
private DefaultResourceManager resourceManager;
/**
* Set up {@link DefaultResourceManager} for tests.
*/
@Before
public void setUp()
{
Set<ResourceHandler> resourceHandlers = ImmutableSet.of(resourceHandler);
resourceManager = new DefaultResourceManager(servletContext, pluginLoader, resourceHandlers);
}
/**
* Test {@link DefaultResourceManager#getResources(sonia.scm.resources.ResourceType)} method.
*/
@Test
public void testGetResources()
{
appendScriptResources("a/b.js", "z/a.js", "a/a.js");
List<Resource> resources = resourceManager.getResources(ResourceType.SCRIPT);
assertEquals(1, resources.size());
}
}

76
scm-webapp/src/test/java/sonia/scm/resources/ResourceManagerTestBase.java Normal file
View File

@@ -0,0 +1,76 @@
/***
* Copyright (c) 2015, Sebastian Sdorra
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. Neither the name of SCM-Manager; nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* https://bitbucket.org/sdorra/scm-manager
*
*/
package sonia.scm.resources;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
import java.util.List;
import javax.servlet.ServletContext;
import org.mockito.Mock;
import static org.mockito.Mockito.when;
import sonia.scm.plugin.Plugin;
import sonia.scm.plugin.PluginLoader;
import sonia.scm.plugin.PluginResources;
/**
* Base class for {@link ResourceManager} tests.
*
* @author Sebastian Sdorra
*/
public abstract class ResourceManagerTestBase
{
@Mock
protected ServletContext servletContext;
@Mock
protected PluginLoader pluginLoader;
@Mock
protected ResourceHandler resourceHandler;
/**
* Append scripts resources to plugin loader.
*
* @param resources resource names
*/
protected void appendScriptResources(String... resources)
{
PluginResources pluginResources = new PluginResources();
pluginResources.setScriptResources(Sets.newHashSet(resources));
Plugin plugin = new Plugin();
plugin.setResources(pluginResources);
List<Plugin> plugins = ImmutableList.of(plugin);
when(pluginLoader.getInstalledPlugins()).thenReturn(plugins);
}
}