@@ -238,10 +238,11 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
238
238
}
239
239
row {
240
240
component(cbSpecifyTestPackage)
241
- }
241
+ }. apply { visible = false }
242
242
row(" Destination package:" ) {
243
243
component(testPackageField)
244
- }
244
+ }.apply { visible = false }
245
+
245
246
row(" Generate test methods for:" ) {}
246
247
row {
247
248
scrollPane(membersTable)
@@ -465,11 +466,6 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
465
466
466
467
}
467
468
468
- if (cbSpecifyTestPackage.isSelected && testPackageField.text.isEmpty()) {
469
- showTestPackageAbsenceErrorMessage()
470
- return
471
- }
472
-
473
469
configureJvmTargetIfRequired()
474
470
configureTestFrameworkIfRequired()
475
471
configureMockFrameworkIfRequired()
@@ -531,12 +527,6 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
531
527
" Generation error"
532
528
)
533
529
534
- private fun showTestPackageAbsenceErrorMessage () =
535
- Messages .showErrorDialog(
536
- " Specify a package to store tests in." ,
537
- " Generation error"
538
- )
539
-
540
530
private fun findReadOnlyContentEntry (testSourceRoot : VirtualFile ? ): ContentEntry ? {
541
531
if (testSourceRoot == null ) return null
542
532
if (testSourceRoot is FakeVirtualFile ) {
@@ -866,14 +856,10 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
866
856
867
857
cbSpecifyTestPackage.addActionListener {
868
858
val testPackageName = findTestPackageComboValue()
859
+ val packageNameIsNeeded = testPackageField.isEnabled || testPackageName != SAME_PACKAGE_LABEL
869
860
870
- if (testPackageField.isEnabled) {
871
- testPackageField.isEnabled = false
872
- testPackageField.text = testPackageName
873
- } else {
874
- testPackageField.isEnabled = true
875
- testPackageField.text = if (testPackageName != SAME_PACKAGE_LABEL ) testPackageName else " "
876
- }
861
+ testPackageField.text = if (packageNameIsNeeded) testPackageName else " "
862
+ testPackageField.isEnabled = ! testPackageField.isEnabled
877
863
}
878
864
}
879
865
0 commit comments