Details
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/ExceptionMapperBase.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/ExceptionMapperBase.java
index b16ed1e..d803d10 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/ExceptionMapperBase.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/ExceptionMapperBase.java
@@ -29,17 +29,25 @@ public abstract class ExceptionMapperBase {
private static final Logger log = LoggerFactory.getLogger(ExceptionMapperBase.class);
protected Response buildConflictingRequestResponse(final Exception e, final UriInfo uriInfo) {
- log.warn("Conflicting request for {}: {}", uriInfo.getRequestUri(), e);
+ return buildConflictingRequestResponse(e.toString(), uriInfo);
+ }
+
+ protected Response buildConflictingRequestResponse(final String error, final UriInfo uriInfo) {
+ log.warn("Conflicting request for {}: {}", uriInfo.getRequestUri(), error);
return Response.status(Status.CONFLICT)
- .entity(e)
+ .entity(error)
.type(MediaType.TEXT_PLAIN_TYPE)
.build();
}
protected Response buildNotFoundResponse(final Exception e, final UriInfo uriInfo) {
- log.warn("Not found for {}: {}", uriInfo.getRequestUri(), e);
+ return buildNotFoundResponse(e.toString(), uriInfo);
+ }
+
+ protected Response buildNotFoundResponse(final String error, final UriInfo uriInfo) {
+ log.warn("Not found for {}: {}", uriInfo.getRequestUri(), error);
return Response.status(Status.NOT_FOUND)
- .entity(e)
+ .entity(error)
.type(MediaType.TEXT_PLAIN_TYPE)
.build();
}
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/RuntimeExceptionMapper.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/RuntimeExceptionMapper.java
index 533ff16..e8e3c61 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/RuntimeExceptionMapper.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/mappers/RuntimeExceptionMapper.java
@@ -17,6 +17,7 @@
package com.ning.billing.jaxrs.mappers;
import javax.inject.Singleton;
+import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
@@ -35,6 +36,14 @@ public class RuntimeExceptionMapper extends ExceptionMapperBase implements Excep
@Override
public Response toResponse(final RuntimeException exception) {
- return buildInternalErrorResponse(exception, uriInfo);
+ if (exception instanceof NullPointerException) {
+ // Assume bad payload
+ return buildBadRequestResponse(exception, uriInfo);
+ } else if (exception instanceof WebApplicationException) {
+ // e.g. com.sun.jersey.api.NotFoundException
+ return ((WebApplicationException) exception).getResponse();
+ } else {
+ return buildInternalErrorResponse(exception, uriInfo);
+ }
}
}
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java
index 471ce40..6851692 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/SubscriptionResource.java
@@ -118,7 +118,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
@QueryParam(QUERY_CALL_TIMEOUT) @DefaultValue("3") final long timeoutSec,
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment) {
+ @HeaderParam(HDR_COMMENT) final String comment) throws EntitlementUserApiException {
final SubscriptionCallCompletionCallback<Subscription> callback = new SubscriptionCallCompletionCallback<Subscription>() {
@Override
public Subscription doOperation(final CallContext ctx) throws EntitlementUserApiException, InterruptedException, TimeoutException {
@@ -158,7 +158,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
@QueryParam(QUERY_CALL_TIMEOUT) @DefaultValue("3") final long timeoutSec,
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
- @HeaderParam(HDR_COMMENT) final String comment) {
+ @HeaderParam(HDR_COMMENT) final String comment) throws EntitlementUserApiException {
final SubscriptionCallCompletionCallback<Response> callback = new SubscriptionCallCompletionCallback<Response>() {
private boolean isImmediateOp = true;
@@ -216,7 +216,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
@HeaderParam(HDR_CREATED_BY) final String createdBy,
@HeaderParam(HDR_REASON) final String reason,
@HeaderParam(HDR_COMMENT) final String comment,
- @javax.ws.rs.core.Context final UriInfo uriInfo) {
+ @javax.ws.rs.core.Context final UriInfo uriInfo) throws EntitlementUserApiException {
final SubscriptionCallCompletionCallback<Response> callback = new SubscriptionCallCompletionCallback<Response>() {
private boolean isImmediateOp = true;
@@ -304,7 +304,7 @@ public class SubscriptionResource extends JaxRsResourceBase {
final boolean callCompletion,
final String createdBy,
final String reason,
- final String comment) {
+ final String comment) throws EntitlementUserApiException {
final CallContext ctx = context.createContext(createdBy, reason, comment);
final CompletionUserRequestSubscription waiter = callCompletion ? new CompletionUserRequestSubscription(ctx.getUserToken()) : null;
@@ -317,9 +317,6 @@ public class SubscriptionResource extends JaxRsResourceBase {
waiter.waitForCompletion(timeoutSec * 1000);
}
return callback.doResponseOk(operationValue);
- } catch (EntitlementUserApiException e) {
- log.info(String.format("Failed to complete operation"), e);
- return Response.status(Status.BAD_REQUEST).build();
} catch (InterruptedException e) {
return Response.status(Status.INTERNAL_SERVER_ERROR).build();
} catch (TimeoutException e) {
diff --git a/server/src/main/java/com/ning/billing/server/listeners/KillbillGuiceListener.java b/server/src/main/java/com/ning/billing/server/listeners/KillbillGuiceListener.java
index 808ff0d..e20dc8e 100644
--- a/server/src/main/java/com/ning/billing/server/listeners/KillbillGuiceListener.java
+++ b/server/src/main/java/com/ning/billing/server/listeners/KillbillGuiceListener.java
@@ -56,6 +56,7 @@ public class KillbillGuiceListener extends SetupServer {
.addHealthCheck(KillbillHealthcheck.class)
.addJMXExport(KillbillHealthcheck.class)
.addModule(getModule())
+ .addJerseyResource("com.ning.billing.jaxrs.mappers")
.addJerseyResource("com.ning.billing.jaxrs.resources");
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestAccount.java b/server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
index ae1f20e..9adeb8b 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Ning, Inc.
+ * Copyright 2010-2012 Ning, Inc.
*
* Ning licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
@@ -13,13 +13,8 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package com.ning.billing.jaxrs;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+package com.ning.billing.jaxrs;
import java.util.HashMap;
import java.util.LinkedList;
@@ -35,7 +30,6 @@ import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.ning.billing.catalog.api.BillingPeriod;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.jaxrs.json.AccountJson;
@@ -49,15 +43,20 @@ import com.ning.billing.jaxrs.json.RefundJson;
import com.ning.billing.jaxrs.json.SubscriptionJsonNoEvents;
import com.ning.billing.jaxrs.json.TagDefinitionJson;
import com.ning.billing.jaxrs.resources.JaxrsResource;
-import com.ning.billing.mock.api.MockBillCycleDay;
import com.ning.http.client.Response;
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
public class TestAccount extends TestJaxrsBase {
private static final Logger log = LoggerFactory.getLogger(TestAccount.class);
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testAccountOk() throws Exception {
final AccountJson input = createAccount("xoxo", "shdgfhwe", "xoxo@yahoo.com");
@@ -73,8 +72,8 @@ public class TestAccount extends TestJaxrsBase {
// Update Account
final AccountJson newInput = new AccountJson(objFromJson.getAccountId(),
- "zozo", 4, objFromJson.getExternalKey(), "rr@google.com", new BillCycleDayJson(18, 18),
- "EUR", null, "UTC", "bl1", "bh2", "", "ca", "usa", "415-255-2991");
+ "zozo", 4, objFromJson.getExternalKey(), "rr@google.com", new BillCycleDayJson(18, 18),
+ "EUR", null, "UTC", "bl1", "bh2", "", "ca", "usa", "415-255-2991");
baseJson = mapper.writeValueAsString(newInput);
final String uri = JaxrsResource.ACCOUNTS_PATH + "/" + objFromJson.getAccountId();
response = doPut(uri, baseJson, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
@@ -84,46 +83,40 @@ public class TestAccount extends TestJaxrsBase {
Assert.assertTrue(objFromJson.equals(newInput));
}
-
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testUpdateNonExistentAccount() throws Exception {
final AccountJson input = getAccountJson("xoxo", "shghaahwe", "xoxo@yahoo.com");
final String baseJson = mapper.writeValueAsString(input);
final String uri = JaxrsResource.ACCOUNTS_PATH + "/" + input.getAccountId();
final Response response = doPut(uri, baseJson, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- Assert.assertEquals(response.getStatusCode(), Status.NO_CONTENT.getStatusCode());
- final String body = response.getResponseBody();
- Assert.assertEquals(body, "");
+ Assert.assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode());
}
-
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testAccountNonExistent() throws Exception {
final String uri = JaxrsResource.ACCOUNTS_PATH + "/99999999-b103-42f3-8b6e-dd244f1d0747";
final Response response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- Assert.assertEquals(response.getStatusCode(), Status.NO_CONTENT.getStatusCode());
+ Assert.assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode());
}
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testAccountBadAccountId() throws Exception {
final String uri = JaxrsResource.ACCOUNTS_PATH + "/yo";
final Response response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
Assert.assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode());
}
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testAccountTimeline() throws Exception {
clock.setTime(new DateTime(2012, 4, 25, 0, 3, 42, 0));
-
final AccountJson accountJson = createAccountWithDefaultPaymentMethod("poney", "shdddqgfhwe", "poney@yahoo.com");
assertNotNull(accountJson);
final BundleJsonNoSubscriptions bundleJson = createBundle(accountJson.getAccountId(), "996599");
assertNotNull(bundleJson);
-
final SubscriptionJsonNoEvents subscriptionJson = createSubscription(bundleJson.getBundleId(), "Shotgun", ProductCategory.BASE.toString(), BillingPeriod.MONTHLY.toString(), true);
assertNotNull(subscriptionJson);
@@ -148,8 +141,7 @@ public class TestAccount extends TestJaxrsBase {
Assert.assertEquals(objFromJson.getBundles().get(0).getSubscriptions().get(0).getEvents().size(), 2);
}
-
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testAccountPaymentMethods() throws Exception {
final AccountJson accountJson = createAccount("qwerty", "ytrewq", "qwerty@yahoo.com");
@@ -202,7 +194,6 @@ public class TestAccount extends TestJaxrsBase {
List<PaymentMethodJson> paymentMethods = mapper.readValue(baseJson, new TypeReference<List<PaymentMethodJson>>() {});
assertEquals(paymentMethods.size(), 2);
-
//
// CHANGE DEFAULT
//
@@ -236,7 +227,7 @@ public class TestAccount extends TestJaxrsBase {
assertEquals(paymentMethods.size(), 1);
}
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testAccountPaymentsWithRefund() throws Exception {
//clock.setTime(new DateTime(2012, 4, 25, 0, 3, 42, 0));
@@ -253,7 +244,6 @@ public class TestAccount extends TestJaxrsBase {
clock.addMonths(1);
crappyWaitForLackOfProperSynchonization();
-
String uri = JaxrsResource.ACCOUNTS_PATH + "/" + accountJson.getAccountId() + "/" + JaxrsResource.PAYMENTS;
Response response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
@@ -271,7 +261,7 @@ public class TestAccount extends TestJaxrsBase {
}
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testTags() throws Exception {
// Use tag definition for AUTO_PAY_OFF
@@ -289,11 +279,9 @@ public class TestAccount extends TestJaxrsBase {
Assert.assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
}
-
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testCustomFields() throws Exception {
-
final AccountJson accountJson = createAccount("yoyoq", "gfgrqe", "yoyoq@yahoo.com");
assertNotNull(accountJson);
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestBundle.java b/server/src/test/java/com/ning/billing/jaxrs/TestBundle.java
index 2f169f9..962c581 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestBundle.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestBundle.java
@@ -13,30 +13,28 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
+
package com.ning.billing.jaxrs;
-import javax.ws.rs.core.Response.Status;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import javax.ws.rs.core.Response.Status;
+
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.ning.billing.jaxrs.json.AccountJson;
import com.ning.billing.jaxrs.json.BundleJsonNoSubscriptions;
import com.ning.billing.jaxrs.resources.JaxrsResource;
import com.ning.http.client.Response;
-public class TestBundle extends TestJaxrsBase {
-
- private static final Logger log = LoggerFactory.getLogger(TestBundle.class);
+import com.fasterxml.jackson.core.type.TypeReference;
+public class TestBundle extends TestJaxrsBase {
@Test(groups = "slow", enabled = true)
public void testBundleOk() throws Exception {
@@ -54,7 +52,6 @@ public class TestBundle extends TestJaxrsBase {
Assert.assertTrue(objFromJson.equals(bundleJson));
}
-
@Test(groups = "slow", enabled = true)
public void testBundleFromAccount() throws Exception {
@@ -84,17 +81,15 @@ public class TestBundle extends TestJaxrsBase {
String uri = JaxrsResource.BUNDLES_PATH + "/99999999-b103-42f3-8b6e-dd244f1d0747";
Response response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- Assert.assertEquals(response.getStatusCode(), Status.NO_CONTENT.getStatusCode());
-
+ Assert.assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode());
// Retrieves by external key
final Map<String, String> queryParams = new HashMap<String, String>();
queryParams.put(JaxrsResource.QUERY_EXTERNAL_KEY, "56566");
response = doGet(JaxrsResource.BUNDLES_PATH, queryParams, DEFAULT_HTTP_TIMEOUT_SEC);
- Assert.assertEquals(response.getStatusCode(), Status.NO_CONTENT.getStatusCode());
-
+ Assert.assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode());
- uri = JaxrsResource.ACCOUNTS_PATH + "/" + accountJson.getAccountId().toString() + "/" + JaxrsResource.BUNDLES;
+ uri = JaxrsResource.ACCOUNTS_PATH + "/" + accountJson.getAccountId() + "/" + JaxrsResource.BUNDLES;
response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
Assert.assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
final String baseJson = response.getResponseBody();
@@ -107,7 +102,7 @@ public class TestBundle extends TestJaxrsBase {
public void testAppNonExistent() throws Exception {
final String uri = JaxrsResource.ACCOUNTS_PATH + "/99999999-b103-42f3-8b6e-dd244f1d0747/" + JaxrsResource.BUNDLES;
final Response response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- Assert.assertEquals(response.getStatusCode(), Status.NO_CONTENT.getStatusCode());
+ Assert.assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode());
}
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestChargeback.java b/server/src/test/java/com/ning/billing/jaxrs/TestChargeback.java
index 34cf968..0a7dcb2 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestChargeback.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestChargeback.java
@@ -21,13 +21,13 @@ import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
+import javax.ws.rs.core.Response.Status;
+
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.google.common.collect.ImmutableMap;
import com.ning.billing.catalog.api.BillingPeriod;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.jaxrs.json.AccountJson;
@@ -40,11 +40,15 @@ import com.ning.billing.jaxrs.json.SubscriptionJsonNoEvents;
import com.ning.billing.jaxrs.resources.JaxrsResource;
import com.ning.http.client.Response;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.common.collect.ImmutableMap;
+
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
public class TestChargeback extends TestJaxrsBase {
+
@Test(groups = "slow")
public void testAddChargeback() throws Exception {
final PaymentJsonSimple payment = createAccountWithInvoiceAndPayment();
@@ -53,7 +57,7 @@ public class TestChargeback extends TestJaxrsBase {
// Create the chargeback
Response response = doPost(JaxrsResource.CHARGEBACKS_PATH, jsonInput, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.CREATED.getStatusCode(), response.getResponseBody());
+ assertEquals(response.getStatusCode(), Status.CREATED.getStatusCode(), response.getResponseBody());
// Find the chargeback by location
final String location = response.getHeader("Location");
@@ -71,14 +75,14 @@ public class TestChargeback extends TestJaxrsBase {
}
private void verifyCollectionChargebackResponse(final Response response, final ChargebackJson input) throws IOException {
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.OK.getStatusCode());
+ assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
final ChargebackCollectionJson objFromJson = mapper.readValue(response.getResponseBody(), ChargebackCollectionJson.class);
assertEquals(objFromJson.getChargebacks().size(), 1);
assertTrue(objFromJson.getChargebacks().get(0).getChargebackAmount().compareTo(input.getChargebackAmount()) == 0);
}
private void verifySingleChargebackResponse(final Response response, final ChargebackJson input) throws IOException {
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.OK.getStatusCode());
+ assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
final ChargebackJson objFromJson = mapper.readValue(response.getResponseBody(), ChargebackJson.class);
assertTrue(objFromJson.getChargebackAmount().compareTo(input.getChargebackAmount()) == 0);
}
@@ -91,7 +95,7 @@ public class TestChargeback extends TestJaxrsBase {
// Try to create the chargeback
final Response response = doPost(JaxrsResource.CHARGEBACKS_PATH, jsonInput, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.BAD_REQUEST.getStatusCode(), response.getResponseBody());
+ assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode(), response.getResponseBody());
}
@Test(groups = "slow")
@@ -101,27 +105,26 @@ public class TestChargeback extends TestJaxrsBase {
// Try to create the chargeback
final Response response = doPost(JaxrsResource.CHARGEBACKS_PATH, jsonInput, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getResponseBody());
+ assertEquals(response.getStatusCode(), Status.BAD_REQUEST.getStatusCode(), response.getResponseBody());
}
@Test(groups = "slow")
public void testNoChargebackForAccount() throws Exception {
final String accountId = UUID.randomUUID().toString();
final Response response = doGet(JaxrsResource.CHARGEBACKS_PATH + "/accounts/" + accountId, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.OK.getStatusCode(), response.getResponseBody());
+ assertEquals(response.getStatusCode(), Status.OK.getStatusCode(), response.getResponseBody());
final ChargebackCollectionJson chargebackCollectionJson = mapper.readValue(response.getResponseBody(), ChargebackCollectionJson.class);
Assert.assertEquals(chargebackCollectionJson.getAccountId(), accountId);
Assert.assertEquals(chargebackCollectionJson.getChargebacks().size(), 0);
}
-
@Test(groups = "slow")
public void testNoChargebackForPayment() throws Exception {
final String payment = UUID.randomUUID().toString();
final Response response = doGet(JaxrsResource.CHARGEBACKS_PATH + "/payments/" + payment, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
// STEPH needs to fix that we get 200 instaed of 204 although stepping through code, i see we do return NO_CONTENT. mistery that needs to be solved!!!!
- //assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.NO_CONTENT.getStatusCode(), response.getResponseBody());
+ //assertEquals(response.getStatusCode(),Status.NO_CONTENT.getStatusCode(), response.getResponseBody());
}
private PaymentJsonSimple createAccountWithInvoiceAndPayment() throws Exception {
@@ -147,7 +150,7 @@ public class TestChargeback extends TestJaxrsBase {
// Retrieve the invoice
final Response response = doGet(JaxrsResource.INVOICES_PATH, ImmutableMap.<String, String>of(JaxrsResource.QUERY_ACCOUNT_ID, accountJson.getAccountId()), DEFAULT_HTTP_TIMEOUT_SEC);
- Assert.assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.OK.getStatusCode());
+ Assert.assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
final String baseJson = response.getResponseBody();
final List<InvoiceJsonSimple> objFromJson = mapper.readValue(baseJson, new TypeReference<List<InvoiceJsonSimple>>() {});
assertNotNull(objFromJson);
@@ -162,7 +165,7 @@ public class TestChargeback extends TestJaxrsBase {
final String uri = JaxrsResource.INVOICES_PATH + "/" + invoice.getInvoiceId() + "/" + JaxrsResource.PAYMENTS;
final Response response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- Assert.assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.OK.getStatusCode());
+ Assert.assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
final String baseJson = response.getResponseBody();
final List<PaymentJsonSimple> objFromJson = mapper.readValue(baseJson, new TypeReference<List<PaymentJsonSimple>>() {});
assertNotNull(objFromJson);
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestCredit.java b/server/src/test/java/com/ning/billing/jaxrs/TestCredit.java
index 8d0b3c8..50a58a7 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestCredit.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestCredit.java
@@ -19,22 +19,22 @@ package com.ning.billing.jaxrs;
import java.math.BigDecimal;
import java.util.UUID;
+import javax.ws.rs.core.Response.Status;
+
import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.LocalDate;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.ning.billing.jaxrs.json.AccountJson;
import com.ning.billing.jaxrs.json.CreditJson;
import com.ning.billing.jaxrs.resources.JaxrsResource;
-import com.ning.billing.util.clock.DefaultClock;
import com.ning.http.client.Response;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
public class TestCredit extends TestJaxrsBase {
+
AccountJson accountJson;
@BeforeMethod(groups = "slow")
@@ -54,14 +54,14 @@ public class TestCredit extends TestJaxrsBase {
// Create the credit
Response response = doPost(JaxrsResource.CREDITS_PATH, jsonInput, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.CREATED.getStatusCode(), response.getResponseBody());
+ assertEquals(response.getStatusCode(), Status.CREATED.getStatusCode(), response.getResponseBody());
final String location = response.getHeader("Location");
assertNotNull(location);
// Retrieves by Id based on Location returned
response = doGetWithUrl(location, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.OK.getStatusCode());
+ assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
// We can't just compare the object via .equals() due e.g. to the invoice id
final CreditJson objFromJson = mapper.readValue(response.getResponseBody(), CreditJson.class);
@@ -81,7 +81,7 @@ public class TestCredit extends TestJaxrsBase {
// Try to create the credit
final Response response = doPost(JaxrsResource.CREDITS_PATH, jsonInput, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.BAD_REQUEST.getStatusCode(), response.getResponseBody());
+ assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode(), response.getResponseBody());
}
@Test(groups = "slow")
@@ -91,12 +91,12 @@ public class TestCredit extends TestJaxrsBase {
// Try to create the credit
final Response response = doPost(JaxrsResource.CREDITS_PATH, jsonInput, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.BAD_REQUEST.getStatusCode(), response.getResponseBody());
+ assertEquals(response.getStatusCode(), Status.BAD_REQUEST.getStatusCode(), response.getResponseBody());
}
@Test(groups = "slow")
public void testCreditDoesNotExist() throws Exception {
final Response response = doGet(JaxrsResource.CREDITS_PATH + "/" + UUID.randomUUID().toString(), DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- assertEquals(response.getStatusCode(), javax.ws.rs.core.Response.Status.NOT_FOUND.getStatusCode(), response.getResponseBody());
+ assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode(), response.getResponseBody());
}
}
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java b/server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java
index adb005b..a4c59bc 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java
@@ -13,14 +13,16 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
+
package com.ning.billing.jaxrs;
-import javax.ws.rs.core.Response.Status;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.ws.rs.core.Response.Status;
+
import org.joda.time.DateTime;
import org.joda.time.Interval;
import org.slf4j.Logger;
@@ -28,7 +30,6 @@ import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.ning.billing.catalog.api.BillingPeriod;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.jaxrs.json.AccountJson;
@@ -39,11 +40,14 @@ import com.ning.billing.jaxrs.json.SubscriptionJsonNoEvents;
import com.ning.billing.jaxrs.resources.JaxrsResource;
import com.ning.http.client.Response;
+import com.fasterxml.jackson.core.type.TypeReference;
+
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
public class TestInvoice extends TestJaxrsBase {
+
private static final Logger log = LoggerFactory.getLogger(TestInvoice.class);
@Test(groups = "slow")
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestInvoiceNotification.java b/server/src/test/java/com/ning/billing/jaxrs/TestInvoiceNotification.java
index d1aa37f..3f68c8c 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestInvoiceNotification.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestInvoiceNotification.java
@@ -23,8 +23,6 @@ import org.joda.time.DateTime;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.google.common.collect.ImmutableMap;
import com.ning.billing.catalog.api.BillingPeriod;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.jaxrs.json.AccountJson;
@@ -34,7 +32,11 @@ import com.ning.billing.jaxrs.json.SubscriptionJsonNoEvents;
import com.ning.billing.jaxrs.resources.JaxrsResource;
import com.ning.http.client.Response;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.google.common.collect.ImmutableMap;
+
public class TestInvoiceNotification extends TestJaxrsBase {
+
@Test(groups = "slow")
public void testTriggerNotification() throws Exception {
final AccountJson accountJson = createScenarioWithOneInvoice();
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestPayment.java b/server/src/test/java/com/ning/billing/jaxrs/TestPayment.java
index 090b700..3ca0383 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestPayment.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestPayment.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Ning, Inc.
+ * Copyright 2010-2012 Ning, Inc.
*
* Ning licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
@@ -13,38 +13,35 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
-package com.ning.billing.jaxrs;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+package com.ning.billing.jaxrs;
import java.math.BigDecimal;
import java.util.List;
import javax.ws.rs.core.Response.Status;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.ning.billing.catalog.api.BillingPeriod;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.jaxrs.json.AccountJson;
import com.ning.billing.jaxrs.json.BundleJsonNoSubscriptions;
import com.ning.billing.jaxrs.json.PaymentJsonSimple;
-
import com.ning.billing.jaxrs.json.RefundJson;
import com.ning.billing.jaxrs.json.SubscriptionJsonNoEvents;
import com.ning.billing.jaxrs.resources.JaxrsResource;
import com.ning.http.client.Response;
-public class TestPayment extends TestJaxrsBase {
+import com.fasterxml.jackson.core.type.TypeReference;
- private static final Logger log = LoggerFactory.getLogger(TestPayment.class);
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
- @Test(groups = "slow", enabled = true)
+public class TestPayment extends TestJaxrsBase {
+
+ @Test(groups = "slow")
public void testPaymentWithRefund() throws Exception {
final AccountJson accountJson = createAccountWithDefaultPaymentMethod("eraahahildo", "sheqrgfhwe", "eraahahildo@yahoo.com");
assertNotNull(accountJson);
@@ -58,13 +55,12 @@ public class TestPayment extends TestJaxrsBase {
clock.addMonths(1);
crappyWaitForLackOfProperSynchonization();
-
String uri = JaxrsResource.ACCOUNTS_PATH + "/" + accountJson.getAccountId() + "/" + JaxrsResource.PAYMENTS;
Response response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
Assert.assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
String baseJson = response.getResponseBody();
- List<PaymentJsonSimple> objFromJson = mapper.readValue(baseJson, new TypeReference<List<PaymentJsonSimple>>() {});
+ final List<PaymentJsonSimple> objFromJson = mapper.readValue(baseJson, new TypeReference<List<PaymentJsonSimple>>() {});
Assert.assertEquals(objFromJson.size(), 1);
final String paymentId = objFromJson.get(0).getPaymentId();
@@ -79,7 +75,7 @@ public class TestPayment extends TestJaxrsBase {
// Issue the refund
- RefundJson refundJson = new RefundJson(null, paymentId, paymentAmount, false);
+ final RefundJson refundJson = new RefundJson(null, paymentId, paymentAmount, false);
baseJson = mapper.writeValueAsString(refundJson);
response = doPost(uri, baseJson, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
assertEquals(response.getStatusCode(), Status.CREATED.getStatusCode());
@@ -100,6 +96,5 @@ public class TestPayment extends TestJaxrsBase {
baseJson = response.getResponseBody();
objRefundFromJson = mapper.readValue(baseJson, new TypeReference<List<RefundJson>>() {});
Assert.assertEquals(objRefundFromJson.size(), 1);
-
}
}
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java b/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java
index 28c6563..ce1e9f4 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Ning, Inc.
+ * Copyright 2010-2012 Ning, Inc.
*
* Ning licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
@@ -13,16 +13,16 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
+
package com.ning.billing.jaxrs;
-import javax.ws.rs.core.Response.Status;
import java.util.Map;
import java.util.UUID;
+import javax.ws.rs.core.Response.Status;
+
import org.joda.time.DateTime;
import org.joda.time.Interval;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -41,12 +41,9 @@ import static org.testng.Assert.assertTrue;
public class TestSubscription extends TestJaxrsBase {
- private static final Logger log = LoggerFactory.getLogger(TestSubscription.class);
-
private static final String CALL_COMPLETION_TIMEOUT_SEC = "5";
-
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testSubscriptionInTrialOk() throws Exception {
final DateTime initialDate = new DateTime(2012, 4, 25, 0, 3, 42, 0);
@@ -64,7 +61,6 @@ public class TestSubscription extends TestJaxrsBase {
String uri = JaxrsResource.SUBSCRIPTIONS_PATH + "/" + subscriptionJson.getSubscriptionId().toString();
-
// Retrieves with GET
Response response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
@@ -76,12 +72,12 @@ public class TestSubscription extends TestJaxrsBase {
final String newProductName = "Assault-Rifle";
final SubscriptionJsonNoEvents newInput = new SubscriptionJsonNoEvents(subscriptionJson.getSubscriptionId(),
- subscriptionJson.getBundleId(),
- null,
- newProductName,
- subscriptionJson.getProductCategory(),
- subscriptionJson.getBillingPeriod(),
- subscriptionJson.getPriceList(), null, null);
+ subscriptionJson.getBundleId(),
+ null,
+ newProductName,
+ subscriptionJson.getProductCategory(),
+ subscriptionJson.getBillingPeriod(),
+ subscriptionJson.getPriceList(), null, null);
baseJson = mapper.writeValueAsString(newInput);
final Map<String, String> queryParams = getQueryParamsForCallCompletion(CALL_COMPLETION_TIMEOUT_SEC);
@@ -103,7 +99,6 @@ public class TestSubscription extends TestJaxrsBase {
response = doDelete(uri, queryParams, DEFAULT_HTTP_TIMEOUT_SEC);
assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
-
// Retrieves to check EndDate
uri = JaxrsResource.SUBSCRIPTIONS_PATH + "/" + subscriptionJson.getSubscriptionId().toString();
response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
@@ -115,30 +110,26 @@ public class TestSubscription extends TestJaxrsBase {
assertTrue(objFromJson.getCancelledDate().compareTo(clock.getUTCNow()) > 0);
// Uncancel
- uri = JaxrsResource.SUBSCRIPTIONS_PATH + "/" + subscriptionJson.getSubscriptionId().toString() + "/uncancel";
+ uri = JaxrsResource.SUBSCRIPTIONS_PATH + "/" + subscriptionJson.getSubscriptionId() + "/uncancel";
response = doPut(uri, baseJson, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
Assert.assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
}
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testWithNonExistentSubscription() throws Exception {
final String uri = JaxrsResource.SUBSCRIPTIONS_PATH + "/" + UUID.randomUUID().toString();
final SubscriptionJsonNoEvents subscriptionJson = new SubscriptionJsonNoEvents(null, UUID.randomUUID().toString(), null, "Pistol", ProductCategory.BASE.toString(), BillingPeriod.MONTHLY.toString(),
- PriceListSet.DEFAULT_PRICELIST_NAME, null, null);
+ PriceListSet.DEFAULT_PRICELIST_NAME, null, null);
final String baseJson = mapper.writeValueAsString(subscriptionJson);
Response response = doPut(uri, baseJson, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- Assert.assertEquals(response.getStatusCode(), Status.NO_CONTENT.getStatusCode());
- String body = response.getResponseBody();
- Assert.assertEquals(body, "");
+ Assert.assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode());
response = doDelete(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- Assert.assertEquals(response.getStatusCode(), Status.NO_CONTENT.getStatusCode());
- body = response.getResponseBody();
- Assert.assertEquals(body, "");
+ Assert.assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode());
response = doGet(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- Assert.assertEquals(response.getStatusCode(), Status.NO_CONTENT.getStatusCode());
+ Assert.assertEquals(response.getStatusCode(), Status.NOT_FOUND.getStatusCode());
}
}
diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestTag.java b/server/src/test/java/com/ning/billing/jaxrs/TestTag.java
index 174fab1..2fbf239 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestTag.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestTag.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Ning, Inc.
+ * Copyright 2010-2012 Ning, Inc.
*
* Ning licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
@@ -13,27 +13,29 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
+
package com.ning.billing.jaxrs;
-import javax.ws.rs.core.Response.Status;
import java.util.List;
-import org.testng.Assert;
+import javax.ws.rs.core.Response.Status;
+
import org.testng.annotations.Test;
-import com.fasterxml.jackson.core.type.TypeReference;
import com.ning.billing.jaxrs.json.TagDefinitionJson;
import com.ning.billing.jaxrs.resources.JaxrsResource;
import com.ning.http.client.Response;
+import com.fasterxml.jackson.core.type.TypeReference;
+
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
public class TestTag extends TestJaxrsBase {
- @Test(groups = "slow", enabled = true)
- public void testTagDefinitionOk() throws Exception {
+ @Test(groups = "slow")
+ public void testTagDefinitionOk() throws Exception {
final TagDefinitionJson input = new TagDefinitionJson(null, "blue", "relaxing color");
String baseJson = mapper.writeValueAsString(input);
Response response = doPost(JaxrsResource.TAG_DEFINITIONS_PATH, baseJson, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
@@ -52,9 +54,8 @@ public class TestTag extends TestJaxrsBase {
assertTrue(objFromJson.equalsNoId(input));
}
- @Test(groups = "slow", enabled = true)
+ @Test(groups = "slow")
public void testMultipleTagDefinitionOk() throws Exception {
-
Response response = doGet(JaxrsResource.TAG_DEFINITIONS_PATH, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
String baseJson = response.getResponseBody();
@@ -62,22 +63,22 @@ public class TestTag extends TestJaxrsBase {
List<TagDefinitionJson> objFromJson = mapper.readValue(baseJson, new TypeReference<List<TagDefinitionJson>>() {});
final int sizeSystemTag = (objFromJson == null || objFromJson.size() == 0) ? 0 : objFromJson.size();
- TagDefinitionJson inputBlue = new TagDefinitionJson(null, "blue", "relaxing color");
+ final TagDefinitionJson inputBlue = new TagDefinitionJson(null, "blue", "relaxing color");
baseJson = mapper.writeValueAsString(inputBlue);
response = doPost(JaxrsResource.TAG_DEFINITIONS_PATH, baseJson, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
assertEquals(response.getStatusCode(), Status.CREATED.getStatusCode());
- TagDefinitionJson inputRed = new TagDefinitionJson(null, "red", "hot color");
+ final TagDefinitionJson inputRed = new TagDefinitionJson(null, "red", "hot color");
baseJson = mapper.writeValueAsString(inputRed);
response = doPost(JaxrsResource.TAG_DEFINITIONS_PATH, baseJson, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
assertEquals(response.getStatusCode(), Status.CREATED.getStatusCode());
- TagDefinitionJson inputYellow = new TagDefinitionJson(null, "yellow", "vibrant color");
+ final TagDefinitionJson inputYellow = new TagDefinitionJson(null, "yellow", "vibrant color");
baseJson = mapper.writeValueAsString(inputYellow);
response = doPost(JaxrsResource.TAG_DEFINITIONS_PATH, baseJson, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
assertEquals(response.getStatusCode(), Status.CREATED.getStatusCode());
- TagDefinitionJson inputGreen = new TagDefinitionJson(null, "green", "super relaxing color");
+ final TagDefinitionJson inputGreen = new TagDefinitionJson(null, "green", "super relaxing color");
baseJson = mapper.writeValueAsString(inputGreen);
response = doPost(JaxrsResource.TAG_DEFINITIONS_PATH, baseJson, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
assertEquals(response.getStatusCode(), Status.CREATED.getStatusCode());
@@ -90,11 +91,9 @@ public class TestTag extends TestJaxrsBase {
assertNotNull(objFromJson);
assertEquals(objFromJson.size(), 4 + sizeSystemTag);
-
-
- String uri = JaxrsResource.TAG_DEFINITIONS_PATH + "/" + objFromJson.get(0).getId();
+ final String uri = JaxrsResource.TAG_DEFINITIONS_PATH + "/" + objFromJson.get(0).getId();
response = doDelete(uri, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
- assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
+ assertEquals(response.getStatusCode(), Status.NO_CONTENT.getStatusCode());
response = doGet(JaxrsResource.TAG_DEFINITIONS_PATH, DEFAULT_EMPTY_QUERY, DEFAULT_HTTP_TIMEOUT_SEC);
assertEquals(response.getStatusCode(), Status.OK.getStatusCode());
@@ -103,7 +102,5 @@ public class TestTag extends TestJaxrsBase {
objFromJson = mapper.readValue(baseJson, new TypeReference<List<TagDefinitionJson>>() {});
assertNotNull(objFromJson);
assertEquals(objFromJson.size(), 3 + sizeSystemTag);
-
}
-
}
