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

fixed UnitTests for AbstractManager after merge with 1.x

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-01-29 13:46:03 +01:00
parent 428734e0c7
commit 588e248863
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scm-webapp/src/test/java/sonia/scm/api/rest/resources/AbstractManagerResourceTest.java
View File

@@ -9,10 +9,10 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.Manager;
import sonia.scm.ModelObject;
import sonia.scm.group.Group;
import javax.ws.rs.core.GenericEntity;
import javax.ws.rs.core.Request;
import javax.ws.rs.core.UriInfo;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
@@ -29,8 +29,13 @@ public class AbstractManagerResourceTest {
@Mock
private Manager<Simple> manager;
@Mock
private Request request;
@Mock
private UriInfo uriInfo;
@Captor
private ArgumentCaptor<Comparator<Simple>> comparatorCaptor;
@@ -63,27 +68,24 @@ public class AbstractManagerResourceTest {
abstractManagerResource.getAll(request, 0, 1, "x", true);
}
/**@Test
@Test
public void testLocation() throws URISyntaxException {
URI base = new URI("https://scm.scm-manager.org/");
TestManagerResource resource = new TestManagerResource(manager);
when(uriInfo.getAbsolutePath()).thenReturn(base);
URI uri = resource.location(uriInfo, "special-group");
assertEquals(new URI("https://scm.scm-manager.org/groups/special-group"), uri);
URI uri = location("special-item");
assertEquals(new URI("https://scm.scm-manager.org/simple/special-item"), uri);
}
@Test
public void testLocationWithSpaces() throws URISyntaxException {
URI base = new URI("https://scm.scm-manager.org/");
URI uri = location("Scm Special Group");
assertEquals(new URI("https://scm.scm-manager.org/simple/Scm%20Special%20Group"), uri);
}
TestManagerResource resource = new TestManagerResource(manager);
private URI location(String id) throws URISyntaxException {
URI base = new URI("https://scm.scm-manager.org/");
when(uriInfo.getAbsolutePath()).thenReturn(base);
URI uri = resource.location(uriInfo, "Scm Special Group");
assertEquals(new URI("https://scm.scm-manager.org/groups/Scm%20Special%20Group"), uri);
}**/
return abstractManagerResource.location(uriInfo, id);
}
private class SimpleManagerResource extends AbstractManagerResource<Simple> {
@@ -107,7 +109,7 @@ public class AbstractManagerResourceTest {
@Override
protected String getPathPart() {
return null;
return "simple";
}
}