Merge pull request #2508 from constantine2nd/develop

Berlin Group fix tests

Author: simonredfern

obp-api/src/main/resources/props/sample.props.template

@@ -600,7 +600,6 @@ super_admin_user_ids=USER_ID1,USER_ID2,
 # "OBPv4.0.0" or "v4.0.0"
 # "OBPv3.1.0" or "v3.1.0"
 # "OBPv3.0.0" or "v3.0.0"
-# "BGv1" or "v1"
 # "BGv1.3" or "v1.3"
 # "PAPIv2.1.1.1" or "v2.1.1.1"
 # "STETv1.4" or "v1.4"

obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala

@@ -12,7 +12,6 @@ import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.{jsonDynamicResourceDoc, _}
 import code.api.UKOpenBanking.v2_0_0.OBP_UKOpenBanking_200
 import code.api.UKOpenBanking.v3_1_0.OBP_UKOpenBanking_310
-import code.api.berlin.group.v1.OBP_BERLIN_GROUP_1
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
 import code.api.dynamic.endpoint.helper.practise.{DynamicEndpointCodeGenerator, PractiseEndpoint}
 import code.api.dynamic.endpoint.helper.{CompiledObjects, DynamicEndpointHelper, DynamicEndpoints}

obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala

@@ -281,17 +281,6 @@ class ResourceDocsTest extends ResourceDocsV140ServerSetup with PropsReset with
       //This should not throw any exceptions
       responseDocs.resource_docs.map(responseDoc => stringToNodeSeq(responseDoc.description))
     }
-    
-    
-    scenario(s"We will test ${ApiEndpoint1.name} Api -BGv1", ApiEndpoint1, VersionOfApi) {
-      val requestGetObp = (ResourceDocsV4_0Request / "resource-docs" / "BGv1" / "obp").GET
-      val responseGetObp = makeGetRequest(requestGetObp)
-      And("We should get  200 and the response can be extract to case classes")
-      val responseDocs = responseGetObp.body.extract[ResourceDocsJson]
-      responseGetObp.code should equal(200)
-      //This should not throw any exceptions
-      responseDocs.resource_docs.map(responseDoc => stringToNodeSeq(responseDoc.description))
-    }
 
     scenario(s"We will test ${ApiEndpoint1.name} Api -v1.3", ApiEndpoint1, VersionOfApi) {
       val requestGetObp = (ResourceDocsV4_0Request / "resource-docs" / "v1.3" / "obp").GET
@@ -550,17 +539,6 @@ class ResourceDocsTest extends ResourceDocsV140ServerSetup with PropsReset with
       responseDocs.resource_docs.map(responseDoc => stringToNodeSeq(responseDoc.description))
     }
 
-
-    scenario(s"We will test ${ApiEndpoint2.name} Api -BGv1", ApiEndpoint1, VersionOfApi) {
-      val requestGetObp = (ResourceDocsV1_4Request /"banks"/ testBankId1.value/ "resource-docs" / "BGv1" / "obp").GET
-      val responseGetObp = makeGetRequest(requestGetObp)
-      And("We should get  200 and the response can be extract to case classes")
-      val responseDocs = responseGetObp.body.extract[ResourceDocsJson]
-      responseGetObp.code should equal(200)
-      //This should not throw any exceptions
-      responseDocs.resource_docs.map(responseDoc => stringToNodeSeq(responseDoc.description))
-    }
-
     scenario(s"We will test ${ApiEndpoint2.name} Api -v1.3", ApiEndpoint1, VersionOfApi) {
       val requestGetObp = (ResourceDocsV1_4Request /"banks"/ testBankId1.value/ "resource-docs" / "v1.3" / "obp").GET
       val responseGetObp = makeGetRequest(requestGetObp)

obp-api/src/test/scala/code/util/ApiVersionUtilsTest.scala

@@ -20,6 +20,6 @@ class ApiVersionUtilsTest extends V400ServerSetup {
     versions.map(version => ApiVersionUtils.valueOf(version.fullyQualifiedVersion))
 
     //NOTE, when we added the new version, better fix this number manually. and also check the versions
-    versions.length shouldBe(24)
+    versions.length shouldBe(23)
   }}
 }