diff options
| author |   Rob Daugherty <rd472p@att.com> | 2018-10-23 14:08:57 -0400 |
|---|---|---|
| committer | Rob Daugherty <rd472p@att.com> | 2018-10-23 16:18:55 -0400 |
| commit | 6cf9ff1f1f2360a406f68f3147d86fd864d31910 (patch) | |
| tree | 0df346a4222f84511ba47ac090e81d37a2c675d4 /asdc-controller/src/test/java/org | |
| parent | 60f8f5342f1fba49373699c1466e6ca06d1adc34 (diff) | |
| parent | 0116cbfe7836b05381fe5632e0e536a625789b31 (diff) | |
8/23: merge casablanca to master
Change-Id: I0a73fbedf8c6f22e0a37cd8f0505ddcf83250341
Issue-ID: SO-1160
Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'asdc-controller/src/test/java/org')
| -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; |