diff options
author | Marcus Williams <marcus.williams@intel.com> | 2018-10-24 14:10:15 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-10-24 14:10:15 +0000 |
commit | d0c0de2ddf2b7cfc32c2a769f79f682ebd4be772 (patch) | |
tree | db36f77f04ef3822d4bdd8705aa1255ed27947b4 /asdc-controller/src/test/java/org/onap | |
parent | 8a1d80171bc7a19e43799e40d86c6269c3d35ce1 (diff) | |
parent | 6cf9ff1f1f2360a406f68f3147d86fd864d31910 (diff) |
Merge "8/23: merge casablanca to master"
Diffstat (limited to 'asdc-controller/src/test/java/org/onap')
-rw-r--r-- | asdc-controller/src/test/java/org/onap/so/asdc/BaseTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/BaseTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/BaseTest.java index 9a7240c830..74f0d60596 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/BaseTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/BaseTest.java @@ -27,8 +27,8 @@ import org.junit.runner.RunWith; import org.onap.so.asdc.installer.ToscaResourceStructure; import org.onap.so.asdc.installer.VfResourceStructure; import org.onap.so.asdc.installer.heat.ToscaResourceInstaller; -import org.onap.so.asdc.tenantIsolation.SpringContextHelper; import org.onap.so.asdc.tenantIsolation.WatchdogDistribution; +import org.onap.so.spring.SpringContextHelper; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer; import org.springframework.boot.test.context.SpringBootTest; |