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

Merge pull request #1052 from scm-manager/snyk-upgrade-93e27ecafc052abede73fd6047533bbf

Browse Source 
[Snyk] Upgrade org.junit.jupiter:junit-jupiter-params from 5.2.0 to 5.6.0
This commit is contained in:
René Pfeuffer
2020-03-19 10:24:11 +01:00
committed by GitHub
parent 7ca65b30f2 70149865a8
commit ed4ae43089
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -828,7 +828,7 @@
<!-- test libraries -->
<mockito.version>2.28.2</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<junit.version>5.2.0</junit.version>
<junit.version>5.6.0</junit.version>
<!-- logging libraries -->
<slf4j.version>1.7.30</slf4j.version>

5
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolRequestMockFactory.java
View File

@@ -3,12 +3,12 @@ package sonia.scm.web;
import com.google.common.collect.Lists;
import javax.servlet.http.HttpServletRequest;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class WireProtocolRequestMockFactory {
@@ -88,7 +88,6 @@ public class WireProtocolRequestMockFactory {
private HttpServletRequest base(String method, String queryStringValue) {
HttpServletRequest request = mock(HttpServletRequest.class);
when(request.getRequestURI()).thenReturn(repositoryPath);
when(request.getMethod()).thenReturn(method);
queryString(request, queryStringValue);

6
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/web/WireProtocolTest.java
View File

@@ -47,7 +47,10 @@ import java.util.Collections;
import java.util.List;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
/**
@@ -98,7 +101,6 @@ public class WireProtocolTest {
@Test
public void testGetCommandsOfWithHgArgsPost() throws IOException {
when(request.getMethod()).thenReturn("POST");
when(request.getQueryString()).thenReturn("cmd=batch");
when(request.getIntHeader("X-HgArgs-Post")).thenReturn(29);
when(request.getHeaderNames()).thenReturn(Collections.enumeration(Lists.newArrayList("X-HgArgs-Post")));