MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

[i18n] move properties used in Testng plugin to a separate bundle (IDEA-209382)

Browse Source 
GitOrigin-RevId: 3165d4cee6e76994bfe4f0bbee197b7d3eda826b
This commit is contained in:
nik
2020-02-19 17:13:55 +03:00
committed by intellij-monorepo-bot
parent 2296d4eddc
commit 3b3616d1bc
21 changed files with 149 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
platform/analysis-api/resources/messages/InspectionsBundle.properties
View File

@@ -381,29 +381,10 @@ error.hint.property.has.non.method.usages=Property has non-method usages
# Pseudo functional expression using static class inspection, add methods dialog
# Undeclared test inspection
inspection.undeclared.test.problem.descriptor=Undeclared test ''{0}''
inspection.undeclared.test.register=Register ''{0}''
inspection.undeclared.test.register.test=Register test
inspection.undeclared.test.create.suite.fix=Create suite
# Groups problem inspection
inspection.depends.on.groups.add.as.defined.test.group.fix=Add ''{0}'' as a defined test group.
inspection.depends.on.groups.undefined.group.problem=Group ''{0}'' is undefined.
inspection.depends.on.groups.defined.groups.panel.title=&Defined Groups
inspection.depends.on.groups.display.name=TestNG
inspection.depends.on.groups.family.name=TestNG
# "dependsOnMethods" problem inspection
inspection.depends.on.method.unknown.method.problem=Method ''{0}'' unknown.
inspection.depends.on.method.duplicated.name.problem=Duplicated method name: {0}
inspection.depends.on.method.name=TestNG
# Expected exception never thrown in test method body inspection
inspection.testng.expected.exception.never.thrown.problem=Expected <code>#ref</code> never thrown in body of ''{0}()'' #loc
# Data provider problems inspection
inspection.testng.data.provider.does.not.exist.problem=Data provider does not exist
inspection.testng.data.provider.need.to.be.static=Data provider from foreign class need to be static
label.max.length=Max length:
label.min.length=Min length:
label.pattern=Pattern:

40
platform/platform-resources-en/src/messages/ExecutionBundle.properties
View File

@@ -209,7 +209,6 @@ use.module.path.checkbox.label=Use module path
no.tests.found.in.package.error.message=No tests found in the package ''{0}''
package.does.not.exist.error.message=Package ''{0}'' does not exist
choose.main.class.dialog.title=Choose Main Class
junit.configuration.test.runner.parameters.label=Test runner pa&rams:
junit.configuration.test.border=Test
junit.configuration.configure.junit.test.label=Test:
junit.configuration.test.method.radio=Test Method
@@ -543,43 +542,4 @@ no.coverage.suites.configured=No coverage suites configured.
marker.code.coverage=marker: code coverage
action.name.cover=Cover
run.selected.configuration.with.coverage.enabled=Run selected configuration with coverage enabled
testng.configuration.class.label=&Class
testng.configuration.group.label=&Group
testng.configuration.method.label=M&ethod
testng.configuration.suite.label=&Suite
testng.configuration.pattern.label=Pattern
testng.configuration.package.label=Packa&ge
testng.configuration.output.directory=&Output directory
testng.configuration.use.default.reporters.option=Use default reporters
testng.configuration.properties.file=&Properties file
testng.configuration.across.module.dependencies.radio=Across module &dependencies
testng.configuration.in.single.module.radio=In &single module
testng.configuration.in.whole.project.radio=In &whole project
testng.configuration.jdk.settings.pane=JDK Settings
testng.configuration.parameters.pane=Parameters
testng.configuration.listeners.pane=Listeners
testng.configuration.test.kind.label=Test kind:
testng.suite.browser.select.xml.or.yaml.suite.file=Please select the xml or yaml suite file
testng.suite.browser.select.suite=Select Suite
testng.group.browser.no.tests.found.in.project=No tests found in project
testng.group.browser.cannot.browse.groups=Cannot Browse Groups
testng.create.setup.dialog.message=Method ''{0}'' already exist but is not annotated as @BeforeMethod.
testng.create.setup.dialog.title=Create SetUp
testng.annotate.dialog.title=Annotate
testng.create.new.method.dialog.title=Create new method
testng.select.output.directory=Select test output directory
testng.output.directory.button.title=TestNG
testng.browse.button.title=TestNG
testng.select.properties.file=Select .properties file for test properties
testng.choose.test.group=Choose Test Group
testng.util.found.test.class=Found test class {0}
testng.util.searching.test.progress.title=Searching For Tests...
testng.util.will.be.added.to.module.classpath=TestNG will be added to module classpath
testng.util.unable.to.convert=Unable to Convert.
test.case.can.be.converted.to.testng=TestCase can be converted to TestNG
junit.convert.tool.display.name=TestNG
testng.entry.point.test.cases=TestNG test cases
testng.parameters.table.model.name=Name
testng.parameters.table.model.value=Value
javafx.certificates.dialog.choose.keystore.file.title=Choose Keystore File

1
plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties
View File

@@ -715,7 +715,6 @@ implicit.call.to.super.display.name=Implicit call to 'super()'
empty.catch.block.display.name=Empty 'catch' block
unqualified.static.usage.display.name=Unqualified static access
simplifiable.junit.assertion.display.name=Simplifiable JUnit assertion
simplifiable.testng.assertion.display.name=Simplifiable TestNG assertion
object.notify.display.name=Call to 'notify()' instead of 'notifyAll()'
thread.start.in.construction.display.name=Call to 'Thread.start()' during object construction
non.final.clone.display.name=Non-final 'clone()' in secure context

4
plugins/testng/resources/META-INF/plugin.xml
View File

@@ -11,6 +11,7 @@
<depends>com.intellij.modules.java</depends>
<depends optional="true" config-file="testng-intellilang.xml">org.intellij.intelliLang</depends>
<resource-bundle>messages.TestngBundle</resource-bundle>
<extensions defaultExtensionNs="com.intellij">
<deadCode implementation="com.theoryinpractice.testng.inspection.TestNGEntryPoint"/>
@@ -76,7 +77,7 @@
<runConfigurationProducer
implementation="com.theoryinpractice.testng.configuration.testDiscovery.TestNGTestDiscoveryConfigurationProducer"/>
<localInspection implementationClass="com.theoryinpractice.testng.inspection.SimplifiedTestNGAssertionInspection"
groupPath="Java" language="JAVA" shortName="SimplifiedTestNGAssertion" bundle="messages.InspectionGadgetsBundle"
groupPath="Java" language="JAVA" shortName="SimplifiedTestNGAssertion" bundle="messages.TestngBundle"
key="simplifiable.testng.assertion.display.name" groupName="TestNG"
enabledByDefault="true" level="WARNING"/>
<localInspection groupPath="Java" language="JAVA" shortName="ConstantTestNGAssertArgument" displayName="Constant TestNG assert argument"
@@ -101,5 +102,4 @@
<add-to-group anchor="first" group-id="RunContextGroup"/>
</group>
</actions>
</idea-plugin>

55
plugins/testng/resources/messages/TestngBundle.properties Normal file
View File

@@ -0,0 +1,55 @@
inspection.depends.on.groups.add.as.defined.test.group.fix=Add ''{0}'' as a defined test group.
inspection.depends.on.groups.defined.groups.panel.title=&Defined Groups
inspection.depends.on.groups.display.name=TestNG
inspection.depends.on.groups.family.name=TestNG
inspection.depends.on.groups.undefined.group.problem=Group ''{0}'' is undefined.
inspection.depends.on.method.duplicated.name.problem=Duplicated method name: {0}
inspection.depends.on.method.name=TestNG
inspection.depends.on.method.unknown.method.problem=Method ''{0}'' unknown.
inspection.testng.data.provider.does.not.exist.problem=Data provider does not exist
inspection.testng.data.provider.need.to.be.static=Data provider from foreign class need to be static
inspection.testng.expected.exception.never.thrown.problem=Expected <code>#ref</code> never thrown in body of ''{0}()'' #loc
inspection.undeclared.test.create.suite.fix=Create suite
inspection.undeclared.test.problem.descriptor=Undeclared test ''{0}''
inspection.undeclared.test.register=Register ''{0}''
inspection.undeclared.test.register.test=Register test
junit.configuration.test.runner.parameters.label=Test runner pa&rams:
junit.convert.tool.display.name=TestNG
simplifiable.testng.assertion.display.name=Simplifiable TestNG assertion
test.case.can.be.converted.to.testng=TestCase can be converted to TestNG
testng.annotate.dialog.title=Annotate
testng.browse.button.title=TestNG
testng.choose.test.group=Choose Test Group
testng.configuration.across.module.dependencies.radio=Across module &dependencies
testng.configuration.class.label=&Class
testng.configuration.group.label=&Group
testng.configuration.in.single.module.radio=In &single module
testng.configuration.in.whole.project.radio=In &whole project
testng.configuration.jdk.settings.pane=JDK Settings
testng.configuration.listeners.pane=Listeners
testng.configuration.method.label=M&ethod
testng.configuration.output.directory=&Output directory
testng.configuration.package.label=Packa&ge
testng.configuration.parameters.pane=Parameters
testng.configuration.pattern.label=Pattern
testng.configuration.properties.file=&Properties file
testng.configuration.suite.label=&Suite
testng.configuration.test.kind.label=Test kind:
testng.configuration.use.default.reporters.option=Use default reporters
testng.create.new.method.dialog.title=Create new method
testng.create.setup.dialog.message=Method ''{0}'' already exist but is not annotated as @BeforeMethod.
testng.create.setup.dialog.title=Create SetUp
testng.entry.point.test.cases=TestNG test cases
testng.group.browser.cannot.browse.groups=Cannot Browse Groups
testng.group.browser.no.tests.found.in.project=No tests found in project
testng.output.directory.button.title=TestNG
testng.parameters.table.model.name=Name
testng.parameters.table.model.value=Value
testng.select.output.directory=Select test output directory
testng.select.properties.file=Select .properties file for test properties
testng.suite.browser.select.suite=Select Suite
testng.suite.browser.select.xml.or.yaml.suite.file=Please select the xml or yaml suite file
testng.util.found.test.class=Found test class {0}
testng.util.searching.test.progress.title=Searching For Tests...
testng.util.unable.to.convert=Unable to Convert.
testng.util.will.be.added.to.module.classpath=TestNG will be added to module classpath

9
plugins/testng/src/com/theoryinpractice/testng/TestNGFramework.java
View File

@@ -3,7 +3,6 @@ package com.theoryinpractice.testng;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.intention.AddAnnotationFix;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configurations.ConfigurationType;
import com.intellij.ide.fileTemplates.FileTemplateDescriptor;
import com.intellij.openapi.application.ApplicationManager;
@@ -121,10 +120,10 @@ public class TestNGFramework extends JavaTestFramework {
}
int exit = ApplicationManager.getApplication().isUnitTestMode() ?
Messages.YES :
Messages.showYesNoDialog(manager.getProject(), ExecutionBundle.message("testng.create.setup.dialog.message", setUpName),
ExecutionBundle.message("testng.create.setup.dialog.title"),
ExecutionBundle.message("testng.annotate.dialog.title" ),
ExecutionBundle.message("testng.create.new.method.dialog.title"),
Messages.showYesNoDialog(manager.getProject(), TestngBundle.message("testng.create.setup.dialog.message", setUpName),
TestngBundle.message("testng.create.setup.dialog.title"),
TestngBundle.message("testng.annotate.dialog.title" ),
TestngBundle.message("testng.create.new.method.dialog.title"),
Messages.getWarningIcon());
if (exit == Messages.YES) {
new AddAnnotationFix(BeforeMethod.class.getName(), inClass).invoke(inClass.getProject(), null, inClass.getContainingFile());

28
plugins/testng/src/com/theoryinpractice/testng/TestngBundle.java Normal file
View File

@@ -0,0 +1,28 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.theoryinpractice.testng;
import com.intellij.DynamicBundle;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.PropertyKey;
import java.util.function.Supplier;
public class TestngBundle extends DynamicBundle {
@NonNls private static final String BUNDLE = "messages.TestngBundle";
private static final TestngBundle INSTANCE = new TestngBundle();
private TestngBundle() {
super(BUNDLE);
}
@NotNull
public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
return INSTANCE.getMessage(key, params);
}
@NotNull
public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
return INSTANCE.getLazyMessage(key, params);
}
}

32
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
View File

@@ -25,7 +25,7 @@
</constraints>
<properties>
<labelLocation value="West"/>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.method.label"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.method.label"/>
</properties>
</component>
<component id="93b2" class="com.intellij.openapi.ui.LabeledComponent" binding="suiteField">
@@ -34,7 +34,7 @@
</constraints>
<properties>
<labelLocation value="West"/>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.suite.label"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.suite.label"/>
</properties>
</component>
<grid id="3ac91" binding="packagePanel" layout-manager="FormLayout">
@@ -59,7 +59,7 @@
</constraints>
<properties>
<labelLocation value="West"/>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.package.label"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.package.label"/>
</properties>
</component>
<component id="a9e21" class="javax.swing.JRadioButton" binding="packagesInProject">
@@ -68,7 +68,7 @@
<forms/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.in.whole.project.radio"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.in.whole.project.radio"/>
</properties>
</component>
<component id="9d797" class="javax.swing.JRadioButton" binding="packagesInModule">
@@ -77,7 +77,7 @@
<forms/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.in.single.module.radio"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.in.single.module.radio"/>
</properties>
</component>
<component id="b6e4c" class="javax.swing.JRadioButton" binding="packagesAcrossModules">
@@ -86,7 +86,7 @@
<forms/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.across.module.dependencies.radio"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.across.module.dependencies.radio"/>
</properties>
</component>
</children>
@@ -97,7 +97,7 @@
</constraints>
<properties>
<labelLocation value="West"/>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.class.label"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.class.label"/>
</properties>
</component>
<component id="d1d3" class="com.intellij.openapi.ui.LabeledComponent" binding="outputDirectory">
@@ -106,7 +106,7 @@
</constraints>
<properties>
<labelLocation value="West"/>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.output.directory"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.output.directory"/>
</properties>
</component>
<component id="ba631" class="com.intellij.openapi.ui.LabeledComponent" binding="groupField">
@@ -115,7 +115,7 @@
</constraints>
<properties>
<labelLocation value="West"/>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.group.label"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.group.label"/>
</properties>
</component>
<component id="d64d9" class="com.intellij.openapi.ui.LabeledComponent" binding="myPattern">
@@ -125,7 +125,7 @@
<properties>
<componentClass value="javax.swing.JPanel"/>
<labelLocation value="West"/>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.pattern.label"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.pattern.label"/>
<visible value="true"/>
</properties>
</component>
@@ -143,7 +143,7 @@
<grid id="fab89" layout-manager="GridLayoutManager" row-count="7" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<tabbedpane title-resource-bundle="messages/ExecutionBundle" title-key="testng.configuration.jdk.settings.pane"/>
<tabbedpane title-resource-bundle="messages/TestngBundle" title-key="testng.configuration.jdk.settings.pane"/>
</constraints>
<properties/>
<border type="none"/>
@@ -207,7 +207,7 @@
</grid>
<grid id="bccab" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title-resource-bundle="messages/ExecutionBundle" title-key="testng.configuration.parameters.pane"/>
<tabbedpane title-resource-bundle="messages/TestngBundle" title-key="testng.configuration.parameters.pane"/>
</constraints>
<properties/>
<border type="none"/>
@@ -216,7 +216,7 @@
<constraints border-constraint="North"/>
<properties>
<labelLocation value="West"/>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.properties.file"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.properties.file"/>
</properties>
</component>
<grid id="28036" binding="myPropertiesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
@@ -230,7 +230,7 @@
<grid id="da698" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<tabbedpane title-resource-bundle="messages/ExecutionBundle" title-key="testng.configuration.listeners.pane"/>
<tabbedpane title-resource-bundle="messages/TestngBundle" title-key="testng.configuration.listeners.pane"/>
</constraints>
<properties/>
<border type="none"/>
@@ -250,7 +250,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.use.default.reporters.option"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.use.default.reporters.option"/>
</properties>
</component>
</children>
@@ -286,7 +286,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="testng.configuration.test.kind.label"/>
<text resource-bundle="messages/TestngBundle" key="testng.configuration.test.kind.label"/>
</properties>
</component>
</children>

7
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
View File

@@ -36,6 +36,7 @@ import com.intellij.ui.table.TableView;
import com.intellij.util.IconUtil;
import com.intellij.util.containers.ContainerUtil;
import com.theoryinpractice.testng.MessageInfoException;
import com.theoryinpractice.testng.TestngBundle;
import com.theoryinpractice.testng.configuration.browser.GroupBrowser;
import com.theoryinpractice.testng.configuration.browser.PackageBrowser;
import com.theoryinpractice.testng.configuration.browser.SuiteBrowser;
@@ -167,7 +168,7 @@ public class TestNGConfigurationEditor<T extends TestNGConfiguration> extends Se
propertiesFile.getComponent().getTextField().setDocument(model.getPropertiesFileDocument());
outputDirectory.getComponent().getTextField().setDocument(model.getOutputDirectoryDocument());
commonJavaParameters.setProgramParametersLabel(ExecutionBundle.message("junit.configuration.test.runner.parameters.label"));
commonJavaParameters.setProgramParametersLabel(TestngBundle.message("junit.configuration.test.runner.parameters.label"));
myShortenCommandLineCombo.setComponent(new ShortenCommandLineModeCombo(project, alternateJDK, getModulesComponent()));
setAnchor(outputDirectory.getLabel());
@@ -388,7 +389,7 @@ public class TestNGConfigurationEditor<T extends TestNGConfiguration> extends Se
TextFieldWithBrowseButton outputDirectoryButton = new TextFieldWithBrowseButton();
outputDirectory.setComponent(outputDirectoryButton);
outputDirectoryButton.addBrowseFolderListener(ExecutionBundle.message("testng.output.directory.button.title"), ExecutionBundle.message("testng.select.output.directory"), project,
outputDirectoryButton.addBrowseFolderListener(TestngBundle.message("testng.output.directory.button.title"), TestngBundle.message("testng.select.output.directory"), project,
FileChooserDescriptorFactory.createSingleFolderDescriptor());
moduleClasspath.setEnabled(true);
@@ -407,7 +408,7 @@ public class TestNGConfigurationEditor<T extends TestNGConfiguration> extends Se
};
textFieldWithBrowseButton
.addBrowseFolderListener(ExecutionBundle.message("testng.browse.button.title"), ExecutionBundle.message("testng.select.properties.file"), project, propertiesFileDescriptor);
.addBrowseFolderListener(TestngBundle.message("testng.browse.button.title"), TestngBundle.message("testng.select.properties.file"), project, propertiesFileDescriptor);
propertiesTableView = new TableView(propertiesTableModel);

4
plugins/testng/src/com/theoryinpractice/testng/configuration/browser/GroupBrowser.java
View File

@@ -15,13 +15,13 @@
*/
package com.theoryinpractice.testng.configuration.browser;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configuration.BrowseModuleValueActionListener;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.psi.PsiClass;
import com.intellij.psi.search.GlobalSearchScope;
import com.theoryinpractice.testng.TestngBundle;
import com.theoryinpractice.testng.configuration.TestNGConfigurationEditor;
import com.theoryinpractice.testng.model.TestClassFilter;
import com.theoryinpractice.testng.util.TestNGUtil;
@@ -52,7 +52,7 @@ public class GroupBrowser extends BrowseModuleValueActionListener
}
PsiClass[] classes = TestNGUtil.getAllTestClasses(filter, true);
if(classes == null || classes.length == 0) {
Messages.showMessageDialog(getField(), ExecutionBundle.message("testng.group.browser.no.tests.found.in.project"), ExecutionBundle.message("testng.group.browser.cannot.browse.groups"), Messages.getInformationIcon());
Messages.showMessageDialog(getField(), TestngBundle.message("testng.group.browser.no.tests.found.in.project"), TestngBundle.message("testng.group.browser.cannot.browse.groups"), Messages.getInformationIcon());
return null;
} else {
return GroupList.showDialog(classes, getField());

4
plugins/testng/src/com/theoryinpractice/testng/configuration/browser/GroupList.java
View File

@@ -1,7 +1,6 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.theoryinpractice.testng.configuration.browser;
import com.intellij.execution.ExecutionBundle;
import com.intellij.openapi.ui.DialogBuilder;
import com.intellij.psi.PsiClass;
import com.intellij.ui.ScrollPaneFactory;
@@ -9,6 +8,7 @@ import com.intellij.ui.ScrollingUtil;
import com.intellij.ui.SortedListModel;
import com.intellij.ui.components.JBList;
import com.intellij.util.ArrayUtilRt;
import com.theoryinpractice.testng.TestngBundle;
import com.theoryinpractice.testng.util.TestNGUtil;
import javax.swing.*;
@@ -45,7 +45,7 @@ public class GroupList extends JPanel
DialogBuilder builder = new DialogBuilder(component);
builder.setCenterPanel(groupList);
builder.setPreferredFocusComponent(groupList.list);
builder.setTitle(ExecutionBundle.message("testng.choose.test.group"));
builder.setTitle(TestngBundle.message("testng.choose.test.group"));
return builder.show() != 0 ? null : groupList.getSelected();
}
}

6
plugins/testng/src/com/theoryinpractice/testng/configuration/browser/SuiteBrowser.java
View File

@@ -15,12 +15,12 @@
*/
package com.theoryinpractice.testng.configuration.browser;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configuration.BrowseModuleValueActionListener;
import com.intellij.openapi.fileChooser.FileChooser;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.theoryinpractice.testng.TestngBundle;
/**
* @author Hani Suleiman
@@ -40,8 +40,8 @@ public class SuiteBrowser extends BrowseModuleValueActionListener
return virtualFile.isDirectory() || "xml".equals(virtualFile.getExtension()) || "yaml".equals(virtualFile.getExtension());
}
};
descriptor.setDescription((ExecutionBundle.message("testng.suite.browser.select.xml.or.yaml.suite.file")));
descriptor.setTitle(ExecutionBundle.message("testng.suite.browser.select.suite"));
descriptor.setDescription((TestngBundle.message("testng.suite.browser.select.xml.or.yaml.suite.file")));
descriptor.setTitle(TestngBundle.message("testng.suite.browser.select.suite"));
VirtualFile file = FileChooser.chooseFile(descriptor, getProject(), null);
return file != null ? file.getPath() : null;
}

13
plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java
View File

@@ -1,7 +1,6 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.theoryinpractice.testng.inspection;
import com.intellij.AbstractBundle;
import com.intellij.codeInspection.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
@@ -13,6 +12,7 @@ import com.intellij.psi.*;
import com.intellij.ui.DocumentAdapter;
import com.intellij.util.ArrayUtilRt;
import com.intellij.util.containers.ContainerUtil;
import com.theoryinpractice.testng.TestngBundle;
import com.theoryinpractice.testng.util.TestNGUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -21,7 +21,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
import java.awt.*;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
@@ -37,7 +36,7 @@ public class DependsOnGroupsInspection extends AbstractBaseJavaLocalInspectionTo
@NotNull
@Override
public String getGroupDisplayName() {
return InspectionsBundle.message("inspection.depends.on.groups.display.name");
return TestngBundle.message("inspection.depends.on.groups.display.name");
}
@NotNull
@@ -55,7 +54,7 @@ public class DependsOnGroupsInspection extends AbstractBaseJavaLocalInspectionTo
@Nullable
public JComponent createOptionsPanel() {
final LabeledComponent<JTextField> definedGroups = new LabeledComponent<>();
definedGroups.setText(InspectionsBundle.message("inspection.depends.on.groups.defined.groups.panel.title"));
definedGroups.setText(TestngBundle.message("inspection.depends.on.groups.defined.groups.panel.title"));
final JTextField textField = new JTextField(StringUtil.join(ArrayUtilRt.toStringArray(groups), ","));
textField.getDocument().addDocumentListener(new DocumentAdapter() {
@Override
@@ -114,7 +113,7 @@ public class DependsOnGroupsInspection extends AbstractBaseJavaLocalInspectionTo
String methodName = matcher.group(1);
if (!groups.contains(methodName)) {
LOGGER.debug("group doesn't exist:" + methodName);
ProblemDescriptor descriptor = manager.createProblemDescriptor(annotation, InspectionsBundle.message("inspection.depends.on.groups.undefined.group.problem", methodName),
ProblemDescriptor descriptor = manager.createProblemDescriptor(annotation, TestngBundle.message("inspection.depends.on.groups.undefined.group.problem", methodName),
new GroupNameQuickFix(methodName),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
problemDescriptors.add(descriptor);
@@ -138,13 +137,13 @@ public class DependsOnGroupsInspection extends AbstractBaseJavaLocalInspectionTo
@Override
@NotNull
public String getName() {
return InspectionsBundle.message("inspection.depends.on.groups.add.as.defined.test.group.fix", myGroupName);
return TestngBundle.message("inspection.depends.on.groups.add.as.defined.test.group.fix", myGroupName);
}
@Override
@NotNull
public String getFamilyName() {
return InspectionsBundle.message("inspection.depends.on.groups.family.name");
return TestngBundle.message("inspection.depends.on.groups.family.name");
}
@Override

7
plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnMethodInspection.java
View File

@@ -8,6 +8,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.containers.ContainerUtil;
import com.theoryinpractice.testng.TestngBundle;
import com.theoryinpractice.testng.util.TestNGUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -29,7 +30,7 @@ public class DependsOnMethodInspection extends AbstractBaseJavaLocalInspectionTo
@NotNull
@Override
public String getGroupDisplayName() {
return InspectionsBundle.message("inspection.depends.on.method.name");
return TestngBundle.message("inspection.depends.on.method.name");
}
@NotNull
@@ -78,7 +79,7 @@ public class DependsOnMethodInspection extends AbstractBaseJavaLocalInspectionTo
element2Highlight = initializers[idx];
}
}
problemDescriptors.add(manager.createProblemDescriptor(element2Highlight, InspectionsBundle.message("inspection.depends.on.method.duplicated.name.problem", methodName),
problemDescriptors.add(manager.createProblemDescriptor(element2Highlight, TestngBundle.message("inspection.depends.on.method.duplicated.name.problem", methodName),
(LocalQuickFix)null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly));
}
@@ -121,7 +122,7 @@ public class DependsOnMethodInspection extends AbstractBaseJavaLocalInspectionTo
if (foundMethods.length == 0) {
LOGGER.debug("dependsOnMethods method doesn't exist:" + methodName);
problemDescriptors.add(manager.createProblemDescriptor(
value, InspectionsBundle.message("inspection.depends.on.method.unknown.method.problem", methodName), (LocalQuickFix)null, ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, onTheFly));
value, TestngBundle.message("inspection.depends.on.method.unknown.method.problem", methodName), (LocalQuickFix)null, ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, onTheFly));
}
else {
boolean hasTestsOrConfigs = false;

4
plugins/testng/src/com/theoryinpractice/testng/inspection/ExpectedExceptionNeverThrownTestNGInspection.java
View File

@@ -4,10 +4,10 @@ package com.theoryinpractice.testng.inspection;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.ExceptionUtil;
import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool;
import com.intellij.codeInspection.InspectionsBundle;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.psi.*;
import com.intellij.psi.util.InheritanceUtil;
import com.theoryinpractice.testng.TestngBundle;
import org.jetbrains.annotations.NotNull;
import java.util.List;
@@ -63,7 +63,7 @@ public class ExpectedExceptionNeverThrownTestNGInspection extends AbstractBaseJa
return;
}
}
myProblemsHolder.registerProblem(operand, InspectionsBundle.message("inspection.testng.expected.exception.never.thrown.problem", method.getName()));
myProblemsHolder.registerProblem(operand, TestngBundle.message("inspection.testng.expected.exception.never.thrown.problem", method.getName()));
}
}
}

6
plugins/testng/src/com/theoryinpractice/testng/inspection/JUnitConvertTool.java
View File

@@ -3,7 +3,6 @@ package com.theoryinpractice.testng.inspection;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInspection.*;
import com.intellij.execution.ExecutionBundle;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
@@ -14,6 +13,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.typeMigration.TypeConversionDescriptor;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import com.theoryinpractice.testng.TestngBundle;
import com.theoryinpractice.testng.util.TestNGUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -46,7 +46,7 @@ public class JUnitConvertTool extends AbstractBaseJavaLocalInspectionTool {
@NotNull
@Override
public String getGroupDisplayName() {
return ExecutionBundle.message("junit.convert.tool.display.name");
return TestngBundle.message("junit.convert.tool.display.name");
}
@NotNull
@@ -59,7 +59,7 @@ public class JUnitConvertTool extends AbstractBaseJavaLocalInspectionTool {
public ProblemDescriptor @Nullable [] checkClass(@NotNull PsiClass psiClass, @NotNull InspectionManager manager, boolean isOnTheFly) {
if (TestNGUtil.inheritsJUnitTestCase(psiClass) || TestNGUtil.containsJunitAnnotations(psiClass)) {
final PsiIdentifier nameIdentifier = psiClass.getNameIdentifier();
ProblemDescriptor descriptor = manager.createProblemDescriptor(nameIdentifier != null ? nameIdentifier : psiClass, ExecutionBundle.message("test.case.can.be.converted.to.testng"),
ProblemDescriptor descriptor = manager.createProblemDescriptor(nameIdentifier != null ? nameIdentifier : psiClass, TestngBundle.message("test.case.can.be.converted.to.testng"),
new JUnitConverterQuickFix(),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
return new ProblemDescriptor[]{descriptor};

6
plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGDataProviderInspection.java
View File

@@ -3,7 +3,6 @@ package com.theoryinpractice.testng.inspection;
import com.intellij.codeInsight.daemon.impl.quickfix.CreateMethodQuickFix;
import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool;
import com.intellij.codeInspection.InspectionsBundle;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.ide.fileTemplates.FileTemplate;
@@ -16,6 +15,7 @@ import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.theoryinpractice.testng.DataProviderReference;
import com.theoryinpractice.testng.TestNGFramework;
import com.theoryinpractice.testng.TestngBundle;
import com.theoryinpractice.testng.util.TestNGUtil;
import org.jetbrains.annotations.NotNull;
import org.testng.annotations.DataProvider;
@@ -48,7 +48,7 @@ public class TestNGDataProviderInspection extends AbstractBaseJavaLocalInspectio
fixes = LocalQuickFix.EMPTY_ARRAY;
}
holder.registerProblem(provider, InspectionsBundle.message("inspection.testng.data.provider.does.not.exist.problem"), fixes);
holder.registerProblem(provider, TestngBundle.message("inspection.testng.data.provider.does.not.exist.problem"), fixes);
} else {
Version version = TestNGUtil.detectVersion(holder.getProject(), ModuleUtilCore.findModuleForPsiElement(providerClass));
if (version != null && version.isOrGreaterThan(6, 9, 13)) {
@@ -56,7 +56,7 @@ public class TestNGDataProviderInspection extends AbstractBaseJavaLocalInspectio
}
final PsiMethod providerMethod = (PsiMethod)dataProviderMethod;
if (providerClass != topLevelClass && !providerMethod.hasModifierProperty(PsiModifier.STATIC)) {
holder.registerProblem(provider, InspectionsBundle.message("inspection.testng.data.provider.need.to.be.static"));
holder.registerProblem(provider, TestngBundle.message("inspection.testng.data.provider.need.to.be.static"));
}
}
break;

4
plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGEntryPoint.java
View File

@@ -18,12 +18,12 @@ package com.theoryinpractice.testng.inspection;
import com.intellij.codeInspection.reference.EntryPoint;
import com.intellij.codeInspection.reference.RefElement;
import com.intellij.execution.ExecutionBundle;
import com.intellij.openapi.util.DefaultJDOMExternalizer;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiModifierListOwner;
import com.theoryinpractice.testng.TestngBundle;
import com.theoryinpractice.testng.util.TestNGUtil;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
@@ -45,7 +45,7 @@ public class TestNGEntryPoint extends EntryPoint {
@Override
@NotNull
public String getDisplayName() {
return ExecutionBundle.message("testng.entry.point.test.cases");
return TestngBundle.message("testng.entry.point.test.cases");
}
@Override

9
plugins/testng/src/com/theoryinpractice/testng/inspection/UndeclaredTestInspection.java
View File

@@ -19,6 +19,7 @@ import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.IncorrectOperationException;
import com.theoryinpractice.testng.TestngBundle;
import com.theoryinpractice.testng.configuration.browser.SuiteBrowser;
import com.theoryinpractice.testng.util.TestNGUtil;
import org.jetbrains.annotations.Nls;
@@ -91,7 +92,7 @@ public class UndeclaredTestInspection extends AbstractBaseJavaLocalInspectionToo
}
final PsiIdentifier nameIdentifier = aClass.getNameIdentifier();
LOG.assertTrue(nameIdentifier != null);
return new ProblemDescriptor[]{manager.createProblemDescriptor(nameIdentifier, InspectionsBundle.message("inspection.undeclared.test.problem.descriptor", aClass.getName()),
return new ProblemDescriptor[]{manager.createProblemDescriptor(nameIdentifier, TestngBundle.message("inspection.undeclared.test.problem.descriptor", aClass.getName()),
isOnTheFly, new LocalQuickFix[]{new RegisterClassFix(aClass),
new CreateTestngFix()},
ProblemHighlightType.GENERIC_ERROR_OR_WARNING)};
@@ -109,13 +110,13 @@ public class UndeclaredTestInspection extends AbstractBaseJavaLocalInspectionToo
@Override
@NotNull
public String getName() {
return InspectionsBundle.message("inspection.undeclared.test.register", myClassName);
return TestngBundle.message("inspection.undeclared.test.register", myClassName);
}
@Override
@NotNull
public String getFamilyName() {
return InspectionsBundle.message("inspection.undeclared.test.register.test");
return TestngBundle.message("inspection.undeclared.test.register.test");
}
@Override
@@ -167,7 +168,7 @@ public class UndeclaredTestInspection extends AbstractBaseJavaLocalInspectionToo
@Override
@NotNull
public String getFamilyName() {
return InspectionsBundle.message("inspection.undeclared.test.create.suite.fix");
return TestngBundle.message("inspection.undeclared.test.create.suite.fix");
}
@Override

6
plugins/testng/src/com/theoryinpractice/testng/model/TestNGParametersTableModel.java
View File

@@ -16,10 +16,10 @@
package com.theoryinpractice.testng.model;
import com.intellij.execution.ExecutionBundle;
import com.intellij.ui.JBColor;
import com.intellij.util.ui.ColumnInfo;
import com.intellij.util.ui.ListTableModel;
import com.theoryinpractice.testng.TestngBundle;
import javax.swing.*;
import javax.swing.table.TableCellEditor;
@@ -34,7 +34,7 @@ public class TestNGParametersTableModel extends ListTableModel<Map.Entry<String,
public TestNGParametersTableModel() {
super(
new ColumnInfo<Map.Entry<String, String>, String>(ExecutionBundle.message("testng.parameters.table.model.name"))
new ColumnInfo<Map.Entry<String, String>, String>(TestngBundle.message("testng.parameters.table.model.name"))
{
@Override
public String valueOf(Map.Entry<String, String> object) {
@@ -48,7 +48,7 @@ public class TestNGParametersTableModel extends ListTableModel<Map.Entry<String,
return new DefaultCellEditor(textField);
}
},
new ColumnInfo<Map.Entry<String, String>, String>(ExecutionBundle.message("testng.parameters.table.model.value"))
new ColumnInfo<Map.Entry<String, String>, String>(TestngBundle.message("testng.parameters.table.model.value"))
{
@Override
public String valueOf(Map.Entry<String, String> object) {

10
plugins/testng/src/com/theoryinpractice/testng/util/TestNGUtil.java
View File

@@ -2,7 +2,6 @@
package com.theoryinpractice.testng.util;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.execution.ExecutionBundle;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.module.Module;
@@ -29,6 +28,7 @@ import com.intellij.util.PathUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.JBIterable;
import com.intellij.util.xml.NanoXmlUtil;
import com.theoryinpractice.testng.TestngBundle;
import com.theoryinpractice.testng.model.TestClassFilter;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -363,7 +363,7 @@ public class TestNGUtil {
for (final PsiClass psiClass : AllClassesSearch.search(scope, manager.getProject())) {
if (filter.isAccepted(psiClass)) {
if (indicator != null) {
indicator.setText2(ExecutionBundle.message("testng.util.found.test.class", ReadAction.compute(psiClass::getQualifiedName)));
indicator.setText2(TestngBundle.message("testng.util.found.test.class", ReadAction.compute(psiClass::getQualifiedName)));
}
set.add(psiClass);
}
@@ -371,7 +371,7 @@ public class TestNGUtil {
holder[0] = set.toArray(PsiClass.EMPTY_ARRAY);
};
if (sync) {
ProgressManager.getInstance().runProcessWithProgressSynchronously(process, ExecutionBundle.message("testng.util.searching.test.progress.title"), true, filter.getProject());
ProgressManager.getInstance().runProcessWithProgressSynchronously(process, TestngBundle.message("testng.util.searching.test.progress.title"), true, filter.getProject());
}
else {
process.run();
@@ -403,8 +403,8 @@ public class TestNGUtil {
if (JavaPsiFacade.getInstance(manager.getProject()).findClass(TestNG.class.getName(), psiElement.getResolveScope()) == null) {
if (!ApplicationManager.getApplication().isUnitTestMode()) {
if (Messages.showOkCancelDialog(psiElement.getProject(),
ExecutionBundle.message("testng.util.will.be.added.to.module.classpath"),
ExecutionBundle.message("testng.util.unable.to.convert"),
TestngBundle.message("testng.util.will.be.added.to.module.classpath"),
TestngBundle.message("testng.util.unable.to.convert"),
Messages.getWarningIcon()) != Messages.OK) {
return false;
}