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

Commit 6bcdf90e authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Delete unused testing scripts and WithFramework."

parents 1d50879b c21dab9d
Loading
Loading
Loading
Loading
+0 −58
Original line number Diff line number Diff line
/*
 * 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.
 */

package com.android.internal.util;

import java.lang.reflect.Method;

/**
 * Binds native framework methods and then invokes a main class with the
 * remaining arguments.
 */
class WithFramework {

    /**
     * Invokes main(String[]) method on class in args[0] with args[1..n].
     */
    public static void main(String[] args) throws Exception {
        if (args.length == 0) {
            printUsage();
            return;
        }

        Class<?> mainClass = Class.forName(args[0]);

        System.loadLibrary("android_runtime");
        if (registerNatives() < 0) {
            throw new RuntimeException("Error registering natives.");
        }

        String[] newArgs = new String[args.length - 1];
        System.arraycopy(args, 1, newArgs, 0, newArgs.length);
        Method mainMethod = mainClass.getMethod("main", String[].class);
        mainMethod.invoke(null, new Object[] { newArgs });
    }

    private static void printUsage() {
        System.err.println("Usage: dalvikvm " + WithFramework.class.getName()
                + " [main class] [args]");
    }

    /**
     * Registers native functions. See AndroidRuntime.cpp.
     */
    static native int registerNatives();
}
+3 −13
Original line number Diff line number Diff line
@@ -1427,20 +1427,10 @@ AndroidRuntime* AndroidRuntime::getRuntime()
}

/**
 * Used by WithFramework to register native functions.
 * Used by surface flinger's DdmConnection to register native methods from
 * the framework.
 */
extern "C"
jint Java_com_android_internal_util_WithFramework_registerNatives(
        JNIEnv* env, jclass clazz) {
extern "C" jint registerFrameworkNatives(JNIEnv* env) {
    return register_jni_procs(gRegJNI, NELEM(gRegJNI), env);
}

/**
 * Used by LoadClass to register native functions.
 */
extern "C"
jint Java_LoadClass_registerNatives(JNIEnv* env, jclass clazz) {
    return register_jni_procs(gRegJNI, NELEM(gRegJNI), env);
}

}   // namespace android

tests/CoreTests/run_core_test.sh

deleted100755 → 0
+0 −6
Original line number Diff line number Diff line
framework=/system/framework
bpath=$framework/core.jar:$framework/ext.jar:$framework/framework.jar:$framework/android.test.runner.jar
adb shell exec dalvikvm -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=3001 \
      -Xbootclasspath:$bpath -cp /data/app/android.core.apk \
      -Djava.io.tmpdir=/sdcard/tmp \
      com.android.internal.util.WithFramework junit.textui.TestRunner $*

tests/CoreTests/run_junit.sh

deleted100755 → 0
+0 −9
Original line number Diff line number Diff line
# runs unit tests over adb shell using dalvikvm.  The value added is setting the classpath for you
# and pointing to the junit textui test runner.
#
# the normal usage might be:
# (make MoreJavaTests)
# $ adb sync
# $ java/tests/run_junit.sh android.util.MyTest

adb shell exec dalvikvm -cp system/app/MoreTests.apk junit.textui.TestRunner $*