Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: adblock-android-tests/src/org/adblockplus/libadblockplus/tests/ConsoleJsObjectTest.java

Issue 29819555: Fix libadblockplus-android tests
Patch Set: Created July 1, 2018, 9:20 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present 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 package org.adblockplus.libadblockplus.tests; 18 package org.adblockplus.libadblockplus.tests;
19 19
20 import org.adblockplus.libadblockplus.BaseJsEngineTest;
20 import org.adblockplus.libadblockplus.LogSystem; 21 import org.adblockplus.libadblockplus.LogSystem;
21 import org.adblockplus.libadblockplus.MockLogSystem; 22 import org.adblockplus.libadblockplus.MockLogSystem;
22 23
23 import org.junit.Test; 24 import org.junit.Test;
24 25
25 public class ConsoleJsObjectTest extends BaseJsEngineTest 26 public class ConsoleJsObjectTest extends BaseJsEngineTest
26 { 27 {
27 protected MockLogSystem mockLogSystem; 28 protected MockLogSystem mockLogSystem;
28 29
29 @Override 30 @Override
30 protected LogSystem createLogSystem() 31 protected void setUp() throws Exception
31 { 32 {
32 return mockLogSystem = new MockLogSystem(); 33 mockLogSystem = new MockLogSystem();
34 setLogSystem(mockLogSystem);
35 super.setUp();
33 } 36 }
34 37
35 @Test 38 @Test
36 public void testConsoleLogCall() 39 public void testConsoleLogCall()
37 { 40 {
38 jsEngine.evaluate("\n\nconsole.log('foo', 'bar');\n\n", "eval"); 41 jsEngine.evaluate("\n\nconsole.log('foo', 'bar');\n\n", "eval");
39 assertEquals(LogSystem.LogLevel.LOG, mockLogSystem.getLastLogLevel()); 42 assertEquals(LogSystem.LogLevel.LOG, mockLogSystem.getLastLogLevel());
40 assertEquals("foo bar", mockLogSystem.getLastMessage()); 43 assertEquals("foo bar", mockLogSystem.getLastMessage());
41 assertEquals("eval:3", mockLogSystem.getLastSource()); 44 assertEquals("eval:3", mockLogSystem.getLastSource());
42 } 45 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 "}\n" + 93 "}\n" +
91 "foo();", "eval"); 94 "foo();", "eval");
92 assertEquals(LogSystem.LogLevel.TRACE, mockLogSystem.getLastLogLevel()); 95 assertEquals(LogSystem.LogLevel.TRACE, mockLogSystem.getLastLogLevel());
93 assertEquals( 96 assertEquals(
94 "1: /* anonymous */() at eval:5\n" + 97 "1: /* anonymous */() at eval:5\n" +
95 "2: foo() at eval:6\n" + 98 "2: foo() at eval:6\n" +
96 "3: /* anonymous */() at eval:8\n", mockLogSystem.getLastMessage()); 99 "3: /* anonymous */() at eval:8\n", mockLogSystem.getLastMessage());
97 assertEquals("", mockLogSystem.getLastSource()); 100 assertEquals("", mockLogSystem.getLastSource());
98 } 101 }
99 } 102 }
OLDNEW

Powered by Google App Engine
This is Rietveld