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

Fix unit test

Browse Source 
It looks like the system config is cached somehow from jgit 5.4.3 on,
so that putting the config in a file that is deleted after the first
test invalidates this config, which leads to the effect, that for the
test that runs second the filter is not applied.
This commit is contained in:
Rene Pfeuffer
2020-03-03 09:30:24 +01:00
parent 24de6c89a5
commit 34b570fddf
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommand_LFSTest.java
View File

@@ -5,15 +5,17 @@ import com.github.sdorra.shiro.SubjectAware;
import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.After; import org.junit.AfterClass;
import org.junit.Before; import org.junit.BeforeClass;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import sonia.scm.SCMContextProvider;
import sonia.scm.repository.Person; import sonia.scm.repository.Person;
import sonia.scm.repository.util.WorkdirProvider; import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.store.Blob; import sonia.scm.store.Blob;
import sonia.scm.store.BlobStore; import sonia.scm.store.BlobStore;
import sonia.scm.util.IOUtil;
import sonia.scm.web.lfs.LfsBlobStoreFactory; import sonia.scm.web.lfs.LfsBlobStoreFactory;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@@ -29,6 +31,8 @@ import static org.mockito.Mockito.when;
@SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini", username = "admin", password = "secret") @SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini", username = "admin", password = "secret")
public class GitModifyCommand_LFSTest extends AbstractGitCommandTestBase { public class GitModifyCommand_LFSTest extends AbstractGitCommandTestBase {
private static File contextDir;
@Rule @Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder(); public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule @Rule
@@ -38,14 +42,18 @@ public class GitModifyCommand_LFSTest extends AbstractGitCommandTestBase {
private final LfsBlobStoreFactory lfsBlobStoreFactory = mock(LfsBlobStoreFactory.class); private final LfsBlobStoreFactory lfsBlobStoreFactory = mock(LfsBlobStoreFactory.class);
@Before @BeforeClass
public void registerFilter() { public static void registerFilter() throws IOException {
SCMContextProvider contextProvider = mock(SCMContextProvider.class);
contextDir = Files.createTempDirectory("scm").toFile();
when(contextProvider.getBaseDirectory()).thenReturn(contextDir);
new GitLfsFilterContextListener(contextProvider).contextInitialized(null); new GitLfsFilterContextListener(contextProvider).contextInitialized(null);
} }
@After @AfterClass
public void unregisterFilter() { public static void unregisterFilter() throws IOException {
new GitLfsFilterContextListener(contextProvider).contextDestroyed(null); new GitLfsFilterContextListener(null).contextDestroyed(null);
IOUtil.delete(contextDir);
} }
@Test @Test