Changeset 104482 in vbox for trunk/src/libs/xpcom18a4/xpcom/tests

Timestamp:

May 2, 2024 4:24:06 PM (10 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163004

Message:

libs/xpcom: Some fixes in testcases, bugref:3409

Location:

trunk/src/libs/xpcom18a4/xpcom/tests

Files:

• TestAutoLock.cpp (modified) (1 diff)
• TestObserverService.cpp (modified) (7 diffs)
• TestStrings.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/tests/TestAutoLock.cpp

@@ -93 +93 @@
     vrc = RTThreadCreate(&hThread, run, NULL, 0 /*cbStack*/,
                          RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "AutoLockTest");
+    if (RT_FAILURE(vrc))
+        return RTEXITCODE_FAILURE;
 
     // ...and now do the same thing ourselves

trunk/src/libs/xpcom18a4/xpcom/tests/TestObserverService.cpp

@@ -127 +127 @@
                                                  NS_GET_IID(nsIObserverService),
                                                 (void **) &anObserverService);
-#ifdef VBOX
+
     bool fSuccess = res == NS_OK;
-#endif
-        
-    if (res == NS_OK) {
+    if (fSuccess) {
 
         nsIObserver *aObserver = new TestObserver(NS_LITERAL_STRING("Observer-A"));
@@ -140 +138 @@
         printf("Adding Observer-A as observer of topic-A...\n");
         rv = anObserverService->AddObserver(aObserver, topicA.get(), PR_FALSE);
-#ifdef VBOX
-        fSuccess = fSuccess &&
-#endif
-        testResult(rv);
+        fSuccess = testResult(rv);
  
         printf("Adding Observer-B as observer of topic-A...\n");
         rv = anObserverService->AddObserver(bObserver, topicA.get(), PR_FALSE);
-#ifdef VBOX
-        fSuccess = fSuccess &&
-#endif
-        testResult(rv);
+        fSuccess = fSuccess && testResult(rv);
  
         printf("Adding Observer-B as observer of topic-B...\n");
         rv = anObserverService->AddObserver(bObserver, topicB.get(), PR_FALSE);
-#ifdef VBOX
-        fSuccess = fSuccess &&
-#endif
-        testResult(rv);
+        fSuccess = fSuccess && testResult(rv);
 
         printf("Testing Notify(observer-A, topic-A)...\n");
@@ -163 +152 @@
                                    topicA.get(),
                                    NS_LITERAL_STRING("Testing Notify(observer-A, topic-A)").get() );
-#ifdef VBOX
-        fSuccess = fSuccess &&
-#endif
-        testResult(rv);
+        fSuccess = fSuccess && testResult(rv);
 
         printf("Testing Notify(observer-B, topic-B)...\n");
@@ -172 +158 @@
                                    topicB.get(),
                                    NS_LITERAL_STRING("Testing Notify(observer-B, topic-B)").get() );
-#ifdef VBOX
-        fSuccess = fSuccess &&
-#endif
-        testResult(rv);
+        fSuccess = fSuccess && testResult(rv);
  
         printf("Testing EnumerateObserverList (for topic-A)...\n");
         nsCOMPtr<nsISimpleEnumerator> e;
         rv = anObserverService->EnumerateObservers(topicA.get(), getter_AddRefs(e));
-
-#ifdef VBOX
-        fSuccess = fSuccess &&
-#endif
-        testResult(rv);
+        fSuccess = fSuccess && testResult(rv);
 
         printf("Enumerating observers of topic-A...\n");
@@ -200 +179 @@
                                       topicA.get(), 
                                       NS_LITERAL_STRING("during enumeration").get() );
-#ifdef VBOX
-              fSuccess = fSuccess &&
-#endif
-              testResult(rv);
+              fSuccess = fSuccess && testResult(rv);
           }
         }
@@ -210 +186 @@
         printf("Removing Observer-A...\n");
         rv = anObserverService->RemoveObserver(aObserver, topicA.get());
-#ifdef VBOX
-        fSuccess = fSuccess &&
-#endif
-        testResult(rv);
+        fSuccess = fSuccess && testResult(rv);
 
 
         printf("Removing Observer-B (topic-A)...\n");
         rv = anObserverService->RemoveObserver(bObserver, topicB.get());
-#ifdef VBOX
-        fSuccess = fSuccess &&
-#endif
-        testResult(rv);
+        fSuccess = fSuccess && testResult(rv);
         printf("Removing Observer-B (topic-B)...\n");
         rv = anObserverService->RemoveObserver(bObserver, topicA.get());
-#ifdef VBOX
-        fSuccess = fSuccess &&
-#endif
-        testResult(rv);
-
-#ifdef VBOX
+        fSuccess = fSuccess && testResult(rv);
+
         /* Cleanup: */
         nsrefcnt refs = bObserver->Release();
@@ -240 +206 @@
         if (refs != 0)
             printf("aObserver->Release() -> %d, expected 0\n", (int)refs);
-#endif
-    }
-#ifdef VBOX
+    }
+
     return fSuccess ? 0 : 1;
-#else
-    return NS_OK;
-#endif
-}
+}

trunk/src/libs/xpcom18a4/xpcom/tests/TestStrings.cpp

@@ -72 +72 @@
     nsAutoString buf(aStr);
 
-    PRInt32 n = buf.FindChar(',');
-
-    n = buf.Length();
+    PRInt32 n = buf.Length();
 
     buf.Cut(0, n + 1);