From 9901675ddfbe4b1c6617fd26ff3bb0de8edeb1ce Mon Sep 17 00:00:00 2001 From: worry127722 Date: Tue, 10 Jun 2014 11:58:21 +0800 Subject: [PATCH 01/17] [test] --- _test/plugins/autosubmit.js | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 _test/plugins/autosubmit.js diff --git a/_test/plugins/autosubmit.js b/_test/plugins/autosubmit.js new file mode 100644 index 000000000..c78fd5e91 --- /dev/null +++ b/_test/plugins/autosubmit.js @@ -0,0 +1,41 @@ +/** + * Created by wangrui10 on 14-6-4. + */ +module('plugins.autosubmit'); + +test("自动提交",function(){ + var form = document.body.appendChild(document.createElement('form')); + form.id = 'formid'; + form.action = './'; + form.method = "post"; + form.target = '_blank'; + + var text = document.createElement('input'); + text.type = 'text'; + form.appendChild(text); + + var btn = document.createElement('input'); + btn.type = 'submit'; + form.appendChild(btn); + + var div = form.appendChild(document.createElement('div')); + div.id = 'ue'; + var editor = UE.getEditor('ue'); + editor.ready(function(){ + editor.body.innerHTML='123123'; + editor.focus(); + editor.execCommand('autosubmit'); + + form = domUtils.findParentByTagName(this.iframe,"form", false); + + setTimeout(function(){ + equal(editor.textarea.value,'123123','检查editor中准备同步的内容'); + var d = $('#'+form.id).context.forms.formid[2].value; + equal(d,'123123','editor中的内容同步到textarea中'); + start(); + },100); + + }); + stop(); +}); + From 79130b316f16fe292616e7ce4fdf8e9506f040cb Mon Sep 17 00:00:00 2001 From: worry127722 Date: Tue, 10 Jun 2014 13:47:37 +0800 Subject: [PATCH 02/17] [test] --- _test/import.js | 2 ++ _test/plugins/defaultfilter.js | 8 ++++++++ _test/plugins/insertcode.js | 14 ++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/_test/import.js b/_test/import.js index 84a404095..e7f5825bd 100644 --- a/_test/import.js +++ b/_test/import.js @@ -20,6 +20,7 @@ ///import core/localstorage; ///import plugins/defaultfilter; ///import plugins/inserthtml; +///import plugins/insertfile; ///import plugins/autotypeset; ///import plugins/background; ///import plugins/image; @@ -59,6 +60,7 @@ ///import plugins/autolink; ///import plugins/autoheight; ///import plugins/autofloat; +///import plugins/autosubmit; ///import plugins/video; ///import plugins/table.core; ///import plugins/table.cmds; diff --git a/_test/plugins/defaultfilter.js b/_test/plugins/defaultfilter.js index 95425bdd2..0809dda99 100644 --- a/_test/plugins/defaultfilter.js +++ b/_test/plugins/defaultfilter.js @@ -10,6 +10,14 @@ module( 'plugins.defaultfilter' ); //test('',function(){ // stop(); //}); +test( 'p标签禁止嵌套', function () { + var editor = te.obj[0]; + editor.setContent( '

123

456

' ); + var br = ua.browser.ie?' ':'
'; + console.log(editor.getContent()); + var html = '

'+br+'

123

456

'; + ua.checkSameHtml(editor.body.innerHTML,html, 'p标签禁止嵌套'); +} ); test( '对代码的行号不处理', function () { var editor = te.obj[0]; editor.setContent( '
1
2
'); diff --git a/_test/plugins/insertcode.js b/_test/plugins/insertcode.js index 4098c526e..605ab7fb7 100644 --- a/_test/plugins/insertcode.js +++ b/_test/plugins/insertcode.js @@ -70,6 +70,20 @@ test('trace 3395：插入代码为空时，清空编辑器', function () { ua.keydown(editor.body, {'keyCode':8}); br = ua.browser.ie ? '' : '
'; ua.checkSameHtml(editor.body.innerHTML, '

' + br + '

', '检查编辑器清空'); + + if(!ua.browser.ie){ + editor.setContent('
');
+        editor.fireEvent('delkeydown',{});
+        ua.checkSameHtml(editor.body.innerHTML, '
' + br + '
', '检查编辑器清空');
+        }
+        editor.setContent('
');
+        ua.keydown(editor.body, {'keyCode':40});
+
+        if(ua.browser.ie==8||ua.browser.ie==11)
+            br = '
'
+        if(ua.browser.ie==8)return;
+        ua.checkSameHtml(editor.body.innerHTML,'
'+br+'
','方向键处理');
+
 });
 
 test('trace 3396：多次切换源码，不会产生空行', function () {

From 29f2ade7cd55549ef81bf91357cbb587eff34c43 Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Wed, 11 Jun 2014 17:16:16 +0800
Subject: [PATCH 03/17] ad

---
 _test/build_run.xml       |  4 ++--
 _test/tools/br/config.php | 16 ++++++++--------
 _test/tools/br/js/run.js  |  3 ++-
 _test/tools/br/report.php |  9 +++++----
 _test/tools/br/runall.php | 10 +++++-----
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/_test/build_run.xml b/_test/build_run.xml
index 4444695fc..527b13583 100644
--- a/_test/build_run.xml
+++ b/_test/build_run.xml
@@ -1,11 +1,11 @@
 
  
-    
+    
     
     
     
-    
+    
     
 
     
diff --git a/_test/tools/br/config.php b/_test/tools/br/config.php
index fbc842dc9..f44114d74 100644
--- a/_test/tools/br/config.php
+++ b/_test/tools/br/config.php
@@ -2,11 +2,11 @@
         class Config
         {
                 public static $BROWSERS = array(
-                    'ie8supp' => array( '10.94.26.94' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
-                , 'ie11main' => array( '10.81.96.46' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
+//                    'ie8supp' => array( '10.94.26.94' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
+//                , 'ie11main' => array( '10.81.96.46' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 
-                ,
-                    'firefox' => array( '10.94.26.95' , "C:\\Program Files\\mozilla firefox\\firefox.exe" )
+//                ,
+//                    'firefox' => array( '10.94.26.95' , "C:\\Program Files\\mozilla firefox\\firefox.exe" )
 //                    'firefox' => array( '10.81.96.46@8500' , "C:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe" )
 //                , '360ie8' => array('10.81.58.64@8500',"C:\\Program Files\\360\\360se\\360SE.exe")
 //                , '360ie7' => array( '10.81.58.87@8500' , "C:\\Program Files\\360\\360se\\360SE.exe" )
@@ -15,10 +15,10 @@ class Config
 //                , 'ie6' => array( '10.81.58.86@8500' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 //C:\Program Files\Google\Chrome\Application\chrome.exe
 // "C:\Program Files\Mozilla Firefox\firefox.exe"
-                , 'chrome' => array( '10.94.26.95' , "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe" )
-                ,
-                    'ie8main' => array( '10.94.26.94' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
-                , 'ie11supp' => array( '10.81.96.46' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
+//                , 'chrome' => array( '10.94.26.95' , "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe" )
+//                ,
+//                    'ie8main' => array( '10.94.26.94' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
+                 'ie9supp' => array( '172.22.65.36' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 //                , 'ie7' => array( '10.81.58.87@8500' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 //                , 'opera' => array( '10.81.58.64@8500' , "C:\\Program Files\\Opera\\opera.exe" )
 //                , 'safari' => array( '10.81.58.63@8500' , "C:\\Program Files\\Safari\\Safari.exe" )
diff --git a/_test/tools/br/js/run.js b/_test/tools/br/js/run.js
index 477e3dbe2..178a26ae5 100644
--- a/_test/tools/br/js/run.js
+++ b/_test/tools/br/js/run.js
@@ -112,8 +112,9 @@ function run( kiss, runnext ) {
     /**
      * 初始化执行区并通过嵌入iframe启动用例执行
      */
+        var locsearch = location.search.split('--_--').join('&');
     var url = 'run.php?case=' + kiss + '&time=' + new Date().getTime() + "&"
-        + location.search.substring( 1 );
+        + locsearch.substring( 1 );
     // + (location.search.length > 0 ? '&' + location.search.substring(1)
     // : '');
 
diff --git a/_test/tools/br/report.php b/_test/tools/br/report.php
index 5162a8487..febce3f20 100644
--- a/_test/tools/br/report.php
+++ b/_test/tools/br/report.php
@@ -59,13 +59,14 @@ function report()
     $suite = $dom->appendChild($dom->createElement('testsuite'));
     $cfg = preg_split('/[&=]/', $_POST['config']);
     $config = array();
-    for ($i = 0; $i < sizeof($cfg); $i += 2) {
+    for ($i = 0; $i < sizeof($cfg); $i++) {
         //	echo "{$cfg[$i]} {$cfg[$i+1]}\r\n
";
-        $config[$cfg[$i]] = $cfg[$i + 1];
+        $info = explode("=" , $cfg[$i]);
+        $config[$info[0]] = $info[1];
         $p = $suite->appendChild($dom->createElement("property"));
 
-        $p->setAttribute('name', $cfg[$i]);
-        $p->setAttribute('value', $cfg[$i + 1]);
+        $p->setAttribute('name', $cfg[0]);
+        $p->setAttribute('value', $cfg[1]);
 
     }
     $suite->setAttribute("name", $config['browser']);
diff --git a/_test/tools/br/runall.php b/_test/tools/br/runall.php
index b1cf61e5e..01053d85a 100644
--- a/_test/tools/br/runall.php
+++ b/_test/tools/br/runall.php
@@ -22,17 +22,17 @@ function run( $b , $debug = false )
             : $browser[ 1 ];
     $browserSet = array_key_exists( 'browserSet' , $_GET )?"^&browserSet=".$_GET[ 'browserSet' ]:'';
 
-    $url = "http://" . $_SERVER[ 'SERVER_ADDR' ] . ( $debug ? "" : ":8089" )
-           . substr( $_SERVER[ 'PHP_SELF' ] , 0 , -11 ) . "/list.php?batchrun=true^&browser=$b".$browserSet;
+    $url = "http://" . $_SERVER[ 'SERVER_ADDR' ] . ( $debug ? "" : ":8080" )
+           . substr( $_SERVER[ 'PHP_SELF' ] , 0 , -11 ) . "/list.php?batchrun=true--_--browser=$b".$browserSet;
     if ( !array_key_exists( "ci" , $_GET ) )
-        $url .= "^&mail=true";
+        $url .= "--_--mail=true";
 
     if(array_key_exists(  "filter" , $_GET  )){
         $filterR = array_key_exists( $b , $_GET )?$_GET[$b]:$_GET['filter'];
         if(strstr($b,'main')||strstr($b,'supp')){
-            $url .= "^&filterRun={$filterR}^&filter={$_GET['filter']}";
+            $url .= "--_--filterRun={$filterR}^&filter={$_GET['filter']}";
         }else {
-            $url .= "^&filterRun={$_GET['filter']}^&filter={$_GET['filter']}";
+            $url .= "--_--filterRun={$_GET['filter']}^&filter={$_GET['filter']}";
 
         }
     }

From c06a77a2bc46be8208aff063ec832759d74e6269 Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Thu, 12 Jun 2014 11:31:31 +0800
Subject: [PATCH 04/17] 6

---
 _test/build_run_core.xml   | 4 ++--
 _test/build_run_plugin.xml | 4 ++--
 _test/build_run_ui.xml     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/_test/build_run_core.xml b/_test/build_run_core.xml
index 769f1f73c..cac96a19e 100644
--- a/_test/build_run_core.xml
+++ b/_test/build_run_core.xml
@@ -1,11 +1,11 @@
 
  
-    
+    
     
     
     
-    
+    
     
     
     
diff --git a/_test/build_run_plugin.xml b/_test/build_run_plugin.xml
index 3c6062a9c..5582f5e53 100644
--- a/_test/build_run_plugin.xml
+++ b/_test/build_run_plugin.xml
@@ -1,11 +1,11 @@
 
  
-    
+    
     
     
     
-    
+    
     
 
     
diff --git a/_test/build_run_ui.xml b/_test/build_run_ui.xml
index a848d4bd2..8d8147bb1 100644
--- a/_test/build_run_ui.xml
+++ b/_test/build_run_ui.xml
@@ -1,11 +1,11 @@
 
  
-    
+    
     
     
     
-    
+    
     
     
     

From 40deaf13e78b7231573af9a97d4fa296850bcaef Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Thu, 12 Jun 2014 11:55:28 +0800
Subject: [PATCH 05/17] 1

---
 _test/build_run.xml        | 4 ++--
 _test/build_run_core.xml   | 4 ++--
 _test/build_run_plugin.xml | 4 ++--
 _test/build_run_ui.xml     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/_test/build_run.xml b/_test/build_run.xml
index 527b13583..5699daa0f 100644
--- a/_test/build_run.xml
+++ b/_test/build_run.xml
@@ -6,7 +6,7 @@
     
     
     
-    
+    
 
     
     
@@ -24,7 +24,7 @@
 
     
         
-        
+        
             
             
             
diff --git a/_test/build_run_core.xml b/_test/build_run_core.xml
index cac96a19e..d23fe8368 100644
--- a/_test/build_run_core.xml
+++ b/_test/build_run_core.xml
@@ -6,7 +6,7 @@
     
     
     
-    
+    
     
     
         
@@ -23,7 +23,7 @@
 
     
         
-        
+        
             
             
             
diff --git a/_test/build_run_plugin.xml b/_test/build_run_plugin.xml
index 5582f5e53..765f53833 100644
--- a/_test/build_run_plugin.xml
+++ b/_test/build_run_plugin.xml
@@ -6,7 +6,7 @@
     
     
     
-    
+    
 
     
     
@@ -24,7 +24,7 @@
 
     
         
-        
+        
             
             
             
diff --git a/_test/build_run_ui.xml b/_test/build_run_ui.xml
index 8d8147bb1..565be4235 100644
--- a/_test/build_run_ui.xml
+++ b/_test/build_run_ui.xml
@@ -6,7 +6,7 @@
     
     
     
-    
+    
     
     
         
@@ -23,7 +23,7 @@
 
     
         
-        
+        
             
             
             

From 971412fc23fb517be260b9c8ace15bbc3015942f Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Thu, 12 Jun 2014 12:02:19 +0800
Subject: [PATCH 06/17] 1

---
 _test/build_run.xml        | 2 +-
 _test/build_run_core.xml   | 2 +-
 _test/build_run_plugin.xml | 2 +-
 _test/build_run_ui.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_test/build_run.xml b/_test/build_run.xml
index 5699daa0f..1d9366997 100644
--- a/_test/build_run.xml
+++ b/_test/build_run.xml
@@ -1,7 +1,7 @@
 
  
-    
+    
     
     
     
diff --git a/_test/build_run_core.xml b/_test/build_run_core.xml
index d23fe8368..95788ced5 100644
--- a/_test/build_run_core.xml
+++ b/_test/build_run_core.xml
@@ -1,7 +1,7 @@
 
  
-    
+    
     
     
     
diff --git a/_test/build_run_plugin.xml b/_test/build_run_plugin.xml
index 765f53833..373b9d198 100644
--- a/_test/build_run_plugin.xml
+++ b/_test/build_run_plugin.xml
@@ -1,7 +1,7 @@
 
  
-    
+    
     
     
     
diff --git a/_test/build_run_ui.xml b/_test/build_run_ui.xml
index 565be4235..e3354d441 100644
--- a/_test/build_run_ui.xml
+++ b/_test/build_run_ui.xml
@@ -1,7 +1,7 @@
 
  
-    
+    
     
     
     

From 2c741227128fcb3cbb06d6b25d60ef749ebaf4b8 Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Thu, 12 Jun 2014 12:23:53 +0800
Subject: [PATCH 07/17] 3

---
 _test/build_run.xml        | 4 ++--
 _test/build_run_core.xml   | 2 +-
 _test/build_run_plugin.xml | 2 +-
 _test/build_run_ui.xml     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_test/build_run.xml b/_test/build_run.xml
index 1d9366997..676ee7def 100644
--- a/_test/build_run.xml
+++ b/_test/build_run.xml
@@ -62,7 +62,7 @@
 
     
         
+             dest="C:/Program Files (x86)/Jenkins/tmp/${git.user}_${git.project}.php"/>
     
     
         
@@ -75,7 +75,7 @@
 
     
         
+             dest="C:/Program Files (x86)/Jenkins/tmp/${git.user}_${git.project}IE.php"/>
     
     
         
diff --git a/_test/build_run_core.xml b/_test/build_run_core.xml
index 95788ced5..1482985bb 100644
--- a/_test/build_run_core.xml
+++ b/_test/build_run_core.xml
@@ -61,7 +61,7 @@
 
     
         
+             dest="C:/Program Files (x86)/Jenkins/tmp/${git.user}_${git.project}core.php"/>
     
     
         
diff --git a/_test/build_run_plugin.xml b/_test/build_run_plugin.xml
index 373b9d198..a87968a87 100644
--- a/_test/build_run_plugin.xml
+++ b/_test/build_run_plugin.xml
@@ -62,7 +62,7 @@
 
     
         
+             dest="C:/Program Files (x86)/Jenkins/tmp/${git.user}_${git.project}plugin.php"/>
     
     
         
diff --git a/_test/build_run_ui.xml b/_test/build_run_ui.xml
index e3354d441..732206f5d 100644
--- a/_test/build_run_ui.xml
+++ b/_test/build_run_ui.xml
@@ -61,7 +61,7 @@
 
     
         
+             dest="C:/Program Files (x86)/Jenkins/tmp/${git.user}_${git.project}ui.php"/>
     
     
         

From 4268b85b9a17d7282694ec65ad11911cc10a2bc9 Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Thu, 12 Jun 2014 12:26:24 +0800
Subject: [PATCH 08/17] s

---
 _test/build_run.xml        | 4 ++--
 _test/build_run_core.xml   | 2 +-
 _test/build_run_plugin.xml | 2 +-
 _test/build_run_ui.xml     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_test/build_run.xml b/_test/build_run.xml
index 676ee7def..e7d179f2f 100644
--- a/_test/build_run.xml
+++ b/_test/build_run.xml
@@ -61,7 +61,7 @@
     
 
     
-        
     
     
@@ -74,7 +74,7 @@
     
 
     
-        
     
     
diff --git a/_test/build_run_core.xml b/_test/build_run_core.xml
index 1482985bb..18d416f73 100644
--- a/_test/build_run_core.xml
+++ b/_test/build_run_core.xml
@@ -60,7 +60,7 @@
     
 
     
-        
     
     
diff --git a/_test/build_run_plugin.xml b/_test/build_run_plugin.xml
index a87968a87..14844fcf2 100644
--- a/_test/build_run_plugin.xml
+++ b/_test/build_run_plugin.xml
@@ -61,7 +61,7 @@
     
 
     
-        
     
     
diff --git a/_test/build_run_ui.xml b/_test/build_run_ui.xml
index 732206f5d..68d7622fe 100644
--- a/_test/build_run_ui.xml
+++ b/_test/build_run_ui.xml
@@ -60,7 +60,7 @@
     
 
     
-        
     
     

From 9a5b95ab1b9cc4d7ff0094960f505d0fe07f3071 Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Fri, 13 Jun 2014 11:02:31 +0800
Subject: [PATCH 09/17] q

---
 _test/tools/br/js/run.js    | 1 +
 _test/tools/br/lib/Staf.php | 1 +
 _test/tools/br/runall.php   | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/_test/tools/br/js/run.js b/_test/tools/br/js/run.js
index 178a26ae5..3ee90d5df 100644
--- a/_test/tools/br/js/run.js
+++ b/_test/tools/br/js/run.js
@@ -115,6 +115,7 @@ function run( kiss, runnext ) {
         var locsearch = location.search.split('--_--').join('&');
     var url = 'run.php?case=' + kiss + '&time=' + new Date().getTime() + "&"
         + locsearch.substring( 1 );
+    console.log(url);
     // + (location.search.length > 0 ? '&' + location.search.substring(1)
     // : '');
 
diff --git a/_test/tools/br/lib/Staf.php b/_test/tools/br/lib/Staf.php
index 4420c7bc2..dfc75cc5d 100644
--- a/_test/tools/br/lib/Staf.php
+++ b/_test/tools/br/lib/Staf.php
@@ -25,6 +25,7 @@ public static function process_start($path, $params, $host='local', $wait=false)
 		if($wait){
 			$cmd.=" wait returnstdout returnstderr";
 		}
+        echo $cmd;
 		return self::process($cmd, $host);
 	}
 
diff --git a/_test/tools/br/runall.php b/_test/tools/br/runall.php
index 01053d85a..f1c3dda14 100644
--- a/_test/tools/br/runall.php
+++ b/_test/tools/br/runall.php
@@ -22,7 +22,7 @@ function run( $b , $debug = false )
             : $browser[ 1 ];
     $browserSet = array_key_exists( 'browserSet' , $_GET )?"^&browserSet=".$_GET[ 'browserSet' ]:'';
 
-    $url = "http://" . $_SERVER[ 'SERVER_ADDR' ] . ( $debug ? "" : ":8080" )
+    $url = "http://" . $_SERVER[ 'SERVER_ADDR' ] . ( $debug ? "" : ":80" )
            . substr( $_SERVER[ 'PHP_SELF' ] , 0 , -11 ) . "/list.php?batchrun=true--_--browser=$b".$browserSet;
     if ( !array_key_exists( "ci" , $_GET ) )
         $url .= "--_--mail=true";
@@ -50,6 +50,7 @@ function run( $b , $debug = false )
 
     require_once 'lib/Staf.php';
     $result = Staf::process_start( $path , $url , $host );
+    echo $path.$url.$host;
     return $result;
 }
 
@@ -80,6 +81,9 @@ function delDirAndFile( $dirName )
 if ( file_exists( $reportfile ) ) {
     //	rmdir('report');
     $reports = scandir( $reportfile );
+    $basedir = dirname(__FILE__);
+    echo $reportfile;
+
     /*自己和父节点*/
     print 'on batch run, please waiting : ' . ( sizeof( $reports ) - 2 );
     return;

From 642a933ded9dcaf5df25d15fb36e9bcc94221267 Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Tue, 26 Aug 2014 14:14:34 +0800
Subject: [PATCH 10/17] 1

---
 _test/tools/br/config.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/_test/tools/br/config.php b/_test/tools/br/config.php
index f44114d74..91f5f7ad5 100644
--- a/_test/tools/br/config.php
+++ b/_test/tools/br/config.php
@@ -2,11 +2,11 @@
         class Config
         {
                 public static $BROWSERS = array(
-//                    'ie8supp' => array( '10.94.26.94' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
-//                , 'ie11main' => array( '10.81.96.46' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
+                    'ie8supp' => array( '10.94.26.94' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
+                , 'ie11main' => array( '10.81.96.46' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 
-//                ,
-//                    'firefox' => array( '10.94.26.95' , "C:\\Program Files\\mozilla firefox\\firefox.exe" )
+                ,
+                    'firefox' => array( '10.94.26.95' , "C:\\Program Files\\mozilla firefox\\firefox.exe" )
 //                    'firefox' => array( '10.81.96.46@8500' , "C:\\Program Files (x86)\\Mozilla Firefox\\firefox.exe" )
 //                , '360ie8' => array('10.81.58.64@8500',"C:\\Program Files\\360\\360se\\360SE.exe")
 //                , '360ie7' => array( '10.81.58.87@8500' , "C:\\Program Files\\360\\360se\\360SE.exe" )
@@ -15,10 +15,11 @@ class Config
 //                , 'ie6' => array( '10.81.58.86@8500' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 //C:\Program Files\Google\Chrome\Application\chrome.exe
 // "C:\Program Files\Mozilla Firefox\firefox.exe"
-//                , 'chrome' => array( '10.94.26.95' , "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe" )
+                , 'chrome' => array( '10.94.26.95' , "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe" )
 //                ,
-//                    'ie8main' => array( '10.94.26.94' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
-                 'ie9supp' => array( '172.22.65.36' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
+                   , 'ie8main' => array( '10.94.26.94' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
+                , 'ie11supp' => array( '10.81.96.46' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
+//                 'ie9supp' => array( '172.22.65.36' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 //                , 'ie7' => array( '10.81.58.87@8500' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 //                , 'opera' => array( '10.81.58.64@8500' , "C:\\Program Files\\Opera\\opera.exe" )
 //                , 'safari' => array( '10.81.58.63@8500' , "C:\\Program Files\\Safari\\Safari.exe" )

From c44b3cdc7ec39880d2376423a5f84405ed0251ee Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Tue, 26 Aug 2014 14:17:08 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=9C=BA=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _test/tools/br/config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_test/tools/br/config.php b/_test/tools/br/config.php
index 91f5f7ad5..a75c5bd76 100644
--- a/_test/tools/br/config.php
+++ b/_test/tools/br/config.php
@@ -23,6 +23,7 @@ class Config
 //                , 'ie7' => array( '10.81.58.87@8500' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 //                , 'opera' => array( '10.81.58.64@8500' , "C:\\Program Files\\Opera\\opera.exe" )
 //                , 'safari' => array( '10.81.58.63@8500' , "C:\\Program Files\\Safari\\Safari.exe" )
+                
                 );
 
                 public static $DEBUG = false;

From 16cc51854963f805df2254e5ea6162e8ca29c00e Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Tue, 26 Aug 2014 15:02:41 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=9C=BAip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _test/build_run.xml        | 2 +-
 _test/build_run_core.xml   | 2 +-
 _test/build_run_plugin.xml | 2 +-
 _test/build_run_ui.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_test/build_run.xml b/_test/build_run.xml
index e7d179f2f..d16086ffc 100644
--- a/_test/build_run.xml
+++ b/_test/build_run.xml
@@ -1,7 +1,7 @@
 
  
-    
+    
     
     
     
diff --git a/_test/build_run_core.xml b/_test/build_run_core.xml
index 18d416f73..5198a3830 100644
--- a/_test/build_run_core.xml
+++ b/_test/build_run_core.xml
@@ -1,7 +1,7 @@
 
  
-    
+    
     
     
     
diff --git a/_test/build_run_plugin.xml b/_test/build_run_plugin.xml
index 14844fcf2..2f05e02b2 100644
--- a/_test/build_run_plugin.xml
+++ b/_test/build_run_plugin.xml
@@ -1,7 +1,7 @@
 
  
-    
+    
     
     
     
diff --git a/_test/build_run_ui.xml b/_test/build_run_ui.xml
index 68d7622fe..0ecd57530 100644
--- a/_test/build_run_ui.xml
+++ b/_test/build_run_ui.xml
@@ -1,7 +1,7 @@
 
  
-    
+    
     
     
     

From c96bcf395ba32a5820f9542ef7b3e544830019a0 Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Tue, 26 Aug 2014 15:13:28 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _test/build_run.xml        | 4 ++--
 _test/build_run_core.xml   | 4 ++--
 _test/build_run_plugin.xml | 4 ++--
 _test/build_run_ui.xml     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/_test/build_run.xml b/_test/build_run.xml
index d16086ffc..ae39bf193 100644
--- a/_test/build_run.xml
+++ b/_test/build_run.xml
@@ -5,8 +5,8 @@
     
     
     
-    
-    
+    
+    
 
     
     
diff --git a/_test/build_run_core.xml b/_test/build_run_core.xml
index 5198a3830..0925aa68a 100644
--- a/_test/build_run_core.xml
+++ b/_test/build_run_core.xml
@@ -5,8 +5,8 @@
     
     
     
-    
-    
+    
+    
     
     
         
diff --git a/_test/build_run_plugin.xml b/_test/build_run_plugin.xml
index 2f05e02b2..34a04d41f 100644
--- a/_test/build_run_plugin.xml
+++ b/_test/build_run_plugin.xml
@@ -5,8 +5,8 @@
     
     
     
-    
-    
+    
+    
 
     
     
diff --git a/_test/build_run_ui.xml b/_test/build_run_ui.xml
index 0ecd57530..1534da5e5 100644
--- a/_test/build_run_ui.xml
+++ b/_test/build_run_ui.xml
@@ -5,8 +5,8 @@
     
     
     
-    
-    
+    
+    
     
     
         

From 4587d745afad178a4ae19e691191963a5eaeedbf Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Tue, 26 Aug 2014 15:22:59 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _test/build_run.xml        | 2 +-
 _test/build_run_core.xml   | 2 +-
 _test/build_run_plugin.xml | 2 +-
 _test/build_run_ui.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_test/build_run.xml b/_test/build_run.xml
index ae39bf193..4c15f1cab 100644
--- a/_test/build_run.xml
+++ b/_test/build_run.xml
@@ -24,7 +24,7 @@
 
     
         
-        
+        
             
             
             
diff --git a/_test/build_run_core.xml b/_test/build_run_core.xml
index 0925aa68a..ebb8926e2 100644
--- a/_test/build_run_core.xml
+++ b/_test/build_run_core.xml
@@ -23,7 +23,7 @@
 
     
         
-        
+        
             
             
             
diff --git a/_test/build_run_plugin.xml b/_test/build_run_plugin.xml
index 34a04d41f..2a41488fb 100644
--- a/_test/build_run_plugin.xml
+++ b/_test/build_run_plugin.xml
@@ -24,7 +24,7 @@
 
     
         
-        
+        
             
             
             
diff --git a/_test/build_run_ui.xml b/_test/build_run_ui.xml
index 1534da5e5..eea425c04 100644
--- a/_test/build_run_ui.xml
+++ b/_test/build_run_ui.xml
@@ -23,7 +23,7 @@
 
     
         
-        
+        
             
             
             

From 58bc1be8ea2ae13a014ceb22a6d298017de334af Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Tue, 26 Aug 2014 16:35:33 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _test/build_run.xml        | 34 +++++++++++++++++-----------------
 _test/build_run_core.xml   |  4 ++--
 _test/build_run_plugin.xml |  4 ++--
 _test/build_run_ui.xml     |  4 ++--
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/_test/build_run.xml b/_test/build_run.xml
index 4c15f1cab..02b26c0b7 100644
--- a/_test/build_run.xml
+++ b/_test/build_run.xml
@@ -1,7 +1,7 @@
 
  
-    
+    
     
     
     
@@ -61,8 +61,8 @@
     
 
     
-        
+        
     
     
         
@@ -74,8 +74,8 @@
     
 
     
-        
+        
     
     
         
@@ -86,16 +86,16 @@
         
     
 
-
+    
 
\ No newline at end of file
diff --git a/_test/build_run_core.xml b/_test/build_run_core.xml
index ebb8926e2..769f1f73c 100644
--- a/_test/build_run_core.xml
+++ b/_test/build_run_core.xml
@@ -60,8 +60,8 @@
     
 
     
-        
+        
     
     
         
diff --git a/_test/build_run_plugin.xml b/_test/build_run_plugin.xml
index 2a41488fb..3c6062a9c 100644
--- a/_test/build_run_plugin.xml
+++ b/_test/build_run_plugin.xml
@@ -61,8 +61,8 @@
     
 
     
-        
+        
     
     
         
diff --git a/_test/build_run_ui.xml b/_test/build_run_ui.xml
index eea425c04..a848d4bd2 100644
--- a/_test/build_run_ui.xml
+++ b/_test/build_run_ui.xml
@@ -60,8 +60,8 @@
     
 
     
-        
+        
     
     
         

From de72a831133c5d2265571ca2537bbb18ae2945fe Mon Sep 17 00:00:00 2001
From: worry127722 
Date: Tue, 26 Aug 2014 16:55:42 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _test/tools/br/js/run.js  |  6 ++----
 _test/tools/br/runall.php | 24 ++++++++++--------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/_test/tools/br/js/run.js b/_test/tools/br/js/run.js
index 3ee90d5df..7461c8286 100644
--- a/_test/tools/br/js/run.js
+++ b/_test/tools/br/js/run.js
@@ -112,10 +112,8 @@ function run( kiss, runnext ) {
     /**
      * 初始化执行区并通过嵌入iframe启动用例执行
      */
-        var locsearch = location.search.split('--_--').join('&');
     var url = 'run.php?case=' + kiss + '&time=' + new Date().getTime() + "&"
-        + locsearch.substring( 1 );
-    console.log(url);
+        + location.search.substring( 1 );
     // + (location.search.length > 0 ? '&' + location.search.substring(1)
     // : '');
 
@@ -259,7 +257,7 @@ function covcalc() {
                 (recordCovForBrowser==null)?(recordCovForBrowser='0'):(recordCovForBrowser +=',0');
                 missing.push( lineNumber );
             } else {
-                 (recordCovForBrowser==null)?(recordCovForBrowser='1'):(recordCovForBrowser +=',1');
+                (recordCovForBrowser==null)?(recordCovForBrowser='1'):(recordCovForBrowser +=',1');
                 num_executed++;
             }
             num_statements++;
diff --git a/_test/tools/br/runall.php b/_test/tools/br/runall.php
index f1c3dda14..7f1539831 100644
--- a/_test/tools/br/runall.php
+++ b/_test/tools/br/runall.php
@@ -18,39 +18,38 @@ function run( $b , $debug = false )
     $browser = Config::$BROWSERS[ $b ];
     $host = $debug ? 'localhost' : $browser[ 0 ];
     $path = $debug
-            ? 'C:\\Documents and Settings\\shenlixia01\\Local Settings\\Application Data\\Google\Chrome\\Application\\chrome.exe'
-            : $browser[ 1 ];
+        ? 'C:\\Documents and Settings\\shenlixia01\\Local Settings\\Application Data\\Google\Chrome\\Application\\chrome.exe'
+        : $browser[ 1 ];
     $browserSet = array_key_exists( 'browserSet' , $_GET )?"^&browserSet=".$_GET[ 'browserSet' ]:'';
 
-    $url = "http://" . $_SERVER[ 'SERVER_ADDR' ] . ( $debug ? "" : ":80" )
-           . substr( $_SERVER[ 'PHP_SELF' ] , 0 , -11 ) . "/list.php?batchrun=true--_--browser=$b".$browserSet;
+    $url = "http://" . $_SERVER[ 'SERVER_ADDR' ] . ( $debug ? "" : ":8089" )
+        . substr( $_SERVER[ 'PHP_SELF' ] , 0 , -11 ) . "/list.php?batchrun=true^&browser=$b".$browserSet;
     if ( !array_key_exists( "ci" , $_GET ) )
-        $url .= "--_--mail=true";
+        $url .= "^&mail=true";
 
     if(array_key_exists(  "filter" , $_GET  )){
         $filterR = array_key_exists( $b , $_GET )?$_GET[$b]:$_GET['filter'];
         if(strstr($b,'main')||strstr($b,'supp')){
-            $url .= "--_--filterRun={$filterR}^&filter={$_GET['filter']}";
+            $url .= "^&filterRun={$filterR}^&filter={$_GET['filter']}";
         }else {
-            $url .= "--_--filterRun={$_GET['filter']}^&filter={$_GET['filter']}";
+            $url .= "^&filterRun={$_GET['filter']}^&filter={$_GET['filter']}";
 
         }
     }
 
 //    if( $b!='ie6') {
-        if ( array_key_exists( 'cov' , $_GET ) )
-            $url .= "^&cov={$_GET['cov']}";
+    if ( array_key_exists( 'cov' , $_GET ) )
+        $url .= "^&cov={$_GET['cov']}";
 //    }
     //	else
     //	$url .= "^&cov=true";
-print $url;
+    print $url;
     if ( $b == 'baidu' ) {
         $url = "--'$url'";
     }
 
     require_once 'lib/Staf.php';
     $result = Staf::process_start( $path , $url , $host );
-    echo $path.$url.$host;
     return $result;
 }
 
@@ -81,9 +80,6 @@ function delDirAndFile( $dirName )
 if ( file_exists( $reportfile ) ) {
     //	rmdir('report');
     $reports = scandir( $reportfile );
-    $basedir = dirname(__FILE__);
-    echo $reportfile;
-
     /*自己和父节点*/
     print 'on batch run, please waiting : ' . ( sizeof( $reports ) - 2 );
     return;

From 18601e829d3347dfdf7f1cf584678ba13ba8bda9 Mon Sep 17 00:00:00 2001
From: Jinqn <459452372@qq.com>
Date: Tue, 26 Aug 2014 17:24:29 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E6=81=A2=E5=A4=8D=20=5Ftest=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _test/build_run.xml         | 24 ++++++++++++------------
 _test/tools/br/config.php   |  6 ++----
 _test/tools/br/js/run.js    |  2 +-
 _test/tools/br/lib/Staf.php |  1 -
 _test/tools/br/report.php   |  9 ++++-----
 _test/tools/br/runall.php   | 12 ++++++------
 6 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/_test/build_run.xml b/_test/build_run.xml
index 02b26c0b7..4444695fc 100644
--- a/_test/build_run.xml
+++ b/_test/build_run.xml
@@ -86,16 +86,16 @@
         
     
 
-    
+
 
\ No newline at end of file
diff --git a/_test/tools/br/config.php b/_test/tools/br/config.php
index a75c5bd76..fbc842dc9 100644
--- a/_test/tools/br/config.php
+++ b/_test/tools/br/config.php
@@ -16,14 +16,12 @@ class Config
 //C:\Program Files\Google\Chrome\Application\chrome.exe
 // "C:\Program Files\Mozilla Firefox\firefox.exe"
                 , 'chrome' => array( '10.94.26.95' , "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe" )
-//                ,
-                   , 'ie8main' => array( '10.94.26.94' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
+                ,
+                    'ie8main' => array( '10.94.26.94' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
                 , 'ie11supp' => array( '10.81.96.46' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
-//                 'ie9supp' => array( '172.22.65.36' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 //                , 'ie7' => array( '10.81.58.87@8500' , "C:\\Program Files\\Internet Explorer\\iexplore.exe" )
 //                , 'opera' => array( '10.81.58.64@8500' , "C:\\Program Files\\Opera\\opera.exe" )
 //                , 'safari' => array( '10.81.58.63@8500' , "C:\\Program Files\\Safari\\Safari.exe" )
-                
                 );
 
                 public static $DEBUG = false;
diff --git a/_test/tools/br/js/run.js b/_test/tools/br/js/run.js
index 7461c8286..477e3dbe2 100644
--- a/_test/tools/br/js/run.js
+++ b/_test/tools/br/js/run.js
@@ -257,7 +257,7 @@ function covcalc() {
                 (recordCovForBrowser==null)?(recordCovForBrowser='0'):(recordCovForBrowser +=',0');
                 missing.push( lineNumber );
             } else {
-                (recordCovForBrowser==null)?(recordCovForBrowser='1'):(recordCovForBrowser +=',1');
+                 (recordCovForBrowser==null)?(recordCovForBrowser='1'):(recordCovForBrowser +=',1');
                 num_executed++;
             }
             num_statements++;
diff --git a/_test/tools/br/lib/Staf.php b/_test/tools/br/lib/Staf.php
index dfc75cc5d..4420c7bc2 100644
--- a/_test/tools/br/lib/Staf.php
+++ b/_test/tools/br/lib/Staf.php
@@ -25,7 +25,6 @@ public static function process_start($path, $params, $host='local', $wait=false)
 		if($wait){
 			$cmd.=" wait returnstdout returnstderr";
 		}
-        echo $cmd;
 		return self::process($cmd, $host);
 	}
 
diff --git a/_test/tools/br/report.php b/_test/tools/br/report.php
index febce3f20..5162a8487 100644
--- a/_test/tools/br/report.php
+++ b/_test/tools/br/report.php
@@ -59,14 +59,13 @@ function report()
     $suite = $dom->appendChild($dom->createElement('testsuite'));
     $cfg = preg_split('/[&=]/', $_POST['config']);
     $config = array();
-    for ($i = 0; $i < sizeof($cfg); $i++) {
+    for ($i = 0; $i < sizeof($cfg); $i += 2) {
         //	echo "{$cfg[$i]} {$cfg[$i+1]}\r\n
";
-        $info = explode("=" , $cfg[$i]);
-        $config[$info[0]] = $info[1];
+        $config[$cfg[$i]] = $cfg[$i + 1];
         $p = $suite->appendChild($dom->createElement("property"));
 
-        $p->setAttribute('name', $cfg[0]);
-        $p->setAttribute('value', $cfg[1]);
+        $p->setAttribute('name', $cfg[$i]);
+        $p->setAttribute('value', $cfg[$i + 1]);
 
     }
     $suite->setAttribute("name", $config['browser']);
diff --git a/_test/tools/br/runall.php b/_test/tools/br/runall.php
index 7f1539831..b1cf61e5e 100644
--- a/_test/tools/br/runall.php
+++ b/_test/tools/br/runall.php
@@ -18,12 +18,12 @@ function run( $b , $debug = false )
     $browser = Config::$BROWSERS[ $b ];
     $host = $debug ? 'localhost' : $browser[ 0 ];
     $path = $debug
-        ? 'C:\\Documents and Settings\\shenlixia01\\Local Settings\\Application Data\\Google\Chrome\\Application\\chrome.exe'
-        : $browser[ 1 ];
+            ? 'C:\\Documents and Settings\\shenlixia01\\Local Settings\\Application Data\\Google\Chrome\\Application\\chrome.exe'
+            : $browser[ 1 ];
     $browserSet = array_key_exists( 'browserSet' , $_GET )?"^&browserSet=".$_GET[ 'browserSet' ]:'';
 
     $url = "http://" . $_SERVER[ 'SERVER_ADDR' ] . ( $debug ? "" : ":8089" )
-        . substr( $_SERVER[ 'PHP_SELF' ] , 0 , -11 ) . "/list.php?batchrun=true^&browser=$b".$browserSet;
+           . substr( $_SERVER[ 'PHP_SELF' ] , 0 , -11 ) . "/list.php?batchrun=true^&browser=$b".$browserSet;
     if ( !array_key_exists( "ci" , $_GET ) )
         $url .= "^&mail=true";
 
@@ -38,12 +38,12 @@ function run( $b , $debug = false )
     }
 
 //    if( $b!='ie6') {
-    if ( array_key_exists( 'cov' , $_GET ) )
-        $url .= "^&cov={$_GET['cov']}";
+        if ( array_key_exists( 'cov' , $_GET ) )
+            $url .= "^&cov={$_GET['cov']}";
 //    }
     //	else
     //	$url .= "^&cov=true";
-    print $url;
+print $url;
     if ( $b == 'baidu' ) {
         $url = "--'$url'";
     }