diff options
Diffstat (limited to 'src/test/java')
3 files changed, 395 insertions, 22 deletions
diff --git a/src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java b/src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java index f4d693fe6..e7cb5c859 100644 --- a/src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java +++ b/src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java @@ -27,8 +27,8 @@ import org.camunda.bpm.engine.delegate.DelegateExecution; import org.junit.Assert; import org.junit.Test; import org.onap.clamp.clds.client.SdcCatalogServices; -import org.onap.clamp.clds.model.CldsAsdcResource; -import org.onap.clamp.clds.model.CldsAsdcServiceDetail; +import org.onap.clamp.clds.model.CldsSdcResource; +import org.onap.clamp.clds.model.CldsSdcServiceDetail; import org.onap.clamp.clds.model.prop.Global; import org.onap.clamp.clds.model.prop.ModelProperties; @@ -38,50 +38,47 @@ import java.util.List; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * Created by Julien Bertozzi on 6/20/17. - */ public class SdcReqTest { String baseUrl = "AYBABTU"; String serviceInvariantUUID = "serviceInvariantUUID"; @Test - public void getAsdcReqUrlsListNoGlobalPropTest() throws Exception { + public void getSdcReqUrlsListNoGlobalPropTest() throws Exception { ModelProperties prop = mock(ModelProperties.class); SdcCatalogServices sdcCatalogServices = mock(SdcCatalogServices.class); DelegateExecution delegateExecution = mock(DelegateExecution.class); Global global = mock(Global.class); - CldsAsdcServiceDetail cldsAsdcServiceDetail = mock(CldsAsdcServiceDetail.class); - CldsAsdcResource cldsAsdcResource = mock(CldsAsdcResource.class); - List<CldsAsdcResource> cldsAsdcResources = new ArrayList<>(); - cldsAsdcResources.add(cldsAsdcResource); + CldsSdcServiceDetail CldsSdcServiceDetail = mock(CldsSdcServiceDetail.class); + CldsSdcResource CldsSdcResource = mock(CldsSdcResource.class); + List<CldsSdcResource> CldsSdcResources = new ArrayList<>(); + CldsSdcResources.add(CldsSdcResource); List<String> resourceVf = new ArrayList<>(); resourceVf.add(serviceInvariantUUID); - Assert.assertTrue(SdcReq.getAsdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); + Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); when(prop.getGlobal()).thenReturn(global); - Assert.assertTrue(SdcReq.getAsdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); + Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); when(global.getService()).thenReturn(serviceInvariantUUID); - Assert.assertTrue(SdcReq.getAsdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); + Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); - when(sdcCatalogServices.getCldsAsdcServiceDetailFromJson(null)).thenReturn(cldsAsdcServiceDetail); + when(sdcCatalogServices.getCldsSdcServiceDetailFromJson(null)).thenReturn(CldsSdcServiceDetail); when(global.getResourceVf()).thenReturn(new ArrayList<>()); - Assert.assertTrue(SdcReq.getAsdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); + Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); - when(cldsAsdcServiceDetail.getResources()).thenReturn(cldsAsdcResources); - Assert.assertTrue(SdcReq.getAsdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); + when(CldsSdcServiceDetail.getResources()).thenReturn(CldsSdcResources); + Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); - when(cldsAsdcResource.getResoucreType()).thenReturn("VF"); - Assert.assertTrue(SdcReq.getAsdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); + when(CldsSdcResource.getResoucreType()).thenReturn("VF"); + Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty()); when(global.getResourceVf()).thenReturn(resourceVf); - when(cldsAsdcResource.getResourceInvariantUUID()).thenReturn(serviceInvariantUUID); - when(cldsAsdcResource.getResourceInstanceName()).thenReturn("Resource instance name"); + when(CldsSdcResource.getResourceInvariantUUID()).thenReturn(serviceInvariantUUID); + when(CldsSdcResource.getResourceInstanceName()).thenReturn("Resource instance name"); List<String> expected = new ArrayList<>(); expected.add("AYBABTU/null/resourceInstances/resourceinstancename/artifacts"); - Assert.assertEquals(expected, SdcReq.getAsdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution)); + Assert.assertEquals(expected, SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution)); } } diff --git a/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesIT.java b/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesIT.java new file mode 100644 index 000000000..159e66ac5 --- /dev/null +++ b/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesIT.java @@ -0,0 +1,289 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.it; + +import static org.junit.Assert.assertTrue; + +import java.util.LinkedList; +import java.util.List; + +import org.apache.commons.io.IOUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.onap.clamp.clds.AbstractIT; +import org.onap.clamp.clds.client.SdcCatalogServices; +import org.onap.clamp.clds.model.CldsAlarmCondition; +import org.onap.clamp.clds.model.CldsSdcResource; +import org.onap.clamp.clds.model.CldsSdcResourceBasicInfo; +import org.onap.clamp.clds.model.CldsSdcServiceInfo; +import org.onap.clamp.clds.model.CldsServiceData; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * Test DCAE API in org.onap.clamp.ClampDesigner.client package - replicate DCAE + * Delegates in test. + */ +@RunWith(SpringRunner.class) +@SpringBootTest +public class SdcCatalogServicesIT extends AbstractIT { + @Autowired + private SdcCatalogServices sdcCatalogWired = new SdcCatalogServices(); + + @Test + public void removeDuplicateServicesTest() throws Exception { + SdcCatalogServices catalogServices = new SdcCatalogServices(); + List<CldsSdcServiceInfo> rawCldsSdcServiceList = new LinkedList<CldsSdcServiceInfo>(); + + CldsSdcServiceInfo service1a = new CldsSdcServiceInfo(); + service1a.setName("service1"); + service1a.setVersion("1.0"); + service1a.setInvariantUUID("invariantUUID1.0"); + rawCldsSdcServiceList.add(service1a); + rawCldsSdcServiceList.add(service1a); + + CldsSdcServiceInfo service1b = new CldsSdcServiceInfo(); + service1b.setName("service1"); + service1b.setVersion("1.1"); + service1b.setInvariantUUID("invariantUUID1.1"); + rawCldsSdcServiceList.add(service1b); + + CldsSdcServiceInfo service1c = new CldsSdcServiceInfo(); + service1c.setName("service1"); + service1c.setVersion("1.2"); + service1c.setInvariantUUID("invariantUUID1.2"); + rawCldsSdcServiceList.add(service1c); + + CldsSdcServiceInfo service2 = new CldsSdcServiceInfo(); + service2.setName("service2"); + service2.setVersion("1.0"); + service2.setInvariantUUID("invariantUUID2.0"); + rawCldsSdcServiceList.add(service2); + + List<CldsSdcServiceInfo> resultList = catalogServices.removeDuplicateServices(rawCldsSdcServiceList); + + assertTrue(resultList.size() == 2); + + CldsSdcServiceInfo res1, res2; + if ("service1".equals(resultList.get(0).getName())) { + res1 = resultList.get(0); + res2 = resultList.get(1); + } else { + res1 = resultList.get(1); + res2 = resultList.get(0); + } + + assertTrue("service1".equals(res1.getName())); + assertTrue("1.2".equals(res1.getVersion())); + + assertTrue("service2".equals(res2.getName())); + assertTrue("1.0".equals(res2.getVersion())); + + } + + @Test + public void removeDuplicateSdcResourceInstancesTest() { + SdcCatalogServices catalogServices = new SdcCatalogServices(); + List<CldsSdcResource> rawCldsSdcResourceList = new LinkedList<CldsSdcResource>(); + + CldsSdcResource sdcResource1a = new CldsSdcResource(); + sdcResource1a.setResourceInstanceName("resource1"); + sdcResource1a.setResourceVersion("1.0"); + rawCldsSdcResourceList.add(sdcResource1a); + + CldsSdcResource sdcResource1b = new CldsSdcResource(); + sdcResource1b.setResourceInstanceName("resource1"); + sdcResource1b.setResourceVersion("1.1"); + rawCldsSdcResourceList.add(sdcResource1b); + + CldsSdcResource sdcResource1c = new CldsSdcResource(); + sdcResource1c.setResourceInstanceName("resource1"); + sdcResource1c.setResourceVersion("1.2"); + rawCldsSdcResourceList.add(sdcResource1c); + + CldsSdcResource sdcResource2 = new CldsSdcResource(); + sdcResource2.setResourceInstanceName("resource2"); + sdcResource2.setResourceVersion("1.0"); + rawCldsSdcResourceList.add(sdcResource2); + + List<CldsSdcResource> resultList = catalogServices.removeDuplicateSdcResourceInstances(rawCldsSdcResourceList); + + CldsSdcResource res1, res2; + if ("resource1".equals(resultList.get(0).getResourceInstanceName())) { + res1 = resultList.get(0); + res2 = resultList.get(1); + } else { + res1 = resultList.get(1); + res2 = resultList.get(0); + } + + assertTrue("resource1".equals(res1.getResourceInstanceName())); + assertTrue("1.2".equals(res1.getResourceVersion())); + + assertTrue("resource2".equals(res2.getResourceInstanceName())); + assertTrue("1.0".equals(res2.getResourceVersion())); + + } + + @Test + public void removeDuplicateSdcResourceBasicInfoTest() { + + SdcCatalogServices catalogServices = new SdcCatalogServices(); + List<CldsSdcResourceBasicInfo> rawCldsSdcResourceList = new LinkedList<CldsSdcResourceBasicInfo>(); + + CldsSdcResourceBasicInfo sdcResource1a = new CldsSdcResourceBasicInfo(); + sdcResource1a.setName("resource1"); + sdcResource1a.setVersion("1.0"); + rawCldsSdcResourceList.add(sdcResource1a); + + CldsSdcResourceBasicInfo sdcResource1b = new CldsSdcResourceBasicInfo(); + sdcResource1b.setName("resource1"); + sdcResource1b.setVersion("1.1"); + rawCldsSdcResourceList.add(sdcResource1b); + + CldsSdcResourceBasicInfo sdcResource1c = new CldsSdcResourceBasicInfo(); + sdcResource1c.setName("resource1"); + sdcResource1c.setVersion("1.2"); + rawCldsSdcResourceList.add(sdcResource1c); + + CldsSdcResourceBasicInfo sdcResource2 = new CldsSdcResourceBasicInfo(); + sdcResource2.setName("resource2"); + sdcResource2.setVersion("1.0"); + rawCldsSdcResourceList.add(sdcResource2); + + List<CldsSdcResourceBasicInfo> resultList = catalogServices + .removeDuplicateSdcResourceBasicInfo(rawCldsSdcResourceList); + + CldsSdcResourceBasicInfo res1, res2; + if ("resource1".equals(resultList.get(0).getName())) { + res1 = resultList.get(0); + res2 = resultList.get(1); + } else { + res1 = resultList.get(1); + res2 = resultList.get(0); + } + + assertTrue("resource1".equals(res1.getName())); + assertTrue("1.2".equals(res1.getVersion())); + + assertTrue("resource2".equals(res2.getName())); + assertTrue("1.0".equals(res2.getVersion())); + + } + + @Test + public void getServiceUuidFromServiceInvariantIdTest() throws Exception { + SdcCatalogServices aSpy = Mockito.spy(sdcCatalogWired); + Mockito.when(aSpy.getSdcServicesInformation(null)).thenReturn(IOUtils.toString( + SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcServicesListExample.json"), "UTF-8")); + + // Try the vcts4 version 1.0, this one should be replaced by 1.1 so it + // should not exist, returning empty string + String resUuidVcts4Null = aSpy.getServiceUuidFromServiceInvariantId("a33ed748-3477-4434-b3f3-b5560f5e7d9b"); + assertTrue("".equals(resUuidVcts4Null)); + + // Try the vcts4 version 1.1, this one should be there as it replaces + // the vcts4 v1.0 + String resUuidVcts4Latest = aSpy.getServiceUuidFromServiceInvariantId("a33ed748-3477-4434-b3f3-b5560f5e7d9c"); + assertTrue("29018914-966c-442d-9d08-251b9dc45b8f".equals(resUuidVcts4Latest)); + + // Try the vcts5 version 1.0, this one should be there + String resUuidVcts5 = aSpy.getServiceUuidFromServiceInvariantId("a33ed748-3477-4434-b3f3-b5560f5e7d8c"); + assertTrue("29018914-966c-442d-9d08-251b9dc45b7f".equals(resUuidVcts5)); + + // try one that does not exist at all + String resUuidUnknown = aSpy.getServiceUuidFromServiceInvariantId("testuuid"); + assertTrue("".equals(resUuidUnknown)); + + } + + @Test + public void getCldsServiceDataWithAlarmConditionsTest() throws Exception { + SdcCatalogServices aSpy = Mockito.spy(sdcCatalogWired); + Mockito.when(aSpy.getSdcServicesInformation(null)).thenReturn(IOUtils.toString( + SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcServicesListExample.json"), "UTF-8")); + + // This invariant uuid is the one from vcts4 v1.1 + String serviceResourceDetailUrl = refProp.getStringValue("sdc.serviceUrl") + + "/29018914-966c-442d-9d08-251b9dc45b8f/metadata"; + Mockito.when(aSpy.getCldsServicesOrResourcesBasedOnURL(serviceResourceDetailUrl, false)) + .thenReturn(IOUtils.toString( + SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcServiceDetailsExample.json"), + "UTF-8")); + + String resourceDetailUrl = refProp.getStringValue("sdc.catalog.url") + + "resources/585822c7-4027-4f84-ba50-e9248606f136/metadata"; + Mockito.when(aSpy.getCldsServicesOrResourcesBasedOnURL(resourceDetailUrl, false)) + .thenReturn(IOUtils.toString( + SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcResourceDetailsExample.json"), + "UTF-8")); + + String securityRulesDetailUrl = refProp.getStringValue("sdc.catalog.url") + + "resources/d57e57d2-e3c6-470d-8d16-e6ea05f536c5/metadata"; + Mockito.when(aSpy.getCldsServicesOrResourcesBasedOnURL(securityRulesDetailUrl, false)).thenReturn( + IOUtils.toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcSecurityRules.json"), + "UTF-8")); + + String cinderVolumeDetailUrl = refProp.getStringValue("sdc.catalog.url") + + "resources/b4288e07-597a-44a2-aa98-ad36e551a39d/metadata"; + Mockito.when(aSpy.getCldsServicesOrResourcesBasedOnURL(cinderVolumeDetailUrl, false)).thenReturn( + IOUtils.toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcCinderVolume.json"), + "UTF-8")); + + String vfcGenericDetailUrl = refProp.getStringValue("sdc.catalog.url") + + "resources/2c8f1219-8000-4001-aa13-496a0396d40f/metadata"; + Mockito.when(aSpy.getCldsServicesOrResourcesBasedOnURL(vfcGenericDetailUrl, false)).thenReturn(IOUtils.toString( + SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcVFCGenericWithAlarms.json"), "UTF-8")); + + String csvDetailUrl = "/sdc/v1/catalog/resources/84855843-5247-4e97-a2bd-5395a510253b/artifacts/d57ac7ec-f3c3-4793-983a-c75ac3a43153"; + Mockito.when(aSpy.getResponsesFromArtifactUrl(csvDetailUrl)).thenReturn(IOUtils.toString( + SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcMeasurementsList.csv"), "UTF-8")); + + String csvAlarmsDetailUrl = "/sdc/v1/catalog/resources/2c8f1219-8000-4001-aa13-496a0396d40f/resourceInstances/virc_fe_be/artifacts/5138e316-0237-49aa-817a-b3d8eaf77392"; + Mockito.when(aSpy.getResponsesFromArtifactUrl(csvAlarmsDetailUrl)).thenReturn(IOUtils + .toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcAlarmsList.csv"), "UTF-8")); + + String allVfResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url") + "resources?resourceType=VF"; + Mockito.when(aSpy.getCldsServicesOrResourcesBasedOnURL(allVfResourcesDetailUrl, false)).thenReturn(IOUtils + .toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcVFResources.json"), "UTF-8")); + + String allVfcResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url") + "resources?resourceType=VFC"; + Mockito.when(aSpy.getCldsServicesOrResourcesBasedOnURL(allVfcResourcesDetailUrl, false)).thenReturn( + IOUtils.toString(SdcCatalogServicesIT.class.getResourceAsStream("/example/sdc/sdcVFCResources.json"), + "UTF-8")); + + CldsServiceData cldsServiceData = aSpy + .getCldsServiceDataWithAlarmConditions("a33ed748-3477-4434-b3f3-b5560f5e7d9c"); + assertTrue("a33ed748-3477-4434-b3f3-b5560f5e7d9c".equals(cldsServiceData.getServiceInvariantUUID())); + assertTrue("29018914-966c-442d-9d08-251b9dc45b8f".equals(cldsServiceData.getServiceUUID())); + assertTrue(cldsServiceData.getCldsVfs().size() == 1); + + List<CldsAlarmCondition> alarmsList = aSpy.getAllAlarmConditionsFromCldsServiceData(cldsServiceData); + assertTrue(alarmsList.size() == 6); + + } + +} diff --git a/src/test/java/org/onap/clamp/clds/it/SdcIT.java b/src/test/java/org/onap/clamp/clds/it/SdcIT.java new file mode 100644 index 000000000..0d8acbff9 --- /dev/null +++ b/src/test/java/org/onap/clamp/clds/it/SdcIT.java @@ -0,0 +1,87 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.it; + +import org.onap.clamp.clds.AbstractIT; +import org.onap.clamp.clds.client.req.SdcReq; +import org.onap.clamp.clds.model.CldsEvent; +import org.onap.clamp.clds.model.prop.ModelProperties; +import org.onap.clamp.clds.transform.TransformUtil; +import org.onap.clamp.clds.model.refprop.RefProp; +import org.onap.clamp.clds.client.SdcCatalogServices; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.junit.BeforeClass; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * Test DCAE API in org.onap.clamp.ClampDesigner.client package - replicate DCAE Delegates in test. + */ +@RunWith(SpringRunner.class) +@SpringBootTest +public class SdcIT extends AbstractIT { + @Autowired + private RefProp refProp; + + @Autowired + private SdcCatalogServices sdcCatalogServices; + + @BeforeClass + public static void oneTimeSetUp() { + System.setProperty("AJSC_CONF_HOME", System.getProperty("user.dir") + "/src/test/resources/"); + } + + @Test + public void testBlueprint() throws Exception { + String modelProp = TransformUtil.getResourceAsString("example/modelProp.json"); + String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnProp.json"); + String modelName = "example-model06"; + String controlName = "ClosedLoop-FRWL-SIG04-1582f840-test-test-1234-005056a9d756"; + String docText = TransformUtil.getResourceAsString("example/templateProp.json"); + ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, true, modelBpmnProp, modelProp); + String blueprint = SdcReq.formatBlueprint(refProp, prop, docText); + System.out.println("blueprint=" + blueprint); + //assertEquals(blueprint, ""); + } + + + @Test + public void testTcaBlueprint() throws Exception { + String modelProp = TransformUtil.getResourceAsString("example/modelPropForPolicy.json"); + String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnPropForPolicy.json"); + String modelName = "example-model06"; + String controlName = "ClosedLoop-FRWL-SIG04-1582f840-test-test-1234-005056a9d756"; + + String docText = TransformUtil.getResourceAsString("example/templatePropForTca.json"); + + ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, true, modelBpmnProp, modelProp); + String blueprint = SdcReq.formatBlueprint(refProp, prop, docText); + + System.out.println("blueprint=" + blueprint); + //assertEquals(blueprint, ""); + } +} |