Author: sebb
Date: Fri Aug 14 20:16:36 2009
New Revision: 804356
URL: http://svn.apache.org/viewvc?rev=804356&view=rev
Log:
Drop some deprecated/unused methods
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/exceptions/IllegalUserActionException.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/exceptions/IllegalUserActionException.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/exceptions/IllegalUserActionException.java?rev=804356&r1=804355&r2=804356&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/exceptions/IllegalUserActionException.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/exceptions/IllegalUserActionException.java
Fri Aug 14 20:16:36 2009
@@ -24,7 +24,7 @@
/**
* @deprecated - use IllegalUserActionException(String)
*/
- @Deprecated
+ @Deprecated // Needed for serialisation testing
public IllegalUserActionException() {
super();
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=804356&r1=804355&r2=804356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Fri Aug 14 20:16:36 2009
@@ -372,29 +372,6 @@
}
/**
- * Method to set the elapsed time for a sample. Retained for backward
- * compatibility with 3rd party add-ons.
- * It is assumed that the method is only called at the end of a sample
- * and that timeStamps are end-times
- *
- * Also used by SampleResultConverter when creating results from files.
- *
- * Must not be used in conjunction with sampleStart()/End()
- *
- * @deprecated use sampleStart() and sampleEnd() instead
- * @param elapsed
- * time in milliseconds
- */
- @Deprecated
- public void setTime(long elapsed) {
- if (startTime != 0 || endTime != 0){
- throw new RuntimeException("Calling setTime() after start/end
times have been set");
- }
- long now = currentTimeInMs();
- setTimes(now - elapsed, now);
- }
-
- /**
* Set the "marked" flag to show that the result has been written to the
file.
*
* @param filename
@@ -715,19 +692,6 @@
/**
* Returns the dataEncoding or the default if no dataEncoding was provided
- *
- * @deprecated use getDataEncodingWithDefault() or
getDataEncodingNoDefault() as needed.
- */
- @Deprecated
- public String getDataEncoding() {
- if (dataEncoding != null) {
- return dataEncoding;
- }
- return DEFAULT_ENCODING;
- }
-
- /**
- * Returns the dataEncoding or the default if no dataEncoding was provided
* @return the value of the dataEncoding or DEFAULT_ENCODING
*/
public String getDataEncodingWithDefault() {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=804356&r1=804355&r2=804356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
Fri Aug 14 20:16:36 2009
@@ -158,32 +158,6 @@
}
/**
- * Make a SampleResult given a delimited string.
- *
- * @param inputLine - line from CSV file
- * @param saveConfig - configuration
- * @param lineNumber - line number for error reporting
- * @return SampleResult
- *
- * @deprecated Does not handle quoted strings; use {...@link
#processSamples(String, Visualizer, ResultCollector)} instead
- *
- * @throws JMeterError
- */
- @Deprecated
- public static SampleEvent makeResultFromDelimitedString(
- final String inputLine,
- final SampleSaveConfiguration saveConfig, // may be updated
- final long lineNumber) {
- /*
- * Bug 40772: replaced StringTokenizer with String.split(), as the
- * former does not return empty tokens.
- */
- // The \Q prefix is needed to ensure that meta-characters (e.g. ".")
work.
- String parts[]=inputLine.split("\\Q"+saveConfig.getDelimiter());//
$NON-NLS-1$
- return makeResultFromDelimitedString(parts, saveConfig, lineNumber);
- }
-
- /**
* Make a SampleResult given a set of tokens
* @param parts tokens parsed from the input
* @param saveConfig the save configuration (may be updated)
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java?rev=804356&r1=804355&r2=804356&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java Fri
Aug 14 20:16:36 2009
@@ -171,23 +171,6 @@
* calculates the average page size, which means divide the bytes by number
* of samples.
*
- * This is an ambiguous name, so:
- * @deprecated use getAvgPageBytes() instead.
- *
- * @return average page size
- */
- @Deprecated
- public double getPageSize() {
- if (count > 0 && bytes > 0) {
- return (double) bytes / count;
- }
- return 0.0;
- }
-
- /**
- * calculates the average page size, which means divide the bytes by number
- * of samples.
- *
* @return average page size in bytes
*/
public double getAvgPageBytes() {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java?rev=804356&r1=804355&r2=804356&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Fri Aug 14 20:16:36 2009
@@ -133,25 +133,6 @@
}
/**
- * Should calculate the average page size, which means divide the bytes by
number
- * of samples - actually calculates the throughput in bytes / second
- *
- * @deprecated use getBytesPerSecond() instead
- * @see #getAvgPageBytes() for the average page size
- */
- @Deprecated
- public double getPageSize() {
- double rate = 0;
- if (this.getElapsed() > 0 && calculator.getTotalBytes() > 0) {
- rate = calculator.getTotalBytes() / ((double) this.getElapsed() /
1000);
- }
- if (rate < 0) {
- rate = 0;
- }
- return rate;
- }
-
- /**
* Throughput in bytes / second
*
* @return throughput in bytes/second
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java?rev=804356&r1=804355&r2=804356&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
Fri Aug 14 20:16:36 2009
@@ -188,21 +188,18 @@
public void testEncodingAndType() throws Exception {
// check default
SampleResult res = new SampleResult();
- assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncoding());
assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncodingWithDefault());
assertEquals("DataType should be blank","",res.getDataType());
assertNull(res.getDataEncodingNoDefault());
// check null changes nothing
res.setEncodingAndType(null);
- assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncoding());
assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncodingWithDefault());
assertEquals("DataType should be blank","",res.getDataType());
assertNull(res.getDataEncodingNoDefault());
// check no charset
res.setEncodingAndType("text/html");
- assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncoding());
assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncodingWithDefault());
assertEquals("text",res.getDataType());
assertNull(res.getDataEncodingNoDefault());
@@ -211,14 +208,12 @@
res.setEncodingAndType("text/html; charset=aBcd");
assertEquals("aBcd",res.getDataEncodingWithDefault());
assertEquals("aBcd",res.getDataEncodingNoDefault());
- assertEquals("aBcd",res.getDataEncoding());
assertEquals("text",res.getDataType());
// Check quoted charset
res.setEncodingAndType("text/html; charset=\"aBCd\"");
assertEquals("aBCd",res.getDataEncodingWithDefault());
assertEquals("aBCd",res.getDataEncodingNoDefault());
- assertEquals("aBCd",res.getDataEncoding());
assertEquals("text",res.getDataType());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
