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

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

Issue 29347315: Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback (Closed)
Patch Set: Introduced file system abstraction to java and using LazyFileSystem for filter tests Created July 10, 2016, 10:47 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
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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 } 71 }
72 72
73 triggerEvent(this.ptr, eventName, args); 73 triggerEvent(this.ptr, eventName, args);
74 } 74 }
75 75
76 public void triggerEvent(final String eventName) 76 public void triggerEvent(final String eventName)
77 { 77 {
78 triggerEvent(this.ptr, eventName, null); 78 triggerEvent(this.ptr, eventName, null);
79 } 79 }
80 80
81 public void setFileSystem(FileSystem fileSystem)
82 {
83 setFileSystem(this.ptr, fileSystem.ptr);
84 }
85
81 public void setDefaultFileSystem(final String basePath) 86 public void setDefaultFileSystem(final String basePath)
82 { 87 {
83 setDefaultFileSystem(this.ptr, basePath); 88 setDefaultFileSystem(this.ptr, basePath);
84 } 89 }
85 90
86 public void setDefaultLogSystem() 91 public void setDefaultLogSystem()
87 { 92 {
88 setDefaultLogSystem(this.ptr); 93 setDefaultLogSystem(this.ptr);
89 } 94 }
90 95
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 private final static native long ctor(AppInfo appInfo); 150 private final static native long ctor(AppInfo appInfo);
146 151
147 private final static native void setEventCallback(long ptr, String eventName, long callback); 152 private final static native void setEventCallback(long ptr, String eventName, long callback);
148 153
149 private final static native void removeEventCallback(long ptr, String eventNam e); 154 private final static native void removeEventCallback(long ptr, String eventNam e);
150 155
151 private final static native JsValue evaluate(long ptr, String source, String f ilename); 156 private final static native JsValue evaluate(long ptr, String source, String f ilename);
152 157
153 private final static native void triggerEvent(long ptr, String eventName, long [] args); 158 private final static native void triggerEvent(long ptr, String eventName, long [] args);
154 159
160 private final static native void setFileSystem(long ptr, long fileSystemPtr);
161
155 private final static native void setDefaultFileSystem(long ptr, String basePat h); 162 private final static native void setDefaultFileSystem(long ptr, String basePat h);
156 163
157 private final static native void setLogSystem(long ptr, long logSystemPtr); 164 private final static native void setLogSystem(long ptr, long logSystemPtr);
158 165
159 private final static native void setDefaultLogSystem(long ptr); 166 private final static native void setDefaultLogSystem(long ptr);
160 167
161 private final static native void setWebRequest(long ptr, long webRequestPtr); 168 private final static native void setWebRequest(long ptr, long webRequestPtr);
162 169
163 private final static native void setDefaultWebRequest(long ptr); 170 private final static native void setDefaultWebRequest(long ptr);
164 171
165 private final static native JsValue newValue(long ptr, long value); 172 private final static native JsValue newValue(long ptr, long value);
166 173
167 private final static native JsValue newValue(long ptr, boolean value); 174 private final static native JsValue newValue(long ptr, boolean value);
168 175
169 private final static native JsValue newValue(long ptr, String value); 176 private final static native JsValue newValue(long ptr, String value);
170 177
171 private final static native void dtor(long ptr); 178 private final static native void dtor(long ptr);
172 } 179 }
OLDNEW

Powered by Google App Engine
This is Rietveld