JAVA-3498 Fix integration test in spring-cloud-zuul (fix imports - 2)
This commit is contained in:
parent
bef161cc5d
commit
cb7c9406ee
|
@ -11,14 +11,15 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
|
||||||
import static org.hamcrest.Matchers.is;
|
import static org.hamcrest.Matchers.is;
|
||||||
import static org.hamcrest.Matchers.lessThanOrEqualTo;
|
import static org.hamcrest.Matchers.lessThanOrEqualTo;
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertNotEquals;
|
||||||
import static org.junit.Assert.assertNotNull;
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
import static org.junit.Assert.assertNull;
|
||||||
import static org.junit.Assert.assertThat;
|
import static org.junit.Assert.assertThat;
|
||||||
import static org.springframework.http.HttpStatus.OK;
|
import static org.springframework.http.HttpStatus.OK;
|
||||||
import static org.springframework.http.HttpStatus.TOO_MANY_REQUESTS;
|
import static org.springframework.http.HttpStatus.TOO_MANY_REQUESTS;
|
||||||
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import org.junit.Assert;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
@ -80,7 +81,7 @@ public class GreetingControllerIntegrationTest {
|
||||||
|
|
||||||
assertEquals(limit, "1");
|
assertEquals(limit, "1");
|
||||||
assertEquals(remaining, "0");
|
assertEquals(remaining, "0");
|
||||||
Assert.assertNotEquals(reset, "2000");
|
assertNotEquals(reset, "2000");
|
||||||
|
|
||||||
assertEquals(TOO_MANY_REQUESTS, response.getStatusCode());
|
assertEquals(TOO_MANY_REQUESTS, response.getStatusCode());
|
||||||
|
|
||||||
|
@ -101,13 +102,13 @@ public class GreetingControllerIntegrationTest {
|
||||||
|
|
||||||
if (nullable) {
|
if (nullable) {
|
||||||
if (quotaHeaders) {
|
if (quotaHeaders) {
|
||||||
Assert.assertNull(quota);
|
assertNull(quota);
|
||||||
Assert.assertNull(remainingQuota);
|
assertNull(remainingQuota);
|
||||||
} else {
|
} else {
|
||||||
Assert.assertNull(limit);
|
assertNull(limit);
|
||||||
Assert.assertNull(remaining);
|
assertNull(remaining);
|
||||||
}
|
}
|
||||||
Assert.assertNull(reset);
|
assertNull(reset);
|
||||||
} else {
|
} else {
|
||||||
if (quotaHeaders) {
|
if (quotaHeaders) {
|
||||||
assertNotNull(quota);
|
assertNotNull(quota);
|
||||||
|
|
Loading…
Reference in New Issue