Skip to content

Commit

Permalink
up test coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
abuttaro committed Jan 27, 2018
1 parent a33c599 commit d9c8399
Show file tree
Hide file tree
Showing 13 changed files with 313 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.github.restup.controller.interceptor;

import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

import com.github.restup.controller.model.ParsedResourceControllerRequest;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import com.github.restup.controller.model.ParsedResourceControllerRequest;

@RunWith(MockitoJUnitRunner.class)
public class RequestInterceptorChainTest {
Expand All @@ -25,13 +23,13 @@ public void testNull() {
@Test
public void testBefore() {
new RequestInterceptorChain(interceptor).before(request);
verify(interceptor, times(1)).before(request);
verify(interceptor).before(request);
}

@Test
public void testAfter() {
new RequestInterceptorChain(interceptor).after(request);
verify(interceptor, times(1)).after(request);
verify(interceptor).after(request);
}

}
12 changes: 12 additions & 0 deletions up-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.github.restup.http.model;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import com.github.restup.errors.ErrorObjectException;
import com.github.restup.registry.ResourceRegistry;
import static org.mockito.Mockito.*;

@RunWith(MockitoJUnitRunner.class)
public class HttpServletResourceControllerRequestTest {

@Mock
HttpServletRequest httpRequest;

ResourceRegistry registry = new ResourceRegistry();


@Test(expected=ErrorObjectException.class)
public void testResponse() {
when(httpRequest.getRequestURL()).thenReturn(new StringBuffer("http://www.foo.com/a/b/c"));
when(httpRequest.getRequestURI()).thenReturn("/a/b/c");

HttpServletResourceControllerRequest request = HttpServletResourceControllerRequest.builder(httpRequest).setRegistry(registry).build();
request.getParameterNames();
request.getParameter("foo");
request.getHeaders("bar");
verify(httpRequest).getParameterNames();
verify(httpRequest).getParameter("foo");
verify(httpRequest).getHeaders("bar");
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.github.restup.http.model;

import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import static org.mockito.Mockito.verify;

@RunWith(MockitoJUnitRunner.class)
public class HttpServletResourceControllerResponseTest {

@Mock
HttpServletResponse httpServletResponse;

@Test
public void testResponse() {
HttpServletResourceControllerResponse response = new HttpServletResourceControllerResponse(httpServletResponse);
String name = "foo";
String value = "bar";
int status = 123;
response.setHeader(name, value);
response.setStatus(status);

verify(httpServletResponse).setHeader(name, value);
verify(httpServletResponse).setStatus(status);
}
}
12 changes: 12 additions & 0 deletions up-test-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.openpojo</groupId>
<artifactId>openpojo</artifactId>
<version>0.8.7</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

Expand Down
88 changes: 88 additions & 0 deletions up-test-model/src/main/java/com/many/fields/A2J.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,92 @@ public A2J(Long id, String a, String b, String c, String d, String e, String f,
this.j = j;
}

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getA() {
return a;
}

public void setA(String a) {
this.a = a;
}

public String getB() {
return b;
}

public void setB(String b) {
this.b = b;
}

public String getC() {
return c;
}

public void setC(String c) {
this.c = c;
}

public String getD() {
return d;
}

public void setD(String d) {
this.d = d;
}

public String getE() {
return e;
}

public void setE(String e) {
this.e = e;
}

public String getF() {
return f;
}

public void setF(String f) {
this.f = f;
}

public String getG() {
return g;
}

public void setG(String g) {
this.g = g;
}

public String getH() {
return h;
}

public void setH(String h) {
this.h = h;
}

public String getI() {
return i;
}

public void setI(String i) {
this.i = i;
}

public String getJ() {
return j;
}

public void setJ(String j) {
this.j = j;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,12 @@ public class Contractor extends Person {
@Relationship(resource = Company.class)
private Long companyId;

public Long getCompanyId() {
return companyId;
}

public void setCompanyId(Long companyId) {
this.companyId = companyId;
}

}
16 changes: 16 additions & 0 deletions up-test-model/src/main/java/com/model/test/company/Employee.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,20 @@ public class Employee extends Person {
private Long id;
private String department;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getDepartment() {
return department;
}

public void setDepartment(String department) {
this.department = department;
}

}
25 changes: 16 additions & 9 deletions up-test-model/src/main/java/com/test/model/animals/Animal.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,27 @@
import com.github.restup.annotations.ApiName;

@ApiName("animal")
@SuppressWarnings("unused")
public class Animal {

private final Long id;
private final String name;

public Animal(Long id, String name) {
super();
this.id = id;
this.name = name;
}
public Animal(Long id, String name) {
super();
this.id = id;
this.name = name;
}

public Animal() {
this(null, null);
}
public Animal() {
this(null, null);
}

public Long getId() {
return id;
}

public String getName() {
return name;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@

import com.github.restup.annotations.ApiName;

@SuppressWarnings("unused")
@ApiName("animal")
public class Zebra extends Animal {

private int numStripes;

public int getNumStripes() {
return numStripes;
}

public void setNumStripes(int numStripes) {
this.numStripes = numStripes;
}

}
9 changes: 4 additions & 5 deletions up-test-model/src/main/java/com/university/University.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
import static com.university.University.PLURAL_NAME;
import static com.university.University.RESOURCE_NAME;
import static com.university.University.TABLE_NAME;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.github.restup.annotations.ApiName;
import com.github.restup.annotations.Plural;
import com.github.restup.annotations.field.CaseInsensitive;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Expand All @@ -16,6 +11,10 @@
import org.hibernate.validator.constraints.NotBlank;
import org.hibernate.validator.constraints.SafeHtml;
import org.hibernate.validator.constraints.SafeHtml.WhiteListType;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.github.restup.annotations.ApiName;
import com.github.restup.annotations.Plural;
import com.github.restup.annotations.field.CaseInsensitive;

@Entity(name = TABLE_NAME)
@ApiName(value = RESOURCE_NAME)
Expand Down
21 changes: 21 additions & 0 deletions up-test-model/src/test/java/com/test/model/DeepTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.test.model;

import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import com.deep.Shallow;
import com.many.fields.A2J;

public class DeepTest {

@Test
public void deep() {
Shallow graph = Shallow.graph();
assertNotNull(graph);
}

@Test
public void a2j() {
new A2J(1l,"a","b","c","d","e","f","g","h","i","j");
}

}
Loading

0 comments on commit d9c8399

Please sign in to comment.