[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-qa
Subject:    com pftt2: fix regular expression escape and ui bug: src/com/github/mattficken/io/StringUtil.java
From:       Anatol Belski <ab () php ! net>
Date:       2013-10-24 23:44:58
Message-ID: php-mail-45f5c3bf4126735189d23538bb7f6b9e1216505734 () git ! php ! net
[Download RAW message or body]

Commit:    d0575a55d6770cc5a3cabe1c820c7276f85a67f6
Author:    Matt Ficken <v-mafick@microsoft.com>         Thu, 24 Oct 2013 16:44:58 \
                -0700
Parents:   09e6f7b2982be21fa9d72e86cdfe548c07f92f33
Branches:  master

Link:       http://git.php.net/?p=pftt2.git;a=commitdiff;h=d0575a55d6770cc5a3cabe1c820c7276f85a67f6


Log:
fix regular expression escape and ui bug


Former-commit-id: a4b4e385f12ddcd6ab9242dd39c64b84a9178dd5

Changed paths:
  M  src/com/github/mattficken/io/StringUtil.java
  M  src/com/mostc/pftt/ui/PhptHostTab.java


Diff:
diff --git a/src/com/github/mattficken/io/StringUtil.java \
b/src/com/github/mattficken/io/StringUtil.java index 0657a91..6e4ffa2 100644
--- a/src/com/github/mattficken/io/StringUtil.java
+++ b/src/com/github/mattficken/io/StringUtil.java
@@ -283,6 +283,7 @@ public final class StringUtil {
 			case '\\':
 			case '$':
 			case '+':
+			case ':':
 				sb.append("\\");
 			}
 			sb.append(c);
diff --git a/src/com/mostc/pftt/ui/PhptHostTab.java \
b/src/com/mostc/pftt/ui/PhptHostTab.java index 804427f..b152fd5 100644
--- a/src/com/mostc/pftt/ui/PhptHostTab.java
+++ b/src/com/mostc/pftt/ui/PhptHostTab.java
@@ -39,13 +39,13 @@ public class PhptHostTab extends JSplitPane {
 	protected JPanel panel, button_panel;
 	protected JProgressBar progress_bar, pass_bar;
 	protected JButton stop_button, prev_file_button, prev_button, next_file_button, \
next_button, to_actual_button, to_expect_button, ignore_button, skip_button, \
                pass_button;
-	protected JLabel pass_label, total_label, fail_label, crash_label, xfail_label, \
xfail_works_label, skip_label, xskip_label, bork_label, unsupported_label, \
test_exceptions_label; +	protected JLabel pass_label, total_label, fail_label, \
crash_label, xfail_label, xfail_works_label, skip_label, xskip_label, bork_label, \
timeout_label, unsupported_label, test_exceptions_label;  protected JMenuBar jmb;
 	protected JMenu options_menu, status_list_menu;
 	protected ExpectedActualDiffPHPTDisplay eat_display;
 	protected JCheckBoxMenuItem host_console_cb;
 	protected JSplitPane jsp;
-	protected final DefaultListModel fail_list_model, crash_list_model, \
xfail_list_model, xfail_works_list_model, xskip_list_model, skip_list_model, \
pass_list_model, bork_list_model, unsupported_list_model, test_exceptions_list_model; \
+	protected final DefaultListModel fail_list_model, crash_list_model, \
xfail_list_model, xfail_works_list_model, xskip_list_model, skip_list_model, \
pass_list_model, bork_list_model, timeout_list_model, unsupported_list_model, \
test_exceptions_list_model;  protected JList test_list;
 	protected JScrollPane test_list_jsp;
 	protected ConsoleTextEditor host_console;
@@ -69,6 +69,7 @@ public class PhptHostTab extends JSplitPane {
 		skip_list_model = new DefaultListModel();
 		pass_list_model = new DefaultListModel();
 		bork_list_model = new DefaultListModel();
+		timeout_list_model = new DefaultListModel();
 		unsupported_list_model = new DefaultListModel();
 		test_exceptions_list_model = new DefaultListModel();
 		
@@ -102,6 +103,8 @@ public class PhptHostTab extends JSplitPane {
 		panel.add("left", fail_label = new JLabel("0"));
 		panel.add(new JLabel("CRASH"));
 		panel.add(crash_label = new JLabel("0"));
+		panel.add(new JLabel("Timeout"));
+		panel.add(timeout_label = new JLabel("0"));
 		panel.add(new JLabel("Bork"));
 		panel.add(bork_label = new JLabel("0"));
 		panel.add("left", new JLabel("XFail Works"));
@@ -287,7 +290,7 @@ public class PhptHostTab extends JSplitPane {
 		jsp.setDividerLocation(0.75d);
 	}
 	
-	protected int crash, pass, fail, xfail, xfail_works, skip, xskip, bork, \
unsupported, test_exceptions; // XXX duplicates functionality from PhptTelemetry \
+	protected int crash, pass, fail, xfail, xfail_works, skip, xskip, bork, \
unsupported, timeout, test_exceptions; // XXX duplicates functionality from \
PhptTelemetry  
 	public void showResult(final int total, final int completed, final PhptTestResult \
result) {  SwingUtilities.invokeLater(new Runnable() {
@@ -360,6 +363,12 @@ public class PhptHostTab extends JSplitPane {
 						
 						pass_list_model.addElement(result);
 						break;
+					case TIMEOUT:
+						timeout++;
+						timeout_label.setText(Integer.toString(unsupported));
+						
+						timeout_list_model.addElement(result);
+						break;
 					default:
 						unsupported++;
 						unsupported_label.setText(Integer.toString(unsupported));


[prev in list] [next in list] [prev in thread] [next in thread]