NIHVIVO-1129 move the ReportsMerger into its own package, so the FileFaker can have one to itself.
This commit is contained in:
jeb228
parent
0c50024664
commit
b1bd6cf652
9 changed files with 16 additions and 9 deletions
|
|
@ -215,7 +215,7 @@ report - Just summarize output from previously run tests.
|
||||||
<property name="merge.input.filenames"
|
<property name="merge.input.filenames"
|
||||||
value="ver_release1.1.1/SecondTests-rel-1-1-1.html, ver_trunkRdb/SecondTests-rel-1-2.html, ver_trunkSdb/SecondTests-rel-1-2.html" />
|
value="ver_release1.1.1/SecondTests-rel-1-1-1.html, ver_trunkRdb/SecondTests-rel-1-2.html, ver_trunkSdb/SecondTests-rel-1-2.html" />
|
||||||
|
|
||||||
<java classname="edu.cornell.mannlib.vitro.utilities.loadtesting.ReportsMerger"
|
<java classname="edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger.ReportsMerger"
|
||||||
fork="yes"
|
fork="yes"
|
||||||
failonerror="true">
|
failonerror="true">
|
||||||
<classpath location="${build.dir}" />
|
<classpath location="${build.dir}" />
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||||
|
|
||||||
package edu.cornell.mannlib.vitro.utilities.loadtesting;
|
package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
|
||||||
|
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
|
@ -10,6 +10,7 @@ import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.TreeSet;
|
import java.util.TreeSet;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Write the merged data to an HTML page.
|
* Write the merged data to an HTML page.
|
||||||
*/
|
*/
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||||
|
|
||||||
package edu.cornell.mannlib.vitro.utilities.loadtesting;
|
package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
|
||||||
|
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
|
@ -10,6 +10,7 @@ import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.TreeSet;
|
import java.util.TreeSet;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Write the merged data to an HTML page.
|
* Write the merged data to an HTML page.
|
||||||
*
|
*
|
||||||
|
|
@ -1,12 +1,13 @@
|
||||||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||||
|
|
||||||
package edu.cornell.mannlib.vitro.utilities.loadtesting;
|
package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Take two or more reports from JMeter's test results, and merge them into a
|
* Take two or more reports from JMeter's test results, and merge them into a
|
||||||
* unified HTML report.
|
* unified HTML report.
|
||||||
|
|
@ -1,11 +1,12 @@
|
||||||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||||
|
|
||||||
package edu.cornell.mannlib.vitro.utilities.loadtesting;
|
package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parse the command-line parameters for the ReportManager
|
* Parse the command-line parameters for the ReportManager
|
||||||
*/
|
*/
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||||
|
|
||||||
package edu.cornell.mannlib.vitro.utilities.loadtesting;
|
package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileWriter;
|
import java.io.FileWriter;
|
||||||
|
|
@ -10,6 +10,7 @@ import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A base implementation of ReportsMergerParameters
|
* A base implementation of ReportsMergerParameters
|
||||||
*/
|
*/
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||||
|
|
||||||
package edu.cornell.mannlib.vitro.utilities.loadtesting;
|
package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Info about the executions of a single test in a single file.
|
* Info about the executions of a single test in a single file.
|
||||||
|
|
@ -1,12 +1,13 @@
|
||||||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||||
|
|
||||||
package edu.cornell.mannlib.vitro.utilities.loadtesting;
|
package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
|
||||||
|
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the data that was parsed from a single results file.
|
* Holds the data that was parsed from a single results file.
|
||||||
*/
|
*/
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||||
|
|
||||||
package edu.cornell.mannlib.vitro.utilities.loadtesting;
|
package edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
@ -14,6 +14,7 @@ import java.util.Map;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parse a single test results file.
|
* Parse a single test results file.
|
||||||
*/
|
*/
|
||||||
Loading…
Add table
Reference in a new issue