Author: sebb Date: Fri Aug 14 19:05:57 2009 New Revision: 804321 URL: http://svn.apache.org/viewvc?rev=804321&view=rev Log: Add @Override and @Deprecated annotations
Modified: jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/PackageTest.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/PackageTest.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeFunction.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/NullURLConnection.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java jakarta/jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java Modified: jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java Fri Aug 14 19:05:57 2009 @@ -680,6 +680,7 @@ final CLOptionDescriptor[] options = new CLOptionDescriptor[] { YOU }; final ParserControl control = new AbstractParserControl() { + @Override public boolean isFinished(int lastOptionCode) { return (lastOptionCode == YOU_OPT); } @@ -702,6 +703,7 @@ final CLOptionDescriptor[] options2 = new CLOptionDescriptor[] { ALL, CLEAR1, CLEAR2, CLEAR3, CLEAR5 }; final ParserControl control1 = new AbstractParserControl() { + @Override public boolean isFinished(int lastOptionCode) { return (lastOptionCode == YOU_OPT); } @@ -740,6 +742,7 @@ final CLOptionDescriptor[] options2 = new CLOptionDescriptor[] {}; final ParserControl control1 = new AbstractParserControl() { + @Override public boolean isFinished(final int lastOptionCode) { return (lastOptionCode == CLEAR1_OPT); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java Fri Aug 14 19:05:57 2009 @@ -39,6 +39,7 @@ private JMeterVariables vars; private AssertionResult result; + @Override public void setUp() throws MalformedURLException { jmctx = JMeterContextService.getContext(); assertion = new ResponseAssertion(); @@ -232,6 +233,7 @@ // unknown. static final String TEST_PATTERN = ".*A.*\\."; + @Override public void run() { ResponseAssertion assertion = new ResponseAssertion(); assertion.setTestFieldResponseData(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java Fri Aug 14 19:05:57 2009 @@ -34,7 +34,8 @@ private String data1 = "response Data\n" + "line 2\n\nEOF"; private int data1Len=data1.length(); - public void setUp() { + @Override + public void setUp() { jmctx = JMeterContextService.getContext(); assertion = new SizeAssertion(); assertion.setThreadContext(jmctx); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java Fri Aug 14 19:05:57 2009 @@ -45,6 +45,7 @@ super(arg0); } + @Override protected void setUp() throws Exception { super.setUp(); jmctx = JMeterContextService.getContext(); @@ -58,6 +59,7 @@ // LoggingManager.setPriority("DEBUG","jmeter"); } + @Override protected void tearDown() throws Exception { super.tearDown(); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java Fri Aug 14 19:05:57 2009 @@ -46,6 +46,7 @@ super(arg0); } + @Override protected void setUp() throws Exception { super.setUp(); jmctx = JMeterContextService.getContext(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java Fri Aug 14 19:05:57 2009 @@ -40,6 +40,7 @@ super(arg0); } + @Override public void tearDown() throws IOException{ FileServer.getFileServer().closeFiles(); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestWhileController.java Fri Aug 14 19:05:57 2009 @@ -42,6 +42,7 @@ private JMeterContext jmctx; private JMeterVariables jmvars; + @Override public void setUp() { jmctx = JMeterContextService.getContext(); jmctx.setVariables(new JMeterVariables()); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/PackageTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/PackageTest.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/PackageTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/PackageTest.java Fri Aug 14 19:05:57 2009 @@ -49,6 +49,7 @@ private JMeterContext jmctx = null; + @Override public void setUp() { jmctx = JMeterContextService.getContext(); variables = new HashMap(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java Fri Aug 14 19:05:57 2009 @@ -38,6 +38,7 @@ super(name); } + @Override public void setUp() { variables = new TestPlan(); variables.addParameter("server", "jakarta.apache.org"); @@ -85,6 +86,7 @@ * * @see junit.framework.TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { JMeterContextService.getContext().setSamplingStarted(false); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java Fri Aug 14 19:05:57 2009 @@ -41,6 +41,7 @@ private JMeterContext jmctx = null; + @Override public void setUp() { jmctx = JMeterContextService.getContext(); extractor = new RegexExtractor(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java Fri Aug 14 19:05:57 2009 @@ -41,6 +41,7 @@ private final static String VAL_NAME = "value"; private final static String VAL_NAME_NR = "value_matchNr"; + @Override public void setUp() { jmctx = JMeterContextService.getContext(); extractor = new XPathExtractor(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/PackageTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/PackageTest.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/PackageTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/PackageTest.java Fri Aug 14 19:05:57 2009 @@ -220,6 +220,7 @@ private JMeterVariables vars = null; + @Override public void setUp() { jmctx = JMeterContextService.getContext(); jmctx.setVariables(new JMeterVariables()); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java Fri Aug 14 19:05:57 2009 @@ -43,6 +43,7 @@ super(name); } + @Override public void setUp() { function = new JexlFunction(); result = new SampleResult(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java Fri Aug 14 19:05:57 2009 @@ -45,6 +45,7 @@ super(name); } + @Override public void setUp() { variable = new RegexFunction(); result = new SampleResult(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeFunction.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeFunction.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeFunction.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeFunction.java Fri Aug 14 19:05:57 2009 @@ -46,6 +46,7 @@ super(name); } + @Override public void setUp() { jmctx = JMeterContextService.getContext(); vars = new JMeterVariables(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java Fri Aug 14 19:05:57 2009 @@ -30,6 +30,7 @@ super(name); } + @Override public void setUp() { save = new Save(); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java Fri Aug 14 19:05:57 2009 @@ -63,6 +63,7 @@ public TestSampler() { } + @Override public String toString() { return getName(); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java Fri Aug 14 19:05:57 2009 @@ -37,6 +37,7 @@ super(name); } + @Override protected void setUp() { Arguments args = new Arguments(); args.addArgument("username", "mstover"); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java Fri Aug 14 19:05:57 2009 @@ -37,6 +37,7 @@ private JMeterContext jmctx = null; + @Override public void setUp() throws Exception { super.setUp(); jmctx = JMeterContextService.getContext(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java Fri Aug 14 19:05:57 2009 @@ -65,10 +65,12 @@ TestSetup setup = new TestSetup(new TestSuite(TestHTTPMirrorThread.class)){ private HttpMirrorServer httpServer; + @Override protected void setUp() throws Exception { httpServer = startHttpMirror(HTTP_SERVER_PORT); } + @Override protected void tearDown() throws Exception { // Shutdown the http server httpServer.stopServer(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/gui/TestHttpTestSampleGui.java Fri Aug 14 19:05:57 2009 @@ -29,6 +29,7 @@ super(name); } + @Override public void setUp() { gui = new HttpTestSampleGui(); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java Fri Aug 14 19:05:57 2009 @@ -40,6 +40,7 @@ private JMeterContext jmctx = null; + @Override public void setUp() { jmctx = JMeterContextService.getContext(); parser.setThreadContext(jmctx); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java Fri Aug 14 19:05:57 2009 @@ -40,6 +40,7 @@ super(name); } + @Override public void setUp() { context = JMeterContextService.getContext(); mod = new URLRewritingModifier(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHtmlParsingUtils.java Fri Aug 14 19:05:57 2009 @@ -30,6 +30,7 @@ super(name); } + @Override protected void setUp() { } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java Fri Aug 14 19:05:57 2009 @@ -33,6 +33,7 @@ super(name); } + @Override public void setUp() { control = new ProxyControl(); control.addIncludedPattern(".*\\.jsp"); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java Fri Aug 14 19:05:57 2009 @@ -32,6 +32,7 @@ * @see org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase#sample(java.net.URL, * java.lang.String, boolean, int) */ + @Override protected HTTPSampleResult sample(URL u, String s, boolean b, int i) { throw new UnsupportedOperationException("For test purposes only"); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/NullURLConnection.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/NullURLConnection.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/NullURLConnection.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/NullURLConnection.java Fri Aug 14 19:05:57 2009 @@ -41,13 +41,16 @@ super(url); } + @Override public void connect() { } + @Override public void setRequestProperty(String name, String value) { data.put(name, value); } + @Override public String getRequestProperty(String name) { return (String) data.get(name); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java Fri Aug 14 19:05:57 2009 @@ -53,6 +53,7 @@ private File temporaryFile; PostWriter postWriter; + @Override protected void setUp() throws Exception { establishConnection(); sampler = new HTTPSampler();// This must be the original (Java) HTTP sampler @@ -70,6 +71,7 @@ output.close(); } + @Override protected void tearDown() throws Exception { // delete temporay file temporaryFile.delete(); @@ -886,24 +888,30 @@ super(new URL(url)); } + @Override public void connect() throws IOException { } + @Override public OutputStream getOutputStream() throws IOException { return output; } + @Override public void disconnect() { } + @Override public boolean usingProxy() { return false; } + @Override public String getRequestProperty(String key) { return (String) properties.get(key); } + @Override public void setRequestProperty(String key, String value) { properties.put(key, value); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java Fri Aug 14 19:05:57 2009 @@ -74,6 +74,7 @@ public static Test suite(){ TestSetup setup = new TestSetup(new TestSuite(TestHTTPSamplersAgainstHttpMirrorServer.class)){ private HttpMirrorServer httpServer; + @Override protected void setUp() throws Exception { httpServer = TestHTTPMirrorThread.startHttpMirror(MIRROR_PORT); // Create the test file content @@ -88,6 +89,7 @@ output.close(); } + @Override protected void tearDown() throws Exception { // Shutdown mirror server httpServer.stopServer(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/accesslog/TestLogFilter.java Fri Aug 14 19:05:57 2009 @@ -76,6 +76,7 @@ private LogFilter testf; + @Override public void setUp() { testf = new LogFilter(); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java Fri Aug 14 19:05:57 2009 @@ -39,6 +39,7 @@ super(arg0); } + @Override public void tearDown() throws IOException{ FS.closeFiles(); FS.resetBase(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java Fri Aug 14 19:05:57 2009 @@ -78,6 +78,7 @@ ResourceBundle bundle; + @Override public void setUp() { if (testLocale == null) { return;// errorDetected() @@ -96,10 +97,12 @@ } } + @Override public void tearDown() { JMeterUtils.setLocale(Locale.getDefault()); } + @Override public void runTest() throws Throwable { if (testLocale == null) { super.runTest(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java Fri Aug 14 19:05:57 2009 @@ -52,6 +52,7 @@ return null; } + @Override public Object clone() { return new TestSampler(); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java Fri Aug 14 19:05:57 2009 @@ -38,6 +38,7 @@ super(arg0); } + @Override public void setUp() { calc = new StatCalculator(); } Modified: jakarta/jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java?rev=804321&r1=804320&r2=804321&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jorphan/reflect/TestFunctor.java Fri Aug 14 19:05:57 2009 @@ -61,6 +61,7 @@ Test1a(String s){ super("1a:"+s); } + @Override public String getName(){ return super.getName()+"."; } @@ -85,6 +86,7 @@ super(arg0); } + @Override public void setUp(){ LoggingManager.setPriority("FATAL_ERROR",LoggingManager.removePrefix(Functor.class.getName())); } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org