Changeset 147381 in webkit

Timestamp:

Apr 1, 2013 10:29:39 PM (11 years ago)

Author:

jsbell@chromium.org

Message:

[Chromium] IndexedDB: Turn "should only be true in unit tests" comments into ASSERTs
​https://bugs.webkit.org/show_bug.cgi?id=113597

Reviewed by Adam Barth.

In the vein of wkbug.com/111233 and wkbug.com/110820 don't just comment that
some condition is true only in unit tests - ASSERT that Chromium's unitTestSupport()
is non-null to catch errors during development.

Exercised by Chromium's webkit_unit_tests.

• Modules/indexeddb/IDBDatabaseBackendImpl.cpp:

(WebCore::IDBDatabaseBackendImpl::openConnection):
(WebCore::IDBDatabaseBackendImpl::close):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBDatabaseBackendImpl.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-01  Joshua Bell  <jsbell@chromium.org>
+
+        [Chromium] IndexedDB: Turn "should only be true in unit tests" comments into ASSERTs
+        https://bugs.webkit.org/show_bug.cgi?id=113597
+
+        Reviewed by Adam Barth.
+
+        In the vein of wkbug.com/111233 and wkbug.com/110820 don't just comment that
+        some condition is true only in unit tests - ASSERT that Chromium's unitTestSupport()
+        is non-null to catch errors during development.
+
+        Exercised by Chromium's webkit_unit_tests.
+
+        * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
+        (WebCore::IDBDatabaseBackendImpl::openConnection):
+        (WebCore::IDBDatabaseBackendImpl::close):
+
 2013-04-01  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp

@@ -39 +39 @@
 #include "IDBTransactionCoordinator.h"
 #include "SharedBuffer.h"
+#if PLATFORM(CHROMIUM)
+#include <public/Platform.h>
+#endif
 #include <wtf/TemporaryChange.h>
 
@@ -1213 +1216 @@
     if (version == IDBDatabaseMetadata::DefaultIntVersion) {
         // For unit tests only - skip upgrade steps. Calling from script with DefaultIntVersion throws exception.
+#if PLATFORM(CHROMIUM)
+        ASSERT(WebKit::Platform::current()->unitTestSupport());
+#endif
         ASSERT(isNewDatabase);
         m_databaseCallbacksSet.add(databaseCallbacks);
@@ -1349 +1355 @@
 
         m_backingStore.clear();
-        // This check should only be false in tests.
+
+        // This check should only be false in unit tests.
+#if PLATFORM(CHROMIUM)
+        ASSERT(m_factory || WebKit::Platform::current()->unitTestSupport());
+#else
+        ASSERT(m_factory);
+#endif
         if (m_factory)
             m_factory->removeIDBDatabaseBackend(m_identifier);