Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-01 20:29:12 +01:00
Code Issues Packages Projects Releases Activity

added modules, classloading and view packages to sonia.scm.lifecycle

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-06-25 09:49:52 +02:00
parent 6efa6ff29f
commit 80febf9424
47 changed files with 105 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ class StaticResourceServletTest {
doReturn("/scm").when(request).getContextPath();
doReturn("/scm/resource.txt").when(request).getRequestURI();
doReturn(context).when(request).getServletContext();
URL resource = Resources.getResource("sonia/scm/boot/resource.txt");
URL resource = Resources.getResource("sonia/scm/lifecycle/resource.txt");
doReturn(resource).when(context).getResource("/resource.txt");
doReturn(stream).when(response).getOutputStream();

2
scm-webapp/src/test/java/sonia/scm/lifecycle/ClassLoaderLifeCycleTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/classloading/ClassLoaderLifeCycleTest.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.lifecycle;
package sonia.scm.lifecycle.classloading;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

2
scm-webapp/src/test/java/sonia/scm/CloseableModuleTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/modules/CloseableModuleTest.java
View File

@@ -1,4 +1,4 @@
package sonia.scm;
package sonia.scm.lifecycle.modules;
import com.google.inject.Guice;
import com.google.inject.Injector;

3
scm-webapp/src/test/java/sonia/scm/EagerSingletonModuleTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/modules/EagerSingletonModuleTest.java
View File

@@ -1,9 +1,10 @@
package sonia.scm;
package sonia.scm.lifecycle.modules;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.junit.jupiter.api.Test;
import sonia.scm.EagerSingleton;
import javax.inject.Inject;
import javax.inject.Singleton;

7
scm-webapp/src/test/java/sonia/scm/lifecycle/InjectionLifeCycleTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/modules/InjectionLifeCycleTest.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.lifecycle;
package sonia.scm.lifecycle.modules;
import com.google.common.base.Strings;
import com.google.inject.AbstractModule;
@@ -10,10 +10,11 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import sonia.scm.CloseableModule;
import sonia.scm.lifecycle.modules.CloseableModule;
import sonia.scm.Default;
import sonia.scm.EagerSingleton;
import sonia.scm.EagerSingletonModule;
import sonia.scm.lifecycle.modules.EagerSingletonModule;
import sonia.scm.lifecycle.modules.InjectionLifeCycle;
import javax.inject.Inject;
import javax.inject.Singleton;

2
scm-webapp/src/test/java/sonia/scm/MoreMatchersTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/modules/MoreMatchersTest.java
View File

@@ -1,4 +1,4 @@
package sonia.scm;
package sonia.scm.lifecycle.modules;
import com.google.inject.TypeLiteral;
import com.google.inject.matcher.Matcher;

2
scm-webapp/src/test/java/sonia/scm/ScmEventBusModuleTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/modules/ScmEventBusModuleTest.java
View File

@@ -1,4 +1,4 @@
package sonia.scm;
package sonia.scm.lifecycle.modules;
import com.github.legman.Subscribe;
import com.google.inject.Guice;

4
scm-webapp/src/test/java/sonia/scm/ScmInitializerModuleTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/modules/ScmInitializerModuleTest.java
View File

@@ -1,8 +1,10 @@
package sonia.scm;
package sonia.scm.lifecycle.modules;
import com.google.inject.Guice;
import com.google.inject.Injector;
import org.junit.jupiter.api.Test;
import sonia.scm.Initable;
import sonia.scm.SCMContextProvider;
import static org.assertj.core.api.Assertions.assertThat;

2
scm-webapp/src/test/java/sonia/scm/ServletContextListenerHolderTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/modules/ServletContextListenerHolderTest.java
View File

@@ -1,4 +1,4 @@
package sonia.scm;
package sonia.scm.lifecycle.modules;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;

2
scm-webapp/src/test/java/sonia/scm/lifecycle/ServletContextModuleTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/modules/ServletContextModuleTest.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.lifecycle;
package sonia.scm.lifecycle.modules;
import com.google.inject.Guice;
import com.google.inject.Injector;

2
scm-webapp/src/test/java/sonia/scm/lifecycle/SingleViewServletTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/view/SingleViewServletTest.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.lifecycle;
package sonia.scm.lifecycle.view;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

3
scm-webapp/src/test/java/sonia/scm/lifecycle/SingleViewTest.java → scm-webapp/src/test/java/sonia/scm/lifecycle/view/SingleViewTest.java
View File

@@ -1,4 +1,4 @@
package sonia.scm.lifecycle;
package sonia.scm.lifecycle.view;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import sonia.scm.StaticResourceServlet;
import sonia.scm.lifecycle.modules.ModuleProvider;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;

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

@@ -42,7 +42,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import sonia.scm.lifecycle.ClassLoaderLifeCycle;
import sonia.scm.lifecycle.classloading.ClassLoaderLifeCycle;
import static org.hamcrest.Matchers.*;