[JENKINS-54368] - User should be able to control the test execution failure #182
Conversation
Merge latest to master with 5.5 plugin release
…ion-tools-plugin into US47837-upload-results-timeout
…lts-timeout US47837 upload partial results
![codeclimate[bot]](https://avatars.githubusercontent.com/in/9403?s=60&v=4){kind=small}
|
|
||
| //add cleanup test | ||
| if(StringUtils.isEmpty(this.cleanupTest)){ | ||
| props.put("CleanupTest1", ""); |
There was a problem hiding this comment.
Define a constant instead of duplicating this literal "CleanupTest1" 3 times.
|
|
||
| //add number of reruns | ||
| if(StringUtils.isEmpty(this.numberOfReruns)){ | ||
| props.put("Reruns1", "0"); |
There was a problem hiding this comment.
Define a constant instead of duplicating this literal "Reruns1" 3 times.
HpToolsLauncher/Launcher.cs
Outdated
| if (cleanupTests != null && cleanupTests.Count() > 0 && validCleanupTests.Count == 0) | ||
| { | ||
| ConsoleWriter.WriteLine(Resources.LauncherNoValidCleanupTests); | ||
| return null; |
There was a problem hiding this comment.
Avoid too many return statements within this method.
| * @return an mtbx file with tests, a single test or a list of tests from test folder | ||
| */ | ||
| public List<String> getBuildTests() { | ||
| List<String> buildTests = new ArrayList<>(); |
There was a problem hiding this comment.
Remove this useless assignment to local variable "buildTests".
HpToolsLauncher/Launcher.cs
Outdated
|
|
||
| //run the tests! | ||
| RunTests(runner, resultsFilename); | ||
| } else {//TestStorageType.Alm |
There was a problem hiding this comment.
Identical blocks of code found in 2 locations. Consider refactoring.
There was a problem hiding this comment.
- Please open a JIRA issue with the PR.
- Review codeclimate issues.
- And address my comments
- Your change in config.jelly of runFromFileBuilder breaks a test, see appveyor build.
src/main/java/com/microfocus/application/automation/tools/model/RerunSettings.java
Outdated
Show resolved
Hide resolved
...in/resources/com/microfocus/application/automation/tools/run/RunFromFileBuilder/config.jelly
Outdated
Show resolved
Hide resolved
| * @param folder the test path setup in the configuration (can be the an mtbx file, a single test or a folder containing other tests) | ||
| * @return a list of tests | ||
| */ | ||
| private List<String> listFilesForFolder(final File folder) { |
There was a problem hiding this comment.
Method listFilesForFolder has a Cognitive Complexity of 14 (exceeds 5 allowed). Consider refactoring.
| * @param rerunSettings the list of current tests | ||
| * @return the updated list of tests to rerun | ||
| */ | ||
| private List<String> getTests(List<String> buildTests, List<RerunSettings> rerunSettings){ |
There was a problem hiding this comment.
Method getTests has a Cognitive Complexity of 7 (exceeds 5 allowed). Consider refactoring.
...in/resources/com/microfocus/application/automation/tools/run/RunFromFileBuilder/config.jelly
Outdated
Show resolved
Hide resolved
grount
changed the title
| @@ -48,7 +49,11 @@ | |||
|
|
|||
| public final static EnumDescription FAST_RUN_MODE = new EnumDescription("Fast", "Fast"); | |||
| public final static EnumDescription NORMAL_RUN_MODE = new EnumDescription("Normal", "Normal"); | |||
| public final static EnumDescription ANY_BUILD_TEST = new EnumDescription("Of any of the build's tests", "Of any of the build's tests"); | |||
There was a problem hiding this comment.
You should create your model under uft folder and just introduce a filed inside your own model.
| @@ -0,0 +1,93 @@ | |||
| /* | |||
There was a problem hiding this comment.
src/main/java/com/microfocus/application/automation/tools/uft/.../RerunSettings.java
| @@ -286,6 +293,61 @@ public void setFsTests(String fsTests) { | |||
| runFromFileModel.setFsTests(fsTests); | |||
| } | |||
|
|
|||
| public String getNumberOfReruns() { return runFromFileModel.getNumberOfReruns(); } | |||
There was a problem hiding this comment.
When you will introduce your own model that will implement abstractDescriableImpl there won't be a need in exposing the field getters/setters.
| @@ -661,6 +786,7 @@ public Properties getProperties() { | |||
|
|
|||
| private Properties createProperties(EnvVars envVars) { | |||
| Properties props = new Properties(); | |||
| List<String> buildTestsList = new ArrayList<>(); | |||
There was a problem hiding this comment.
Remove this useless assignment to local variable "buildTestsList".
| * @param rerunSettingModels the list of current tests | ||
| * @return the updated list of tests to rerun | ||
| *//* | ||
| private List<String> getTests(List<String> buildTests, List<RerunSettingsModel> rerunSettingModels){ |
There was a problem hiding this comment.
This block of commented-out lines of code should be removed.
| this.fsTestType = fsTestType; | ||
| } | ||
|
|
||
| /*public List<RerunSettingsModel> getRerunSettingModels() { |
There was a problem hiding this comment.
This block of commented-out lines of code should be removed.
| * @return an mtbx file with tests, a single test or a list of tests from test folder | ||
| */ | ||
| public List<String> getBuildTests() { | ||
| //String directory = "C:\\Users\\laakso\\Documents\\UFT_tests"; |
There was a problem hiding this comment.
This block of commented-out lines of code should be removed.
| @@ -102,6 +103,11 @@ public RunFromFileBuilder(String fsTests) { | |||
| runFromFileModel = new RunFromFileSystemModel(fsTests); | |||
| } | |||
|
|
|||
| /*public RunFromFileBuilder(String fsTests, UftSettingsModel uftSettingsModel) { | |||
There was a problem hiding this comment.
This block of commented-out lines of code should be removed.
|
|
||
| public List<EnumDescription> getFsTestTypes() { return fsTestTypes; } | ||
|
|
||
| public void addToProperties(Properties props){ |
There was a problem hiding this comment.
Refactor this method to reduce its Cognitive Complexity from 21 to the 15 allowed.
| * @return an mtbx file with tests, a single test or a list of tests from test folder | ||
| */ | ||
| public static List<String> getBuildTests(String fsTestPath) { | ||
| // String directory = this.fsTestPath; |
There was a problem hiding this comment.
This block of commented-out lines of code should be removed.
| return buildTests; | ||
| } | ||
|
|
||
| return null; |
There was a problem hiding this comment.
Return an empty collection instead of null.
| */ | ||
| public static List<String> getTests(List<String> buildTests, List<RerunSettingsModel> rerunSettingModels){ | ||
| if(buildTests == null || rerunSettingModels == null){ | ||
| return null; |
There was a problem hiding this comment.
Return an empty collection instead of null.
| */ | ||
| public List<RerunSettingsModel> getRerunSettingsModels(){ | ||
| List<String> testPaths = UftToolUtils.getTests(UftToolUtils.getBuildTests(fsTestPath), rerunSettingsModels); | ||
| for(String testPath : testPaths){ |
There was a problem hiding this comment.
Identical blocks of code found in 3 locations. Consider refactoring.
| if(testPaths != null) { | ||
| for (String testPath : testPaths) { | ||
| if (!UftToolUtils.listContainsTest(rerunSettings, testPath)) { | ||
| rerunSettings.add(new RerunSettingsModel(testPath, false, 0, "")); |
There was a problem hiding this comment.
A "NullPointerException" could be thrown; "rerunSettings" is nullable here.
| */ | ||
| public static List<RerunSettingsModel> getSettings(String fsTestPath, List<RerunSettingsModel> rerunSettings){ | ||
| List<String> testPaths = getTests(getBuildTests(fsTestPath), rerunSettings); | ||
| if(testPaths != null) { |
There was a problem hiding this comment.
Remove this expression which always evaluates to "true"
| * @param rerunSettingModels the list of current tests | ||
| * @return the updated list of tests to rerun | ||
| */ | ||
| public static List<String> getTests(List<String> buildTests, List<RerunSettingsModel> rerunSettingModels){ |
There was a problem hiding this comment.
Method getTests has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring.
| * @param folder the test path setup in the configuration (can be the an mtbx file, a single test or a folder containing other tests) | ||
| * @return a list of tests | ||
| */ | ||
| public static List<String> listFilesForFolder(final File folder) { |
There was a problem hiding this comment.
Method listFilesForFolder has a Cognitive Complexity of 14 (exceeds 5 allowed). Consider refactoring.
| * @param rerunSettings the rerun settings models list to initialize | ||
| * @return the updated rerun settings list | ||
| */ | ||
| public static List<RerunSettingsModel> getSettings(String fsTestPath, List<RerunSettingsModel> rerunSettings){ |
There was a problem hiding this comment.
Method getSettings has a Cognitive Complexity of 6 (exceeds 5 allowed). Consider refactoring.
| * | ||
| * @param props | ||
| */ | ||
| public void addToProperties(Properties props){ |
There was a problem hiding this comment.
Method addToProperties has a Cognitive Complexity of 21 (exceeds 5 allowed). Consider refactoring.
| * @param folder the test path setup in the configuration (can be the an mtbx file, a single test or a folder containing other tests) | ||
| * @return a list of tests | ||
| */ | ||
| public static List<String> listFilesForFolder(final File folder) { |
There was a problem hiding this comment.
Method listFilesForFolder has a Cognitive Complexity of 13 (exceeds 5 allowed). Consider refactoring.
| List<String> testPaths = UftToolUtils.getTests(UftToolUtils.getBuildTests(fsTestPath), rerunSettingsModels); | ||
| for(String testPath : testPaths){ | ||
| if(!UftToolUtils.listContainsTest(rerunSettingsModels, testPath)) { | ||
| rerunSettingsModels.add(new RerunSettingsModel(testPath, false, 0, "")); |
There was a problem hiding this comment.
A "NullPointerException" could be thrown; "rerunSettingsModels" is nullable here.
| * @param folder the test path setup in the configuration (can be the an mtbx file, a single test or a folder containing other tests) | ||
| * @return a list of tests | ||
| */ | ||
| public static List<String> listFilesForFolder(final File folder) { |
There was a problem hiding this comment.
Method listFilesForFolder has a Cognitive Complexity of 13 (exceeds 5 allowed). Consider refactoring.
| * | ||
| * @param props | ||
| */ | ||
| public void addToProperties(Properties props){ |
There was a problem hiding this comment.
Method addToProperties has a Cognitive Complexity of 15 (exceeds 5 allowed). Consider refactoring.
|
Approved for test build |
| @@ -0,0 +1,152 @@ | |||
| /* | |||
There was a problem hiding this comment.
Please move this method to uft package.
| return buildTests; | ||
| } | ||
|
|
||
| return null; |
There was a problem hiding this comment.
Return an empty collection instead of null.
| List<String> testPaths = UftToolUtils.getTests(UftToolUtils.getBuildTests(fsTestPath), rerunSettingsModels); | ||
| for(String testPath : testPaths){ | ||
| if(!UftToolUtils.listContainsTest(rerunSettingsModels, testPath)) { | ||
| rerunSettingsModels.add(new RerunSettingsModel(testPath, false, 0, "")); |
There was a problem hiding this comment.
A "NullPointerException" could be thrown; "rerunSettingsModels" is nullable here.
| * | ||
| * @param props | ||
| */ | ||
| public void addToProperties(Properties props){ |
There was a problem hiding this comment.
Method addToProperties has a Cognitive Complexity of 15 (exceeds 5 allowed). Consider refactoring.
| * @param rerunSettingModels the list of current tests | ||
| * @return the updated list of tests to rerun | ||
| */ | ||
| public static List<String> getTests(List<String> buildTests, List<RerunSettingsModel> rerunSettingModels){ |
There was a problem hiding this comment.
Method getTests has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring.
| * @param folder the test path setup in the configuration (can be the an mtbx file, a single test or a folder containing other tests) | ||
| * @return a list of tests | ||
| */ | ||
| public static List<String> listFilesForFolder(final File folder) { |
There was a problem hiding this comment.
Method listFilesForFolder has a Cognitive Complexity of 13 (exceeds 5 allowed). Consider refactoring.
|
Code Climate has analyzed commit 9a3972c and detected 5 issues on this pull request. Here's the issue category breakdown:
View more on Code Climate. |
|
Approved for test build |
* defect #803014: octane-sonar integration works only with "maven project" jobs * tech: minor fixes for coverage classes
https://issues.jenkins-ci.org/browse/JENKINS-54368