You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/01/17 21:08:52 UTC

svn commit: r369903 - in /jakarta/jmeter/branches/rel-2-1: src/core/org/apache/jmeter/gui/action/ src/jorphan/org/apache/jorphan/collections/ src/jorphan/org/apache/jorphan/math/ src/reports/org/apache/jmeter/report/gui/action/ test/src/org/apache/jmet...

Author: sebb
Date: Tue Jan 17 12:08:35 2006
New Revision: 369903

URL: http://svn.apache.org/viewcvs?rev=369903&view=rev
Log:
Move test code to test tree

Added:
    jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/action/PackageTest.java
    jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/collections/PackageTest.java
Modified:
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
    jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/HashTree.java
    jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
    jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
    jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/math/StatCalculator.java
    jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportSaveGraphics.java
    jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/math/TestStatCalculator.java

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java?rev=369903&r1=369902&r2=369903&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java Tue Jan 17 12:08:35 2006
@@ -102,21 +102,4 @@
 			}
 		}
 	}
-
-//	public static class Test extends junit.framework.TestCase {
-//		private SaveGraphics save;
-//
-//		public Test(String name) {
-//			super(name);
-//		}
-//
-//		public void setUp() throws Exception {
-//            super.setUp();
-//			save = new SaveGraphics();
-//		}
-//
-//		public void testSomething() throws Exception {
-//			// TODO write some tests
-//		}
-//	}
 }

Modified: jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=369903&r1=369902&r2=369903&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/HashTree.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/HashTree.java Tue Jan 17 12:08:35 2006
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
  *
@@ -30,11 +29,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
-
 /**
  * This class is used to create a tree structure of objects. Each element in the
  * tree is also a key to the next node down in the tree. It provides many ways
@@ -1072,69 +1066,6 @@
 				spaces.setLength(depth * 2);
 			}
 			return spaces.toString();
-		}
-	}
-
-	public static class Test extends TestCase {
-		public Test(String name) {
-			super(name);
-		}
-
-		public void testAdd1() throws Exception {
-			Logger log = LoggingManager.getLoggerForClass();
-			Collection treePath = Arrays.asList(new String[] { "1", "2", "3", "4" });
-			HashTree tree = new HashTree();
-			log.debug("treePath = " + treePath);
-			tree.add(treePath, "value");
-			log.debug("Now treePath = " + treePath);
-			log.debug(tree.toString());
-			assertEquals(1, tree.list(treePath).size());
-			assertEquals("value", tree.getArray(treePath)[0]);
-		}
-
-		public void testEqualsAndHashCode() throws Exception {
-			HashTree tree1 = new HashTree("abcd");
-			HashTree tree2 = new HashTree("abcd");
-			HashTree tree3 = new HashTree("abcde");
-			HashTree tree4 = new HashTree("abcde");
-
-			assertTrue(tree1.equals(tree1));
-			assertTrue(tree1.equals(tree2));
-			assertTrue(tree2.equals(tree1));
-			assertTrue(tree2.equals(tree2));
-			assertTrue(tree1.hashCode() == tree2.hashCode());
-
-			assertTrue(tree3.equals(tree3));
-			assertTrue(tree3.equals(tree4));
-			assertTrue(tree4.equals(tree3));
-			assertTrue(tree4.equals(tree4));
-			assertTrue(tree3.hashCode() == tree4.hashCode());
-
-			assertNotSame(tree1, tree2);
-			assertNotSame(tree1, tree3);
-			assertNotSame(tree1, tree4);
-			assertNotSame(tree2, tree3);
-			assertNotSame(tree2, tree4);
-
-			assertFalse(tree1.equals(tree3));
-			assertFalse(tree1.equals(tree4));
-			assertFalse(tree2.equals(tree3));
-			assertFalse(tree2.equals(tree4));
-
-			assertNotNull(tree1);
-			assertNotNull(tree2);
-
-			tree1.add("abcd", tree3);
-			assertFalse(tree1.equals(tree2));
-			assertFalse(tree2.equals(tree1));// Check reflexive
-			if (tree1.hashCode() == tree2.hashCode()) {
-				// This is not a requirement
-				System.out.println("WARN: unequal HashTrees should not have equal hashCodes");
-			}
-			tree2.add("abcd", tree4);
-			assertTrue(tree1.equals(tree2));
-			assertTrue(tree2.equals(tree1));
-			assertTrue(tree1.hashCode() == tree2.hashCode());
 		}
 	}
 }

Modified: jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java?rev=369903&r1=369902&r2=369903&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java Tue Jan 17 12:08:35 2006
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
  *
@@ -215,82 +214,6 @@
 
 	void writeObject(ObjectOutputStream oos) throws IOException {
 		oos.defaultWriteObject();
-	}
-
-	public static class Test extends junit.framework.TestCase {
-		public Test(String name) {
-			super(name);
-		}
-
-		public void testAddObjectAndTree() throws Exception {
-			ListedHashTree tree = new ListedHashTree("key");
-			ListedHashTree newTree = new ListedHashTree("value");
-			tree.add("key", newTree);
-			assertEquals(tree.list().size(), 1);
-			assertEquals("key", tree.getArray()[0]);
-			assertEquals(1, tree.getTree("key").list().size());
-			assertEquals(0, tree.getTree("key").getTree("value").size());
-			assertEquals(tree.getTree("key").getArray()[0], "value");
-			assertNotNull(tree.getTree("key").get("value"));
-		}
-
-		public void testEqualsAndHashCode() throws Exception {
-			ListedHashTree tree1 = new ListedHashTree("abcd");
-			ListedHashTree tree2 = new ListedHashTree("abcd");
-			ListedHashTree tree3 = new ListedHashTree("abcde");
-			ListedHashTree tree4 = new ListedHashTree("abcde");
-
-			assertTrue(tree1.equals(tree1));
-			assertTrue(tree1.equals(tree2));
-			assertTrue(tree2.equals(tree1));
-			assertTrue(tree2.equals(tree2));
-			assertTrue(tree1.hashCode() == tree2.hashCode());
-
-			assertTrue(tree3.equals(tree3));
-			assertTrue(tree3.equals(tree4));
-			assertTrue(tree4.equals(tree3));
-			assertTrue(tree4.equals(tree4));
-			assertTrue(tree3.hashCode() == tree4.hashCode());
-
-			assertNotSame(tree1, tree2);
-			assertNotSame(tree1, tree3);
-			assertFalse(tree1.equals(tree3));
-			assertFalse(tree3.equals(tree1));
-			assertFalse(tree1.equals(tree4));
-			assertFalse(tree4.equals(tree1));
-
-			assertFalse(tree2.equals(tree3));
-			assertFalse(tree3.equals(tree2));
-			assertFalse(tree2.equals(tree4));
-			assertFalse(tree4.equals(tree2));
-
-			tree1.add("abcd", tree3);
-			assertFalse(tree1.equals(tree2));
-			assertFalse(tree2.equals(tree1));
-
-			tree2.add("abcd", tree4);
-			assertTrue(tree1.equals(tree2));
-			assertTrue(tree2.equals(tree1));
-			assertTrue(tree1.hashCode() == tree2.hashCode());
-
-			tree1.add("a1");
-			tree1.add("a2");
-			// tree1.add("a3");
-			tree2.add("a2");
-			tree2.add("a1");
-
-			assertFalse(tree1.equals(tree2));
-			assertFalse(tree2.equals(tree1));
-			if (tree1.hashCode() == tree2.hashCode()) {
-				// This is not a requirement
-				System.out.println("WARN: unequal ListedHashTrees should not have equal hashcodes");
-
-			}
-
-			tree4.add("abcdef");
-			assertFalse(tree3.equals(tree4));
-			assertFalse(tree4.equals(tree3));
-		}
 	}
 
 	/*

Modified: jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/SearchByClass.java?rev=369903&r1=369902&r2=369903&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/SearchByClass.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/collections/SearchByClass.java Tue Jan 17 12:08:35 2006
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
  *
@@ -104,24 +103,6 @@
 			ListedHashTree tree = new ListedHashTree(node);
 			tree.set(node, subTree);
 			subTrees.put(node, tree);
-		}
-	}
-
-	public static class Test extends junit.framework.TestCase {
-		public Test(String name) {
-			super(name);
-		}
-
-		public void testSearch() throws Exception {
-			ListedHashTree tree = new ListedHashTree();
-			SearchByClass searcher = new SearchByClass(Integer.class);
-			String one = "one";
-			String two = "two";
-			Integer o = new Integer(1);
-			tree.add(one, o);
-			tree.getTree(one).add(o, two);
-			tree.traverse(searcher);
-			assertEquals(1, searcher.getSearchResults().size());
 		}
 	}
 

Modified: jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/math/StatCalculator.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/math/StatCalculator.java?rev=369903&r1=369902&r2=369903&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/math/StatCalculator.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/math/StatCalculator.java Tue Jan 17 12:08:35 2006
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
  *
@@ -25,8 +24,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 /**
  * This class serves as a way to calculate the median of a list of values. It is
  * not threadsafe.
@@ -207,35 +204,4 @@
 			values.add((index * (-1)) - 1, val);
 		}
 	}
-
-	public static class Test extends TestCase {
-		StatCalculator calc;
-
-		public Test(String name) {
-			super(name);
-		}
-
-		public void setUp() {
-			calc = new StatCalculator();
-		}
-
-		public void testCalculation() {
-			calc.addValue(18);
-			calc.addValue(10);
-			calc.addValue(9);
-			calc.addValue(11);
-			calc.addValue(28);
-			calc.addValue(3);
-			calc.addValue(30);
-			calc.addValue(15);
-			calc.addValue(15);
-			calc.addValue(21);
-			assertEquals(16, (int) calc.getMean());
-			assertEquals(8.0622577F, (float) calc.getStandardDeviation(), 0F);
-			assertEquals(30, calc.getMax().intValue());
-			assertEquals(3, calc.getMin().intValue());
-			assertEquals(15, calc.getMedian().intValue());
-		}
-	}
-
 }

Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportSaveGraphics.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportSaveGraphics.java?rev=369903&r1=369902&r2=369903&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportSaveGraphics.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportSaveGraphics.java Tue Jan 17 12:08:35 2006
@@ -106,22 +106,4 @@
 			}
 		}
 	}
-
-//	public static class Test extends junit.framework.TestCase {
-//		ReportSaveGraphics save;
-//
-//		public Test(String name) {
-//			super(name);
-//		}
-//
-//		public void setUp() throws Exception {
-//            super.setUp();
-//			save = new ReportSaveGraphics();
-//		}
-//
-//		public void testSomething() {
-//			// TODO write some tests
-//		}
-//	}
-
 }

Added: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/action/PackageTest.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/action/PackageTest.java?rev=369903&view=auto
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/action/PackageTest.java (added)
+++ jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/gui/action/PackageTest.java Tue Jan 17 12:08:35 2006
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2006 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.gui.action;
+
+import junit.framework.TestCase;
+
+public class PackageTest extends TestCase {
+
+	public PackageTest(String arg0) {
+		super(arg0);
+	}
+
+	//TODO add tests for SaveGraphics
+	public void testSaveGraphics() throws Exception {
+	}
+	
+	//TODO add tests for ReportSaveGraphics
+	public void testReportSaveGraphics() throws Exception {
+	}
+	
+}

Added: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/collections/PackageTest.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/collections/PackageTest.java?rev=369903&view=auto
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/collections/PackageTest.java (added)
+++ jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/collections/PackageTest.java Tue Jan 17 12:08:35 2006
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2001-2004 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.jorphan.collections;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import junit.framework.TestCase;
+
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
+
+public class PackageTest extends TestCase {
+		public PackageTest(String name) {
+			super(name);
+		}
+
+		public void testAdd1() throws Exception {
+			Logger log = LoggingManager.getLoggerForClass();
+			Collection treePath = Arrays.asList(new String[] { "1", "2", "3", "4" });
+			HashTree tree = new HashTree();
+			log.debug("treePath = " + treePath);
+			tree.add(treePath, "value");
+			log.debug("Now treePath = " + treePath);
+			log.debug(tree.toString());
+			assertEquals(1, tree.list(treePath).size());
+			assertEquals("value", tree.getArray(treePath)[0]);
+		}
+
+		public void testEqualsAndHashCode1() throws Exception {
+			HashTree tree1 = new HashTree("abcd");
+			HashTree tree2 = new HashTree("abcd");
+			HashTree tree3 = new HashTree("abcde");
+			HashTree tree4 = new HashTree("abcde");
+
+			assertTrue(tree1.equals(tree1));
+			assertTrue(tree1.equals(tree2));
+			assertTrue(tree2.equals(tree1));
+			assertTrue(tree2.equals(tree2));
+			assertTrue(tree1.hashCode() == tree2.hashCode());
+
+			assertTrue(tree3.equals(tree3));
+			assertTrue(tree3.equals(tree4));
+			assertTrue(tree4.equals(tree3));
+			assertTrue(tree4.equals(tree4));
+			assertTrue(tree3.hashCode() == tree4.hashCode());
+
+			assertNotSame(tree1, tree2);
+			assertNotSame(tree1, tree3);
+			assertNotSame(tree1, tree4);
+			assertNotSame(tree2, tree3);
+			assertNotSame(tree2, tree4);
+
+			assertFalse(tree1.equals(tree3));
+			assertFalse(tree1.equals(tree4));
+			assertFalse(tree2.equals(tree3));
+			assertFalse(tree2.equals(tree4));
+
+			assertNotNull(tree1);
+			assertNotNull(tree2);
+
+			tree1.add("abcd", tree3);
+			assertFalse(tree1.equals(tree2));
+			assertFalse(tree2.equals(tree1));// Check reflexive
+			if (tree1.hashCode() == tree2.hashCode()) {
+				// This is not a requirement
+				System.out.println("WARN: unequal HashTrees should not have equal hashCodes");
+			}
+			tree2.add("abcd", tree4);
+			assertTrue(tree1.equals(tree2));
+			assertTrue(tree2.equals(tree1));
+			assertTrue(tree1.hashCode() == tree2.hashCode());
+		}
+
+
+		public void testAddObjectAndTree() throws Exception {
+			ListedHashTree tree = new ListedHashTree("key");
+			ListedHashTree newTree = new ListedHashTree("value");
+			tree.add("key", newTree);
+			assertEquals(tree.list().size(), 1);
+			assertEquals("key", tree.getArray()[0]);
+			assertEquals(1, tree.getTree("key").list().size());
+			assertEquals(0, tree.getTree("key").getTree("value").size());
+			assertEquals(tree.getTree("key").getArray()[0], "value");
+			assertNotNull(tree.getTree("key").get("value"));
+		}
+
+		public void testEqualsAndHashCode2() throws Exception {
+			ListedHashTree tree1 = new ListedHashTree("abcd");
+			ListedHashTree tree2 = new ListedHashTree("abcd");
+			ListedHashTree tree3 = new ListedHashTree("abcde");
+			ListedHashTree tree4 = new ListedHashTree("abcde");
+
+			assertTrue(tree1.equals(tree1));
+			assertTrue(tree1.equals(tree2));
+			assertTrue(tree2.equals(tree1));
+			assertTrue(tree2.equals(tree2));
+			assertTrue(tree1.hashCode() == tree2.hashCode());
+
+			assertTrue(tree3.equals(tree3));
+			assertTrue(tree3.equals(tree4));
+			assertTrue(tree4.equals(tree3));
+			assertTrue(tree4.equals(tree4));
+			assertTrue(tree3.hashCode() == tree4.hashCode());
+
+			assertNotSame(tree1, tree2);
+			assertNotSame(tree1, tree3);
+			assertFalse(tree1.equals(tree3));
+			assertFalse(tree3.equals(tree1));
+			assertFalse(tree1.equals(tree4));
+			assertFalse(tree4.equals(tree1));
+
+			assertFalse(tree2.equals(tree3));
+			assertFalse(tree3.equals(tree2));
+			assertFalse(tree2.equals(tree4));
+			assertFalse(tree4.equals(tree2));
+
+			tree1.add("abcd", tree3);
+			assertFalse(tree1.equals(tree2));
+			assertFalse(tree2.equals(tree1));
+
+			tree2.add("abcd", tree4);
+			assertTrue(tree1.equals(tree2));
+			assertTrue(tree2.equals(tree1));
+			assertTrue(tree1.hashCode() == tree2.hashCode());
+
+			tree1.add("a1");
+			tree1.add("a2");
+			// tree1.add("a3");
+			tree2.add("a2");
+			tree2.add("a1");
+
+			assertFalse(tree1.equals(tree2));
+			assertFalse(tree2.equals(tree1));
+			if (tree1.hashCode() == tree2.hashCode()) {
+				// This is not a requirement
+				System.out.println("WARN: unequal ListedHashTrees should not have equal hashcodes");
+
+			}
+
+			tree4.add("abcdef");
+			assertFalse(tree3.equals(tree4));
+			assertFalse(tree4.equals(tree3));
+		}
+
+
+		public void testSearch() throws Exception {
+			ListedHashTree tree = new ListedHashTree();
+			SearchByClass searcher = new SearchByClass(Integer.class);
+			String one = "one";
+			String two = "two";
+			Integer o = new Integer(1);
+			tree.add(one, o);
+			tree.getTree(one).add(o, two);
+			tree.traverse(searcher);
+			assertEquals(1, searcher.getSearchResults().size());
+		}
+
+}

Modified: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/math/TestStatCalculator.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/math/TestStatCalculator.java?rev=369903&r1=369902&r2=369903&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/math/TestStatCalculator.java (original)
+++ jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jorphan/math/TestStatCalculator.java Tue Jan 17 12:08:35 2006
@@ -1,19 +1,24 @@
 /*
- * Created on May 13, 2004
+ * Copyright 2004 The Apache Software Foundation.
  *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
+ * 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.jorphan.math;
 
 import junit.framework.TestCase;
 
-/**
- * @author mstover
- * 
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
 public class TestStatCalculator extends TestCase {
 
 	StatCalculator calc;
@@ -49,5 +54,22 @@
 		calc.addValue(4);
 		assertEquals(10, calc.getCount());
 		assertEquals(9, calc.getPercentPoint(0.8999999).intValue());
+	}
+	public void testCalculation() {
+		calc.addValue(18);
+		calc.addValue(10);
+		calc.addValue(9);
+		calc.addValue(11);
+		calc.addValue(28);
+		calc.addValue(3);
+		calc.addValue(30);
+		calc.addValue(15);
+		calc.addValue(15);
+		calc.addValue(21);
+		assertEquals(16, (int) calc.getMean());
+		assertEquals(8.0622577F, (float) calc.getStandardDeviation(), 0F);
+		assertEquals(30, calc.getMax().intValue());
+		assertEquals(3, calc.getMin().intValue());
+		assertEquals(15, calc.getMedian().intValue());
 	}
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org