mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Merge revision 448 and 453 changes:
- Add support for running unit tests without multi-threaded message loop mode (issue #338). - Mac: Fix unit test expectations. - Mac: cef_time_t.day_of_week is not supported. - Mac: Add support for building the 'Run cef_unittests' target from the command line. git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@455 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -57,11 +57,13 @@ public:
|
||||
ASSERT_EQ(date.year, 2010);
|
||||
ASSERT_EQ(date.month, 5);
|
||||
ASSERT_EQ(date.day_of_month, 3);
|
||||
#if !defined(OS_MACOSX)
|
||||
ASSERT_EQ(date.day_of_week, 1);
|
||||
#endif
|
||||
ASSERT_EQ(date.hour, 12);
|
||||
ASSERT_EQ(date.minute, 30);
|
||||
ASSERT_EQ(date.second, 10);
|
||||
ASSERT_EQ(date.millisecond, 100);
|
||||
ASSERT_NEAR(date.millisecond, 100, 1);
|
||||
argct++;
|
||||
|
||||
ASSERT_TRUE(arguments[argct]->IsString());
|
||||
@@ -188,12 +190,14 @@ public:
|
||||
CefTime date = value->GetDateValue();
|
||||
ASSERT_EQ(date.year, 2010);
|
||||
ASSERT_EQ(date.month, 5);
|
||||
#if !defined(OS_MACOSX)
|
||||
ASSERT_EQ(date.day_of_week, 1);
|
||||
#endif
|
||||
ASSERT_EQ(date.day_of_month, 3);
|
||||
ASSERT_EQ(date.hour, 12);
|
||||
ASSERT_EQ(date.minute, 30);
|
||||
ASSERT_EQ(date.second, 10);
|
||||
ASSERT_EQ(date.millisecond, 100);
|
||||
ASSERT_NEAR(date.millisecond, 100, 1);
|
||||
|
||||
value = object->GetValue("arrayVal");
|
||||
ASSERT_TRUE(value.get() != NULL);
|
||||
@@ -299,7 +303,7 @@ public:
|
||||
CefRefPtr<CefV8Value> object)
|
||||
{
|
||||
// Create the new V8 object
|
||||
CefRefPtr<CefV8Value> testObj = CefV8Value::CreateObject(NULL);
|
||||
CefRefPtr<CefV8Value> testObj = CefV8Value::CreateObject(NULL, NULL);
|
||||
ASSERT_TRUE(testObj.get() != NULL);
|
||||
ASSERT_TRUE(object->SetValue("test", testObj, V8_PROPERTY_ATTRIBUTE_NONE));
|
||||
|
||||
@@ -328,7 +332,18 @@ public:
|
||||
ASSERT_TRUE(testObj->SetValue("stringVal",
|
||||
CefV8Value::CreateString("the string"), V8_PROPERTY_ATTRIBUTE_NONE));
|
||||
|
||||
cef_time_t date = {2010, 5, 1, 3, 12, 30, 10, 100};
|
||||
cef_time_t date = {
|
||||
2010,
|
||||
5,
|
||||
#if !defined(OS_MACOSX)
|
||||
1,
|
||||
#endif
|
||||
3,
|
||||
12,
|
||||
30,
|
||||
10,
|
||||
100
|
||||
};
|
||||
ASSERT_TRUE(testObj->SetValue("dateVal", CefV8Value::CreateDate(date),
|
||||
V8_PROPERTY_ATTRIBUTE_NONE));
|
||||
|
||||
@@ -828,7 +843,7 @@ public:
|
||||
CefRefPtr<CefV8Value> foobarFunc =
|
||||
CefV8Value::CreateFunction("foobar", funcHandler);
|
||||
|
||||
obj = CefV8Value::CreateObject(NULL);
|
||||
obj = CefV8Value::CreateObject(NULL, NULL);
|
||||
url = CefV8Value::CreateString("http://tests/end.html");
|
||||
|
||||
obj->SetValue("url", url, V8_PROPERTY_ATTRIBUTE_NONE);
|
||||
|
Reference in New Issue
Block a user