Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Added default jmeter.properties to the plugin #47

Closed
wants to merge 16 commits into from
Closed

Added default jmeter.properties to the plugin #47

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5e37998
added resultsformat=xml in saveservice.properties
foragerr Apr 11, 2015
9744427
included default jmeter.properties
foragerr Apr 12, 2015
c9cef0f
moved results=xml property from saveservice.properties into code
foragerr Apr 12, 2015
c43c1de
changed order of jmeter.properties precedence
foragerr Apr 13, 2015
9441709
Adds suport for http://jmeter-plugins.org/ and extended report
May 26, 2015
eac35fe
Some code cleanup, made plugin addition backwards compatible. I.e. if an
May 28, 2015
c397ac6
Addresses code review feedback:
May 29, 2015
cafde13
remove extraneous println
ecopoesis Jun 23, 2015
c16a446
added /bin and eclipse files to .gitignore
foragerr Jul 8, 2015
a83e843
Merge remote-tracking branch 'ecopoesis/master'
foragerr Jul 8, 2015
b248a3f
Merge remote-tracking branch 'pokowaka/master'
foragerr Jul 8, 2015
fa2f93b
Minor Fixes
foragerr Jul 8, 2015
c7d69ea
fixes https://github.com/kulya/jmeter-gradle-plugin/issues/27
foragerr Jul 8, 2015
68c79a9
Merge branch 'fix_#27'
foragerr Jul 8, 2015
6ded889
Fixed a problem with useSaveServiceFormat
foragerr Jul 9, 2015
13fb0e1
Add pointer to new version of plugin.
foragerr Feb 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ archivesBaseName = 'jmeter-gradle-plugin'
* Currently supports JMeter versions 2.9, 2.10, 2.11, 2.12, 2.13
*/
ext.jmeterVersion = "2.13"
version = "1.3.3-$jmeterVersion-SNAPSHOT"
version = "1.3.5-$jmeterVersion-SNAPSHOT"

sourceCompatibility=JavaVersion.VERSION_1_6
targetCompatibility=JavaVersion.VERSION_1_6
Expand Down
15 changes: 6 additions & 9 deletions src/main/groovy/com/github/kulya/gradle/plugins/jmeter/JmeterAbstractTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ abstract class JmeterAbstractTask extends ConventionTask{

private List<String> jmeterPluginJars;

private File workDir;
protected File workDir;

private File jmeterLog;

Expand All @@ -26,12 +26,10 @@ abstract class JmeterAbstractTask extends ConventionTask{
* <p/>
* By default it src/test/jmeter
*/
private File srcDir;
protected File srcDir;

private File jmeterPropertyFile;

private boolean propertyFileChanged;

private String maxHeapSize

private List<File> jmeterUserPropertiesFiles;
Expand Down Expand Up @@ -140,6 +138,10 @@ abstract class JmeterAbstractTask extends ConventionTask{
File upgradeProperties = new File(workDir, "upgrade.properties");
System.setProperty("upgrade_properties", "/" + upgradeProperties.getName());
tempProperties.add(upgradeProperties);

File defaultJmeterProperties = new File(workDir, "jmeter.properties");
System.setProperty("default_jm_properties", "/" + defaultJmeterProperties.getName());
tempProperties.add(defaultJmeterProperties);

for (File f : tempProperties) {
try {
Expand Down Expand Up @@ -206,10 +208,6 @@ abstract class JmeterAbstractTask extends ConventionTask{

void setSrcDir(File srcDir) {
this.srcDir = srcDir
if (!propertyFileChanged) {
System.out.println("Here " + this.getClass().getName());
setJmeterPropertyFile(new File(srcDir, JmeterPluginConvention.JMETER_DEFAULT_PROPERTY_NAME));
}
}

File getJmeterPropertyFile() {
Expand All @@ -218,7 +216,6 @@ abstract class JmeterAbstractTask extends ConventionTask{

void setJmeterPropertyFile(File jmeterPropertyFile) {
this.jmeterPropertyFile = jmeterPropertyFile
propertyFileChanged = true
}

String getMaxHeapSize() {
Expand Down
2 changes: 0 additions & 2 deletions src/main/groovy/com/github/kulya/gradle/plugins/jmeter/JmeterPluginConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,10 @@ public class JmeterPluginConvention {
*/
private List<File> jmeterUserPropertiesFiles;

public static final String JMETER_DEFAULT_PROPERTY_NAME = "jmeter.properties";

public JmeterPluginConvention(Project project) {
reportDir = new File(project.getBuildDir(), "jmeter-report");
srcDir = new File(project.getProjectDir(), "src/test/jmeter");
jmeterPropertyFile = new File(srcDir.getAbsolutePath() + File.separator + JMETER_DEFAULT_PROPERTY_NAME);
}

public List<File> getJmeterTestFiles() {
Expand Down
32 changes: 26 additions & 6 deletions src/main/groovy/com/github/kulya/gradle/plugins/jmeter/JmeterRunTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package com.github.kulya.gradle.plugins.jmeter;

import com.github.kulya.gradle.plugins.jmeter.worker.JMeterRunner;

import org.apache.commons.io.IOUtils;
import org.apache.tools.ant.DirectoryScanner;
import org.gradle.api.GradleException;

import javax.xml.transform.TransformerException;

import java.io.*;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand Down Expand Up @@ -201,10 +203,26 @@ private String executeJmeterTest(String fileLocation) {
List<String> args = new ArrayList<String>();
args.addAll(Arrays.asList("-n",
"-t", testFile.getCanonicalPath(),
"-l", resultFile.getCanonicalPath(),
"-p", getJmeterPropertyFile().getCanonicalPath()));


"-l", resultFile.getCanonicalPath()
));

File propsInSrcDir = new File(srcDir,"jmeter.properties");
args.add("-p");

//1. Is jmeterPropertyFile defined?
if (getJmeterPropertyFile() != null)
args.add(getJmeterPropertyFile().getCanonicalPath());

//2. Does jmeter.properties exist in $srcDir/test/jmeter
else if (propsInSrcDir.exists())
args.add(propsInSrcDir.getCanonicalPath());

//3. If neither, use the default jmeter.properties
else{
File defPropsFile = new File(workDir + System.getProperty("default_jm_properties"));
args.add(defPropsFile.getCanonicalPath());
}

if(jmeterUserPropertiesFiles!=null)
{
for(File userPropertyFile: jmeterUserPropertiesFiles)
Expand All @@ -220,15 +238,17 @@ private String executeJmeterTest(String fileLocation) {
if (remote) {
args.add("-r");
}
log.debug("JMeter is called with the following command line arguments: " + args.toString());


log.info("JMeter is called with the following command line arguments: " + args.toString());


JmeterSpecs specs = new JmeterSpecs();
specs.getSystemProperties().put("search_paths", System.getProperty("search_paths"));
specs.getSystemProperties().put("jmeter.home", getWorkDir().getAbsolutePath());
specs.getSystemProperties().put("saveservice_properties", System.getProperty("saveservice_properties"));
specs.getSystemProperties().put("upgrade_properties", System.getProperty("upgrade_properties"));
specs.getSystemProperties().put("log_file", System.getProperty("log_file"));
specs.getSystemProperties().put("jmeter.save.saveservice.output_format","xml");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this necessary, as i recall this used to be in the jmeter.properties file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line in jmeter.properties (it is commented out)

#jmeter.save.saveservice.output_format=csv

which implies that the default format is xml. But for some reason, when using this plugin to run a jmeter test, the results are in csv format. see #45. I added this line to remedy that.

specs.getJmeterProperties().addAll(args);
specs.setMaxHeapSize(maxHeapSize);
new JMeterRunner().executeJmeterCommand(specs, getWorkDir().getAbsolutePath());
Expand Down
Loading