cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject android commit: CB-4230: We test Cordova, not jQuery Mobile
Date Mon, 15 Jul 2013 21:17:24 GMT
Updated Branches:
  refs/heads/master 1895d8ac9 -> 5c4fa213d


CB-4230: We test Cordova, not jQuery Mobile


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/5c4fa213
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/5c4fa213
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/5c4fa213

Branch: refs/heads/master
Commit: 5c4fa213d1ef35ebc262336a47bece585a129419
Parents: 1895d8a
Author: Joe Bowser <bowserj@apache.org>
Authored: Mon Jul 15 14:08:54 2013 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Mon Jul 15 14:08:54 2013 -0700

----------------------------------------------------------------------
 test/AndroidManifest.xml                        | 10 ---
 .../src/org/apache/cordova/test/JQMTabTest.java | 75 --------------------
 .../cordova/test/actions/jqmtabbackbutton.java  | 30 --------
 3 files changed, 115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/5c4fa213/test/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index 5c679ea..878dd25 100755
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -159,16 +159,6 @@
             android:windowSoftInputMode="adjustPan"
             android:label="@string/app_name" 
             android:configChanges="orientation|keyboardHidden"
-            android:name=".actions.jqmtabbackbutton" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:windowSoftInputMode="adjustPan"
-            android:label="@string/app_name" 
-            android:configChanges="orientation|keyboardHidden"
             android:name=".actions.lifecycle" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/5c4fa213/test/src/org/apache/cordova/test/JQMTabTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/JQMTabTest.java b/test/src/org/apache/cordova/test/JQMTabTest.java
deleted file mode 100644
index 66908c4..0000000
--- a/test/src/org/apache/cordova/test/JQMTabTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.apache.cordova.test;
-/*
- *
- * 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.
- *
-*/
-
-
-import org.apache.cordova.CordovaWebView;
-import org.apache.cordova.test.util.Purity;
-import org.apache.cordova.test.actions.jqmtabbackbutton;
-
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-
-public class JQMTabTest extends ActivityInstrumentationTestCase2<jqmtabbackbutton>
{
-
-  private Instrumentation mInstr;
-  private jqmtabbackbutton testActivity;
-  private FrameLayout containerView; 
-  private LinearLayout innerContainer;
-  private CordovaWebView testView;
-  private Purity touchTool;
-  
-  public JQMTabTest()
-  {
-      super("org.apache.cordova.test.activity", jqmtabbackbutton.class);
-  }
-  
-  protected void setUp() throws Exception {
-      super.setUp();
-      mInstr = this.getInstrumentation();
-      testActivity = this.getActivity();
-      containerView = (FrameLayout) testActivity.findViewById(android.R.id.content);
-      innerContainer = (LinearLayout) containerView.getChildAt(0);
-      testView = (CordovaWebView) innerContainer.getChildAt(0);
-      touchTool = new Purity(testActivity, getInstrumentation());
-  }
-  
-
-  public void testTouch()
-  {
-      sleep(5000);
-      int viewportHeight = touchTool.getViewportHeight() - 40;
-      int viewportWidth = touchTool.getViewportWidth();
-      touchTool.touch(50, viewportHeight);
-      sleep(10000);
-  }
-  
-  private void sleep(int timeout) {
-      try {
-        Thread.sleep(timeout);
-      } catch (InterruptedException e) {
-        fail("Unexpected Timeout");
-      }
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/5c4fa213/test/src/org/apache/cordova/test/actions/jqmtabbackbutton.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/actions/jqmtabbackbutton.java b/test/src/org/apache/cordova/test/actions/jqmtabbackbutton.java
deleted file mode 100755
index 737bb36..0000000
--- a/test/src/org/apache/cordova/test/actions/jqmtabbackbutton.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-       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.actions;
-
-import android.os.Bundle;
-import org.apache.cordova.*;
-
-public class jqmtabbackbutton extends DroidGap {
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        super.loadUrl("file:///android_asset/www/jqmtabbackbutton/index.html");
-    }
-}


Mime
View raw message