summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/test/resources
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2021-11-15 12:27:54 +0000
committerMichael Morris <michael.morris@est.tech>2021-11-22 09:46:54 +0000
commitf0d4dd5c846f1c56d8b2641934c028b8151b31b3 (patch)
tree720f5e350dd5a6eba6f14eacfc73a7a209f668ab /catalog-be/src/test/resources
parent86671624c83f8d6af7523d1527858e9f93b35f11 (diff)
Fix test cases failing incorrectly
https://gerrit.onap.org/r/c/sdc/+/124980 Change-Id: I9fbd8a0b5b83d04928feea7624e593b45441ac9b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3757
Diffstat (limited to 'catalog-be/src/test/resources')
-rw-r--r--catalog-be/src/test/resources/paths/path-context.xml112
1 files changed, 46 insertions, 66 deletions
diff --git a/catalog-be/src/test/resources/paths/path-context.xml b/catalog-be/src/test/resources/paths/path-context.xml
index 752e4ecf13..53e8b8c74b 100644
--- a/catalog-be/src/test/resources/paths/path-context.xml
+++ b/catalog-be/src/test/resources/paths/path-context.xml
@@ -20,87 +20,67 @@ limitations under the License.
Modifications copyright (c) 2018 Nokia
================================================================================
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:context="http://www.springframework.org/schema/context"
- xmlns:aop="http://www.springframework.org/schema/aop"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
- <context:annotation-config/>
<aop:aspectj-autoproxy proxy-target-class="true"/>
-
+ <bean class="org.openecomp.sdc.be.dao.config.DAOSpringConfig"/>
+ <bean class="org.openecomp.sdc.be.components.path.beans.ForwardingPathToscaOperationFacade"
+ id="tosca-operation-facade"/>
+ <bean class="org.openecomp.sdc.be.components.path.beans.InMemoryJanusGraphClient"
+ id="janusgraph-client"/>
+ <bean class="org.openecomp.sdc.be.components.path.beans.ArtifactCassandraDaoMock"
+ id="artifact-cassandra-dao"/>
+ <bean class="org.openecomp.sdc.be.components.path.beans.AuditCassandraDaoMock"
+ id="audit-cassandra-dao"/>
+ <bean class="org.openecomp.sdc.be.components.path.beans.FeatureToggleDaoMock"
+ id="feature_toggle_dao"/>
+ <bean class="org.openecomp.sdc.be.components.path.beans.EnvironmentCassandraDaoMock"
+ id="operational-environment-dao"/>
+ <bean class="org.openecomp.sdc.be.components.path.beans.SdcSchemaFilesCassandraDaoMock"
+ id="sdc-schema-files-cassandra-dao"/>
+ <bean class="org.openecomp.sdc.be.components.path.beans.ToscaModelImportCassandraDaoMock"
+ id="tosca-model-import-cassandra-dao"/>
+ <bean class="org.openecomp.sdc.be.client.onboarding.impl.OnboardingClientImpl"
+ id="onboarding-client"/>
+ <bean class="org.openecomp.sdc.be.catalog.impl.DmaapProducer" id="dmaapProducer"/>
+ <bean class="org.openecomp.sdc.be.catalog.impl.DmaapProducerHealth" id="dmaapProducerHealth"/>
+ <bean class="org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic"
+ id="lifecycleBusinessLogic"/>
+ <bean class="org.openecomp.sdc.be.components.path.beans.DistributionEngineMock"
+ id="distributionEngine"/>
+ <bean class="org.openecomp.sdc.be.components.path.beans.ForwardingPathValidatorMock"
+ id="forwardingPathValidator"/>
+ <bean class="org.openecomp.sdc.be.components.attribute.AttributeDeclarationOrchestrator"
+ id="attributeDeclarationOrchestrator"/>
+ <bean
+ class="org.openecomp.sdc.be.components.attribute.ComponentInstanceOutputAttributeDeclarator"/>
+ <bean class="org.openecomp.sdc.be.components.attribute.ComponentInstanceAttributeDeclarator"/>
+ <context:annotation-config/>
<context:component-scan
- base-package="org.openecomp.sdc.be.dao.impl,
- org.openecomp.sdc.be.dao.neo4j,
- org.openecomp.sdc.be.model.operations.impl,
+ base-package="
+ org.openecomp.sdc.be.dao.janusgraph,
+ org.openecomp.sdc.be.model.jsonjanusgraph,
+ org.openecomp.sdc.be.model.operations.impl,
org.openecomp.sdc.be.model.cache,
- org.openecomp.sdc.be.dao.janusgraph,
org.openecomp.sdc.be.user,
- org.openecomp.sdc.be.impl,
- org.openecomp.sdc.be.auditing.impl,
org.openecomp.sdc.be.components.impl,
- org.openecomp.sdc.be.components.attribute,
org.openecomp.sdc.be.components.merge,
+ org.openecomp.sdc.be.datamodel.utils,
+ org.openecomp.sdc.be.components.distribution.engine,
org.openecomp.sdc.be.components.property,
- org.openecomp.sdc.be.components.distribution.engine,
org.openecomp.sdc.be.facade.operations,
- org.openecomp.sdc.be.distribution,
org.openecomp.sdc.be.components.validation,
- org.openecomp.sdc.be.switchover.detector,
- org.openecomp.sdc.be.tosca,
- org.openecomp.sdc.be.client,
- org.openecomp.sdc.be.model.operations.impl,
- org.openecomp.sdc.be.model.jsonjanusgraph.operations,
- org.openecomp.sdc.be.model.jsonjanusgraph.utils,
- org.openecomp.sdc.be.model.jsonjanusgraph.config,
+ org.openecomp.sdc.be.auditing.impl,
org.openecomp.sdc.be.components.csar,
- org.openecomp.sdc.be.datamodel.utils,
- org.openecomp.sdc.be.model.utils,
- org.openecomp.sdc.be.dao.jsongraph">
-
+ org.openecomp.sdc.be.impl,
+ org.openecomp.sdc.be.tosca,
+ org.openecomp.sdc.be.dao.impl">
</context:component-scan>
- <bean id="tosca-operation-facade"
- class="org.openecomp.sdc.be.components.path.beans.ForwardingPathToscaOperationFacade"/>
- <bean id="janusgraph-client"
- class="org.openecomp.sdc.be.components.path.beans.InMemoryJanusGraphClient"/>
- <bean id="lifecycleBusinessLogic"
- class="org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic"/>
- <bean id="userBusinessLogicExt" class="org.openecomp.sdc.be.user.UserBusinessLogicExt"/>
- <bean id="asset-metadata-utils"
- class="org.openecomp.sdc.be.ecomp.converters.AssetMetadataConverter"/>
- <bean class="org.openecomp.sdc.be.dao.config.DAOSpringConfig"/>
- <bean id="cassandra-client"
- class="org.openecomp.sdc.be.components.path.beans.CassandraClientMock"/>
- <bean id="audit-cassandra-dao"
- class="org.openecomp.sdc.be.components.path.beans.AuditCassandraDaoMock"/>
- <bean id="artifact-cassandra-dao"
- class="org.openecomp.sdc.be.components.path.beans.ArtifactCassandraDaoMock"/>
- <bean id="operational-environment-dao"
- class="org.openecomp.sdc.be.components.path.beans.EnvironmentCassandraDaoMock"/>
- <bean id="sdc-schema-files-cassandra-dao"
- class="org.openecomp.sdc.be.components.path.beans.SdcSchemaFilesCassandraDaoMock"/>
- <bean id="distributionEngine"
- class="org.openecomp.sdc.be.components.path.beans.DistributionEngineMock"/>
- <bean id="forwardingPathValidator"
- class="org.openecomp.sdc.be.components.path.beans.ForwardingPathValidatorMock"/>
- <bean id="dataTypeValidatorConverter"
- class="org.openecomp.sdc.be.model.tosca.validators.DataTypeValidatorConverter"/>
- <bean id="sdcSchemaUtils" class="org.openecomp.sdc.be.dao.cassandra.schema.SdcSchemaUtils"/>
- <bean id="dmaapProducer" class="org.openecomp.sdc.be.catalog.impl.DmaapProducer"/>
- <bean id="catalogOperation" class="org.openecomp.sdc.be.facade.operations.CatalogOperation"/>
- <bean id="userOperation" class="org.openecomp.sdc.be.facade.operations.UserOperation"/>
- <bean id="dmaapProducerHealth" class="org.openecomp.sdc.be.catalog.impl.DmaapProducerHealth"/>
- <bean id="feature_toggle_dao"
- class="org.openecomp.sdc.be.components.path.beans.FeatureToggleDaoMock"/>
- <bean id="tosca-model-import-cassandra-dao"
- class="org.openecomp.sdc.be.components.path.beans.ToscaModelImportCassandraDaoMock"/>
- <bean name="httpClient" class="org.apache.http.impl.client.HttpClients"
- factory-method="createDefault"/>
- <bean class="org.openecomp.sdc.be.components.attribute.AttributeDeclarationOrchestrator"/>
- <bean
- class="org.openecomp.sdc.be.components.attribute.ComponentInstanceOutputAttributeDeclarator"/>
- <bean class="org.openecomp.sdc.be.components.attribute.ComponentInstanceAttributeDeclarator"/>
</beans>