mirror of
https://github.com/apache/cordova-android.git
synced 2026-04-04 00:02:03 +08:00
CB-5346 Fix and cleanup broken Android unit test
- Found stale cordova.js in the test project. Changed ant script to copy in a fresh one in the pre-build stage. Removed stale copies from git, added to .gitignore. This is what was causing the test failure when sending javascript to the webview. - Found almost-stale copy of device plugin, did the same as above. - Fixed spacing in log messages in CordovaWebView. - Updated README.md with current information. - Removed dollar signs that were previously accidently appended to the license. - Added cordova version to html pages, next to the other metadata. - Fix incorrect separator in the viewport meta tag. - Changed old-style <log> tag to <preference name="loglevel"> in config.xml. - In BackButtonMultiPageTest, increased the TIMEOUT so the deviceready event can trigger the referenced javascript, improved the setup() method to explicitly load the starting point.
This commit is contained in:
@@ -874,7 +874,7 @@ public class CordovaWebView extends WebView {
|
||||
{
|
||||
WebHistoryItem item = currentList.getItemAtIndex(i);
|
||||
String url = item.getUrl();
|
||||
LOG.d(TAG, "The URL at index: " + Integer.toString(i) + "is " + url );
|
||||
LOG.d(TAG, "The URL at index: " + Integer.toString(i) + " is " + url );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -888,7 +888,7 @@ public class CordovaWebView extends WebView {
|
||||
String url = item.getUrl();
|
||||
String currentUrl = this.getUrl();
|
||||
LOG.d(TAG, "The current URL is: " + currentUrl);
|
||||
LOG.d(TAG, "The URL at item 0 is:" + url);
|
||||
LOG.d(TAG, "The URL at item 0 is: " + url);
|
||||
return currentUrl.equals(url);
|
||||
}
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user