test/AppInfoJsObject.cpp - Issue 11157034: Update info module and make updater use the new downloader module

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: test/AppInfoJsObject.cpp

Issue 11157034: Update info module and make updater use the new downloader module (Closed)

Patch Set: Created July 23, 2013, 10:03 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

« no previous file with comments | « src/AppInfoJsObject.cpp ('k') | test/UpdateCheck.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * This file is part of Adblock Plus <http://adblockplus.org/>,	2 * This file is part of Adblock Plus <http://adblockplus.org/>,

3 * Copyright (C) 2006-2013 Eyeo GmbH	3 * Copyright (C) 2006-2013 Eyeo GmbH

4 *	4 *

5 * Adblock Plus is free software: you can redistribute it and/or modify	5 * Adblock Plus is free software: you can redistribute it and/or modify

6 * it under the terms of the GNU General Public License version 3 as	6 * it under the terms of the GNU General Public License version 3 as

7 * published by the Free Software Foundation.	7 * published by the Free Software Foundation.

8 *	8 *

9 * Adblock Plus is distributed in the hope that it will be useful,	9 * Adblock Plus is distributed in the hope that it will be useful,

10 * but WITHOUT ANY WARRANTY; without even the implied warranty of	10 * but WITHOUT ANY WARRANTY; without even the implied warranty of

11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12 * GNU General Public License for more details.	12 * GNU General Public License for more details.

13 *	13 *

14 * You should have received a copy of the GNU General Public License	14 * You should have received a copy of the GNU General Public License

15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.	15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

16 */	16 */

17	17

18 #include <AdblockPlus.h>	18 #include <AdblockPlus.h>

19 #include <gtest/gtest.h>	19 #include <gtest/gtest.h>

20	20

21 TEST(AppInfoJsObjectTest, AllProperties)	21 TEST(AppInfoJsObjectTest, AllProperties)

22 {	22 {

23 AdblockPlus::AppInfo appInfo;	23 AdblockPlus::AppInfo appInfo;

24 appInfo.id = "1";	24 appInfo.id = "1";

25 appInfo.version = "2";	25 appInfo.version = "2";

26 appInfo.name = "4";	26 appInfo.name = "4";

27 appInfo.platform = "5";	27 appInfo.application = "5";

	28 appInfo.applicationVersion = "6";

28 appInfo.locale = "3";	29 appInfo.locale = "3";

29 appInfo.developmentBuild = true;	30 appInfo.developmentBuild = true;

30 AdblockPlus::JsEnginePtr jsEngine(AdblockPlus::JsEngine::New(appInfo));	31 AdblockPlus::JsEnginePtr jsEngine(AdblockPlus::JsEngine::New(appInfo));

31 ASSERT_EQ("1", jsEngine->Evaluate("_appInfo.id")->AsString());	32 ASSERT_EQ("1", jsEngine->Evaluate("_appInfo.id")->AsString());

32 ASSERT_EQ("2", jsEngine->Evaluate("_appInfo.version")->AsString());	33 ASSERT_EQ("2", jsEngine->Evaluate("_appInfo.version")->AsString());

33 ASSERT_EQ("4", jsEngine->Evaluate("_appInfo.name")->AsString());	34 ASSERT_EQ("4", jsEngine->Evaluate("_appInfo.name")->AsString());

34 ASSERT_EQ("5", jsEngine->Evaluate("_appInfo.platform")->AsString());	35 ASSERT_EQ("5", jsEngine->Evaluate("_appInfo.application")->AsString());

	36 ASSERT_EQ("6", jsEngine->Evaluate("_appInfo.applicationVersion")->AsString());

35 ASSERT_EQ("3", jsEngine->Evaluate("_appInfo.locale")->AsString());	37 ASSERT_EQ("3", jsEngine->Evaluate("_appInfo.locale")->AsString());

36 ASSERT_TRUE(jsEngine->Evaluate("_appInfo.developmentBuild")->AsBool());	38 ASSERT_TRUE(jsEngine->Evaluate("_appInfo.developmentBuild")->AsBool());

37 }	39 }

38	40

39 TEST(AppInfoJsObjectTest, DefaultPropertyValues)	41 TEST(AppInfoJsObjectTest, DefaultPropertyValues)

40 {	42 {

41 AdblockPlus::AppInfo appInfo;	43 AdblockPlus::AppInfo appInfo;

42 AdblockPlus::JsEnginePtr jsEngine(AdblockPlus::JsEngine::New(appInfo));	44 AdblockPlus::JsEnginePtr jsEngine(AdblockPlus::JsEngine::New(appInfo));

43 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.id")->AsString());	45 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.id")->AsString());

44 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.version")->AsString());	46 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.version")->AsString());

45 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.name")->AsString());	47 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.name")->AsString());

46 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.platform")->AsString());	48 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.application")->AsString());

	49 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.applicationVersion")->AsString());

47 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.locale")->AsString());	50 ASSERT_EQ("", jsEngine->Evaluate("_appInfo.locale")->AsString());

48 ASSERT_FALSE(jsEngine->Evaluate("_appInfo.developmentBuild")->AsBool());	51 ASSERT_FALSE(jsEngine->Evaluate("_appInfo.developmentBuild")->AsBool());

49 }	52 }

OLD	NEW