mstover1 2002/08/15 08:37:06
Modified: src/components/org/apache/jmeter/assertions/gui
DurationAssertionGui.java
src/components/org/apache/jmeter/config/gui
ArgumentsPanel.java
src/components/org/apache/jmeter/visualizers
MailerVisualizer.java
src/core/org/apache/jmeter/resources messages.properties
messages_de.properties messages_ja.properties
messages_no.properties
Log:
New error messages in MailerVisualizer and DurationAssertion
Revision Changes Path
1.2 +21 -22
jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
Index: DurationAssertionGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DurationAssertionGui.java 11 Aug 2002 19:24:40 -0000 1.1
+++ DurationAssertionGui.java 15 Aug 2002 15:37:06 -0000 1.2
@@ -55,39 +55,21 @@
package org.apache.jmeter.assertions.gui;
import java.awt.FlowLayout;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
-import java.util.Iterator;
import javax.swing.BorderFactory;
-import javax.swing.Box;
import javax.swing.ButtonGroup;
-import javax.swing.DefaultListCellRenderer;
+import javax.swing.JOptionPane;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JLabel;
-import javax.swing.JList;
import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
import javax.swing.JTextField;
-import javax.swing.JTable;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
-import javax.swing.table.TableCellRenderer;
+
import org.apache.jmeter.assertions.DurationAssertion;
-import org.apache.jmeter.assertions.ResponseAssertion;
-import org.apache.jmeter.gui.util.PowerTableModel;
-import org.apache.jmeter.gui.util.TextAreaCellRenderer;
-import org.apache.jmeter.gui.util.TextAreaTableCellEditor;
import org.apache.jmeter.gui.util.VerticalLayout;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
@@ -139,7 +121,6 @@
assertionDuration = Long.parseLong(durationString);
}
catch (NumberFormatException e) {
- System.out.println("exception");
assertionDuration = Long.MAX_VALUE;
}
el.setAllowedDuration(assertionDuration);
@@ -185,6 +166,7 @@
durationPanel.add(new
JLabel(JMeterUtils.getResString("duration_assertion_label")));
duration = new JTextField(5);
+ duration.addFocusListener(this);
durationPanel.add(duration);
mainPanel.add(durationPanel);
@@ -199,6 +181,23 @@
***************************************/
public void focusLost(FocusEvent e)
{
+ boolean isInvalid = false;
+ String durationString = duration.getText();
+ if (durationString != null) {
+ try {
+ long assertionDuration =
Long.parseLong(durationString);
+ if (assertionDuration < 0) {
+ isInvalid = true;
+ }
+ }
+ catch (NumberFormatException ex) {
+ isInvalid = true;
+ }
+ if (isInvalid) {
+ System.out.println("DurationAssertionGui: Not a valid
number!");
+ JOptionPane.showMessageDialog(null,
JMeterUtils.getResString("duration_assertion_input_error"), "Error",
JOptionPane.ERROR_MESSAGE);
+ }
+ }
}
/****************************************
1.3 +1 -1
jakarta-jmeter/src/components/org/apache/jmeter/config/gui/ArgumentsPanel.java
Index: ArgumentsPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/config/gui/ArgumentsPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArgumentsPanel.java 14 Aug 2002 02:52:18 -0000 1.2
+++ ArgumentsPanel.java 15 Aug 2002 15:37:06 -0000 1.3
@@ -396,7 +396,7 @@
gui.tableModel.addNewRow();
gui.tableModel.setValueAt("howdy",0,0);
gui.tableModel.setValueAt("doody",0,1);
-
assertNull(((Argument)((Arguments)gui.createTestElement()).getArguments().get(0)).getMetaData());
+
assertEquals("=",((Argument)((Arguments)gui.createTestElement()).getArguments().get(0)).getMetaData());
}
}
}
1.2 +43 -29
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Index: MailerVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MailerVisualizer.java 11 Aug 2002 19:24:41 -0000 1.1
+++ MailerVisualizer.java 15 Aug 2002 15:37:06 -0000 1.2
@@ -54,21 +54,40 @@
*/
package org.apache.jmeter.visualizers;
-import java.io.*;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
-import java.util.*;
-import java.net.*;
-import javax.mail.*;
-import javax.mail.internet.*;
-//import javax.activation.* ;
+import java.awt.BorderLayout;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.Properties;
-import org.apache.jmeter.util.*;
-import org.apache.jmeter.gui.util.*;
-import org.apache.jmeter.samplers.*;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import javax.mail.Message;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+
+import org.apache.jmeter.gui.util.VerticalLayout;
+import org.apache.jmeter.samplers.Clearable;
+import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
/*
@@ -337,13 +356,15 @@
}
catch (UnknownHostException e1)
{
- System.out.println("NxError:Invalid Mail Server " + e1);
- System.exit(1);
+ System.out.println("Invalid Mail Server " + e1);
+ JOptionPane.showMessageDialog(null,
JMeterUtils.getResString("invalid_mail_server"), "Error", JOptionPane.ERROR_MESSAGE);
+ //System.exit(1);
}
catch (Exception e)
{
- e.printStackTrace();
- System.exit(1);
+ System.out.println("Couldn't send mail...");
+ JOptionPane.showMessageDialog(null,
JMeterUtils.getResString("mailer_error"), "Error", JOptionPane.ERROR_MESSAGE);
+ //System.exit(1);
}
}
@@ -494,9 +515,7 @@
*/
public String getStaticLabel()
{
- // should be something like this:
- // return JMeterUtils.getResString("mailer_visualizer_title");
- return "Mailer Visualizer";
+ return JMeterUtils.getResString("mailer_visualizer_title");
}
/**
@@ -508,9 +527,7 @@
*/
public String getAttributesTitle()
{
- // should be something like this:
- // return JMeterUtils.getResString("mailer_attributes_panel")
- return "Mailing attributes";
+ return JMeterUtils.getResString("mailer_attributes_panel");
}
/**
* Method used to log a String.
@@ -627,7 +644,4 @@
}
-// new ressource_strings:
-// mailer_visualizer_title - used as the title of this Visualizer
-// mailer_attributes_panel - used as the title of the JPanel (EtchedBorder - title)
where the attributes are entered
1.3 +6 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- messages.properties 14 Aug 2002 02:52:19 -0000 1.2
+++ messages.properties 15 Aug 2002 15:37:06 -0000 1.3
@@ -271,4 +271,9 @@
request_data=Request Data
restart=Restart
encoded_value=URL Encoded Value
-encode?=Encode?
\ No newline at end of file
+encode?=Encode?
+mailer_error=Couldn't send mail. Please correct any misentries.
+invalid_mail_server=The mail-server is unknown.
+mailer_visualizer_title=Mailer Visualizer
+mailer_attributes_panel=Mailing attributes
+duration_assertion_input_error=Please enter a valid positive integer.
\ No newline at end of file
1.4 +6 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties
Index: messages_de.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- messages_de.properties 14 Aug 2002 02:52:19 -0000 1.3
+++ messages_de.properties 15 Aug 2002 15:37:06 -0000 1.4
@@ -266,4 +266,9 @@
request_data=Request Daten
restart=Restart
encoded_value=URL Encoded Value
-encode?=Encode?
\ No newline at end of file
+encode?=Encode?
+mailer_error=Couldn't send mail. Please correct any misentries.
+invalid_mail_server=The mail-server is unknown.
+mailer_visualizer_title=Mailer Visualizer
+mailer_attributes_panel=Mailing attributes
+duration_assertion_input_error=Please enter a valid positive integer.
\ No newline at end of file
1.3 +6 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- messages_ja.properties 14 Aug 2002 02:52:19 -0000 1.2
+++ messages_ja.properties 15 Aug 2002 15:37:06 -0000 1.3
@@ -266,4 +266,9 @@
request_data=Request Data
restart=Restart
encoded_value=URL Encoded Value
-encode?=Encode?
\ No newline at end of file
+encode?=Encode?
+mailer_error=Couldn't send mail. Please correct any misentries.
+invalid_mail_server=The mail-server is unknown.
+mailer_visualizer_title=Mailer Visualizer
+mailer_attributes_panel=Mailing attributes
+duration_assertion_input_error=Please enter a valid positive integer.
\ No newline at end of file
1.3 +6 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- messages_no.properties 14 Aug 2002 02:52:19 -0000 1.2
+++ messages_no.properties 15 Aug 2002 15:37:06 -0000 1.3
@@ -258,4 +258,9 @@
request_data=Request Data
restart=Restart
encoded_value=URL Encoded Value
-encode?=Encode?
\ No newline at end of file
+encode?=Encode?
+mailer_error=Couldn't send mail. Please correct any misentries.
+invalid_mail_server=The mail-server is unknown.
+mailer_visualizer_title=Mailer Visualizer
+mailer_attributes_panel=Mailing attributes
+duration_assertion_input_error=Please enter a valid positive integer.
\ No newline at end of file
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
