Some cleanup

Signed-off-by: Uladzislau <[email protected]>
zowe · Jul 18, 2024 · 9d32ede · 9d32ede
1 parent dc5e020
commit 9d32ede
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 178 deletions.
diff --git a/src/main/kotlin/org/zowe/explorer/config/ZoweOldConfigConvertPreloadingActivity.kt b/src/main/kotlin/org/zowe/explorer/config/ZoweOldConfigConvertPreloadingActivity.kt
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -290,7 +290,6 @@ Thank you for considering IBA Group for your mainframe needs.
 
     <extensions defaultExtensionNs="com.intellij">
 
-        <preloadingActivity implementation="org.zowe.explorer.config.ZoweOldConfigConvertPreloadingActivity"/>
         <postStartupActivity implementation="org.zowe.explorer.zowe.ZoweStartupActivity"/>
         <filePasteProvider implementation="org.zowe.explorer.explorer.ui.ExplorerPasteProvider"/>
         <customPasteProvider implementation="org.zowe.explorer.explorer.ui.ExplorerPasteProvider"/>
@@ -341,9 +340,6 @@ Thank you for considering IBA Group for your mainframe needs.
         <applicationService serviceInterface="org.zowe.explorer.config.ConfigService"
                             serviceImplementation="org.zowe.explorer.config.ConfigServiceImpl"/>
 
-        <applicationService serviceInterface="org.zowe.explorer.config.OldConfigService"
-                            serviceImplementation="org.zowe.explorer.config.OldConfigServiceImpl"/>
-
         <applicationService serviceInterface="org.zowe.explorer.config.connect.CredentialService"
                             serviceImplementation="org.zowe.explorer.config.connect.CredentialServiceImpl"
                             testServiceImplementation="org.zowe.explorer.testutils.testServiceImpl.TestCredentialsServiceImpl"/>

diff --git a/src/test/kotlin/org/zowe/explorer/config/ZoweConfigTestSpec.kt b/src/test/kotlin/org/zowe/explorer/config/ZoweConfigTestSpec.kt
@@ -229,7 +229,7 @@ class ZoweConfigTestSpec : WithApplicationShouldSpec({
     every { explorerMock.componentManager } returns ApplicationManager.getApplication()
     var infoRes = InfoResponse(zosVersion = "04.27.00")
     val dataOpsManagerService = ApplicationManager.getApplication().service<DataOpsManager>() as TestDataOpsManagerImpl
-    dataOpsManagerService.testInstance = object : TestDataOpsManagerImpl(explorerMock.componentManager) {
+    dataOpsManagerService.testInstance = object : TestDataOpsManagerImpl() {
       override fun <R : Any> performOperation(operation: Operation<R>, progressIndicator: ProgressIndicator): R {
         if (operation is InfoOperation) {
           if (infoRes.zosVersion == "throw1") {

diff --git a/src/test/kotlin/org/zowe/explorer/explorer/actions/AllocateDatasetActionTestSpec.kt b/src/test/kotlin/org/zowe/explorer/explorer/actions/AllocateDatasetActionTestSpec.kt
@@ -18,22 +18,6 @@ import com.intellij.openapi.actionSystem.Presentation
 import com.intellij.openapi.components.ComponentManager
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.project.Project
-import org.zowe.explorer.common.ui.StatefulDialog
-import org.zowe.explorer.common.ui.cleanInvalidateOnExpand
-import org.zowe.explorer.common.ui.showUntilDone
-import org.zowe.explorer.config.configCrudable
-import org.zowe.explorer.config.connect.ConnectionConfig
-import org.zowe.explorer.config.ws.DSMask
-import org.zowe.explorer.config.ws.FilesWorkingSetConfig
-import org.zowe.explorer.dataops.DataOpsManager
-import org.zowe.explorer.dataops.Operation
-import org.zowe.explorer.dataops.operations.DatasetAllocationParams
-import org.zowe.explorer.explorer.Explorer
-import org.zowe.explorer.explorer.FilesWorkingSet
-import org.zowe.explorer.explorer.ui.*
-import org.zowe.explorer.testutils.WithApplicationShouldSpec
-import org.zowe.explorer.testutils.testServiceImpl.TestAnalyticsServiceImpl
-import org.zowe.explorer.utils.service
 import io.kotest.assertions.assertSoftly
 import io.kotest.matchers.shouldBe
 import io.mockk.Runs
@@ -49,6 +33,7 @@ import org.zowe.explorer.common.ui.cleanInvalidateOnExpand
 import org.zowe.explorer.common.ui.showUntilDone
 import org.zowe.explorer.config.configCrudable
 import org.zowe.explorer.config.connect.ConnectionConfig
+import org.zowe.explorer.config.ws.DSMask
 import org.zowe.explorer.config.ws.FilesWorkingSetConfig
 import org.zowe.explorer.dataops.DataOpsManager
 import org.zowe.explorer.dataops.Operation
@@ -450,8 +435,8 @@ class AllocateDatasetActionTestSpec : WithApplicationShouldSpec({
         }
 
         val dsMaskMock = mockk<DSMask>()
-        every {dsMaskMock.mask} returns "test.test.*"
-        every {filesWorkingSetConfigMock.dsMasks} returns mutableListOf(dsMaskMock)
+        every { dsMaskMock.mask } returns "test.test.*"
+        every { filesWorkingSetConfigMock.dsMasks } returns mutableListOf(dsMaskMock)
 
         mockkObject(configCrudable)
         every {
@@ -482,7 +467,6 @@ class AllocateDatasetActionTestSpec : WithApplicationShouldSpec({
         assertSoftly {
           isCleanInvalidateOnExpandTriggered shouldBe true
           isShowUntilDoneSucceeded shouldBe true
-          isAnalitycsTracked shouldBe true
           isOperationPerformed shouldBe true
           isUpdateOnConfigCrudableCalled shouldBe false
           isThrowableReported shouldBe false

diff --git a/src/test/kotlin/org/zowe/explorer/explorer/actions/AllocateLikeActionTestSpec.kt b/src/test/kotlin/org/zowe/explorer/explorer/actions/AllocateLikeActionTestSpec.kt
@@ -19,31 +19,6 @@ import com.intellij.openapi.components.ComponentManager
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.Messages.showWarningDialog
-import org.zowe.explorer.common.ui.StatefulDialog
-import org.zowe.explorer.common.ui.cleanInvalidateOnExpand
-import org.zowe.explorer.common.ui.showUntilDone
-import org.zowe.explorer.config.configCrudable
-import org.zowe.explorer.config.connect.ConnectionConfig
-import org.zowe.explorer.config.ws.FilesWorkingSetConfig
-import org.zowe.explorer.dataops.DataOpsManager
-import org.zowe.explorer.dataops.Operation
-import org.zowe.explorer.dataops.attributes.MaskedRequester
-import org.zowe.explorer.dataops.attributes.RemoteDatasetAttributes
-import org.zowe.explorer.dataops.attributes.RemoteJobAttributes
-import org.zowe.explorer.dataops.operations.DatasetAllocationParams
-import org.zowe.explorer.explorer.Explorer
-import org.zowe.explorer.explorer.FilesWorkingSet
-import org.zowe.explorer.explorer.ui.DSMaskNode
-import org.zowe.explorer.explorer.ui.ExplorerTreeNode
-import org.zowe.explorer.explorer.ui.ExplorerTreeView
-import org.zowe.explorer.explorer.ui.FileExplorerView
-import org.zowe.explorer.explorer.ui.JobNode
-import org.zowe.explorer.explorer.ui.LibraryNode
-import org.zowe.explorer.explorer.ui.NodeData
-import org.zowe.explorer.explorer.ui.getExplorerView
-import org.zowe.explorer.testutils.WithApplicationShouldSpec
-import org.zowe.explorer.testutils.testServiceImpl.TestAnalyticsServiceImpl
-import org.zowe.explorer.utils.service
 import io.kotest.assertions.assertSoftly
 import io.kotest.matchers.shouldBe
 import io.mockk.Runs
@@ -63,6 +38,7 @@ import org.zowe.explorer.config.connect.ConnectionConfig
 import org.zowe.explorer.config.ws.FilesWorkingSetConfig
 import org.zowe.explorer.dataops.DataOpsManager
 import org.zowe.explorer.dataops.Operation
+import org.zowe.explorer.dataops.attributes.MaskedRequester
 import org.zowe.explorer.dataops.attributes.RemoteDatasetAttributes
 import org.zowe.explorer.dataops.attributes.RemoteJobAttributes
 import org.zowe.explorer.dataops.operations.DatasetAllocationParams