Change method names

This commit is contained in:
Mohammed Nafees
2014-12-03 18:09:30 +05:30
parent 4dcb979b78
commit c4db5b811a
@@ -60,7 +60,8 @@ public class FundsIntegrationTest {
.build(); .build();
String jsonData = fh.toJSON(); String jsonData = fh.toJSON();
final Long fundID = createFund(jsonData, this.requestSpec, new ResponseSpecBuilder().expectStatusCode(400).build()); ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(400).build();
final Long fundID = createFund(jsonData, this.requestSpec, responseSpec);
Assert.assertNull(fundID); Assert.assertNull(fundID);
} }
@@ -93,7 +94,8 @@ public class FundsIntegrationTest {
.build(); .build();
jsonData = fh2.toJSON(); jsonData = fh2.toJSON();
final Long fundID2 = createFund(jsonData, this.requestSpec, new ResponseSpecBuilder().expectStatusCode(403).build()); ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(403).build();
final Long fundID2 = createFund(jsonData, this.requestSpec, responseSpec);
Assert.assertNull(fundID2); Assert.assertNull(fundID2);
} }
@@ -114,7 +116,8 @@ public class FundsIntegrationTest {
.build(); .build();
jsonData = fh2.toJSON(); jsonData = fh2.toJSON();
final Long fundID2 = createFund(jsonData, this.requestSpec, new ResponseSpecBuilder().expectStatusCode(403).build()); ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(403).build();
final Long fundID2 = createFund(jsonData, this.requestSpec, responseSpec);
Assert.assertNull(fundID2); Assert.assertNull(fundID2);
} }
@@ -126,7 +129,8 @@ public class FundsIntegrationTest {
.build(); .build();
String jsonData = fh.toJSON(); String jsonData = fh.toJSON();
final Long fundID = createFund(jsonData, this.requestSpec, new ResponseSpecBuilder().expectStatusCode(400).build()); ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(400).build();
final Long fundID = createFund(jsonData, this.requestSpec, responseSpec);
Assert.assertNull(fundID); Assert.assertNull(fundID);
} }
@@ -138,7 +142,8 @@ public class FundsIntegrationTest {
.build(); .build();
String jsonData = fh.toJSON(); String jsonData = fh.toJSON();
final Long fundID = createFund(jsonData, this.requestSpec, new ResponseSpecBuilder().expectStatusCode(400).build()); ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(400).build();
final Long fundID = createFund(jsonData, this.requestSpec, responseSpec);
Assert.assertNull(fundID); Assert.assertNull(fundID);
} }
@@ -207,7 +212,9 @@ public class FundsIntegrationTest {
public void testUpdateUnknownFund() { public void testUpdateUnknownFund() {
String newName = Utils.randomNameGenerator("", 10); String newName = Utils.randomNameGenerator("", 10);
String newExternalId = Utils.randomNameGenerator("fund-", 5); String newExternalId = Utils.randomNameGenerator("fund-", 5);
FundsHelper fh = FundsResourceHandler.updateFund(Long.MAX_VALUE, newName, newExternalId, this.requestSpec, new ResponseSpecBuilder().expectStatusCode(404).build()); ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(404).build();
FundsHelper fh = FundsResourceHandler.updateFund(Long.MAX_VALUE, newName, newExternalId, this.requestSpec,
responseSpec);
Assert.assertNull(fh); Assert.assertNull(fh);
} }
@@ -224,14 +231,15 @@ public class FundsIntegrationTest {
String newName = Utils.randomNameGenerator("", 120); String newName = Utils.randomNameGenerator("", 120);
String newExternalId = Utils.randomNameGenerator("fund-", 5); String newExternalId = Utils.randomNameGenerator("fund-", 5);
ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(400).build();
FundsHelper fh2 = FundsResourceHandler.updateFund(fundID, newName, newExternalId, this.requestSpec, FundsHelper fh2 = FundsResourceHandler.updateFund(fundID, newName, newExternalId, this.requestSpec,
new ResponseSpecBuilder().expectStatusCode(400).build()); responseSpec);
Assert.assertNull(fh2); Assert.assertNull(fh2);
} }
@Test @Test
public void testUpdateFundWithEmptyNewName() { public void testUpdateFundWithNewExternalId() {
FundsHelper fh = FundsHelper FundsHelper fh = FundsHelper
.create(Utils.randomNameGenerator("", 10)) .create(Utils.randomNameGenerator("", 10))
.externalId(Utils.randomNameGenerator("fund-", 5)) .externalId(Utils.randomNameGenerator("fund-", 5))
@@ -244,7 +252,7 @@ public class FundsIntegrationTest {
String newExternalId = Utils.randomNameGenerator("fund-", 5); String newExternalId = Utils.randomNameGenerator("fund-", 5);
FundsHelper fh2 = FundsResourceHandler.updateFund(fundID, null, newExternalId, this.requestSpec, this.responseSpec); FundsHelper fh2 = FundsResourceHandler.updateFund(fundID, null, newExternalId, this.requestSpec, this.responseSpec);
Assert.assertNotNull(fh2); Assert.assertEquals(newExternalId, fh2.getExternalId());
} }
@Test @Test
@@ -260,14 +268,15 @@ public class FundsIntegrationTest {
String newName = Utils.randomNameGenerator("", 10); String newName = Utils.randomNameGenerator("", 10);
String newExternalId = Utils.randomNameGenerator("fund-", 120); String newExternalId = Utils.randomNameGenerator("fund-", 120);
ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(400).build();
FundsHelper fh2 = FundsResourceHandler.updateFund(fundID, newName, newExternalId, this.requestSpec, FundsHelper fh2 = FundsResourceHandler.updateFund(fundID, newName, newExternalId, this.requestSpec,
new ResponseSpecBuilder().expectStatusCode(400).build()); responseSpec);
Assert.assertNull(fh2); Assert.assertNull(fh2);
} }
@Test @Test
public void testUpdateFundWithEmptyNewExternalId() { public void testUpdateFundWithNewName() {
FundsHelper fh = FundsHelper FundsHelper fh = FundsHelper
.create(Utils.randomNameGenerator("", 10)) .create(Utils.randomNameGenerator("", 10))
.externalId(Utils.randomNameGenerator("fund-", 5)) .externalId(Utils.randomNameGenerator("fund-", 5))
@@ -280,7 +289,7 @@ public class FundsIntegrationTest {
String newName = Utils.randomNameGenerator("", 10); String newName = Utils.randomNameGenerator("", 10);
FundsHelper fh2 = FundsResourceHandler.updateFund(fundID, newName, null, this.requestSpec, this.responseSpec); FundsHelper fh2 = FundsResourceHandler.updateFund(fundID, newName, null, this.requestSpec, this.responseSpec);
Assert.assertNotNull(fh2); Assert.assertEquals(newName, fh2.getName());
} }
@Test @Test
@@ -296,7 +305,16 @@ public class FundsIntegrationTest {
FundsHelper fh2 = FundsResourceHandler.updateFund(fundID, null, null, this.requestSpec, this.responseSpec); FundsHelper fh2 = FundsResourceHandler.updateFund(fundID, null, null, this.requestSpec, this.responseSpec);
Assert.assertNotNull(fh2); Assert.assertNull(fh2.getName());
Assert.assertNull(fh2.getExternalId());
// assert that there was no change in
// the name and external ID of the fund
jsonData = FundsResourceHandler.retrieveFund(fundID, this.requestSpec, this.responseSpec);
FundsHelper fh3 = new Gson().fromJson(jsonData, FundsHelper.class);
Assert.assertEquals(fh.getName(), fh3.getName());
Assert.assertEquals(fh.getExternalId(), fh3.getExternalId());
} }
private Long createFund(final String fundJSON, private Long createFund(final String fundJSON,