Tooltip: Unit tests cleanup

2 files changed, 30 insertions, 15 deletions

diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index 37bfeafce..a5d76fb8f 100644
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -9,6 +9,7 @@
 	<script type="text/javascript" src="../../../jquery-1.4.2.js"></script>
 	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
 	<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
 	<script type="text/javascript" src="../../../ui/jquery.ui.tooltip.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
index e0262a947..f7abddb8b 100644
--- a/tests/unit/tooltip/tooltip_options.js
+++ b/tests/unit/tooltip/tooltip_options.js
@@ -3,24 +3,38 @@
  */
 (function($) {
 
-module("tooltip: options");
-
-function contentTest(name, expected, impl) {
-	test(name, function() {
-		$("#tooltipped1").tooltip({
-			content: impl
-		}).tooltip("open");
-		same( $(".ui-tooltip").text(), expected );
+module("tooltip: options", {
+	teardown: function() {
 		$(":ui-tooltip").tooltip("destroy");
-	});
-}
+	}
+});
+
+test("content: default", function() {
+	$("#tooltipped1").tooltip().tooltip("open");
+	same( $(".ui-tooltip").text(), "anchortitle" );
+});
 
-contentTest("content: default", "anchortitle");
-contentTest("content: return string", "customstring", function() {
-	return "customstring";
+test("content: return string", function() {
+	$("#tooltipped1").tooltip({
+		content: function() {
+			return "customstring";
+		}
+	}).tooltip("open");
+	same( $(".ui-tooltip").text(), "customstring" );
 });
-contentTest("content: callback string", "customstring2", function(response) {
-	response("customstring2");
+
+test("content: callback string", function() {
+	stop();
+	$("#tooltipped1").tooltip({
+		content: function(response) {
+			response("customstring2");
+			setTimeout(function() {
+				same( $(".ui-tooltip").text(), "customstring2" );
+				start();
+			}, 100)
+		}
+	}).tooltip("open");
+	
 });
 
 test("tooltipClass, default", function() {