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

Update to Mockito v2

Browse Source
This commit is contained in:
René Pfeuffer
2018-08-08 09:20:08 +02:00
parent 47b55414f0
commit 67278582e3
60 changed files with 184 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitGcTaskTest.java
View File

@@ -32,19 +32,23 @@
package sonia.scm.repository;
import com.google.common.collect.Lists;
import org.eclipse.jgit.api.GarbageCollectCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Properties;
import org.eclipse.jgit.api.GarbageCollectCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.junit.Test;
import static org.mockito.Mockito.*;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* Unit tests for {@link GitGcTask}.
@@ -103,8 +107,7 @@ public class GitGcTaskTest
// prepare repositories for task
Repository unhealthy = mock(Repository.class);
when(unhealthy.getType()).thenReturn("git");
when(unhealthy.isHealthy()).thenReturn(Boolean.FALSE);
Repository invalid = mock(Repository.class);
when(unhealthy.getType()).thenReturn("git");
when(unhealthy.isValid()).thenReturn(Boolean.FALSE);
@@ -125,4 +128,4 @@ public class GitGcTaskTest
verify(gcc).call();
}
}
}

2
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
View File

@@ -36,7 +36,7 @@ package sonia.scm.repository;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.io.DefaultFileSystem;
import sonia.scm.schedule.Scheduler;
import sonia.scm.store.ConfigurationStoreFactory;

4
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/api/GitHookBranchProviderTest.java
View File

@@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.*;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for {@link GitHookBranchProvider}.
@@ -112,4 +112,4 @@ public class GitHookBranchProviderTest {
return new GitHookBranchProvider(commands);
}
}
}

4
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/api/GitHookTagProviderTest.java
View File

@@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.*;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.stubbing.OngoingStubbing;
import sonia.scm.repository.Tag;
@@ -127,4 +127,4 @@ public class GitHookTagProviderTest {
return new GitHookTagProvider(commands);
}
}
}