Modified: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/testelement/LineGraphTest.java URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/testelement/LineGraphTest.java?rev=349162&r1=349161&r2=349162&view=diff ============================================================================== --- jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/testelement/LineGraphTest.java (original) +++ jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/testelement/LineGraphTest.java Sat Nov 26 17:01:05 2005 @@ -1,83 +1,83 @@ -/*
- * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.jmeter.testelement; - -import javax.swing.JComponent; - -import org.apache.jmeter.save.SaveGraphicsService; -import org.apache.jmeter.junit.JMeterTestCase; -import org.apache.jmeter.util.JMeterUtils; -import org.apache.jorphan.logging.LoggingManager; -import org.apache.log.Logger; - -/** - * @author peter lin - * - */ -public class LineGraphTest extends JMeterTestCase { - - private static final Logger log = LoggingManager.getLoggerForClass(); - - /** - * @param arg0 - */ - public LineGraphTest(String arg0) { - super(arg0); - } - - public void testGenerateLineChart() { - log.info("jtl version=" + JMeterUtils.getProperty("file_format.testlog")); - // String sampleLog = "C:/eclipse3/workspace/jmeter-21/bin/testfiles/sample_log1.jtl"; - String sampleLog = "testfiles/sample_log1.jtl"; - String sampleLog2 = "testfiles/sample_log1b.jtl"; - String sampleLog3 = "testfiles/sample_log1c.jtl"; - JTLData input = new JTLData(); - JTLData input2 = new JTLData(); - JTLData input3 = new JTLData(); - input.setDataSource(sampleLog); - input.loadData(); - input2.setDataSource(sampleLog2); - input2.loadData(); - input3.setDataSource(sampleLog3); - input3.loadData(); - - assertTrue((input.getStartTimestamp() > 0)); - assertTrue((input.getEndTimestamp() > input.getStartTimestamp())); - assertTrue((input.getURLs().size() > 0)); - log.info("URL count=" + input.getURLs().size()); - java.util.ArrayList list = new java.util.ArrayList(); - list.add(input); - list.add(input2); - list.add(input3); - - LineChart lgraph = new LineChart(); - lgraph.setTitle("Sample Line Graph"); - lgraph.setCaption("Sample"); - lgraph.setName("Sample"); - lgraph.setYAxis("milliseconds"); - lgraph.setYLabel("Test Runs"); - lgraph.setXAxis(AbstractTable.REPORT_TABLE_MAX); - lgraph.setXLabel(AbstractChart.X_DATA_FILENAME_LABEL); - lgraph.setURLs("jakarta_home,jmeter_home"); - JComponent gr = lgraph.renderChart(list); - assertNotNull(gr); - SaveGraphicsService serv = new SaveGraphicsService(); - String filename = lgraph.getTitle(); - filename = filename.replace(' ','_'); - serv.saveJComponent("./testfiles/" + filename,SaveGraphicsService.PNG,gr); - } -} +/* + * Copyright 2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.apache.jmeter.testelement; + +import javax.swing.JComponent; + +import org.apache.jmeter.save.SaveGraphicsService; +import org.apache.jmeter.junit.JMeterTestCase; +import org.apache.jmeter.util.JMeterUtils; +import org.apache.jorphan.logging.LoggingManager; +import org.apache.log.Logger; + +/** + * @author peter lin + * + */ +public class LineGraphTest extends JMeterTestCase { + + private static final Logger log = LoggingManager.getLoggerForClass(); + + /** + * @param arg0 + */ + public LineGraphTest(String arg0) { + super(arg0); + } + + public void testGenerateLineChart() { + log.info("jtl version=" + JMeterUtils.getProperty("file_format.testlog")); + // String sampleLog = "C:/eclipse3/workspace/jmeter-21/bin/testfiles/sample_log1.jtl"; + String sampleLog = "testfiles/sample_log1.jtl"; + String sampleLog2 = "testfiles/sample_log1b.jtl"; + String sampleLog3 = "testfiles/sample_log1c.jtl"; + JTLData input = new JTLData(); + JTLData input2 = new JTLData(); + JTLData input3 = new JTLData(); + input.setDataSource(sampleLog); + input.loadData(); + input2.setDataSource(sampleLog2); + input2.loadData(); + input3.setDataSource(sampleLog3); + input3.loadData(); + + assertTrue((input.getStartTimestamp() > 0)); + assertTrue((input.getEndTimestamp() > input.getStartTimestamp())); + assertTrue((input.getURLs().size() > 0)); + log.info("URL count=" + input.getURLs().size()); + java.util.ArrayList list = new java.util.ArrayList(); + list.add(input); + list.add(input2); + list.add(input3); + + LineChart lgraph = new LineChart(); + lgraph.setTitle("Sample Line Graph"); + lgraph.setCaption("Sample"); + lgraph.setName("Sample"); + lgraph.setYAxis("milliseconds"); + lgraph.setYLabel("Test Runs"); + lgraph.setXAxis(AbstractTable.REPORT_TABLE_MAX); + lgraph.setXLabel(AbstractChart.X_DATA_FILENAME_LABEL); + lgraph.setURLs("jakarta_home,jmeter_home"); + JComponent gr = lgraph.renderChart(list); + assertNotNull(gr); + SaveGraphicsService serv = new SaveGraphicsService(); + String filename = lgraph.getTitle(); + filename = filename.replace(' ','_'); + serv.saveJComponent("./testfiles/" + filename,SaveGraphicsService.PNG,gr); + } +} Propchange: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/testelement/LineGraphTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/testelement/LineGraphTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/PackageTest.java URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/PackageTest.java?rev=349162&r1=349161&r2=349162&view=diff ============================================================================== --- jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/PackageTest.java (original) +++ jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/PackageTest.java Sat Nov 26 17:01:05 2005 @@ -1,65 +1,65 @@ -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.jmeter.util; - -import junit.framework.TestCase; - -public class PackageTest extends TestCase { - - public PackageTest() { - super(); - } - - public PackageTest(String arg0) { - super(arg0); - } - - public void testServer() throws Exception { - BeanShellServer bshs = new BeanShellServer(9876, ""); - assertNotNull(bshs); - // Not sure we can test anything else here - } - public void testSub1() throws Exception { - String input = "http://jakarta.apache.org/jmeter/index.html";; - String pattern = "jakarta.apache.org"; - String sub = "${server}"; - assertEquals("http://${server}/jmeter/index.html";, StringUtilities.substitute(input, pattern, sub)); - } - - public void testSub2() throws Exception { - String input = "arg1=param1;param1"; - String pattern = "param1"; - String sub = "${value}"; - assertEquals("arg1=${value};${value}", StringUtilities.substitute(input, pattern, sub)); - } - - public void testSub3() throws Exception { - String input = "jakarta.apache.org"; - String pattern = "jakarta.apache.org"; - String sub = "${server}"; - assertEquals("${server}", StringUtilities.substitute(input, pattern, sub)); - } - - public void testSub4() throws Exception { - String input = "//a///b////c"; - String pattern = "//"; - String sub = "/"; - assertEquals("/a//b//c", StringUtilities.substitute(input, pattern, sub)); - } - -} +/* + * Copyright 2001-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.jmeter.util; + +import junit.framework.TestCase; + +public class PackageTest extends TestCase { + + public PackageTest() { + super(); + } + + public PackageTest(String arg0) { + super(arg0); + } + + public void testServer() throws Exception { + BeanShellServer bshs = new BeanShellServer(9876, ""); + assertNotNull(bshs); + // Not sure we can test anything else here + } + public void testSub1() throws Exception { + String input = "http://jakarta.apache.org/jmeter/index.html";; + String pattern = "jakarta.apache.org"; + String sub = "${server}"; + assertEquals("http://${server}/jmeter/index.html";, StringUtilities.substitute(input, pattern, sub)); + } + + public void testSub2() throws Exception { + String input = "arg1=param1;param1"; + String pattern = "param1"; + String sub = "${value}"; + assertEquals("arg1=${value};${value}", StringUtilities.substitute(input, pattern, sub)); + } + + public void testSub3() throws Exception { + String input = "jakarta.apache.org"; + String pattern = "jakarta.apache.org"; + String sub = "${server}"; + assertEquals("${server}", StringUtilities.substitute(input, pattern, sub)); + } + + public void testSub4() throws Exception { + String input = "//a///b////c"; + String pattern = "//"; + String sub = "/"; + assertEquals("/a//b//c", StringUtilities.substitute(input, pattern, sub)); + } + +} Propchange: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/PackageTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/PackageTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/TestJMeterUtils.java URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/TestJMeterUtils.java?rev=349162&r1=349161&r2=349162&view=diff ============================================================================== --- jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/TestJMeterUtils.java (original) +++ jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/TestJMeterUtils.java Sat Nov 26 17:01:05 2005 @@ -1,61 +1,61 @@ -/* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -/** - * Package to test JMeterUtils methods - */ - -package org.apache.jmeter.util; - -import junit.framework.TestCase; - -public class TestJMeterUtils extends TestCase { - - public TestJMeterUtils() { - super(); - } - - public TestJMeterUtils(String arg0) { - super(arg0); - } - - - public void testSplit1() { - String in = "a,bc,,"; // Test ignore trailing split characters - String out[] = JMeterUtils.split(in, ",","?"); - assertEquals(3, out.length); - assertEquals("a", out[0]); - assertEquals("bc", out[1]); - } - - public void testSplit2() { - String in = ",,a,bc"; // Test leading split characters with default - String out[] = JMeterUtils.split(in, ",","?"); - assertEquals(3, out.length); - assertEquals("a", out[1]); - assertEquals("bc", out[2]); - } - - public void testSplit3() { - String in = ",,a,bc"; // Test leading split characters no default - String out[] = JMeterUtils.split(in, ",",""); - assertEquals(3, out.length); - assertEquals("", out[0]); - assertEquals("a", out[1]); - assertEquals("bc", out[2]); - } -} +/* + * Copyright 2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +/** + * Package to test JMeterUtils methods + */ + +package org.apache.jmeter.util; + +import junit.framework.TestCase; + +public class TestJMeterUtils extends TestCase { + + public TestJMeterUtils() { + super(); + } + + public TestJMeterUtils(String arg0) { + super(arg0); + } + + + public void testSplit1() { + String in = "a,bc,,"; // Test ignore trailing split characters + String out[] = JMeterUtils.split(in, ",","?"); + assertEquals(3, out.length); + assertEquals("a", out[0]); + assertEquals("bc", out[1]); + } + + public void testSplit2() { + String in = ",,a,bc"; // Test leading split characters with default + String out[] = JMeterUtils.split(in, ",","?"); + assertEquals(3, out.length); + assertEquals("a", out[1]); + assertEquals("bc", out[2]); + } + + public void testSplit3() { + String in = ",,a,bc"; // Test leading split characters no default + String out[] = JMeterUtils.split(in, ",",""); + assertEquals(3, out.length); + assertEquals("", out[0]); + assertEquals("a", out[1]); + assertEquals("bc", out[2]); + } +} Propchange: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/TestJMeterUtils.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/util/TestJMeterUtils.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/util/TestJorphanUtils.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
