Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57420bf8 authored by Guang Zhu's avatar Guang Zhu
Browse files

Small tweaks to Tile Benchmark test 

* tag the module as 'tests' so the apk gets includes in test build
* merge the instrumentation into TileBenchmark app and eliminate
  the test apk entirely
* changed the default test suite to 'alexa25_2011' which is a suite
  of pages based on top 25 news sites from alexa, includes primarily
  english sites, and 3 CJK sites

Change-Id: Icd40a70b560bfd7c521adf8ad4b1068483698103
parent 6b14d585

tests/TileBenchmark/Android.mk

+3 −7
Original line number Diff line number Diff line
@@ -21,12 +21,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 


LOCAL_PACKAGE_NAME := TileBenchmark



include $(BUILD_PACKAGE)



##################################################

include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests



include $(BUILD_MULTI_PREBUILT)

LOCAL_JAVA_LIBRARIES := android.test.runner



# Use the folloing include to make our test apk.

include $(call all-makefiles-under,$(LOCAL_PATH))
 
include $(BUILD_PACKAGE)
 
 No newline at end of file

tests/TileBenchmark/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -18,5 +18,9 @@ 
                  android:label="@string/playback_activity"

                  android:theme="@android:style/Theme.Holo.NoActionBar">

        </activity>

        <uses-library android:name="android.test.runner" />

    </application>

    <instrumentation android:name="android.test.InstrumentationTestRunner"

                     android:targetPackage="com.test.tilebenchmark"

                     android:label="Tests for WebView Tiles."/>

</manifest>

tests/TileBenchmark/tests/src/com/test/tilebenchmark/PerformanceTest.java→tests/TileBenchmark/src/com/test/tilebenchmark/PerformanceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class PerformanceTest extends 
    private static final String URL_POSTFIX = "/index.html?skip=true";

    private static final int MAX_ITERATIONS = 4;

    private static final String TEST_DIRS[] = {

        "intl1"//, "alexa_us", "android", "dom", "intl2", "moz", "moz2"

        "alexa25_2011"//, "alexa_us", "android", "dom", "intl2", "moz", "moz2"

    };



    public PerformanceTest() {

tests/TileBenchmark/tests/Android.mk

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



# We only want this apk build for tests.

LOCAL_MODULE_TAGS := tests



LOCAL_JAVA_LIBRARIES := android.test.runner



# Include all test java files.

LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := TileBenchmarkTests



LOCAL_INSTRUMENTATION_FOR := TileBenchmark



include $(BUILD_PACKAGE)

tests/TileBenchmark/tests/AndroidManifest.xml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed 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.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.test.tilebenchmark.tests">



    <application>

        <uses-library android:name="android.test.runner" />

    </application>



    <instrumentation android:name="android.test.InstrumentationTestRunner"

                     android:targetPackage="com.test.tilebenchmark"

                     android:label="Tests for WebView Tiles."/>

</manifest>