-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add variable support for Include Controller #679
Open
polarnik
wants to merge
2
commits into
apache:master
Choose a base branch
from
polarnik:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
96 changes: 96 additions & 0 deletions
96
src/components/src/test/java/org/apache/jmeter/control/TestIncludeController.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,96 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to you under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.jmeter.control; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
|
||
import org.apache.jmeter.junit.JMeterTestCase; | ||
import org.apache.jmeter.threads.JMeterContext; | ||
import org.apache.jmeter.threads.JMeterContextService; | ||
import org.apache.jmeter.threads.JMeterVariables; | ||
import org.junit.jupiter.api.Test; | ||
|
||
public class TestIncludeController extends JMeterTestCase { | ||
|
||
|
||
@Test | ||
public void testGetIncludePathWithVariable() { | ||
String varName = "testGetIncludePathWithVariable_file_name"; | ||
String varValue = "C:\\testPath\\testFile.jmx"; | ||
String varExpression = "${" + varName + "}"; | ||
|
||
JMeterVariables vars = new JMeterVariables(); | ||
JMeterContext jmctx = JMeterContextService.getContext(); | ||
|
||
jmctx.setVariables(vars); | ||
vars.put(varName, varValue); | ||
|
||
IncludeController includeController = new IncludeController(); | ||
includeController.setIncludePath(varExpression); | ||
|
||
assertEquals(varValue, includeController.getIncludePathAsFunction()); | ||
} | ||
|
||
@Test | ||
public void testGetIncludePathWithVariables() { | ||
String dirName = "var1"; | ||
String dirValue = "/tmp/path/test"; | ||
|
||
String fileName = "var2"; | ||
String fileValue = "testFile.jmx"; | ||
|
||
String varExpression = "${" + dirName + "}/${" + fileName + "}"; | ||
|
||
JMeterVariables vars = new JMeterVariables(); | ||
JMeterContext jmctx = JMeterContextService.getContext(); | ||
|
||
jmctx.setVariables(vars); | ||
vars.put(dirName, dirValue); | ||
vars.put(fileName, fileValue); | ||
|
||
IncludeController includeController = new IncludeController(); | ||
includeController.setIncludePath(varExpression); | ||
|
||
assertEquals(dirValue + "/" + fileValue, includeController.getIncludePathAsFunction()); | ||
} | ||
|
||
|
||
@Test | ||
public void testGetIncludePathWithSimpleString() { | ||
String varValue = "C:\\testPath\\testFile.jmx"; | ||
|
||
JMeterVariables vars = new JMeterVariables(); | ||
JMeterContext jmctx = JMeterContextService.getContext(); | ||
|
||
IncludeController includeController = new IncludeController(); | ||
includeController.setIncludePath(varValue); | ||
|
||
assertEquals(varValue, includeController.getIncludePathAsFunction()); | ||
} | ||
|
||
@Test | ||
public void testGetIncludePathWithEmptyString() { | ||
String varValue = ""; | ||
|
||
IncludeController includeController = new IncludeController(); | ||
includeController.setIncludePath(varValue); | ||
|
||
assertEquals(varValue, includeController.getIncludePathAsFunction()); | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is the wrong approach to attack the problem. It looks like
includePath.setRunningVersion(true)
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if apply
includePath.setRunningVersion(true)
and set includePath like
${__P(somePropName, 'defaultValue')}
and open JMX File in GUI Mode
then includePath view like value of
somePropName
or'defaultValue'
, but not view as${__P(somePropName, 'defaultValue')}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Function
getIncludePathAsFunction()
did not change value ofincludePath
. FunctiongetIncludePathAsFunction()
used instead of simplethis.getPropertyAsString(INCLUDE_PATH)
for variables and functions support without change of valueincludePath
.Script developer may open JMX file in GUI mode, press Save button, and JMX file was saved without changes.
If used
includePath.setRunningVersion(true)
, then after open JMX script in GUI mode and press Save button - original expression will be replaced with expression value.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AFAIK
setRunningVersions(tue)
should be called just before script execution (like it is called for other elements)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok. I try tested this