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

remove powermock dependency, to fix build on java 8

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-08-19 22:00:04 +02:00
parent a8d9d8b9b6
commit 5032d04304
2 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pom.xml
View File

@@ -138,20 +138,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
@@ -439,7 +425,6 @@
<mokito.version>1.9.5</mokito.version> <mokito.version>1.9.5</mokito.version>
<hamcrest.version>1.3</hamcrest.version> <hamcrest.version>1.3</hamcrest.version>
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
<powermock.version>1.5.3</powermock.version>
<!-- logging libraries --> <!-- logging libraries -->
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>

21
scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
View File

@@ -35,16 +35,16 @@ package sonia.scm.repository;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import org.junit.Test; import com.google.common.collect.ImmutableSet;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest; import org.junit.Test;
import org.powermock.modules.junit4.PowerMockRunner;
import sonia.scm.Type; import sonia.scm.Type;
import sonia.scm.config.ScmConfiguration; import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.api.HookContext; import sonia.scm.repository.api.HookContext;
import sonia.scm.repository.api.HookContextFactory;
import sonia.scm.repository.api.HookFeature; import sonia.scm.repository.api.HookFeature;
import sonia.scm.repository.spi.HookContextProvider;
import sonia.scm.repository.xml.XmlRepositoryDAO; import sonia.scm.repository.xml.XmlRepositoryDAO;
import sonia.scm.security.DefaultKeyGenerator; import sonia.scm.security.DefaultKeyGenerator;
import sonia.scm.store.JAXBStoreFactory; import sonia.scm.store.JAXBStoreFactory;
@@ -65,8 +65,6 @@ import java.util.Set;
* *
* @author Sebastian Sdorra * @author Sebastian Sdorra
*/ */
@RunWith(PowerMockRunner.class)
@PrepareForTest(HookContext.class)
public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
{ {
@@ -81,12 +79,13 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
@Override @Override
public HookContext createHookContext(Repository repository) public HookContext createHookContext(Repository repository)
{ {
HookContext ctx = mock(HookContext.class); PreProcessorUtil ppu = mock(PreProcessorUtil.class);
HookContextProvider provider = mock(HookContextProvider.class);
Set<HookFeature> features = ImmutableSet.of();
when(ctx.isFeatureSupported(any(HookFeature.class))).thenReturn( when(provider.getSupportedFeatures()).thenReturn(features);
Boolean.FALSE);
return ctx; return new HookContextFactory(ppu).createContext(provider, repository);
} }
//~--- get methods ---------------------------------------------------------- //~--- get methods ----------------------------------------------------------
@@ -145,7 +144,7 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
protected DefaultRepositoryManager createRepositoryManager( protected DefaultRepositoryManager createRepositoryManager(
boolean archiveEnabled) boolean archiveEnabled)
{ {
Set<RepositoryHandler> handlerSet = new HashSet<RepositoryHandler>(); Set<RepositoryHandler> handlerSet = new HashSet<>();
StoreFactory factory = new JAXBStoreFactory(); StoreFactory factory = new JAXBStoreFactory();
factory.init(contextProvider); factory.init(contextProvider);