8 files changed, 17 insertions, 17 deletions
diff --git a/test/components/dateRange.test.js b/test/components/dateRange.test.js
index d142624..1b0acb1 100644
--- a/test/components/dateRange.test.js
+++ b/test/components/dateRange.test.js
@@ -21,7 +21,7 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 import React from 'react';
-import TestUtils from 'react-dom/lib/ReactTestUtils';
+import TestUtils from 'react-dom/test-utils';
 import {Provider} from 'react-redux';
 import {expect} from 'chai';
 import i18n from 'utils/i18n/i18n';
diff --git a/test/components/dateRangeSelector.test.js b/test/components/dateRangeSelector.test.js
index fd578b1..a8dfe0c 100644
--- a/test/components/dateRangeSelector.test.js
+++ b/test/components/dateRangeSelector.test.js
@@ -21,7 +21,7 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 import React from "react";
-import TestUtils from "react-dom/lib/ReactTestUtils";
+import TestUtils from "react-dom/test-utils";
 import {Provider} from "react-redux";
 import {expect} from "chai";
 import {moment} from "moment";
diff --git a/test/components/inlineMessage.test.js b/test/components/inlineMessage.test.js
index 1e31295..094e6a4 100644
--- a/test/components/inlineMessage.test.js
+++ b/test/components/inlineMessage.test.js
@@ -22,7 +22,7 @@
  */
 import { expect } from 'chai';
 import React from 'react';
-import TestUtils from 'react-dom/lib/ReactTestUtils';
+import TestUtils from 'react-dom/test-utils';
 import InlineMessage from 'generic-components/InlineMessage/InlineMessage.jsx';
 import InlineMessageConstants from 'generic-components/InlineMessage/InlineMessageConstants.js';
 
diff --git a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBar.test.js b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBar.test.js
index d95977d..ff184f5 100644
--- a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBar.test.js
+++ b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBar.test.js
@@ -27,7 +27,7 @@ import sinon from 'sinon';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import {storeCreator} from 'app/AppStore.js';
-import TestUtils from 'react-dom/lib/ReactTestUtils';
+import TestUtils from 'react-dom/test-utils';
 import {
 	autoCompleteSearchBarActionTypes,
 	ERROR_INVALID_SEARCH_TERMS,
@@ -47,7 +47,7 @@ import {
 	onSuggestionsClearRequested,
 	querySelectedNodeElement,
 	getInvalidSearchInputEvent
-} from 'app/tierSupport/autoCompleteSearchBar/AutoCompleteSearchBarActions.js';
+} from 'app/globalAutoCompleteSearchBar/GlobalAutoCompleteSearchBarActions.js';
 import * as networkCall from 'app/networking/NetworkCalls.js';
 import autoCompleteSearchBarTestConstants from './autoCompleteSearchBarTestConstants';
 
diff --git a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarActions.test.js b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarActions.test.js
index 0b03dbf..8b3b901 100644
--- a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarActions.test.js
+++ b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarActions.test.js
@@ -32,7 +32,7 @@ import {
 	TS_BACKEND_SEARCH_SELECTED_NODE_URL,
 	ERROR_INVALID_SEARCH_TERMS,
 	TIER_SUPPORT_NETWORK_ERROR
-} from "app/tierSupport/autoCompleteSearchBar/AutoCompleteSearchBarConstants.js";
+} from 'generic-components/autoCompleteSearchBar/AutoCompleteSearchBarConstants.js';
 import {
 	searchResultsFound,
 	clearSuggestionsTextField,
@@ -42,7 +42,7 @@ import {
 	fetchRequestedValues,
 	fetchSelectedNodeElement,
 	queryRequestedValues
-} from "app/tierSupport/autoCompleteSearchBar/AutoCompleteSearchBarActions.js";
+} from 'app/globalAutoCompleteSearchBar/GlobalAutoCompleteSearchBarActions.js';
 import {tierSupportActionTypes, TSUI_SEARCH_URL} from "app/tierSupport/TierSupportConstants.js";
 import {TABLE_DATA} from "app/tierSupport/selectedNodeDetails/SelectedNodeDetailsConstants.js";
 import {getDynamicTSUISearchURL} from "app/tierSupport/TierSupportActions.js";
diff --git a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarReducer.test.js b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarReducer.test.js
index 89b17e9..3dfb29a 100644
--- a/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarReducer.test.js
+++ b/test/tierSupport/autoCompleteSearchBar/autoCompleteSearchBarReducer.test.js
@@ -23,14 +23,14 @@
 import {expect} from 'chai';
 import React from 'react';
 import {Provider} from 'react-redux';
-import TestUtils from 'react-dom/lib/ReactTestUtils';
+import TestUtils from 'react-dom/test-utils';
 import {tierSupportActionTypes} from 'app/tierSupport/TierSupportConstants.js';
-import reducer from 'app/tierSupport/autoCompleteSearchBar/AutoCompleteSearchBarReducer.js';
+import reducer from 'app/globalAutoCompleteSearchBar/GlobalAutoCompleteSearchBarReducer.js';
 import {MESSAGE_LEVEL_WARNING, MESSAGE_LEVEL_DANGER} from 'utils/GlobalConstants.js';
 import {
     autoCompleteSearchBarActionTypes,
     NO_MATCHES_FOUND,
-    ERROR_INVALID_SEARCH_TERMS} from 'app/tierSupport/autoCompleteSearchBar/AutoCompleteSearchBarConstants.js';
+    ERROR_INVALID_SEARCH_TERMS} from 'generic-components/autoCompleteSearchBar/AutoCompleteSearchBarConstants.js';
 import {
     ERROR_RETRIEVING_DATA} from 'app/networking/NetworkConstants.js';
 
diff --git a/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizations.test.js b/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizations.test.js
index c3aeb91..746a3d4 100644
--- a/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizations.test.js
+++ b/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizations.test.js
@@ -21,17 +21,17 @@
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 import React from 'react';
-import TestUtils from 'react-dom/lib/ReactTestUtils';
+import TestUtils from 'react-dom/test-utils';
 import {storeCreator} from 'app/AppStore.js';
 import {Provider} from 'react-redux';
 import { expect } from 'chai';
-import VnfSearchOrchStatusVisualizations from 'app/vnfSearch/vnfSearchVisualizations/VnfSearchOrchestratedStatusVisualization.jsx';
-import VnfSearchProvStatusVisualizations from 'app/vnfSearch/vnfSearchVisualizations/VnfSearchProvStatusVisualization.jsx';
-import VnfSearchTotalCountVisualization from 'app/vnfSearch/vnfSearchVisualizations/VnfSearchTotalCountVisualization.jsx';
+import VnfSearchOrchStatusVisualizations from 'app/vnfSearch/VnfSearchOrchestratedStatusVisualization.jsx';
+import VnfSearchProvStatusVisualizations from 'app/vnfSearch/VnfSearchProvStatusVisualization.jsx';
+import VnfSearchTotalCountVisualization from 'app/vnfSearch/VnfSearchTotalCountVisualization.jsx';
 import {
   CHART_PROV_STATUS,
   CHART_ORCH_STATUS,
-  TOTAL_VNF_COUNT} from 'app/vnfSearch/vnfSearchVisualizations/VnfSearchVisualizationsConstants.js';
+  TOTAL_VNF_COUNT} from 'app/vnfSearch/VnfSearchConstants.js';
 
 describe('VNF Visualizations Structure Tests', function () {
 
diff --git a/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizationsReducer.test.js b/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizationsReducer.test.js
index 325daf9..f772762 100644
--- a/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizationsReducer.test.js
+++ b/test/vnfSearch/vnfSearchVisualizations/vnfSearchVisualizationsReducer.test.js
@@ -22,10 +22,10 @@
  */
 import React from 'react';
 import { expect } from 'chai';
-import reducer from 'app/vnfSearch/vnfSearchVisualizations/VnfSearchVisualizationsReducer.js';
+import reducer from 'app/vnfSearch/VnfSearchReducer.js';
 import {
   CHART_ORCH_STATUS,
-  CHART_PROV_STATUS, vnfSearchVisualizationsActionTypes} from 'app/vnfSearch/vnfSearchVisualizations/VnfSearchVisualizationsConstants.js';
+  CHART_PROV_STATUS, vnfSearchVisualizationsActionTypes} from 'app/vnfSearch/VnfSearchConstants.js';