[ros-diffs] [tfaber] 59479: [MSHTML_WINETEST] - Use winetest_interactive to disable tests

Author: tfaber
Date: Sun Jul 14 10:11:45 2013
New Revision: 59479

URL: http://svn.reactos.org/svn/reactos?rev=59479&view=rev
Log:
[MSHTML_WINETEST]
- Use winetest_interactive to disable tests

Modified:
    trunk/rostests/winetests/mshtml/activex.c
    trunk/rostests/winetests/mshtml/htmldoc.c

Modified: trunk/rostests/winetests/mshtml/activex.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/activex.c...
==============================================================================
--- trunk/rostests/winetests/mshtml/activex.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/mshtml/activex.c	[iso-8859-1] Sun Jul 14 10:11:45 2013
@@ -2435,14 +2435,18 @@
     /* Set in DoVerb */
     CHECK_CALLED(InPlaceObject_GetWindow);
     CHECK_CALLED(SetObjectRects);
-#if ROSTESTS_114_IS_FIXED
-    test_ui_activate();
-    test_container(notif_doc);
-    test_object_elem(notif_doc);
-#endif
-    win_skip("Skipping test_ui_activate(). ROSTESTS-114.\n");
-    win_skip("Skipping test_container(notif_doc). ROSTESTS-114.\n");
-    win_skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n");
+    if (winetest_interactive)
+    {
+        test_ui_activate();
+        test_container(notif_doc);
+        test_object_elem(notif_doc);
+    }
+    else
+    {
+        skip("Skipping test_ui_activate(). ROSTESTS-114.\n");
+        skip("Skipping test_container(notif_doc). ROSTESTS-114.\n");
+        skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n");
+    }

SET_EXPECT(UIDeactivate);
     SET_EXPECT(Invoke_ENABLED);
@@ -2557,10 +2561,10 @@
     CHECK_CALLED(FindConnectionPoint);
     CHECK_CALLED(Advise);

-#if ROSTESTS_114_IS_FIXED
-    test_event_call();
-#endif
-    win_skip("Skipping test_event_call(). ROSTESTS-114.\n");
+    if (winetest_interactive)
+        test_event_call();
+    else
+        skip("Skipping test_event_call(). ROSTESTS-114.\n");

SET_EXPECT(InPlaceDeactivate);
     SET_EXPECT(Close);

Modified: trunk/rostests/winetests/mshtml/htmldoc.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.c...
==============================================================================
--- trunk/rostests/winetests/mshtml/htmldoc.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/mshtml/htmldoc.c	[iso-8859-1] Sun Jul 14 10:11:45 2013
@@ -7574,17 +7574,21 @@
     test_HTMLDocument(TRUE, TRUE);
     test_HTMLDocument_StreamLoad();
     test_HTMLDocument_StreamInitNew();
-#if ROSTESTS_113_IS_FIXED
-    test_editing_mode(FALSE);
-#endif
-    win_skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n");
+    if (winetest_interactive)
+        test_editing_mode(FALSE);
+    else
+        skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n");
     test_editing_mode(TRUE);
-#if ROSTESTS_113_IS_FIXED
-    test_HTMLDocument_http(FALSE);
-    test_HTMLDocument_http(TRUE);
-#endif
-    win_skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n");
-    win_skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n");
+    if (winetest_interactive)
+    {
+        test_HTMLDocument_http(FALSE);
+        test_HTMLDocument_http(TRUE);
+    }
+    else
+    {
+        skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n");
+        skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n");
+    }

test_UIActivate(FALSE, FALSE, FALSE);
     test_UIActivate(FALSE, TRUE, FALSE);