Skip to content

Commit

Permalink
GH-295: add unit tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Denis Lisenkov <lisenkov.d.y@gmail.com>
  • Loading branch information
@dnlsv
dnlsv committed Feb 10, 2025
1 parent 5ab52ad commit 4469da3
Show file tree
Hide file tree
Showing 6 changed files with 253 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/main/kotlin/org/zowe/explorer/explorer/ui/ExplorerPasteProvider.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ import org.zowe.explorer.utils.castOrNull
import org.zowe.explorer.utils.getAncestorNodes
import org.zowe.explorer.utils.getMinimalCommonParents
import org.zowe.explorer.utils.runWriteActionInEdtAndWait
import org.zowe.explorer.v3.operations.move.conflict.DestinationConflictResolver
import org.zowe.explorer.v3.operations.move.conflict.SourceConflictResolver
import org.zowe.explorer.v3.operations.move.conflict.mergeConflictResolutions
import org.zowe.explorer.v3.operations.transfer.conflict.DestinationConflictResolver
import org.zowe.explorer.v3.operations.transfer.conflict.SourceConflictResolver
import org.zowe.explorer.v3.operations.transfer.conflict.mergeConflictResolutions
import org.zowe.explorer.vfs.MFVirtualFile
import org.zowe.explorer.vfs.MFVirtualFileSystem
import org.zowe.kotlinsdk.DatasetOrganization
Expand Down
2 changes: 1 addition & 1 deletion ...rations/move/conflict/ConflictResolver.kt → ...ons/transfer/conflict/ConflictResolver.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Zowe Community
*/

package org.zowe.explorer.v3.operations.move.conflict
package org.zowe.explorer.v3.operations.transfer.conflict

import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
Expand Down
2 changes: 1 addition & 1 deletion ...e/conflict/DestinationConflictResolver.kt → ...r/conflict/DestinationConflictResolver.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Zowe Community
*/

package org.zowe.explorer.v3.operations.move.conflict
package org.zowe.explorer.v3.operations.transfer.conflict

import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.Messages
Expand Down
2 changes: 1 addition & 1 deletion ...s/move/conflict/SourceConflictResolver.kt → ...ansfer/conflict/SourceConflictResolver.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Zowe Community
*/

package org.zowe.explorer.v3.operations.move.conflict
package org.zowe.explorer.v3.operations.transfer.conflict

import com.intellij.icons.AllIcons
import com.intellij.openapi.project.Project
Expand Down
2 changes: 1 addition & 1 deletion ...orer/v3/operations/move/conflict/utils.kt → .../v3/operations/transfer/conflict/utils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Zowe Community
*/

package org.zowe.explorer.v3.operations.move.conflict
package org.zowe.explorer.v3.operations.transfer.conflict

import org.zowe.explorer.explorer.ui.ConflictResolution

Expand Down
251 changes: 246 additions & 5 deletions src/test/kotlin/org/zowe/explorer/explorer/ui/ExplorerPasteProviderTestSpec.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ import org.zowe.explorer.dataops.attributes.RemoteMemberAttributes
import org.zowe.explorer.dataops.attributes.RemoteUssAttributes
import org.zowe.explorer.dataops.content.synchronizer.checkFileForSync
import org.zowe.explorer.dataops.operations.mover.MoveCopyOperation
import org.zowe.explorer.dataops.operations.mover.names.CopyPasteNameResolver
import org.zowe.explorer.dataops.operations.mover.names.DatasetOrDirResolver
import org.zowe.explorer.dataops.operations.mover.names.DefaultNameResolver
import org.zowe.explorer.dataops.operations.mover.names.SeqToPDSResolver
import org.zowe.explorer.explorer.AbstractExplorerBase
import org.zowe.explorer.explorer.FileExplorerContentProvider
import org.zowe.explorer.explorer.FilesWorkingSet
Expand All @@ -54,6 +50,7 @@ import org.zowe.explorer.vfs.MFVirtualFileSystemModel
import io.kotest.assertions.assertSoftly
import io.kotest.matchers.shouldBe
import io.mockk.*
import org.zowe.explorer.dataops.operations.mover.names.*
import org.zowe.kotlinsdk.Dataset
import org.zowe.kotlinsdk.DatasetOrganization
import java.util.*
Expand Down Expand Up @@ -1949,7 +1946,7 @@ class ExplorerPasteProviderTestSpec : WithApplicationShouldSpec({
}
}

context("Test config resolution") {
context("Test conflict resolution") {
isPastePerformed = false
every { mockedFileExplorerView.isCut } returns AtomicBoolean(false)

Expand Down Expand Up @@ -2939,6 +2936,250 @@ class ExplorerPasteProviderTestSpec : WithApplicationShouldSpec({
file2Copied shouldBe false
}
}

should("Resolve conflicts in source files when copying to PDS") {
var file1CopiedWithOverwrite = false
var file2CopiedWithNewName = false

val mockedSourceParent = mockk<MFVirtualFile> {
every { parent } returns null
}
val (mockedSourceFile1, mockedSourceAttributes1) =
addMockedSourceFile("filename1.txt", parent = mockedSourceParent)
val (mockedSourceFile2, mockedSourceAttributes2) =
addMockedSourceFile("filename2.txt", parent = mockedSourceParent)
val (mockedTargetFile1, mockedTargetAttributes1) = addMockedTargetChildFile("FILENAME")
val (mockedTargetFile2, mockedTargetAttributes2) = addMockedTargetChildFile("FILENAM1")

val mockedClipboardBufferLocal = listOf(mockedSourceFile1, mockedSourceFile2)
every { mockedCopyPasterProvider.getSourceFilesFromClipboard() } returns mockedClipboardBufferLocal

dataOpsManagerService.testInstance = object : TestDataOpsManagerImpl() {
override fun getNameResolver(source: VirtualFile, destination: VirtualFile): CopyPasteNameResolver {
return NotSeqToPDSResolver(dataOpsManagerService)
}

override fun tryToGetAttributes(file: VirtualFile): FileAttributes? {
return when (file) {
mockedSourceFile1 -> mockedSourceAttributes1
mockedSourceFile2 -> mockedSourceAttributes2
mockedTargetFile1 -> mockedTargetAttributes1
mockedTargetFile2 -> mockedTargetAttributes2
mockedTargetFolder -> mockk<RemoteDatasetAttributes> {
every { datasetInfo.datasetOrganization } returns DatasetOrganization.PO
}
else -> super.tryToGetAttributes(file)
}
}

override fun <R : Any> performOperation(operation: Operation<R>, progressIndicator: ProgressIndicator): R {
if (operation is MoveCopyOperation) {
if (operation.source == mockedSourceFile1 && operation.newName == "FILENAME" && operation.forceOverwriting) {
file1CopiedWithOverwrite = true
}

if (operation.source == mockedSourceFile2 && operation.newName == "FILENAM2") {
file2CopiedWithNewName = true
}

@Suppress("UNCHECKED_CAST")
return Unit as R
} else {
return super.performOperation(operation, progressIndicator)
}
}
}

mockkStatic(Messages::class)
every {
Messages.showOkCancelDialog(
any() as Project,
any() as String,
any() as String,
any() as String,
any() as String,
any() as Icon?,
)
} returns Messages.OK
every {
Messages.showYesNoDialog(
any() as Project?, any() as String, any() as String, any() as String, any() as String, any() as Icon?
)
} returns Messages.YES
every {
Messages.showDialog(
any() as Project?,
any() as String,
any() as String,
any() as Array<String>,
0,
any() as Icon?,
null
)
} answers {
val message = secondArg<String>()
if (message.contains("Cannot move '${mockedSourceFile1.name}' to ${mockedTargetFolder.name}")) {
1
} else if (message.contains("Cannot move '${mockedSourceFile2.name}' to ${mockedTargetFolder.name}")) {
2
} else {
throw IllegalArgumentException("Unknown dialog called, that should not be shown.")
}
}

mockedExplorerPasteProvider.performPaste(mockedDataContext)

assertSoftly {
file1CopiedWithOverwrite shouldBe true
file2CopiedWithNewName shouldBe true
}
}
should("Resolve conflicts in source files when copying to PDS from different source directories") {
var file1CopiedWithNewName = false
var numOfCopiedFiles = 0

val mockedSourceParent1 = mockk<MFVirtualFile> {
every { parent } returns null
}
val mockedSourceParent2 = mockk<MFVirtualFile> {
every { parent } returns null
}
val (mockedSourceFile1, mockedSourceAttributes1) =
addMockedSourceFile("filename1.txt", parent = mockedSourceParent1)
val (mockedSourceFile2, mockedSourceAttributes2) =
addMockedSourceFile("filename2.txt", parent = mockedSourceParent1)
val (mockedSourceFile3, mockedSourceAttributes3) =
addMockedSourceFile("filename3.txt", parent = mockedSourceParent1)
val (mockedSourceFile4, mockedSourceAttributes4) =
addMockedSourceFile("filename1.txt", parent = mockedSourceParent2)
val (mockedSourceFile5, mockedSourceAttributes5) =
addMockedSourceFile("filename2.txt", parent = mockedSourceParent2)
val (mockedSourceFile6, mockedSourceAttributes6) =
addMockedSourceFile("filename3.txt", parent = mockedSourceParent2)

val mockedClipboardBufferLocal = listOf(mockedSourceFile1, mockedSourceFile2)
every { mockedCopyPasterProvider.getSourceFilesFromClipboard() } returns mockedClipboardBufferLocal

dataOpsManagerService.testInstance = object : TestDataOpsManagerImpl() {
override fun getNameResolver(source: VirtualFile, destination: VirtualFile): CopyPasteNameResolver {
return NotSeqToPDSResolver(dataOpsManagerService)
}

override fun tryToGetAttributes(file: VirtualFile): FileAttributes? {
return when (file) {
mockedSourceFile1 -> mockedSourceAttributes1
mockedSourceFile2 -> mockedSourceAttributes2
mockedSourceFile3 -> mockedSourceAttributes3
mockedSourceFile4 -> mockedSourceAttributes4
mockedSourceFile5 -> mockedSourceAttributes5
mockedSourceFile6 -> mockedSourceAttributes6
mockedTargetFolder -> mockk<RemoteDatasetAttributes> {
every { datasetInfo.datasetOrganization } returns DatasetOrganization.PO
}
else -> super.tryToGetAttributes(file)
}
}

override fun <R : Any> performOperation(operation: Operation<R>, progressIndicator: ProgressIndicator): R {
if (operation is MoveCopyOperation) {
numOfCopiedFiles++

if (operation.source == mockedSourceFile1 && operation.newName == "FILENAME") {
file1CopiedWithNewName = true
}

@Suppress("UNCHECKED_CAST")
return Unit as R
} else {
return super.performOperation(operation, progressIndicator)
}
}
}

mockkStatic(Messages::class)
every {
Messages.showOkCancelDialog(
any() as Project,
any() as String,
any() as String,
any() as String,
any() as String,
any() as Icon?,
)
} returns Messages.OK
every {
Messages.showYesNoDialog(
any() as Project?, any() as String, any() as String, any() as String, any() as String, any() as Icon?
)
} returns Messages.YES

mockedExplorerPasteProvider.performPaste(mockedDataContext)

assertSoftly {
file1CopiedWithNewName shouldBe true
numOfCopiedFiles shouldBe 6
}
}
should("Cancel copying if there are conflicts in source files") {
isPastePerformed = false

val mockedSourceParent = mockk<MFVirtualFile> {
every { parent } returns null
}
val (mockedSourceFile1, mockedSourceAttributes1) =
addMockedSourceFile("filename1.txt", parent = mockedSourceParent)
val (mockedSourceFile2, mockedSourceAttributes2) =
addMockedSourceFile("filename2.txt", parent = mockedSourceParent)

val mockedClipboardBufferLocal = listOf(mockedSourceFile1, mockedSourceFile2)
every { mockedCopyPasterProvider.getSourceFilesFromClipboard() } returns mockedClipboardBufferLocal

dataOpsManagerService.testInstance = object : TestDataOpsManagerImpl() {
override fun getNameResolver(source: VirtualFile, destination: VirtualFile): CopyPasteNameResolver {
return NotSeqToPDSResolver(dataOpsManagerService)
}

override fun tryToGetAttributes(file: VirtualFile): FileAttributes? {
return when (file) {
mockedSourceFile1 -> mockedSourceAttributes1
mockedSourceFile2 -> mockedSourceAttributes2
mockedTargetFolder -> mockk<RemoteDatasetAttributes> {
every { datasetInfo.datasetOrganization } returns DatasetOrganization.PO
}
else -> super.tryToGetAttributes(file)
}
}

override fun <R : Any> performOperation(operation: Operation<R>, progressIndicator: ProgressIndicator): R {
if (operation is MoveCopyOperation) {
isPastePerformed = true

@Suppress("UNCHECKED_CAST")
return Unit as R
} else {
return super.performOperation(operation, progressIndicator)
}
}
}

mockkStatic(Messages::class)
every {
Messages.showOkCancelDialog(
any() as Project,
any() as String,
any() as String,
any() as String,
any() as String,
any() as Icon?,
)
} returns Messages.CANCEL

mockedExplorerPasteProvider.performPaste(mockedDataContext)

assertSoftly {
isPastePerformed shouldBe false
}
}
}
}
}
Expand Down

0 comments on commit 4469da3

Please sign in to comment.