From 312c3c97d36fd77ad009170e586d104357217971 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 28 Oct 2015 00:46:43 -0700 Subject: [PATCH 1/2] repro and fix issue ARBSubscriptionList SearchType of cardExpiringThisMonth doesn't work --- .../ARBGetSubscriptionListController.java | 4 +- .../controller/test/ArbSubscriptionTest.java | 40 ++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/authorize/api/controller/ARBGetSubscriptionListController.java b/src/main/java/net/authorize/api/controller/ARBGetSubscriptionListController.java index efdc7c89..cbdf6cea 100644 --- a/src/main/java/net/authorize/api/controller/ARBGetSubscriptionListController.java +++ b/src/main/java/net/authorize/api/controller/ARBGetSubscriptionListController.java @@ -17,7 +17,9 @@ protected void validateRequest() { //validate required fields if ( null == request.getSearchType()) throw new NullPointerException("SearchType cannot be null"); - if ( null == request.getPaging()) throw new NullPointerException("Paging cannot be null"); + + //Paging is not the compulsory parameter so need not be validated +// if ( null == request.getPaging()) throw new NullPointerException("Paging cannot be null"); //validate not-required fields } diff --git a/src/test/java/net/authorize/api/controller/test/ArbSubscriptionTest.java b/src/test/java/net/authorize/api/controller/test/ArbSubscriptionTest.java index f17561f4..ed7707e1 100644 --- a/src/test/java/net/authorize/api/controller/test/ArbSubscriptionTest.java +++ b/src/test/java/net/authorize/api/controller/test/ArbSubscriptionTest.java @@ -108,8 +108,44 @@ public void testSubscription() throws Exception { String subscriptionId = createSubscription(merchantAuthenticationType); getSubscription(merchantAuthenticationType, subscriptionId); cancelSubscription(merchantAuthenticationType, subscriptionId); + } - + + + /** + * @Zalak + * Repro issue - ARBSubscriptionList SearchType of "cardExpiringThisMonth" doesn't work + */ + // @Test (expected = NullPointerException.class) + public void GetSubscriptionearchCardExpiringThisMonthIssueTest() + { + ARBGetSubscriptionListRequest getSubscriptionListRequest = new ARBGetSubscriptionListRequest(); + getSubscriptionListRequest.setSearchType(ARBGetSubscriptionListSearchTypeEnum.CARD_EXPIRING_THIS_MONTH); + getSubscriptionListRequest.setMerchantAuthentication(merchantAuthenticationType); + ARBGetSubscriptionListController nullController = new ARBGetSubscriptionListController(getSubscriptionListRequest); + Assert.assertNull(nullController); + + } + + /** + * @Zalak + * After fixing the issue - ARBSubscriptionList SearchType of "cardExpiringThisMonth" doesn't work + */ + @Test + public void GetSubscriptionearchCardExpiringThisMonthFixTest() + { + ARBGetSubscriptionListRequest getSubscriptionListRequest = new ARBGetSubscriptionListRequest(); + getSubscriptionListRequest.setSearchType(ARBGetSubscriptionListSearchTypeEnum.CARD_EXPIRING_THIS_MONTH); + getSubscriptionListRequest.setMerchantAuthentication(merchantAuthenticationType); + ARBGetSubscriptionListController nullController = new ARBGetSubscriptionListController(getSubscriptionListRequest); + ARBGetSubscriptionListResponse response = executeTestRequestWithSuccess(getSubscriptionListRequest, ARBGetSubscriptionListController.class, environment); + Assert.assertNotNull(response); + Assert.assertNotNull(nullController); + + } + + + private ARBGetSubscriptionListRequest setupSubscriptionListRequest(MerchantAuthenticationType merchantAuthentication) { ARBGetSubscriptionListSorting sorting = new ARBGetSubscriptionListSorting(); @@ -166,4 +202,6 @@ private String createSubscription( MerchantAuthenticationType merchantAuthentica return createResponse.getSubscriptionId(); } + + } From c18640f0f89983420f40d885bc913cd0de1973c0 Mon Sep 17 00:00:00 2001 From: Zalak Shah Date: Thu, 29 Oct 2015 13:11:57 -0700 Subject: [PATCH 2/2] Modified files for issue ARBSubscriptionList SearchType of cardExpiringThisMonth doesn't work --- .../ARBGetSubscriptionListController.java | 6 +---- .../controller/test/ArbSubscriptionTest.java | 25 +++---------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/main/java/net/authorize/api/controller/ARBGetSubscriptionListController.java b/src/main/java/net/authorize/api/controller/ARBGetSubscriptionListController.java index cbdf6cea..a030d094 100644 --- a/src/main/java/net/authorize/api/controller/ARBGetSubscriptionListController.java +++ b/src/main/java/net/authorize/api/controller/ARBGetSubscriptionListController.java @@ -17,11 +17,7 @@ protected void validateRequest() { //validate required fields if ( null == request.getSearchType()) throw new NullPointerException("SearchType cannot be null"); - - //Paging is not the compulsory parameter so need not be validated -// if ( null == request.getPaging()) throw new NullPointerException("Paging cannot be null"); - - //validate not-required fields + } @Override diff --git a/src/test/java/net/authorize/api/controller/test/ArbSubscriptionTest.java b/src/test/java/net/authorize/api/controller/test/ArbSubscriptionTest.java index ed7707e1..8c9c82a4 100644 --- a/src/test/java/net/authorize/api/controller/test/ArbSubscriptionTest.java +++ b/src/test/java/net/authorize/api/controller/test/ArbSubscriptionTest.java @@ -114,38 +114,21 @@ public void testSubscription() throws Exception { /** * @Zalak - * Repro issue - ARBSubscriptionList SearchType of "cardExpiringThisMonth" doesn't work + * Repro and fix test for issue - ARBSubscriptionList SearchType of "cardExpiringThisMonth" doesn't work */ - // @Test (expected = NullPointerException.class) - public void GetSubscriptionearchCardExpiringThisMonthIssueTest() - { - ARBGetSubscriptionListRequest getSubscriptionListRequest = new ARBGetSubscriptionListRequest(); - getSubscriptionListRequest.setSearchType(ARBGetSubscriptionListSearchTypeEnum.CARD_EXPIRING_THIS_MONTH); - getSubscriptionListRequest.setMerchantAuthentication(merchantAuthenticationType); - ARBGetSubscriptionListController nullController = new ARBGetSubscriptionListController(getSubscriptionListRequest); - Assert.assertNull(nullController); - - } - - /** - * @Zalak - * After fixing the issue - ARBSubscriptionList SearchType of "cardExpiringThisMonth" doesn't work - */ - @Test - public void GetSubscriptionearchCardExpiringThisMonthFixTest() + @Test + public void ShouldReturnSubsciptionsWhenPagingNotPassedTest() { ARBGetSubscriptionListRequest getSubscriptionListRequest = new ARBGetSubscriptionListRequest(); getSubscriptionListRequest.setSearchType(ARBGetSubscriptionListSearchTypeEnum.CARD_EXPIRING_THIS_MONTH); getSubscriptionListRequest.setMerchantAuthentication(merchantAuthenticationType); ARBGetSubscriptionListController nullController = new ARBGetSubscriptionListController(getSubscriptionListRequest); + Assert.assertNotNull(nullController); ARBGetSubscriptionListResponse response = executeTestRequestWithSuccess(getSubscriptionListRequest, ARBGetSubscriptionListController.class, environment); Assert.assertNotNull(response); - Assert.assertNotNull(nullController); } - - private ARBGetSubscriptionListRequest setupSubscriptionListRequest(MerchantAuthenticationType merchantAuthentication) { ARBGetSubscriptionListSorting sorting = new ARBGetSubscriptionListSorting();