Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incu…
- Loading branch information
Showing
10 changed files
with
276 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
1.8.0 | ||
1.9.0rc1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
/* | ||
Licensed to the Apache Software Foundation (ASF) under one | ||
or more contributor license agreements. See the NOTICE file | ||
distributed with this work for additional information | ||
regarding copyright ownership. The ASF licenses this file | ||
to you under the Apache License, Version 2.0 (the | ||
"License"); you may not use this file except in compliance | ||
with the License. You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, | ||
software distributed under the License is distributed on an | ||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
KIND, either express or implied. See the License for the | ||
specific language governing permissions and limitations | ||
under the License. | ||
*/ | ||
|
||
package org.apache.cordova.test; | ||
|
||
import org.apache.cordova.api.CordovaInterface; | ||
import org.apache.cordova.api.IPlugin; | ||
|
||
import android.app.Activity; | ||
import android.content.Intent; | ||
import android.os.Bundle; | ||
|
||
|
||
public class CordovaDriverAction extends Activity implements CordovaInterface { | ||
/** Called when the activity is first created. */ | ||
@Override | ||
public void onCreate(Bundle savedInstanceState) { | ||
super.onCreate(savedInstanceState); | ||
} | ||
|
||
@Override | ||
public void bindBackButton(boolean arg0) { | ||
// TODO Auto-generated method stub | ||
|
||
} | ||
|
||
@Override | ||
public void cancelLoadUrl() { | ||
// TODO Auto-generated method stub | ||
|
||
} | ||
|
||
@Override | ||
public Activity getActivity() { | ||
// TODO Auto-generated method stub | ||
return null; | ||
} | ||
|
||
@Override | ||
public boolean isBackButtonBound() { | ||
// TODO Auto-generated method stub | ||
return false; | ||
} | ||
|
||
@Override | ||
public Object onMessage(String arg0, Object arg1) { | ||
// TODO Auto-generated method stub | ||
return null; | ||
} | ||
|
||
@Override | ||
public void setActivityResultCallback(IPlugin arg0) { | ||
// TODO Auto-generated method stub | ||
|
||
} | ||
|
||
@Override | ||
public void startActivityForResult(IPlugin arg0, Intent arg1, int arg2) { | ||
// TODO Auto-generated method stub | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
/* | ||
Licensed to the Apache Software Foundation (ASF) under one | ||
or more contributor license agreements. See the NOTICE file | ||
distributed with this work for additional information | ||
regarding copyright ownership. The ASF licenses this file | ||
to you under the Apache License, Version 2.0 (the | ||
"License"); you may not use this file except in compliance | ||
with the License. You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, | ||
software distributed under the License is distributed on an | ||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
KIND, either express or implied. See the License for the | ||
specific language governing permissions and limitations | ||
under the License. | ||
*/ | ||
|
||
package org.apache.cordova.test; | ||
|
||
import org.openqa.selenium.android.library.ViewAdapter; | ||
import org.openqa.selenium.android.library.ViewFactory; | ||
|
||
import org.apache.cordova.CordovaWebView; | ||
|
||
import android.app.Activity; | ||
import android.webkit.WebView; | ||
|
||
public class CordovaViewFactory implements ViewFactory { | ||
|
||
public ViewAdapter createNewView(Activity arg0) { | ||
// TODO Auto-generated method stub | ||
return new ViewAdapter("org.apache.cordova.CordovaWebView", new CordovaWebView(arg0)); | ||
} | ||
|
||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,54 @@ | ||
package org.apache.cordova.test; | ||
|
||
import org.apache.cordova.CordovaWebView; | ||
import org.apache.cordova.CordovaWebViewClient; | ||
import org.apache.cordova.CordovaChromeClient; | ||
|
||
import android.test.ActivityInstrumentationTestCase2; | ||
import android.widget.FrameLayout; | ||
import android.widget.LinearLayout; | ||
|
||
public class UserWebViewTest extends ActivityInstrumentationTestCase2<userwebview> { | ||
|
||
public UserWebViewTest () | ||
{ | ||
super(userwebview.class); | ||
} | ||
|
||
private int TIMEOUT = 1000; | ||
userwebview testActivity; | ||
private FrameLayout containerView; | ||
private LinearLayout innerContainer; | ||
private CordovaWebView testView; | ||
|
||
|
||
protected void setUp() throws Exception { | ||
super.setUp(); | ||
testActivity = this.getActivity(); | ||
containerView = (FrameLayout) testActivity.findViewById(android.R.id.content); | ||
innerContainer = (LinearLayout) containerView.getChildAt(0); | ||
testView = (CordovaWebView) innerContainer.getChildAt(0); | ||
} | ||
|
||
public void testPreconditions(){ | ||
assertNotNull(innerContainer); | ||
assertNotNull(testView); | ||
} | ||
|
||
public void customTest() | ||
{ | ||
assertTrue(CordovaWebView.class.isInstance(testView)); | ||
assertTrue(CordovaWebViewClient.class.isInstance(testActivity.testViewClient)); | ||
assertTrue(CordovaChromeClient.class.isInstance(testActivity.testChromeClient)); | ||
} | ||
|
||
|
||
private void sleep() { | ||
try { | ||
Thread.sleep(TIMEOUT); | ||
} catch (InterruptedException e) { | ||
fail("Unexpected Timeout"); | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
/* | ||
Licensed to the Apache Software Foundation (ASF) under one | ||
or more contributor license agreements. See the NOTICE file | ||
distributed with this work for additional information | ||
regarding copyright ownership. The ASF licenses this file | ||
to you under the Apache License, Version 2.0 (the | ||
"License"); you may not use this file except in compliance | ||
with the License. You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, | ||
software distributed under the License is distributed on an | ||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
KIND, either express or implied. See the License for the | ||
specific language governing permissions and limitations | ||
under the License. | ||
*/ | ||
|
||
package org.apache.cordova.test; | ||
|
||
import org.apache.cordova.CordovaWebViewClient; | ||
import org.apache.cordova.CordovaWebView; | ||
import org.apache.cordova.CordovaChromeClient; | ||
|
||
import org.apache.cordova.test.CordovaViewFactory; | ||
import org.openqa.selenium.By; | ||
import org.openqa.selenium.WebElement; | ||
import org.openqa.selenium.android.library.AndroidWebDriver; | ||
import org.openqa.selenium.android.library.ChromeClientWrapper; | ||
import org.openqa.selenium.android.library.ViewClientWrapper; | ||
|
||
import android.test.ActivityInstrumentationTestCase2; | ||
|
||
public class WebDriverTest extends ActivityInstrumentationTestCase2<CordovaDriverAction> { | ||
|
||
private static final long TIMEOUT = 5000; | ||
private CordovaDriverAction testActivity; | ||
private CordovaWebView testView; | ||
private CordovaViewFactory viewFactory; | ||
private CordovaChromeClient appCode; | ||
private CordovaWebViewClient viewHandler; | ||
private AndroidWebDriver testDriver; | ||
private ViewClientWrapper viewClientWrapper; | ||
private ChromeClientWrapper chromeClientWrapper; | ||
|
||
public WebDriverTest() { | ||
super("com.phonegap.test.activities",CordovaDriverAction.class); | ||
} | ||
|
||
protected void setUp() throws Exception{ | ||
super.setUp(); | ||
|
||
testActivity = this.getActivity(); | ||
viewFactory = new CordovaViewFactory(); | ||
appCode = new CordovaChromeClient(testActivity); | ||
viewHandler = new CordovaWebViewClient(testActivity); | ||
viewClientWrapper = new ViewClientWrapper("org.apache.cordova.CordovaWebViewClient", viewHandler); | ||
chromeClientWrapper = new ChromeClientWrapper("org.apache.cordova.CordovaChromeClient", appCode); | ||
testDriver = new AndroidWebDriver(testActivity, viewFactory, viewClientWrapper, chromeClientWrapper); | ||
testView = (CordovaWebView) testDriver.getWebView(); | ||
viewHandler.setWebView(testView); | ||
appCode.setWebView(testView); | ||
} | ||
|
||
public void testPreconditions(){ | ||
assertNotNull(testView); | ||
} | ||
|
||
public void testWebLoad() { | ||
testDriver.get("file:///android_asset/www/index.html"); | ||
sleep(); | ||
String url = testView.getUrl(); | ||
//Check the sanity! | ||
boolean result = url.equals("file:///android_asset/www/index.html"); | ||
assertTrue(result); | ||
WebElement platformSpan = testDriver.findElement(By.id("platform")); | ||
String text = platformSpan.getText(); | ||
assertTrue(text.equals("Android")); | ||
} | ||
|
||
|
||
private void sleep() { | ||
try { | ||
Thread.sleep(TIMEOUT); | ||
} catch (InterruptedException e) { | ||
fail("Unexpected Timeout"); | ||
} | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.