forked from hpsa/hpe-application-automation-tools-plugin
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #251 from MicroFocus/octane-dev-latest
Octane fixes 5.8.7
- Loading branch information
Showing
10 changed files
with
160 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,5 +28,6 @@ public enum HPRunnerType { | |
| StormRunnerFunctional, | ||
| UFT, | ||
| PerformanceCenter, | ||
| LoadRunner, | ||
| NONE | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
...ofocus/application/automation/tools/octane/tests/detection/MFToolsDetectionExtension.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| package com.microfocus.application.automation.tools.octane.tests.detection; | ||
|
|
||
| import com.microfocus.application.automation.tools.octane.configuration.SDKBasedLoggerProvider; | ||
| import com.microfocus.application.automation.tools.octane.model.processors.projects.JobProcessorFactory; | ||
| import com.microfocus.application.automation.tools.octane.tests.HPRunnerType; | ||
| import hudson.Extension; | ||
| import hudson.FilePath; | ||
| import hudson.model.ParameterValue; | ||
| import hudson.model.ParametersAction; | ||
| import hudson.model.Run; | ||
| import hudson.tasks.Builder; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Recognize execution of Microfocus Tools | ||
| */ | ||
| @Extension | ||
| public class MFToolsDetectionExtension extends ResultFieldsDetectionExtension { | ||
|
|
||
| private static Logger logger = SDKBasedLoggerProvider.getLogger(MFToolsDetectionExtension.class); | ||
| private static final String STORMRUNNER_LOAD_TEST_RUNNER_CLASS = "StormTestRunner"; | ||
| private static final String STORMRUNNER_FUNCTIONAL_TEST_RUNNER_CLASS = "RunFromSrfBuilder"; | ||
| private static final String PERFORMANCE_CENTER_TEST_RUNNER_CLASS = "PcBuilder"; | ||
| private static final String RUN_FROM_FILE_BUILDER = "RunFromFileBuilder"; | ||
| private static final String RUN_FROM_ALM_BUILDER = "RunFromAlmBuilder"; | ||
|
|
||
| private static final String UFT = "UFT"; | ||
| private static final String STORMRUNNER_LOAD = "StormRunner Load"; | ||
| private static final String STORMRUNNER_FUNCTIONAL = "StormRunner Functional"; | ||
| private static final String LOAD_RUNNER = "LoadRunner"; | ||
| private static final String PERFORMANCE_CENTER_RUNNER = "Performance Center"; | ||
| private static final String PERFORMANCE_TEST_TYPE = "Performance"; | ||
|
|
||
|
|
||
| private static final String PERFORMANCE_REPORT = "PerformanceReport"; | ||
| private static final String TRANSACTION_SUMMARY = "TransactionSummary"; | ||
|
|
||
| private static Map<String, HPRunnerType> builder2RunnerType = new HashMap<>(); | ||
| private static Map<HPRunnerType, ResultFields> runnerType2ResultFields = new HashMap<>(); | ||
|
|
||
| static { | ||
| builder2RunnerType.put(STORMRUNNER_LOAD_TEST_RUNNER_CLASS, HPRunnerType.StormRunnerLoad); | ||
| builder2RunnerType.put(STORMRUNNER_FUNCTIONAL_TEST_RUNNER_CLASS, HPRunnerType.StormRunnerFunctional); | ||
| builder2RunnerType.put(RUN_FROM_FILE_BUILDER, HPRunnerType.UFT); | ||
| builder2RunnerType.put(RUN_FROM_ALM_BUILDER, HPRunnerType.UFT); | ||
| builder2RunnerType.put(PERFORMANCE_CENTER_TEST_RUNNER_CLASS, HPRunnerType.PerformanceCenter); | ||
|
|
||
| runnerType2ResultFields.put(HPRunnerType.PerformanceCenter, new ResultFields(null, PERFORMANCE_CENTER_RUNNER, null, PERFORMANCE_TEST_TYPE)); | ||
| runnerType2ResultFields.put(HPRunnerType.UFT, new ResultFields(UFT, UFT, null)); | ||
| runnerType2ResultFields.put(HPRunnerType.StormRunnerLoad, new ResultFields(null, STORMRUNNER_LOAD, null)); | ||
| runnerType2ResultFields.put(HPRunnerType.StormRunnerFunctional, new ResultFields(null, STORMRUNNER_FUNCTIONAL, null)); | ||
| runnerType2ResultFields.put(HPRunnerType.LoadRunner, new ResultFields(null, LOAD_RUNNER, null)); | ||
| } | ||
|
|
||
| /** | ||
| * Detect result fields for ALM Octane tests | ||
| * | ||
| * @param build | ||
| * @return | ||
| * @throws IOException | ||
| * @throws InterruptedException | ||
| */ | ||
| @Override | ||
| public ResultFields detect(Run<?, ?> build) throws IOException, InterruptedException { | ||
| HPRunnerType runnerType = getRunnerType(build); | ||
| return runnerType2ResultFields.get(runnerType); | ||
| } | ||
|
|
||
| /** | ||
| * Get MF runner type from run | ||
| * | ||
| * @param run | ||
| * @return | ||
| */ | ||
| public static HPRunnerType getRunnerType(Run run) { | ||
| HPRunnerType hpRunnerType = HPRunnerType.NONE; | ||
| if (JobProcessorFactory.WORKFLOW_RUN_NAME.equals(run.getClass().getName())) { | ||
| ParametersAction parameterAction = run.getAction(ParametersAction.class); | ||
| ParameterValue runnerTypePv = parameterAction != null ? parameterAction.getParameter(HPRunnerType.class.getSimpleName()) : null; | ||
| if (runnerTypePv != null) { | ||
| hpRunnerType = HPRunnerType.valueOf((String) runnerTypePv.getValue()); | ||
| } | ||
| } else { | ||
| List<Builder> builders = JobProcessorFactory.getFlowProcessor(run.getParent()).tryGetBuilders(); | ||
| if (builders != null) { | ||
| for (Builder builder : builders) { | ||
| String builderName = builder.getClass().getSimpleName(); | ||
| if (builder2RunnerType.containsKey(builderName)) { | ||
| hpRunnerType = builder2RunnerType.get(builderName); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (hpRunnerType == HPRunnerType.UFT && isLoadRunnerProject(run)) { | ||
| hpRunnerType = HPRunnerType.LoadRunner; | ||
| } | ||
| return hpRunnerType; | ||
| } | ||
|
|
||
| private static boolean isLoadRunnerProject(Run run) { | ||
| if (run.getRootDir() != null) { | ||
| try { | ||
| FilePath performanceReportFolder = new FilePath(run.getRootDir()).child(PERFORMANCE_REPORT); | ||
| FilePath transactionSummaryFolder = new FilePath(run.getRootDir()).child(TRANSACTION_SUMMARY); | ||
| return performanceReportFolder.exists() && | ||
| performanceReportFolder.isDirectory() && | ||
| transactionSummaryFolder.exists() && | ||
| transactionSummaryFolder.isDirectory(); | ||
| } catch (IOException | InterruptedException e) { | ||
| logger.error("Failed to check isLoadRunnerProject :" + e.getMessage()); | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 0 additions & 48 deletions
48
...java/com/microfocus/application/automation/tools/octane/tests/detection/UFTExtension.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.