litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1129 move the ReportsMerger into its own package, so the FileFaker can have one to itself.

Browse source
This commit is contained in:
jeb228 2011-01-20 22:11:26 +00:00
parent 0c50024664
commit b1bd6cf652
9 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utilities/load-testing/build.xml
View file

@ -215,7 +215,7 @@ report - Just summarize output from previously run tests.
<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" />
<java classname="edu.cornell.mannlib.vitro.utilities.loadtesting.ReportsMerger"
<java classname="edu.cornell.mannlib.vitro.utilities.loadtesting.reportmerger.ReportsMerger"
fork="yes"
failonerror="true">
<classpath location="${build.dir}" />

3
utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/OutputMarshaller.java → utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/OutputMarshaller.java
View file

@ -1,6 +1,6 @@
/* $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.text.SimpleDateFormat;
@ -10,6 +10,7 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
/**
* Write the merged data to an HTML page.
*/

3
utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/OutputMarshaller2.java → utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/OutputMarshaller2.java
View file

@ -1,6 +1,6 @@
/* $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.text.SimpleDateFormat;
@ -10,6 +10,7 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
/**
* Write the merged data to an HTML page.
*

3
utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMerger.java → utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMerger.java
View file

@ -1,12 +1,13 @@
/* $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.PrintWriter;
import java.util.ArrayList;
import java.util.List;
/**
* Take two or more reports from JMeter's test results, and merge them into a
* unified HTML report.

3
utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMergerParameters.java → utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMergerParameters.java
View file

@ -1,11 +1,12 @@
/* $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.PrintWriter;
import java.util.List;
/**
* Parse the command-line parameters for the ReportManager
*/

3
utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/ReportsMergerParametersImpl.java → utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/ReportsMergerParametersImpl.java
View file

@ -1,6 +1,6 @@
/* $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.FileWriter;
@ -10,6 +10,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* A base implementation of ReportsMergerParameters
*/

2
utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultInfo.java → utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultInfo.java
View file

@ -1,6 +1,6 @@
/* $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.

3
utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultsFileData.java → utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultsFileData.java
View file

@ -1,12 +1,13 @@
/* $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.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* Holds the data that was parsed from a single results file.
*/

3
utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/TestResultsParser.java → utilities/load-testing/src/edu/cornell/mannlib/vitro/utilities/loadtesting/reportmerger/TestResultsParser.java
View file

@ -1,6 +1,6 @@
/* $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.File;
@ -14,6 +14,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Parse a single test results file.
*/