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:21:36 UTC

svn commit: r369906 - in /jakarta/jmeter/branches/rel-2-1: src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/ test/src/org/apache/jmeter/protocol/ldap/ test/src/org/apache/jmeter/protocol/ldap/config/ test/src/org/apache/jmeter/protocol/ldap...

Author: sebb
Date: Tue Jan 17 12:21:24 2006
New Revision: 369906

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

Added:
    jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/ldap/
    jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/ldap/config/
    jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/ldap/config/gui/
    jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java
Modified:
    jakarta/jmeter/branches/rel-2-1/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java

Modified: jakarta/jmeter/branches/rel-2-1/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java?rev=369906&r1=369905&r2=369906&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java Tue Jan 17 12:21:24 2006
@@ -1,4 +1,3 @@
-//$Header$
 /*
  * Copyright 2003-2004 The Apache Software Foundation.
  *
@@ -18,7 +17,6 @@
 
 package org.apache.jmeter.protocol.ldap.config.gui;
 
-import org.apache.jmeter.config.gui.AbstractConfigGui;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.FlowLayout;
@@ -36,15 +34,14 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.table.TableCellEditor;
 
-import junit.framework.TestCase;
-
+import org.apache.jmeter.config.gui.AbstractConfigGui;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.ObjectTableModel;
-import org.apache.jorphan.logging.LoggingManager;
+//import org.apache.jorphan.logging.LoggingManager;
 import org.apache.jorphan.reflect.Functor;
-import org.apache.log.Logger;
+//import org.apache.log.Logger;
 
 /**
  * A GUI panel allowing the user to enter name-value argument pairs. These
@@ -61,7 +58,7 @@
 
 public class LDAPArgumentsPanel extends AbstractConfigGui implements ActionListener {
 	/** Logging. */
-	private static transient Logger log = LoggingManager.getLoggerForClass();
+	//private static final Logger log = LoggingManager.getLoggerForClass();
 
 	/** The title label for this component. */
 	private JLabel tableLabel;
@@ -408,38 +405,5 @@
 
 		table.revalidate();
 		sizeColumns(table);
-	}
-
-	/**
-	 * Tests for the LDAPArgumentsPanel component.
-	 */
-	public static class Test extends TestCase {
-		/**
-		 * Create a new test.
-		 * 
-		 * @param name
-		 *            the name of the test
-		 */
-		public Test(String name) {
-			super(name);
-		}
-
-		/**
-		 * Test that adding an argument to the table results in an appropriate
-		 * TestElement being created.
-		 * 
-		 * @throws Exception
-		 *             if an exception occurred during the test
-		 */
-		public void testLDAPArgumentCreation() throws Exception {
-			LDAPArgumentsPanel gui = new LDAPArgumentsPanel();
-			gui.tableModel.addRow(new LDAPArgument());
-			gui.tableModel.setValueAt("howdy", 0, 0);
-			gui.tableModel.addRow(new LDAPArgument());
-			gui.tableModel.setValueAt("doody", 0, 1);
-
-			assertEquals("=", ((LDAPArgument) ((LDAPArguments) gui.createTestElement()).getArguments().get(0)
-					.getObjectValue()).getMetaData());
-		}
 	}
 }

Added: jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java?rev=369906&view=auto
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java (added)
+++ jakarta/jmeter/branches/rel-2-1/test/src/org/apache/jmeter/protocol/ldap/config/gui/PackageTest.java Tue Jan 17 12:21:24 2006
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2003-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.jmeter.protocol.ldap.config.gui;
+
+import junit.framework.TestCase;
+
+public class PackageTest extends TestCase {
+		/**
+		 * Create a new test.
+		 * 
+		 * @param name
+		 *            the name of the test
+		 */
+		public PackageTest(String name) {
+			super(name);
+		}
+
+		/**
+		 * Test that adding an argument to the table results in an appropriate
+		 * TestElement being created.
+		 * 
+		 * @throws Exception
+		 *             if an exception occurred during the test
+		 */
+		public void testLDAPArgumentCreation() throws Exception {
+			LDAPArgumentsPanel gui = new LDAPArgumentsPanel();
+			gui.tableModel.addRow(new LDAPArgument());
+			gui.tableModel.setValueAt("howdy", 0, 0);
+			gui.tableModel.addRow(new LDAPArgument());
+			gui.tableModel.setValueAt("doody", 0, 1);
+
+			assertEquals("=", ((LDAPArgument) ((LDAPArguments) gui.createTestElement()).getArguments().get(0)
+					.getObjectValue()).getMetaData());
+		}
+}



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