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

Commit 18c415c3 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Clean up database tests a little bit."

parents 5d134343 5a05c23f

core/java/android/database/CursorWindow.java

+3 −3
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ public class CursorWindow extends SQLiteClosable implements Parcelable { 
     */

    public CursorWindow(String name) {

        mStartPos = 0;

        mName = name;

        mWindowPtr = nativeCreate(name, sCursorWindowSize);

        mName = name != null && name.length() != 0 ? name : "<unnamed>";

        mWindowPtr = nativeCreate(mName, sCursorWindowSize);

        if (mWindowPtr == 0) {

            throw new CursorWindowAllocationException("Cursor window allocation of " +

                    (sCursorWindowSize / 1024) + " kb failed. " + printStats());
@@ -161,7 +161,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable { 
    }



    /**

     * Gets the name of this cursor window.

     * Gets the name of this cursor window, never null.

     * @hide

     */

    public String getName() {

core/jni/android_database_CursorWindow.cpp

+3 −8
Original line number Diff line number Diff line
@@ -59,14 +59,9 @@ static void throwUnknownTypeException(JNIEnv * env, jint type) { 


static jint nativeCreate(JNIEnv* env, jclass clazz, jstring nameObj, jint cursorWindowSize) {

    String8 name;

    if (nameObj) {

    const char* nameStr = env->GetStringUTFChars(nameObj, NULL);

    name.setTo(nameStr);

    env->ReleaseStringUTFChars(nameObj, nameStr);

    }

    if (name.size() == 0) {

        name.setTo("<unnamed>");

    }



    CursorWindow* window;

    status_t status = CursorWindow::create(name, cursorWindowSize, &window);

core/tests/coretests/src/android/database/CursorWindowTest.java

+36 −6
Original line number Diff line number Diff line
@@ -35,13 +35,43 @@ public class CursorWindowTest extends TestCase implements PerformanceTestCase { 
    }



    @SmallTest

    public void testValuesLocalWindow() {

        doTestValues(new CursorWindow(true));

    public void testConstructor_WithName() {

        CursorWindow window = new CursorWindow("MyWindow");

        assertEquals("MyWindow", window.getName());

        assertEquals(0, window.getStartPosition());

        window.close();

    }



    @SmallTest

    public void testValuesRemoteWindow() {

        doTestValues(new CursorWindow(false));

    public void testConstructorWithEmptyName() {

        CursorWindow window = new CursorWindow("");

        assertEquals("<unnamed>", window.getName());

        assertEquals(0, window.getStartPosition());

        window.close();

    }



    @SmallTest

    public void testConstructorWithNullName() {

        CursorWindow window = new CursorWindow(null);

        assertEquals("<unnamed>", window.getName());

        assertEquals(0, window.getStartPosition());

        window.close();

    }



    @SmallTest

    public void testDeprecatedConstructor() {

        @SuppressWarnings("deprecation")

        CursorWindow window = new CursorWindow(true /*this argument is ignored*/);

        assertEquals("<unnamed>", window.getName());

        assertEquals(0, window.getStartPosition());

        window.close();

    }



    @SmallTest

    public void testValues() {

        CursorWindow window = new CursorWindow("MyWindow");

        doTestValues(window);

        window.close();

    }



    private void doTestValues(CursorWindow window) {

core/tests/coretests/src/android/database/DatabaseCursorTest.java

+0 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.database;



import dalvik.annotation.BrokenTest;

import android.content.ContentValues;

import android.content.Context;

import android.database.Cursor;
@@ -27,13 +26,11 @@ import android.database.sqlite.SQLiteCursor; 
import android.database.sqlite.SQLiteCursorDriver;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteQuery;

import android.database.sqlite.SQLiteStatement;

import android.os.Looper;

import android.test.AndroidTestCase;

import android.test.PerformanceTestCase;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.Suppress;

import android.util.Log;



import java.io.File;

core/tests/coretests/src/android/database/DatabaseErrorHandlerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.database.sqlite.SQLiteDatabase; 
import android.database.sqlite.SQLiteDiskIOException;

import android.database.sqlite.SQLiteException;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.Suppress;

import android.util.Log;



import java.io.BufferedWriter;