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

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

Issue 29524565: Issue 5556 - remove LogSystem setters (Closed) Base URL: github.com:abby-sergz/libadblockplus-android.git
Patch Set: address comments Created Aug. 24, 2017, 1:38 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.LogSystem; 20 import org.adblockplus.libadblockplus.LogSystem;
21 import org.adblockplus.libadblockplus.MockLogSystem; 21 import org.adblockplus.libadblockplus.MockLogSystem;
22 22
23 import org.junit.Test; 23 import org.junit.Test;
24 24
25 public class ConsoleJsObjectTest extends BaseJsTest 25 public class ConsoleJsObjectTest extends BaseJsTest
26 { 26 {
27 protected MockLogSystem mockLogSystem; 27 protected MockLogSystem mockLogSystem;
28 28
29 @Override 29 @Override
30 protected void setUp() throws Exception 30 protected LogSystem createLogSystem()
31 { 31 {
32 super.setUp(); 32 return mockLogSystem = new MockLogSystem();
33
34 mockLogSystem = new MockLogSystem();
35 jsEngine.setLogSystem(mockLogSystem);
36 } 33 }
37 34
38 @Test 35 @Test
39 public void testConsoleLogCall() 36 public void testConsoleLogCall()
40 { 37 {
41 jsEngine.evaluate("\n\nconsole.log('foo', 'bar');\n\n", "eval"); 38 jsEngine.evaluate("\n\nconsole.log('foo', 'bar');\n\n", "eval");
42 assertEquals(LogSystem.LogLevel.LOG, mockLogSystem.getLastLogLevel()); 39 assertEquals(LogSystem.LogLevel.LOG, mockLogSystem.getLastLogLevel());
43 assertEquals("foo bar", mockLogSystem.getLastMessage()); 40 assertEquals("foo bar", mockLogSystem.getLastMessage());
44 assertEquals("eval:3", mockLogSystem.getLastSource()); 41 assertEquals("eval:3", mockLogSystem.getLastSource());
45 } 42 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 "}\n" + 90 "}\n" +
94 "foo();", "eval"); 91 "foo();", "eval");
95 assertEquals(LogSystem.LogLevel.TRACE, mockLogSystem.getLastLogLevel()); 92 assertEquals(LogSystem.LogLevel.TRACE, mockLogSystem.getLastLogLevel());
96 assertEquals( 93 assertEquals(
97 "1: /* anonymous */() at eval:5\n" + 94 "1: /* anonymous */() at eval:5\n" +
98 "2: foo() at eval:6\n" + 95 "2: foo() at eval:6\n" +
99 "3: /* anonymous */() at eval:8\n", mockLogSystem.getLastMessage()); 96 "3: /* anonymous */() at eval:8\n", mockLogSystem.getLastMessage());
100 assertEquals("", mockLogSystem.getLastSource()); 97 assertEquals("", mockLogSystem.getLastSource());
101 } 98 }
102 } 99 }
OLDNEW

Powered by Google App Engine
This is Rietveld