@@ -27,9 +27,48 @@ button
float:right;
}
+#suite-progress, #total-progress
+{
+ background-color: #111;
+ margin-bottom: 10px;
+ border: 1px solid #666;
+ width: 250px;
+ height: 8px;
+
+ margin: 1px;
+}
+
+#progress-bars {
+ float: left;
+ clear: none;
+}
+
+#current-test-message, #progress-message
+{
+ float: left;
+ font-size: 12px;
+ margin-left: 5px;
+}
+
+.passed-progress, .failed-progress
+{
+ float: left;
+ clear: none;
+ height: 8px;
+}
+
+.passed-progress {
+ background-color: #3c3;
+}
+
+.failed-progress
+{
+ background-color: #c33;
+}
+
#header
{
- font-size:10px;
+ font-size:12px;
margin-bottom:10px;
float:right;
}
apps/drillbit/Resources/drillbit.css
@@ -9,6 +9,8 @@ var total_assertions = 0;
var total_files = 0;
var running_assertions = 0;
var running_completed = 0;
+var running_passed = 0;
+var running_failed = 0;
var auto_run = false;
var auto_close = false;
var debug_tests = false;
@@ -34,6 +36,35 @@ function test_status(name,classname)
.removeClass('passed').addClass(classname.toLowerCase());
}
+function progress(passed,failed,total,progress)
+{
+ var passed_percent = Math.floor((passed/total) * 100);
+ var failed_percent = Math.floor((failed/total) * 100);
+ progress.html(
+ '<div class="passed-progress" style="width: '+passed_percent+'%;"> </div>'+
+ '<div class="failed-progress" style="width: '+failed_percent+'%;"> </div>'
+ );
+}
+
+function suite_progress(passed,failed,total)
+{
+ progress(passed,failed,total,$('#suite-progress'));
+}
+
+function total_progress(passed,failed,total)
+{
+ progress(passed,failed,total,$('#total-progress'));
+
+ var passed_percent = Math.floor((passed/total) * 100);
+ var failed_percent = Math.floor((failed/total) * 100);
+ $('#progress-message').html('<img src="images/check_on.png"/>'+passed+' <img src="images/check_off.png"/>'+failed);
+}
+
+function show_current_test(suite_name, test_name)
+{
+ $('#current-test-message').text(suite_name + ': ' + test_name);
+}
+
function describe(description,test)
{
current_test_load.description = description;
@@ -58,7 +89,7 @@ function describe(description,test)
total_files++;
- $('#header').html(total_assertions+' assertions in '+total_files+' files');
+ $('#header').html(total_assertions+' tests in '+total_files+' files');
current_test_load = null;
}
@@ -387,6 +418,7 @@ window.onload = function()
us+="try {\n";
us+="TitaniumTest.currentTest='" + f + "';\n";
+ us+="TitaniumTest.runningTest('"+entry.name+"','" + f + "');\n";
us+=make_function(entry.test[f],'xscope');
i = f.indexOf('_as_async');
@@ -467,21 +499,43 @@ window.onload = function()
args.push('--results-dir="' + results_dir + '"');
var process = Titanium.Process.launch(app.executable.nativePath(),args);
- process.onread = function(data)
+ var passed = 0;
+ var failed = 0;
+ process.onread = function(d)
{
- var i = data.indexOf('DRILLBIT_');
- if (i != -1)
- {
- var test_name = data.substring(15,data.length-1);
- var test_passed = data.indexOf('_PASS:')!=-1;
- running_completed++;
- var msg = "Completed: " +entry.name + " ... " + running_completed + "/" + running_assertions;
- update_status(msg);
- Titanium.API.debug("test ["+ test_name + "], passed:"+test_passed);
- }
- else
+ var lines = d.split('\n');
+ for (var l = 0; l < lines.length; l++)
{
- Titanium.API.debug("PROCESS:"+data);
+ var data = lines[l];
+ var i = data.indexOf('DRILLBIT_');
+ if (i != -1)
+ {
+ if (data.indexOf('DRILLBIT_TEST:') != -1) {
+ var comma = data.indexOf(',');
+ var suite_name = data.substring(15,comma);
+ var test_name = data.substring(comma+1,data.length-1);
+
+ show_current_test(suite_name,test_name);
+ continue;
+ }
+
+ var test_name = data.substring(15,data.length-1);
+ var test_passed = data.indexOf('_PASS:')!=-1;
+ running_completed++;
+ if (test_passed) { passed++; running_passed++; }
+ else { failed ++; running_failed++; }
+
+ suite_progress(passed, failed, current_test.assertion_count);
+ total_progress(running_passed, running_failed, total_assertions);
+
+ var msg = "Completed: " +entry.name + " ... " + running_completed + "/" + running_assertions;
+ update_status(msg);
+ Titanium.API.debug("test ["+ test_name + "], passed:"+test_passed);
+ }
+ else
+ {
+ Titanium.API.debug("PROCESS:"+data);
+ }
}
};
var size = 0;
apps/drillbit/Resources/drillbit.js
@@ -257,6 +257,12 @@ TitaniumTest =
success:0,
failed:0,
+ runningTest:function(suite,name)
+ {
+ Titanium.App.stdout('DRILLBIT_TEST: '+suite+','+name);
+ Titanium.API.debug('DRILLBIT_TEST: '+suite+','+name);
+ },
+
testPassed:function(name, lineNumber)
{
this.success++;
apps/drillbit/Resources/drillbit_func.js
@@ -7,6 +7,13 @@
<link rel="stylesheet" href="drillbit.css" type="text/css" charset="utf-8">
</head>
<body>
+ <div id="progress-bars">
+ <div id="suite-progress"></div>
+ <div id="total-progress"></div>
+ </div>
+ <div id="progress-message"><img src="images/check_on.png"/>0 <img src="images/check_off.png"/>0</div>
+ <div id="current-test-message">no tests running</div>
+
<div id="header"></div>
<div id="table"></div>
<div><button id="run">Run Tests</button></div>
apps/drillbit/Resources/index.html
@@ -52,5 +52,29 @@ describe("file-based ajax tests",
{
callback.failed('ajax request timed out after 30s');
},2000)
+ },
+ test_query_string_as_async: function(callback)
+ {
+ var timer = 0;
+ $.getJSON('app://url.js?q=1', function(data)
+ {
+ clearTimeout(timer);
+ try
+ {
+ value_of(data).should_be_object();
+ value_of(data.success).should_be_true();
+ value_of(data.abc).should_be(123);
+ callback.passed();
+ }
+ catch(e)
+ {
+ callback.failed(e);
+ }
+ });
+
+ timer = setTimeout(function()
+ {
+ callback.failed('ajax request timed out after 2s');
+ },2000);
}
});
\ No newline at end of file
apps/drillbit/Resources/tests/ajax_file/ajax_file.js
@@ -68,6 +68,9 @@ describe("native XHR tests",
else if (this.readyState == xhr.DONE)
{
clearTimeout(timer);
+ var text = xhr.responseText;
+ value_of(text).should_be_string();
+ value_of(text.length > 0).should_be_true();
callback.passed();
}
}
apps/drillbit/Resources/tests/native_xhr/native_xhr.js
@@ -13,7 +13,7 @@
<width>750</width>
<max-width>3000</max-width>
<min-width>0</min-width>
-<height>700</height>
+<height>725</height>
<max-height>3000</max-height>
<min-height>0</min-height>
<fullscreen>false</fullscreen>
apps/drillbit/tiapp.xml
@@ -1 +1 @@
-Subproject commit e2bdc35b74870374dc02e546ac63c393452c35c4
+Subproject commit 1c64614565797949df1d60024b986e500409afb1
kroll
3b763a3064fb679baaa186afaa6226efd4678019
Marshall Culpepper
mculpepper@appcelerator.org
http://github.com/marshall/titanium/commit/5b17ec6df295c67657f3220e56c05610d7b623ee
5b17ec6df295c67657f3220e56c05610d7b623ee
2009-06-11T16:09:57-07:00
2009-06-11T16:09:57-07:00
make drillbit status a good bit more interactive with progress and more detailed status messages. added a unit test for TI-327, TI-329
504a0b7e8a7938b45f8f48c9cddfa3d8f0ce18ad
Marshall Culpepper
mculpepper@appcelerator.org