getAccounts() {
- return mAccounts;
+ public Account getAccount() {
+ return mAccount;
}
public String getAuthority() {
@@ -63,7 +62,7 @@ public class MockSyncAdapter extends ISyncAdapter.Stub {
}
public void clearData() {
- mAccounts.clear();
+ mAccount = null;
mAuthority = null;
mExtras = null;
mInitialized = false;
@@ -79,7 +78,7 @@ public class MockSyncAdapter extends ISyncAdapter.Stub {
public void startSync(ISyncContext syncContext, String authority, Account account,
Bundle extras) throws RemoteException {
- mAccounts.add(account);
+ mAccount = account;
mAuthority = authority;
mExtras = extras;
@@ -99,7 +98,7 @@ public class MockSyncAdapter extends ISyncAdapter.Stub {
}
public void cancelSync(ISyncContext syncContext) throws RemoteException {
- mAccounts.clear();
+ mAccount = null;
mAuthority = null;
mExtras = null;
@@ -115,7 +114,7 @@ public class MockSyncAdapter extends ISyncAdapter.Stub {
public void initialize(android.accounts.Account account, java.lang.String authority)
throws android.os.RemoteException {
- mAccounts.add(account);
+ mAccount = account;
mAuthority = authority;
mInitialized = true;
diff --git a/tests/src/android/media/cts/MediaPlayerSurfaceStubActivity.java b/tests/src/android/media/cts/MediaPlayerSurfaceStubActivity.java
deleted file mode 100644
index 3cd6fc8..0000000
--- a/tests/src/android/media/cts/MediaPlayerSurfaceStubActivity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.media.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.res.AssetFileDescriptor;
-import android.content.res.Resources;
-import android.media.MediaPlayer;
-import android.os.Bundle;
-import android.util.Log;
-
-public class MediaPlayerSurfaceStubActivity extends Activity {
-
- private static final String TAG = "MediaPlayerSurfaceStubActivity";
-
- protected Resources mResources;
-
- private VideoSurfaceView mVideoView = null;
- private MediaPlayer mMediaPlayer = null;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- mResources = getResources();
- mMediaPlayer = new MediaPlayer();
-
- try {
- AssetFileDescriptor afd = mResources.openRawResourceFd(R.raw.testvideo);
- mMediaPlayer.setDataSource(
- afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
- afd.close();
- } catch (Exception e) {
- Log.e(TAG, e.getMessage(), e);
- }
-
- mVideoView = new VideoSurfaceView(this, mMediaPlayer);
- setContentView(mVideoView);
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- mVideoView.onResume();
- }
-
- public void playVideo() throws Exception {
- mVideoView.startTest();
- }
-
-}
diff --git a/tests/src/android/media/cts/MediaStubActivity.java b/tests/src/android/media/cts/MediaStubActivity.java
index f0ca755..e10e6fa 100644
--- a/tests/src/android/media/cts/MediaStubActivity.java
+++ b/tests/src/android/media/cts/MediaStubActivity.java
@@ -26,7 +26,6 @@ public class MediaStubActivity extends Activity {
public static final int WIDTH = 320;
public static final int HEIGHT = 240;
private SurfaceHolder mHolder;
- private SurfaceHolder mHolder2;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -41,28 +40,9 @@ public class MediaStubActivity extends Activity {
mHolder = surfaceV.getHolder();
mHolder.setFixedSize(WIDTH, HEIGHT);
mHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-
- SurfaceView surfaceV2 = (SurfaceView)findViewById(R.id.surface2);
- ViewGroup.LayoutParams lp2 = surfaceV2.getLayoutParams();
- lp2.width = WIDTH;
- lp2.height = HEIGHT;
- surfaceV2.setLayoutParams(lp2);
- mHolder2 = surfaceV2.getHolder();
- mHolder2.setFixedSize(WIDTH, HEIGHT);
- mHolder2.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-
}
public SurfaceHolder getSurfaceHolder() {
return mHolder;
}
-
- public SurfaceHolder getSurfaceHolder2() {
- return mHolder2;
- }
-
- public SurfaceHolder generateSurfaceHolder() {
- SurfaceView surface = (SurfaceView)findViewById(R.id.surface3);
- return surface.getHolder();
- }
}
diff --git a/tests/src/android/media/cts/VideoSurfaceView.java b/tests/src/android/media/cts/VideoSurfaceView.java
deleted file mode 100644
index 0f23a2d..0000000
--- a/tests/src/android/media/cts/VideoSurfaceView.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.media.cts;
-
-import com.android.cts.stub.R;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
-import android.content.Context;
-import android.graphics.SurfaceTexture;
-import android.media.MediaPlayer;
-import android.opengl.GLES20;
-import android.opengl.GLSurfaceView;
-import android.opengl.Matrix;
-import android.util.Log;
-import android.view.Surface;
-
-class VideoSurfaceView extends GLSurfaceView {
- private static final String TAG = "VideoSurfaceView";
- private static final int SLEEP_TIME = 1000;
-
- VideoRender mRenderer;
- private MediaPlayer mMediaPlayer = null;
-
- public VideoSurfaceView(Context context, MediaPlayer mp) {
- super(context);
-
- setEGLContextClientVersion(2);
- mMediaPlayer = mp;
- mRenderer = new VideoRender(context);
- setRenderer(mRenderer);
- }
-
- @Override
- public void onResume() {
- queueEvent(new Runnable(){
- public void run() {
- mRenderer.setMediaPlayer(mMediaPlayer);
- }});
-
- super.onResume();
- }
-
- public void startTest() throws Exception {
- Thread.sleep(SLEEP_TIME);
- mMediaPlayer.start();
-
- Thread.sleep(SLEEP_TIME * 5);
- mMediaPlayer.setSurface(null);
-
- Thread.sleep(SLEEP_TIME * 1);
- SurfaceTexture surfaceTexture = new SurfaceTexture(0);
- Surface surface = new Surface(surfaceTexture);
- surface.release();
- try {
- mMediaPlayer.setSurface(surface);
- throw new RuntimeException("setSurface with released Surface object didn't throw " +
- "IllegalArgumentException");
- } catch (IllegalArgumentException e) {
- // Expected
- }
-
- while (mMediaPlayer.isPlaying()) {
- Thread.sleep(SLEEP_TIME);
- }
- }
-
- private static class VideoRender
- implements GLSurfaceView.Renderer, SurfaceTexture.OnFrameAvailableListener {
- private static String TAG = "VideoRender";
-
- private static final int FLOAT_SIZE_BYTES = 4;
- private static final int TRIANGLE_VERTICES_DATA_STRIDE_BYTES = 5 * FLOAT_SIZE_BYTES;
- private static final int TRIANGLE_VERTICES_DATA_POS_OFFSET = 0;
- private static final int TRIANGLE_VERTICES_DATA_UV_OFFSET = 3;
- private final float[] mTriangleVerticesData = {
- // X, Y, Z, U, V
- -1.0f, -1.0f, 0, 0.f, 0.f,
- 1.0f, -1.0f, 0, 1.f, 0.f,
- -1.0f, 1.0f, 0, 0.f, 1.f,
- 1.0f, 1.0f, 0, 1.f, 1.f,
- };
-
- private FloatBuffer mTriangleVertices;
-
- private final String mVertexShader =
- "uniform mat4 uMVPMatrix;\n" +
- "uniform mat4 uSTMatrix;\n" +
- "attribute vec4 aPosition;\n" +
- "attribute vec4 aTextureCoord;\n" +
- "varying vec2 vTextureCoord;\n" +
- "void main() {\n" +
- " gl_Position = uMVPMatrix * aPosition;\n" +
- " vTextureCoord = (uSTMatrix * aTextureCoord).xy;\n" +
- "}\n";
-
- private final String mFragmentShader =
- "#extension GL_OES_EGL_image_external : require\n" +
- "precision mediump float;\n" +
- "varying vec2 vTextureCoord;\n" +
- "uniform samplerExternalOES sTexture;\n" +
- "void main() {\n" +
- " gl_FragColor = texture2D(sTexture, vTextureCoord);\n" +
- "}\n";
-
- private float[] mMVPMatrix = new float[16];
- private float[] mSTMatrix = new float[16];
-
- private int mProgram;
- private int mTextureID;
- private int muMVPMatrixHandle;
- private int muSTMatrixHandle;
- private int maPositionHandle;
- private int maTextureHandle;
-
- private SurfaceTexture mSurface;
- private boolean updateSurface = false;
-
- private static int GL_TEXTURE_EXTERNAL_OES = 0x8D65;
-
- private MediaPlayer mMediaPlayer;
-
- public VideoRender(Context context) {
- mTriangleVertices = ByteBuffer.allocateDirect(
- mTriangleVerticesData.length * FLOAT_SIZE_BYTES)
- .order(ByteOrder.nativeOrder()).asFloatBuffer();
- mTriangleVertices.put(mTriangleVerticesData).position(0);
-
- Matrix.setIdentityM(mSTMatrix, 0);
- }
-
- public void setMediaPlayer(MediaPlayer player) {
- mMediaPlayer = player;
- }
-
- public void onDrawFrame(GL10 glUnused) {
- synchronized(this) {
- if (updateSurface) {
- mSurface.updateTexImage();
- mSurface.getTransformMatrix(mSTMatrix);
- updateSurface = false;
- }
- }
-
- GLES20.glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
- GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
-
- GLES20.glUseProgram(mProgram);
- checkGlError("glUseProgram");
-
- GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
- GLES20.glBindTexture(GL_TEXTURE_EXTERNAL_OES, mTextureID);
-
- mTriangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
- GLES20.glVertexAttribPointer(maPositionHandle, 3, GLES20.GL_FLOAT, false,
- TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
- checkGlError("glVertexAttribPointer maPosition");
- GLES20.glEnableVertexAttribArray(maPositionHandle);
- checkGlError("glEnableVertexAttribArray maPositionHandle");
-
- mTriangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
- GLES20.glVertexAttribPointer(maTextureHandle, 3, GLES20.GL_FLOAT, false,
- TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
- checkGlError("glVertexAttribPointer maTextureHandle");
- GLES20.glEnableVertexAttribArray(maTextureHandle);
- checkGlError("glEnableVertexAttribArray maTextureHandle");
-
- Matrix.setIdentityM(mMVPMatrix, 0);
- GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
- GLES20.glUniformMatrix4fv(muSTMatrixHandle, 1, false, mSTMatrix, 0);
-
- GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
- checkGlError("glDrawArrays");
- GLES20.glFinish();
-
- }
-
- public void onSurfaceChanged(GL10 glUnused, int width, int height) {
- }
-
- public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
- mProgram = createProgram(mVertexShader, mFragmentShader);
- if (mProgram == 0) {
- return;
- }
- maPositionHandle = GLES20.glGetAttribLocation(mProgram, "aPosition");
- checkGlError("glGetAttribLocation aPosition");
- if (maPositionHandle == -1) {
- throw new RuntimeException("Could not get attrib location for aPosition");
- }
- maTextureHandle = GLES20.glGetAttribLocation(mProgram, "aTextureCoord");
- checkGlError("glGetAttribLocation aTextureCoord");
- if (maTextureHandle == -1) {
- throw new RuntimeException("Could not get attrib location for aTextureCoord");
- }
-
- muMVPMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMVPMatrix");
- checkGlError("glGetUniformLocation uMVPMatrix");
- if (muMVPMatrixHandle == -1) {
- throw new RuntimeException("Could not get attrib location for uMVPMatrix");
- }
-
- muSTMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uSTMatrix");
- checkGlError("glGetUniformLocation uSTMatrix");
- if (muSTMatrixHandle == -1) {
- throw new RuntimeException("Could not get attrib location for uSTMatrix");
- }
-
-
- int[] textures = new int[1];
- GLES20.glGenTextures(1, textures, 0);
-
- mTextureID = textures[0];
- GLES20.glBindTexture(GL_TEXTURE_EXTERNAL_OES, mTextureID);
- checkGlError("glBindTexture mTextureID");
-
- GLES20.glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MIN_FILTER,
- GLES20.GL_NEAREST);
- GLES20.glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MAG_FILTER,
- GLES20.GL_LINEAR);
-
- /*
- * Create the SurfaceTexture that will feed this textureID,
- * and pass it to the MediaPlayer
- */
- mSurface = new SurfaceTexture(mTextureID);
- mSurface.setOnFrameAvailableListener(this);
-
- Surface surface = new Surface(mSurface);
- mMediaPlayer.setSurface(surface);
- surface.release();
-
- try {
- mMediaPlayer.prepare();
- } catch (IOException t) {
- Log.e(TAG, "media player prepare failed");
- }
-
- synchronized(this) {
- updateSurface = false;
- }
- }
-
- synchronized public void onFrameAvailable(SurfaceTexture surface) {
- updateSurface = true;
- }
-
- private int loadShader(int shaderType, String source) {
- int shader = GLES20.glCreateShader(shaderType);
- if (shader != 0) {
- GLES20.glShaderSource(shader, source);
- GLES20.glCompileShader(shader);
- int[] compiled = new int[1];
- GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
- if (compiled[0] == 0) {
- Log.e(TAG, "Could not compile shader " + shaderType + ":");
- Log.e(TAG, GLES20.glGetShaderInfoLog(shader));
- GLES20.glDeleteShader(shader);
- shader = 0;
- }
- }
- return shader;
- }
-
- private int createProgram(String vertexSource, String fragmentSource) {
- int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
- if (vertexShader == 0) {
- return 0;
- }
- int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
- if (pixelShader == 0) {
- return 0;
- }
-
- int program = GLES20.glCreateProgram();
- if (program != 0) {
- GLES20.glAttachShader(program, vertexShader);
- checkGlError("glAttachShader");
- GLES20.glAttachShader(program, pixelShader);
- checkGlError("glAttachShader");
- GLES20.glLinkProgram(program);
- int[] linkStatus = new int[1];
- GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
- if (linkStatus[0] != GLES20.GL_TRUE) {
- Log.e(TAG, "Could not link program: ");
- Log.e(TAG, GLES20.glGetProgramInfoLog(program));
- GLES20.glDeleteProgram(program);
- program = 0;
- }
- }
- return program;
- }
-
- private void checkGlError(String op) {
- int error;
- while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
- Log.e(TAG, op + ": glError " + error);
- throw new RuntimeException(op + ": glError " + error);
- }
- }
-
- } // End of class VideoRender.
-
-} // End of class VideoSurfaceView.
diff --git a/tests/src/android/opengl/cts/GLSurfaceViewStubActivity.java b/tests/src/android/opengl/cts/GLSurfaceViewStubActivity.java
index 79da413..5a8f310 100644
--- a/tests/src/android/opengl/cts/GLSurfaceViewStubActivity.java
+++ b/tests/src/android/opengl/cts/GLSurfaceViewStubActivity.java
@@ -25,7 +25,6 @@ import javax.microedition.khronos.opengles.GL10;
/**
* A minimal activity for testing {@link android.opengl.GLSurfaceView}.
- * Also accepts non-blank renderers to allow its use for more complex tests.
*/
public class GLSurfaceViewStubActivity extends Activity {
@@ -46,60 +45,11 @@ public class GLSurfaceViewStubActivity extends Activity {
private GLSurfaceView mView;
- /** To override the blank renderer, or other settings, these
- * static set* methods must be called before onCreate() is called.
- * If using ActivityInstrumentationTestCase2, that means the set
- * methods need to be called before calling getActivity in the
- * test setUp().
- */
- private static GLSurfaceView.Renderer mRenderer = null;
- public static void setRenderer(GLSurfaceView.Renderer renderer) {
- mRenderer = renderer;
- }
- public static void resetRenderer() {
- mRenderer = null;
- }
-
- private static int mRenderMode = 0;
- private static boolean mRenderModeSet = false;
- public static void setRenderMode(int renderMode) {
- mRenderModeSet = true;
- mRenderMode = renderMode;
- }
- public static void resetRenderMode() {
- mRenderModeSet = false;
- mRenderMode = 0;
- }
-
- private static int mGlVersion = 0;
- private static boolean mGlVersionSet = false;
- public static void setGlVersion(int glVersion) {
- mGlVersionSet = true;
- mGlVersion = glVersion;
- }
- public static void resetGlVersion() {
- mGlVersionSet = false;
- mGlVersion = 0;
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mView = new GLSurfaceView(this);
- // Only set this if explicitly asked for
- if (mGlVersionSet) {
- mView.setEGLContextClientVersion(mGlVersion);
- }
- // Use no-op renderer by default
- if (mRenderer == null) {
- mView.setRenderer(new Renderer());
- } else {
- mView.setRenderer(mRenderer);
- }
- // Only set this if explicitly asked for
- if (mRenderModeSet) {
- mView.setRenderMode(mRenderMode);
- }
+ mView.setRenderer(new Renderer());
setContentView(mView);
}
diff --git a/tests/src/android/provider/cts/FileCopyHelper.java b/tests/src/android/provider/cts/FileCopyHelper.java
index 4ee93ac..a9c53e5 100644
--- a/tests/src/android/provider/cts/FileCopyHelper.java
+++ b/tests/src/android/provider/cts/FileCopyHelper.java
@@ -18,8 +18,6 @@ package android.provider.cts;
import android.content.Context;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -97,18 +95,4 @@ public class FileCopyHelper {
mContext.deleteFile(path);
}
}
-
- public static void createFile(File file, int numBytes) throws IOException {
- File parentFile = file.getParentFile();
- if (parentFile != null) {
- parentFile.mkdirs();
- }
- byte[] buffer = new byte[numBytes];
- FileOutputStream output = new FileOutputStream(file);
- try {
- output.write(buffer);
- } finally {
- output.close();
- }
- }
}
diff --git a/tests/src/android/provider/cts/MediaStoreAudioTestHelper.java b/tests/src/android/provider/cts/MediaStoreAudioTestHelper.java
index 7bcd0c7..3cc3bbe 100644
--- a/tests/src/android/provider/cts/MediaStoreAudioTestHelper.java
+++ b/tests/src/android/provider/cts/MediaStoreAudioTestHelper.java
@@ -84,8 +84,6 @@ public class MediaStoreAudioTestHelper {
public static final int IS_MUSIC = 1;
- public static final int IS_DRM = 0;
-
public static final int YEAR = 1992;
public static final int TRACK = 1;
@@ -114,7 +112,7 @@ public class MediaStoreAudioTestHelper {
public static final String EXTERNAL_DATA = Environment.getExternalStorageDirectory() +
"/" + FILE_NAME;
- public static final long DATE_MODIFIED = System.currentTimeMillis() / 1000;
+ public static final long DATE_MODIFIED = System.currentTimeMillis();
public static final String GENRE = "POP";
@Override
@@ -136,7 +134,6 @@ public class MediaStoreAudioTestHelper {
values.put(Media.IS_ALARM, IS_ALARM);
values.put(Media.IS_NOTIFICATION, IS_NOTIFICATION);
values.put(Media.IS_RINGTONE, IS_RINGTONE);
- values.put(Media.IS_DRM, IS_DRM);
return values;
}
@@ -160,8 +157,6 @@ public class MediaStoreAudioTestHelper {
public static final int IS_MUSIC = 0;
- public static final int IS_DRM = 0;
-
public static final int YEAR = 1992;
public static final int TRACK = 1001;
@@ -215,7 +210,6 @@ public class MediaStoreAudioTestHelper {
values.put(Media.IS_ALARM, IS_ALARM);
values.put(Media.IS_NOTIFICATION, IS_NOTIFICATION);
values.put(Media.IS_RINGTONE, IS_RINGTONE);
- values.put(Media.IS_DRM, IS_DRM);
return values;
}
diff --git a/tests/src/android/provider/cts/TestSearchRecentSuggestionsProvider.java b/tests/src/android/provider/cts/TestSearchRecentSuggestionsProvider.java
deleted file mode 100644
index d1cb1ef..0000000
--- a/tests/src/android/provider/cts/TestSearchRecentSuggestionsProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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 android.provider.cts;
-
-import android.content.SearchRecentSuggestionsProvider;
-
-public class TestSearchRecentSuggestionsProvider extends SearchRecentSuggestionsProvider {
- final static String AUTHORITY = "android.provider.cts.TestSRSProvider";
- final static int MODE = DATABASE_MODE_QUERIES + DATABASE_MODE_2LINES;
-
- public TestSearchRecentSuggestionsProvider() {
- super();
- setupSuggestions(AUTHORITY, MODE);
- }
-}
diff --git a/tests/src/android/renderscript/cts/RenderscriptGLStubActivity.java b/tests/src/android/renderscript/cts/RenderscriptGLStubActivity.java
deleted file mode 100644
index 3bb6212..0000000
--- a/tests/src/android/renderscript/cts/RenderscriptGLStubActivity.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.renderscript.cts;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.content.Context;
-import android.content.res.Resources;
-import android.renderscript.*;
-
-import com.android.cts.stub.R;
-
-// Renderscript activity
-public class RenderscriptGLStubActivity extends Activity {
- class StubActivityRS {
- private Resources mRes;
- private RenderScriptGL mRS;
-
- private ScriptC mScript;
-
- public StubActivityRS() {
- }
-
- // This provides us with the renderscript context and resources that
- // allow us to create the script that does rendering
- public void init(RenderScriptGL rs, Resources res) {
- mRS = rs;
- mRes = res;
- initRS();
- }
-
- private void initRS() {
- mScript = new ScriptC_stub_activity(mRS, mRes, R.raw.stub_activity);
- mRS.bindRootScript(mScript);
- }
- }
-
- class HelloWorldView extends RSSurfaceView {
- // Renderscipt context
- private RenderScriptGL mRS;
- // Script that does the rendering
- private StubActivityRS mRender;
-
- public HelloWorldView(Context context) {
- super(context);
- ensureRenderScript();
- }
-
- private void ensureRenderScript() {
- if (mRS == null) {
- // Initialize renderscript with desired surface characteristics.
- // In this case, just use the defaults
- RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
- mRS = createRenderScriptGL(sc);
- // Create an instance of the script that does the rendering
- mRender = new StubActivityRS();
- mRender.init(mRS, getResources());
- }
- }
-
- @Override
- protected void onAttachedToWindow() {
- super.onAttachedToWindow();
- ensureRenderScript();
- }
-
- @Override
- protected void onDetachedFromWindow() {
- // Handle the system event and clean up
- mRender = null;
- if (mRS != null) {
- mRS = null;
- destroyRenderScriptGL();
- }
- }
- }
-
- // Custom view to use with RenderScript
- private HelloWorldView mView;
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
-
- // Create our view and set it as the content of our Activity
- mView = new HelloWorldView(this);
- setContentView(mView);
- }
-
- public void recreateView() {
- mView = new HelloWorldView(this);
- setContentView(mView);
- }
-
- public void recreateMultiView() {
- HelloWorldView view1 = new HelloWorldView(this);
- HelloWorldView view2 = new HelloWorldView(this);
- setContentView(view1);
- setContentView(view2);
- mView = view2;
- }
-
- @Override
- protected void onResume() {
- // Ideally an app should implement onResume() and onPause()
- // to take appropriate action when the activity loses focus
- super.onResume();
- mView.resume();
- }
-
- @Override
- protected void onPause() {
- // Ideally an app should implement onResume() and onPause()
- // to take appropriate action when the activity loses focus
- super.onPause();
- mView.pause();
- }
-
-}
-
diff --git a/tests/src/android/renderscript/cts/fe_bool.rs b/tests/src/android/renderscript/cts/fe_bool.rs
deleted file mode 100644
index 727635a..0000000
--- a/tests/src/android/renderscript/cts/fe_bool.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const bool *ain, bool *aout) {
- aout[0] = !ain[0];
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_f32.rs b/tests/src/android/renderscript/cts/fe_f32.rs
deleted file mode 100644
index 3c649e2..0000000
--- a/tests/src/android/renderscript/cts/fe_f32.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float *ain, float *aout) {
- aout[0] = ain[0] + 1.0f;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_f32_2.rs b/tests/src/android/renderscript/cts/fe_f32_2.rs
deleted file mode 100644
index 571100b..0000000
--- a/tests/src/android/renderscript/cts/fe_f32_2.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float2 *ain, float2 *aout) {
- aout[0].x = ain[0].x + 1.0f;
- aout[0].y = ain[0].y + 1.0f;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_f32_3.rs b/tests/src/android/renderscript/cts/fe_f32_3.rs
deleted file mode 100644
index 1df67a7..0000000
--- a/tests/src/android/renderscript/cts/fe_f32_3.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float3 *ain, float3 *aout) {
- aout[0].x = ain[0].x + 1.0f;
- aout[0].y = ain[0].y + 1.0f;
- aout[0].z = ain[0].z + 1.0f;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_f32_4.rs b/tests/src/android/renderscript/cts/fe_f32_4.rs
deleted file mode 100644
index 50a50ec..0000000
--- a/tests/src/android/renderscript/cts/fe_f32_4.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const float4 *ain, float4 *aout) {
- aout[0].x = ain[0].x + 1.0f;
- aout[0].y = ain[0].y + 1.0f;
- aout[0].z = ain[0].z + 1.0f;
- aout[0].w = ain[0].w + 1.0f;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_f64.rs b/tests/src/android/renderscript/cts/fe_f64.rs
deleted file mode 100644
index b609a08..0000000
--- a/tests/src/android/renderscript/cts/fe_f64.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const double *ain, double *aout) {
- aout[0] = ain[0] + 1.0;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_f64_2.rs b/tests/src/android/renderscript/cts/fe_f64_2.rs
deleted file mode 100644
index a97628b..0000000
--- a/tests/src/android/renderscript/cts/fe_f64_2.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const double2 *ain, double2 *aout) {
- aout[0].x = ain[0].x + 1.0;
- aout[0].y = ain[0].y + 1.0;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_f64_3.rs b/tests/src/android/renderscript/cts/fe_f64_3.rs
deleted file mode 100644
index b6e97b8..0000000
--- a/tests/src/android/renderscript/cts/fe_f64_3.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const double3 *ain, double3 *aout) {
- aout[0].x = ain[0].x + 1.0;
- aout[0].y = ain[0].y + 1.0;
- aout[0].z = ain[0].z + 1.0;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_f64_4.rs b/tests/src/android/renderscript/cts/fe_f64_4.rs
deleted file mode 100644
index 959c30b..0000000
--- a/tests/src/android/renderscript/cts/fe_f64_4.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const double4 *ain, double4 *aout) {
- aout[0].x = ain[0].x + 1.0;
- aout[0].y = ain[0].y + 1.0;
- aout[0].z = ain[0].z + 1.0;
- aout[0].w = ain[0].w + 1.0;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i16.rs b/tests/src/android/renderscript/cts/fe_i16.rs
deleted file mode 100644
index e45a0a8..0000000
--- a/tests/src/android/renderscript/cts/fe_i16.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const short *ain, ushort *aout) {
- aout[0] = ain[0] + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i16_2.rs b/tests/src/android/renderscript/cts/fe_i16_2.rs
deleted file mode 100644
index 8eb8245..0000000
--- a/tests/src/android/renderscript/cts/fe_i16_2.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const short2 *ain, ushort2 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i16_3.rs b/tests/src/android/renderscript/cts/fe_i16_3.rs
deleted file mode 100644
index 09113a5..0000000
--- a/tests/src/android/renderscript/cts/fe_i16_3.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const short3 *ain, ushort3 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- aout[0].z = ain[0].z + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i16_4.rs b/tests/src/android/renderscript/cts/fe_i16_4.rs
deleted file mode 100644
index 4a5ca2c..0000000
--- a/tests/src/android/renderscript/cts/fe_i16_4.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const short4 *ain, ushort4 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- aout[0].z = ain[0].z + 1;
- aout[0].w = ain[0].w + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i32.rs b/tests/src/android/renderscript/cts/fe_i32.rs
deleted file mode 100644
index 402a1f7..0000000
--- a/tests/src/android/renderscript/cts/fe_i32.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const int *ain, uint *aout) {
- aout[0] = ain[0] + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i32_2.rs b/tests/src/android/renderscript/cts/fe_i32_2.rs
deleted file mode 100644
index bff5460..0000000
--- a/tests/src/android/renderscript/cts/fe_i32_2.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const int2 *ain, uint2 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i32_3.rs b/tests/src/android/renderscript/cts/fe_i32_3.rs
deleted file mode 100644
index ce666c0..0000000
--- a/tests/src/android/renderscript/cts/fe_i32_3.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const int3 *ain, uint3 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- aout[0].z = ain[0].z + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i32_4.rs b/tests/src/android/renderscript/cts/fe_i32_4.rs
deleted file mode 100644
index ab66082..0000000
--- a/tests/src/android/renderscript/cts/fe_i32_4.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const int4 *ain, uint4 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- aout[0].z = ain[0].z + 1;
- aout[0].w = ain[0].w + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i64.rs b/tests/src/android/renderscript/cts/fe_i64.rs
deleted file mode 100644
index 352a48e..0000000
--- a/tests/src/android/renderscript/cts/fe_i64.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const long *ain, ulong *aout) {
- aout[0] = ain[0] + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i64_2.rs b/tests/src/android/renderscript/cts/fe_i64_2.rs
deleted file mode 100644
index f39531d..0000000
--- a/tests/src/android/renderscript/cts/fe_i64_2.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const long2 *ain, ulong2 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i64_3.rs b/tests/src/android/renderscript/cts/fe_i64_3.rs
deleted file mode 100644
index 1229137..0000000
--- a/tests/src/android/renderscript/cts/fe_i64_3.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const long3 *ain, ulong3 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- aout[0].z = ain[0].z + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i64_4.rs b/tests/src/android/renderscript/cts/fe_i64_4.rs
deleted file mode 100644
index 5e2b2ae..0000000
--- a/tests/src/android/renderscript/cts/fe_i64_4.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const long4 *ain, ulong4 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- aout[0].z = ain[0].z + 1;
- aout[0].w = ain[0].w + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i8.rs b/tests/src/android/renderscript/cts/fe_i8.rs
deleted file mode 100644
index 067ef50..0000000
--- a/tests/src/android/renderscript/cts/fe_i8.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const char *ain, uchar *aout) {
- aout[0] = ain[0] + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i8_2.rs b/tests/src/android/renderscript/cts/fe_i8_2.rs
deleted file mode 100644
index cec1f57..0000000
--- a/tests/src/android/renderscript/cts/fe_i8_2.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const char2 *ain, uchar2 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i8_3.rs b/tests/src/android/renderscript/cts/fe_i8_3.rs
deleted file mode 100644
index 9254ba5..0000000
--- a/tests/src/android/renderscript/cts/fe_i8_3.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const char3 *ain, uchar3 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- aout[0].z = ain[0].z + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_i8_4.rs b/tests/src/android/renderscript/cts/fe_i8_4.rs
deleted file mode 100644
index 0c1fd1d..0000000
--- a/tests/src/android/renderscript/cts/fe_i8_4.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const char4 *ain, uchar4 *aout) {
- aout[0].x = ain[0].x + 1;
- aout[0].y = ain[0].y + 1;
- aout[0].z = ain[0].z + 1;
- aout[0].w = ain[0].w + 1;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/fe_struct.rs b/tests/src/android/renderscript/cts/fe_struct.rs
deleted file mode 100644
index b22604d..0000000
--- a/tests/src/android/renderscript/cts/fe_struct.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-struct fe_test {
- int i;
- float f;
-};
-
-void root(const struct fe_test *ain, struct fe_test *aout) {
- aout[0].i = ain[0].i + 1;
- aout[0].f = ain[0].f + 1.0f;
- return;
-}
diff --git a/tests/src/android/renderscript/cts/graphics_runner.rs b/tests/src/android/renderscript/cts/graphics_runner.rs
deleted file mode 100644
index 18e1f76..0000000
--- a/tests/src/android/renderscript/cts/graphics_runner.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (C) 2011 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.
-
-#include "shared.rsh"
-#include "rs_graphics.rsh"
-
-#include "structs.rsh"
-
-static void drawQuad() {
- float startX = 0, startY = 0;
- float width = 4, height = 4;
- rsgDrawQuadTexCoords(startX, startY, 0, 0, 0,
- startX, startY + height, 0, 0, 1,
- startX + width, startY + height, 0, 1, 1,
- startX + width, startY, 0, 1, 0);
-}
-
-void testProgramVertex(rs_program_vertex pv) {
- rsDebug("Set Program Vertex, drew quad", 0);
- rsgBindProgramVertex(pv);
- drawQuad();
-}
-
-void testProgramFragment(rs_program_fragment pf) {
- rsDebug("Set Program Fragment, drew quad", 0);
- rsgBindProgramFragment(pf);
- drawQuad();
-}
-
-// Just draw a quad with previously setup state
-int root(void) {
- rsDebug("Running script", 0);
- return 0;
-}
diff --git a/tests/src/android/renderscript/cts/negate.rs b/tests/src/android/renderscript/cts/negate.rs
deleted file mode 100644
index af76faa..0000000
--- a/tests/src/android/renderscript/cts/negate.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (C) 2011 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.
-
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void root(const int *ain, int *aout) {
- aout[0] = -1 * ain[0];
- return;
-}
-
diff --git a/tests/src/android/renderscript/cts/passthrough.rs b/tests/src/android/renderscript/cts/passthrough.rs
deleted file mode 100644
index 008f7f2..0000000
--- a/tests/src/android/renderscript/cts/passthrough.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-void passthrough(int i) {
- rsDebug("i: ", i);
- return;
-}
-
diff --git a/tests/src/android/renderscript/cts/primitives.rs b/tests/src/android/renderscript/cts/primitives.rs
deleted file mode 100755
index c121ec4..0000000
--- a/tests/src/android/renderscript/cts/primitives.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-/*****************************************************************************
- *****
- *****
- *****
- ***** DANGER
- ***** DO NOT ALTER THIS TEST WITHOUT VERIFYING ScriptTest.java STILL WORKS
- ***** WE DEPEND ON VARIABLE ORDER FOR VERIFICATION
- *****
- *****
- *****
- *****************************************************************************/
-#include "shared.rsh"
-#include "structs.rsh"
-
-// Testing primitive types
-float floatTest = 1.99f;
-double doubleTest = 2.05;
-char charTest = -8;
-short shortTest = -16;
-int intTest = -32;
-long longTest = 17179869184l; // 1 << 34
-long long longlongTest = 68719476736l; // 1 << 36
-bool boolTest = false;
-
-struct myStruct {
- int i;
-} structTest;
-
-rs_allocation allocationTest;
-int *intPtrTest;
-
-uchar ucharTest = 8;
-ushort ushortTest = 16;
-uint uintTest = 32;
-ulong ulongTest = 4611686018427387904L;
-int64_t int64_tTest = -17179869184l; // - 1 << 34
-uint64_t uint64_tTest = 117179869184l;
-
-static bool test_primitive_types() {
- bool failed = false;
- start();
-
- _RS_ASSERT(floatTest == 2.99f);
- _RS_ASSERT(doubleTest == 3.05);
- _RS_ASSERT(charTest == -16);
- _RS_ASSERT(shortTest == -32);
- _RS_ASSERT(intTest == -64);
- _RS_ASSERT(longTest == 17179869185l);
- _RS_ASSERT(longlongTest == 68719476735l);
-
- _RS_ASSERT(ucharTest == 8);
- _RS_ASSERT(ushortTest == 16);
- _RS_ASSERT(uintTest == 32);
- _RS_ASSERT(ulongTest == 4611686018427387903L);
- _RS_ASSERT(int64_tTest == -17179869184l);
- _RS_ASSERT(uint64_tTest == 117179869185l);
-
- float time = end();
-
- if (failed) {
- rsDebug("test_primitive_types FAILED", time);
- }
- else {
- rsDebug("test_primitive_types PASSED", time);
- }
-
- return failed;
-}
-
-static bool test_vector_types() {
- bool failed = false;
- start();
- _RS_ASSERT(avt->b2.x == 1);
- _RS_ASSERT(avt->b2.y == 2);
- _RS_ASSERT(avt->b3.x == 1);
- _RS_ASSERT(avt->b3.y == 2);
- _RS_ASSERT(avt->b3.z == 3);
- _RS_ASSERT(avt->b4.x == 1);
- _RS_ASSERT(avt->b4.y == 2);
- _RS_ASSERT(avt->b4.z == 3);
- _RS_ASSERT(avt->b4.w == 4);
-
- _RS_ASSERT(avt->s2.x == 1);
- _RS_ASSERT(avt->s2.y == 2);
- _RS_ASSERT(avt->s3.x == 1);
- _RS_ASSERT(avt->s3.y == 2);
- _RS_ASSERT(avt->s3.z == 3);
- _RS_ASSERT(avt->s4.x == 1);
- _RS_ASSERT(avt->s4.y == 2);
- _RS_ASSERT(avt->s4.z == 3);
- _RS_ASSERT(avt->s4.w == 4);
-
- _RS_ASSERT(avt->i2.x == 1);
- _RS_ASSERT(avt->i2.y == 2);
- _RS_ASSERT(avt->i3.x == 1);
- _RS_ASSERT(avt->i3.y == 2);
- _RS_ASSERT(avt->i3.z == 3);
- _RS_ASSERT(avt->i4.x == 1);
- _RS_ASSERT(avt->i4.y == 2);
- _RS_ASSERT(avt->i4.z == 3);
- _RS_ASSERT(avt->i4.w == 4);
-
- _RS_ASSERT(avt->f2.x == 1.0f);
- _RS_ASSERT(avt->f2.y == 2.0f);
- _RS_ASSERT(avt->f3.x == 1.0f);
- _RS_ASSERT(avt->f3.y == 2.0f);
- _RS_ASSERT(avt->f3.z == 3.0f);
- _RS_ASSERT(avt->f4.x == 1.0f);
- _RS_ASSERT(avt->f4.y == 2.0f);
- _RS_ASSERT(avt->f4.z == 3.0f);
- _RS_ASSERT(avt->f4.w == 4.0f);
-
- float time = end();
-
- if (failed) {
- rsDebug("test_vector_types FAILED", time);
- }
- else {
- rsDebug("test_vector_types PASSED", time);
- }
-
- return failed;
-}
-
-void test() {
- bool failed = false;
- failed |= test_primitive_types();
- failed |= test_vector_types();
-
- if (failed) {
- rsSendToClientBlocking(RS_MSG_TEST_FAILED);
- }
- else {
- rsSendToClientBlocking(RS_MSG_TEST_PASSED);
- }
-}
-
diff --git a/tests/src/android/renderscript/cts/shared.rsh b/tests/src/android/renderscript/cts/shared.rsh
deleted file mode 100644
index b91611d..0000000
--- a/tests/src/android/renderscript/cts/shared.rsh
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-static int64_t g_time;
-
-static void start(void) {
- g_time = rsUptimeMillis();
-}
-
-static float end(void) {
- int64_t t = rsUptimeMillis() - g_time;
- return ((float)t) / 1000.f;
-}
-
-#define _RS_ASSERT(b) \
-do { \
- if (!(b)) { \
- failed = true; \
- rsDebug(#b " FAILED", 0); \
- } \
-\
-} while (0)
-
-/* These constants must match those in UnitTest.java */
-static const int RS_MSG_TEST_PASSED = 100;
-static const int RS_MSG_TEST_FAILED = 101;
-
diff --git a/tests/src/android/renderscript/cts/struct_pad.rs b/tests/src/android/renderscript/cts/struct_pad.rs
deleted file mode 100644
index 0c013a3..0000000
--- a/tests/src/android/renderscript/cts/struct_pad.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "shared.rsh"
-
-struct PadMe {
- int i;
- float4 f4;
- int j;
-} s;
-
diff --git a/tests/src/android/renderscript/cts/structs.rsh b/tests/src/android/renderscript/cts/structs.rsh
deleted file mode 100755
index e7d2efd..0000000
--- a/tests/src/android/renderscript/cts/structs.rsh
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (C) 2011 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.
-
-typedef struct ConstMatrix {
- rs_matrix4x4 MATRIX;
-} ConstMatrix_s;
-ConstMatrix_s *c1;
-
-typedef struct ConstComplex {
- rs_matrix4x4 MATRIX;
- rs_matrix4x4 EXTRA;
- float extra1;
- float2 extra2;
- float3 extra3;
- float4 extra4;
-} ConstComplex_s;
-ConstComplex_s *c2;
-
-typedef struct ConstExtra {
- rs_matrix4x4 EXTRA;
- float extra1;
- float2 extra2;
- float3 extra3;
- float4 extra4;
-} ConstExtra_s;
-ConstExtra_s *c3;
-
-typedef struct AllVectorTypes {
- char2 b2;
- char3 b3;
- char4 b4;
-
- short2 s2;
- short3 s3;
- short4 s4;
-
- int2 i2;
- int3 i3;
- int4 i4;
-
- float2 f2;
- float3 f3;
- float4 f4;
-} AllVectorTypes_s;
-AllVectorTypes_s *avt;
diff --git a/tests/src/android/renderscript/cts/stub_activity.rs b/tests/src/android/renderscript/cts/stub_activity.rs
deleted file mode 100644
index 7e149f7..0000000
--- a/tests/src/android/renderscript/cts/stub_activity.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2011 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.
-
-#pragma version(1)
-
-// Tell which java package name the reflected files should belong to
-#pragma rs java_package_name(android.renderscript.cts)
-
-// Built-in header with graphics API's
-#include "rs_graphics.rsh"
-
-int root(void) {
-
- // Clear the background color
- rsgClearColor(0.0f, 0.0f, 0.0f, 0.0f);
- // Tell the runtime what the font color should be
- rsgFontColor(1.0f, 1.0f, 1.0f, 1.0f);
- // Introuduce ourselves to the world
- rsgDrawText("Hello World!", 50, 50);
-
- // Return value tells RS roughly how often to redraw
- // in this case 20 ms
- return 20;
-}
diff --git a/tests/src/android/speech/tts/cts/StubTextToSpeechService.java b/tests/src/android/speech/tts/cts/StubTextToSpeechService.java
deleted file mode 100644
index 5e6bb41..0000000
--- a/tests/src/android/speech/tts/cts/StubTextToSpeechService.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.speech.tts.cts;
-
-import android.media.AudioFormat;
-import android.speech.tts.SynthesisCallback;
-import android.speech.tts.SynthesisRequest;
-import android.speech.tts.TextToSpeech;
-import android.speech.tts.TextToSpeechService;
-
-/**
- * Stub implementation of {@link TextToSpeechService}. Used for testing the
- * TTS engine API.
- */
-public class StubTextToSpeechService extends TextToSpeechService {
-
- @Override
- protected String[] onGetLanguage() {
- return new String[] { "eng", "USA", "" };
- }
-
- @Override
- protected int onIsLanguageAvailable(String lang, String country, String variant) {
- return TextToSpeech.LANG_AVAILABLE;
- }
-
- @Override
- protected int onLoadLanguage(String lang, String country, String variant) {
- return TextToSpeech.LANG_AVAILABLE;
- }
-
- @Override
- protected void onStop() {
- }
-
- @Override
- protected void onSynthesizeText(SynthesisRequest request, SynthesisCallback callback) {
- if (callback.start(16000, AudioFormat.ENCODING_PCM_16BIT, 1) != TextToSpeech.SUCCESS) {
- return;
- }
- byte[] data = { 0x01, 0x2 };
- if (callback.audioAvailable(data, 0, data.length) != TextToSpeech.SUCCESS) {
- return;
- }
- if (callback.done() != TextToSpeech.SUCCESS) {
- return;
- }
- }
-
-}
diff --git a/tests/src/android/theme/cts/ActionBarModifier.java b/tests/src/android/theme/cts/ActionBarModifier.java
deleted file mode 100644
index 2f33a79..0000000
--- a/tests/src/android/theme/cts/ActionBarModifier.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
-import android.app.FragmentTransaction;
-
-/**
- * Implementation of the {@link ActivityTestInfo} interface for {@link ActionBar} tests.
- */
-public class ActionBarModifier implements ActivityTestInfo {
- /**
- * Runs the basic test case that performs no modifications on the {@link ActionBar}.
- */
- public static final int BASIC = 0;
-
- /**
- * Runs the test that turns the icon on the {@link ActionBar} into the up icon version.
- */
- public static final int DISPLAY_HOME_AS_UP = 1;
-
- /**
- * Runs the test that displays tabs in the {@link ActionBar}.
- */
- public static final int TABS = 2;
-
- /**
- * Runs the test that displays a list ({@link Spinner}-style) in the {@link ActionBar}.
- */
- public static final int LIST = 3;
-
- /**
- * Runs the test that displays only the icon and not the title in the {@link ActionBar}.
- */
- public static final int NO_TITLE = 4;
-
- /**
- * Runs the test that displays only the icon in the {@link ActionBar}.
- */
- public static final int NO_ICON = 5;
-
- /**
- * Runs the test that displays action items in the {@link ActionBar}.
- */
- public static final int ACTION_ITEMS = 6;
-
- /**
- * Runs the test that displays a {@link SearchView} as an action view in the {@link ActionBar}.
- */
- public static final int ACTION_VIEW = 7;
-
- /**
- * Runs the test that displays a {@link SearchView} as a collapsable action view (opened) in
- * the {@link ActionBar}.
- */
- public static final int COLLAPSED_ACTION_VIEW = 8;
-
- private String mTestname;
- private int mTestType;
-
- /**
- * Creates an ActionBarModifier with the specified testname and test type.
- * @param testname The unique name of hte test.
- * @param testType The type of test to run based on the public constants of ActionBarModifier.
- */
- public ActionBarModifier(String testname, int testType) {
- mTestname = testname;
- mTestType = testType;
- }
-
- public String getTestName() {
- return mTestname;
- }
- @Override
- public void modifyActivity(SnapshotActivity activity) {
- ActionBar actionBar = activity.getActionBar();
-
- if (actionBar == null) {
- return;
- }
-
- // based on which test was asked, performs a different sequence of actions
- switch (mTestType) {
- case BASIC:
- break;
- case DISPLAY_HOME_AS_UP:
- actionBar.setDisplayHomeAsUpEnabled(true);
- break;
- case TABS:
- actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
- actionBar.setDisplayShowTitleEnabled(false);
- actionBar.addTab(actionBar.newTab().setText("First")
- .setTabListener(new MyTabListener()));
- actionBar.addTab(actionBar.newTab().setText("Second")
- .setTabListener(new MyTabListener()));
- actionBar.addTab(actionBar.newTab().setText("Third")
- .setTabListener(new MyTabListener()));
- break;
- case LIST:
- actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
- break;
- case NO_TITLE:
- actionBar.setDisplayShowTitleEnabled(false);
- break;
- case NO_ICON:
- actionBar.setDisplayShowHomeEnabled(false);
- break;
- // for the last three test, a state is set because these ones must be set up
- // in Activity.onCreateOptionsMenu. A flag is sent that is then checked later
- // in the Activity lifecycle
- case ACTION_ITEMS:
- case ACTION_VIEW:
- case COLLAPSED_ACTION_VIEW:
- activity.setActionItemState(mTestType);
- }
- }
-
- /**
- * Stub class that exists since tabs need to have a listener. Does nothing.
- */
- private class MyTabListener implements ActionBar.TabListener {
- public void onTabSelected(Tab tab, FragmentTransaction ft) {
- // do nothing
- }
-
- public void onTabUnselected(Tab tab, FragmentTransaction ft) {
- // do nothing
- }
-
- public void onTabReselected(Tab tab, FragmentTransaction ft) {
- // do nothing
- }
- }
-
-}
diff --git a/tests/src/android/theme/cts/ActivitySnapshotTester.java b/tests/src/android/theme/cts/ActivitySnapshotTester.java
deleted file mode 100644
index 3040954..0000000
--- a/tests/src/android/theme/cts/ActivitySnapshotTester.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.graphics.Bitmap;
-import android.os.Handler;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.View;
-import android.view.View.MeasureSpec;
-
-/**
- * This class serves as the main driver for the activity screenshot tests.
- */
-public class ActivitySnapshotTester {
- private ActivityInstrumentationTestCase2 mTestCases;
- private boolean mSplitMode;
- private boolean mShouldRetryTest;
-
- /**
- * Creates an {@link ActivitySnapshotTester} to run all of the tests in the given
- * configuration as determined by the parameters passed to it.
- * @param testCases The ActivityInstrumentationTestCase2 that provides the activity
- * to test.
- * @param splitMode true if the test should use SplitActionBarWhenNarrow as a uiOption.
- * Note that this flag does not actually enable that feature, it merely labels
- * the tests appropriately.
- */
- public ActivitySnapshotTester(
- ActivityInstrumentationTestCase2 testCases,
- boolean splitMode) {
- mTestCases = testCases;
- mSplitMode = splitMode;
- }
-
- /**
- * This function either generates the known-good versions of the activity screenshot tests
- * or runs the tests in either portrait or landscape orientation
- * mode based upon the parameters.
- * @param generate true if the known good versions of the tests should be generated.
- * @param portrait true if the tests should be run in portrait orientation.
- */
- public void genOrTestActivityBitmaps(boolean generate, boolean portrait) {
- ThemeInfo[] themes = ThemeTests.getThemes();
- ActivityTestInfo[] activityTests = ThemeTests.getActivityTests();
-
- int numActivityTests = activityTests.length;
-
- // iterate through all of the themes
- for (ThemeInfo theme : themes) {
- // iterate through all of the tests
- for (int i = 0; i < numActivityTests; i++) {
- // run in portrait
- if (portrait) {
- genOrTestActivityBitmap(
- theme, activityTests[i], i,
- ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, generate);
- } else { // landscape
- genOrTestActivityBitmap(
- theme, activityTests[i], i,
- ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, generate);
- }
- }
- }
- }
-
- private void genOrTestActivityBitmap(
- final ThemeInfo theme, final ActivityTestInfo test, final int testIndex,
- final int orientation, final boolean generate) {
- mShouldRetryTest = true;
- while (mShouldRetryTest) {
- mShouldRetryTest = false;
-
- Instrumentation instrumentation = mTestCases.getInstrumentation();
-
- // build the intent to send to the activity
- Intent intent = new Intent();
- intent.putExtra(ThemeTests.EXTRA_THEME_ID, theme.getResourceId());
- intent.putExtra(ThemeTests.EXTRA_THEME_NAME, theme.getThemeName());
- intent.putExtra(ThemeTests.EXTRA_ORIENTATION, orientation);
- intent.putExtra(ThemeTests.EXTRA_ACTIVITY_TEST_INDEX, testIndex);
- intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
- mTestCases.setActivityIntent(intent);
-
- SnapshotActivity activity = mTestCases.getActivity();
-
- // run the test
- activity.runOnUiThread(
- new ActivitySnapshotRunnable(theme, test, orientation, generate));
-
- instrumentation.waitForIdleSync();
-
- ((TestReset) mTestCases).reset();
- }
-
- }
-
- /**
- * This class exists so that we can delay testing until we are certain that our orientation
- * and window size are correct. We check the values and then, if we're not in a stable state,
- * just post another Runnable for the future.
- */
- private class ActivitySnapshotRunnable implements Runnable {
- private ThemeInfo mTheme;
- private ActivityTestInfo mTest;
- private int mOrientation;
- private boolean mGenerate;
- private boolean mShouldRequestLayout;
-
- /**
- * Creates a new ActivitySnapshotRunnable.
- * @param theme The {@link ThemeInfo} to test.
- * @param test The {@link ActivityTestInfo} to test.
- * @param orientation The orientation in which the test should be.
- * @param generate Whether we should be generating a known-good version
- * or comparing to the previously generated version.
- */
- public ActivitySnapshotRunnable(ThemeInfo theme, ActivityTestInfo test,
- int orientation, boolean generate) {
- this(theme, test, orientation, generate, true);
- }
-
- /**
- * Creates a new ActivitySnapshotRunnable.
- * @param theme The {@link ThemeInfo} to test.
- * @param test The {@link ActivityTestInfo} to test.
- * @param orientation The orientation in which the test should be.
- * @param generate Whether we should be generating a known-good version
- * or comparing to the previously generated version.
- * @param shouldRequestLayout true if, before testing or saving the bitmap,
- * another layout pass should occur.
- */
- private ActivitySnapshotRunnable(ThemeInfo theme, ActivityTestInfo test,
- int orientation, boolean generate, boolean shouldRequestLayout) {
- mTheme = theme;
- mTest = test;
- mOrientation = orientation;
- mGenerate = generate;
- mShouldRequestLayout = shouldRequestLayout;
- }
-
- public void run() {
- SnapshotActivity activity = mTestCases.getActivity();
-
- String orientationString = (mOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
- ? "port" : "land";
- String testName = mTheme.getThemeName() + "_" + orientationString +
- "_" + mTest.getTestName();
-
- Configuration config = activity.getResources().getConfiguration();
-
- int realOrientation;
- switch (config.orientation) {
- case Configuration.ORIENTATION_LANDSCAPE:
- realOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
- break;
- case Configuration.ORIENTATION_PORTRAIT:
- realOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
- break;
- default:
- realOrientation = -1;
- break;
- }
-
- // seems more stable if we make sure to request the layout again
- // can't hurt if it's just one more time
- if (mShouldRequestLayout) {
- delaySnapshot(activity, false);
- return;
- }
-
- BitmapProcessor processor;
-
- // whether we should generate the bitmap or compare it to the good version
- if (mGenerate) {
- processor = new BitmapSaver(activity, testName, mSplitMode);
- } else {
- processor = new BitmapComparer(activity, null, testName, true, mSplitMode);
- }
-
- Bitmap bmp = activity.getBitmapOfWindow();
- processor.processBitmap(bmp);
- bmp.recycle();
- }
-
- /**
- * Delays taking a snapshot for a bit longer.
- */
- private void delaySnapshot(Activity activity, final boolean shouldRequestLayout) {
- View view = activity.getWindow().getDecorView();
-
- view.measure(MeasureSpec.makeMeasureSpec(view.getWidth(), MeasureSpec.EXACTLY),
- MeasureSpec.makeMeasureSpec(view.getHeight(), MeasureSpec.EXACTLY));
- view.layout(0, 0, view.getWidth(), view.getHeight());
-
- new Handler().post(new ActivitySnapshotRunnable(mTheme, mTest,
- mOrientation, mGenerate, shouldRequestLayout));
- }
- }
-}
diff --git a/tests/src/android/theme/cts/ActivityTestInfo.java b/tests/src/android/theme/cts/ActivityTestInfo.java
deleted file mode 100644
index 1eeaaec..0000000
--- a/tests/src/android/theme/cts/ActivityTestInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-/**
- * Interface that exists so as to use one piece of code to run all of the
- * activity snapshot tests. Note that each test must have a unique test name
- * as returned by {@link #getTestName()}. If you wish to modify the activity,
- * make sure to do any changes within {@link #modifyActivity(SnapshotActivity)}.
- *
- * If absolutely necessary, you can edit the lifecycle methods of {@link SnapshotActivity}.
- */
-public interface ActivityTestInfo {
- /**
- * Returns the unique name of the test. Note that this name must be unique
- * among all of the activity tests and all of the theme tests.
- * @return The unique name of the test.
- */
- public String getTestName();
-
- /**
- * Performs some manipulations on the activity. Essentially, this function
- * is the test's sandbox to do whatever is needed to change the look of the
- * activity.
- * @param activity The {@link SnapshotActivity} to modify.
- */
- public void modifyActivity(SnapshotActivity activity);
-}
diff --git a/tests/src/android/theme/cts/AlertDialogBuilder.java b/tests/src/android/theme/cts/AlertDialogBuilder.java
deleted file mode 100644
index 040d1b5..0000000
--- a/tests/src/android/theme/cts/AlertDialogBuilder.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.view.View;
-
-/**
- * Implements the {@link DialogBuilder} interface to build and show
- * {@link AlertDialog}s for the purposes of testing. In order to reuse
- * as much as possible, the constructor takes a flag that describes the
- * type of AlertDialog to build for the test.
- *
- * If you want to create another {@link AlertDialog} test, simply
- * add another flag and add another case to the switch statement
- * in {link buildDialog()}
- */
-public class AlertDialogBuilder implements DialogBuilder {
- /**
- * Build an {@link AlertDialog} with one button.
- */
- public static final int ONE_BUTTON = 0;
- /**
- * Build an {@link AlertDialog} with two buttons.
- */
- public static final int TWO_BUTTONS = 1;
- /**
- * Build an {@link AlertDialog} with three buttons.
- */
- public static final int THREE_BUTTONS = 2;
- /**
- * Build an {@link AlertDialog} with a list of items.
- */
- public static final int LIST = 3;
- /**
- * Build an {@link AlertDialog} with a single-choice list of items.
- */
- public static final int SINGLE_CHOICE = 4;
- /**
- * Build an {@link AlertDialog} with a multi-choice list of items.
- */
- public static final int MULTI_CHOICE = 5;
-
- private int mDialogType;
-
- private static final CharSequence[] ITEMS = {"Red", "Green", "Blue"};
-
- public AlertDialogBuilder(int dialogType) {
- mDialogType = dialogType;
- }
-
- @Override
- public Dialog buildDialog(View view) {
- AlertDialog.Builder builder = new AlertDialog.Builder(view.getContext());
-
- switch (mDialogType) {
- case ONE_BUTTON:
- builder.setTitle("Exit Dialog")
- .setMessage("Are you sure you want to exit?")
- .setPositiveButton("Exit", null);
- break;
- case TWO_BUTTONS:
- builder.setMessage("Are you sure you want to exit?")
- .setPositiveButton("Exit", null)
- .setNegativeButton("Cancel", null);
- break;
- case THREE_BUTTONS:
- builder.setMessage("Are you sure you want to exit?")
- .setPositiveButton("Exit", null)
- .setNeutralButton("Neutral", null)
- .setNegativeButton("Cancel", null);
- break;
- case LIST:
- builder.setTitle("Pick a Color")
- .setItems(ITEMS, null);
- break;
- case SINGLE_CHOICE:
- builder.setTitle("Pick a Color")
- .setSingleChoiceItems(ITEMS, 1, null);
- break;
- case MULTI_CHOICE:
- builder.setTitle("Pick a Color")
- .setMultiChoiceItems(ITEMS, new boolean[]{false, true, false}, null);
- break;
- }
-
- return builder.show();
- }
-}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/BitmapComparer.java b/tests/src/android/theme/cts/BitmapComparer.java
deleted file mode 100644
index 7171690..0000000
--- a/tests/src/android/theme/cts/BitmapComparer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import junit.framework.Assert;
-
-/**
- * Implementation of {@link BitmapProcessor} that compares the created bitmap
- * to a known good version based on pixel-perfect matching
- * (specifically {@link Bitmap#sameAs(Bitmap)}. Asserts if the bitmaps do not compare.
- */
-public class BitmapComparer implements BitmapProcessor {
- private String mBitmapIdName;
- private boolean mShouldAssert;
- private Activity mActivity;
- private ImageView mReferenceImage;
-
- public BitmapComparer(Activity activity, ImageView referenceImage,
- String filename, boolean shouldAssert, boolean splitMode) {
- mActivity = activity;
- mReferenceImage = referenceImage;
- mShouldAssert = shouldAssert;
-
- if (splitMode) {
- mBitmapIdName = filename + "_split";
- } else {
- mBitmapIdName = filename;
- }
- }
-
- @Override
- public void processBitmap(Bitmap bitmap) {
- // get the bitmap from the resource system
- // since we only have the name, not the resource ID,
- // we need to look up the ID first
- Resources r = mActivity.getResources();
- int resourceId = r.getIdentifier(mBitmapIdName, "drawable", mActivity.getPackageName());
-
- BitmapDrawable drawable = null;
-
- try {
- drawable = (BitmapDrawable) r.getDrawable(resourceId);
- } catch (NotFoundException e) {
- Assert.fail("Test Failed: Resource not found - " + mBitmapIdName);
- }
-
- Bitmap bmp2 = drawable.getBitmap();
-
- if (mReferenceImage != null) {
- mReferenceImage.setImageBitmap(bmp2);
- }
-
- // pixel-perfect matching - could easily re-write to use a fuzzy-matching algorithm
- boolean identical = bmp2.sameAs(bitmap);
-
- // the second and third options are for the manual lookup version
- if (mShouldAssert) {
- if (!identical) {
- BitmapSaver saver = new BitmapSaver(mActivity, "failed_image_" + mBitmapIdName, false);
- saver.processBitmap(bitmap);
- }
- Assert.assertTrue("Test failed: " + mBitmapIdName, identical);
- } else if (identical) {
- ((TextView) mActivity.findViewById(R.id.text)).setText("Bitmaps identical");
- } else {
- ((TextView) mActivity.findViewById(R.id.text)).setText("Bitmaps differ");
- }
- }
-}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/BitmapProcessor.java b/tests/src/android/theme/cts/BitmapProcessor.java
deleted file mode 100644
index 4031471..0000000
--- a/tests/src/android/theme/cts/BitmapProcessor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.graphics.Bitmap;
-
-/**
- * Simple interface in order to share code between the bitmap comparison and bitmap generation
- * steps.
- */
-public interface BitmapProcessor {
- /**
- * Processes the bitmap that is passed into this function, either saving it or comparing
- * it against a previously generated version.
- * @param bitmap The bitmap to process.
- */
- public void processBitmap(Bitmap bitmap);
-}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/BitmapSaver.java b/tests/src/android/theme/cts/BitmapSaver.java
deleted file mode 100644
index a28944d..0000000
--- a/tests/src/android/theme/cts/BitmapSaver.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import junit.framework.Assert;
-
-/**
- * Implementation of {@link BitmapProcessor} that saves a known-good version of a
- * bitmap and saves it to the application's data folder.
- */
-public class BitmapSaver implements BitmapProcessor {
- private String mFilename;
- private Activity mActivity;
-
- public BitmapSaver(Activity activity, String filename, boolean splitMode) {
- mActivity = activity;
-
- if (splitMode) {
- mFilename = filename + "_split.png";
- } else {
- mFilename = filename + ".png";
- }
- }
-
- @Override
- public void processBitmap(Bitmap bitmap) {
- try {
- FileOutputStream fos = mActivity.openFileOutput(mFilename, Context.MODE_PRIVATE);
- bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
- fos.close();
- } catch (FileNotFoundException e) {
- Assert.fail("Test Failed: FileNotFoundException thrown");
- } catch (IOException e) {
- Assert.fail("Test Failed: IOException thrown");
- }
- }
-}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/CalendarViewModifier.java b/tests/src/android/theme/cts/CalendarViewModifier.java
deleted file mode 100644
index 0f3be46..0000000
--- a/tests/src/android/theme/cts/CalendarViewModifier.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.view.View;
-import android.widget.CalendarView;
-
-/**
- * Modifies the CalendarView widget in order to set a precise date.
- */
-public class CalendarViewModifier implements ThemeTestModifier {
- /**
- * Long representation of a date that is 30 years in milliseconds from
- * Unix epoch (January 1, 1970 00:00:00).
- */
- private static final long DATE = 946707779241L;
-
- @Override
- public View modifyView(View view) {
- ((CalendarView) view).setDate(DATE);
- return view;
- }
-}
diff --git a/tests/src/android/theme/cts/DatePickerModifier.java b/tests/src/android/theme/cts/DatePickerModifier.java
deleted file mode 100644
index b3d2002..0000000
--- a/tests/src/android/theme/cts/DatePickerModifier.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.view.View;
-import android.widget.DatePicker;
-
-/**
- * Modifies a DatePicker widget to set a precise date.
- */
-public class DatePickerModifier implements ThemeTestModifier {
-
- @Override
- public View modifyView(View view) {
- DatePicker tp = (DatePicker) view;
- tp.updateDate(2011, 6, 21);
- return view;
- }
-}
diff --git a/tests/src/android/theme/cts/DialogBuilder.java b/tests/src/android/theme/cts/DialogBuilder.java
deleted file mode 100644
index a870895..0000000
--- a/tests/src/android/theme/cts/DialogBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.app.Dialog;
-import android.view.View;
-
-/**
- * Interface to implement should you want to write a test that uses
- * a Dialog. Since a Dialog shows in a new window, implementation
- * of this interface is required in order to appropriately save
- * the Dialog for testing.
- */
-public interface DialogBuilder {
- /**
- * Builds and shows a Dialog to be saved.
- * @return The Dialog to save.
- */
- public Dialog buildDialog(View view);
-}
\ No newline at end of file
diff --git a/tests/src/android/theme/cts/DialogModifier.java b/tests/src/android/theme/cts/DialogModifier.java
deleted file mode 100644
index bf37f4d..0000000
--- a/tests/src/android/theme/cts/DialogModifier.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.app.Dialog;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * This class builds and modifies a Dialog (or its derived classes)
- * in order to use in the Theme Testing framework. To create a new
- * Dialog test, either create a new class that implements {@link DialogBuilder}
- * or add another test to the existing implementations of {@link DialogBuilder}.
- *
- * See {@link AlertDialogBuilder} for an existing implementation.
- */
-public class DialogModifier implements ThemeTestModifier {
- private DialogBuilder mBuilder;
-
- public DialogModifier(DialogBuilder builder) {
- mBuilder = builder;
- }
-
- @Override
- public View modifyView(View view) {
- Dialog alert = mBuilder.buildDialog(view);
- ViewGroup parent = (ViewGroup) view.getParent();
- parent.removeView(view); // remove the filler view
-
- // get the dialog as a view
- View newView = alert.getWindow().getDecorView();
-
- // remove it from the dialog
- alert.getWindow().getWindowManager().removeView(newView);
-
- // so we can add it to our ViewGroup
- parent.addView(newView);
-
- return newView;
- }
-}
diff --git a/tests/src/android/theme/cts/OrientationSelectorActivity.java b/tests/src/android/theme/cts/OrientationSelectorActivity.java
deleted file mode 100644
index 72aa425..0000000
--- a/tests/src/android/theme/cts/OrientationSelectorActivity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-/**
- * This activity exists solely for debugging purposes. It is
- * the first activity seen when launching the manual viewer of tests.
- * It allows the user to select whether they want to see the tests
- * in portrait or landscape mode.
- */
-public class OrientationSelectorActivity extends Activity {
- private static final String[] mOrientations = {"landscape", "portrait"};
- /**
- * Called with the activity is first created.
- */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.themetestlistactivity);
-
- ListView lv = (ListView) findViewById(R.id.tests_list);
-
- lv.setAdapter(
- new ArrayAdapter(this, android.R.layout.simple_list_item_1, mOrientations));
-
- lv.setOnItemClickListener(mTestClickedListener);
- }
-
- private OnItemClickListener mTestClickedListener = new OnItemClickListener() {
- public void onItemClick(AdapterView parent, View view, int position, long id) {
- Intent intent =
- new Intent(OrientationSelectorActivity.this, ThemeSelectorActivity.class);
- intent.putExtra(ThemeTests.EXTRA_ORIENTATION, position);
- startActivity(intent);
- }
- };
-}
diff --git a/tests/src/android/theme/cts/ProgressDialogBuilder.java b/tests/src/android/theme/cts/ProgressDialogBuilder.java
deleted file mode 100644
index 18decd9..0000000
--- a/tests/src/android/theme/cts/ProgressDialogBuilder.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.view.View;
-
-/**
- * This class implements the {@link DialogBuilder} interface
- * in order to build {@link ProgressDialog}s for testing purposes.
- *
- * In order to add more tests of {@link ProgressDialog}, simply
- * add another case inside {@link ProgressDialogBuilder#buildDialog}.
- */
-public class ProgressDialogBuilder implements DialogBuilder {
- /**
- * Builds a {@link ProgressDialog} that contains a circular
- * {@link ProgressBar}.
- */
- public static final int SPINNER = 0;
-
- /**
- * Builds a {@link ProgressDialog} that contains a horizontal
- * {@link ProgressBar}.
- */
- public static final int HORIZONTAL = 1;
-
- private int mDialogType;
-
- public ProgressDialogBuilder(int dialogType) {
- mDialogType = dialogType;
- }
-
- @Override
- public Dialog buildDialog(View view) {
- ProgressDialog progressDialog = new ProgressDialog(view.getContext());
- progressDialog.setMessage("Loading...");
-
- switch (mDialogType) {
- case SPINNER:
- progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
- break;
- case HORIZONTAL:
- progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
- progressDialog.setMax(100);
- break;
- }
-
- progressDialog.show();
- return progressDialog;
- }
-
-}
diff --git a/tests/src/android/theme/cts/SearchViewModifier.java b/tests/src/android/theme/cts/SearchViewModifier.java
deleted file mode 100644
index dc2c024..0000000
--- a/tests/src/android/theme/cts/SearchViewModifier.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.view.View;
-import android.widget.SearchView;
-
-/**
- * This class modifies {@link SearchView} for the various tests that test
- * the look of it.
- */
-public class SearchViewModifier implements ThemeTestModifier {
- public static final int QUERY_HINT = 0;
- public static final int QUERY = 1;
-
- private int mSearchViewType;
-
- public SearchViewModifier(int searchViewType) {
- mSearchViewType = searchViewType;
- }
-
- @Override
- public View modifyView(View view) {
- SearchView sv = (SearchView) view;
-
- switch (mSearchViewType) {
- case QUERY_HINT:
- sv.setQueryHint("Query Hint");
- break;
- case QUERY:
- sv.setQuery("Query", false);
- break;
- }
-
- sv.setIconifiedByDefault(false);
- return sv;
- }
-}
diff --git a/tests/src/android/theme/cts/SnapshotActivity.java b/tests/src/android/theme/cts/SnapshotActivity.java
deleted file mode 100644
index 1344600..0000000
--- a/tests/src/android/theme/cts/SnapshotActivity.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager.LayoutParams;
-import android.widget.SearchView;
-
-/**
- * This class is an Activity that knows how to set its orientation and theme (via intent
- * extras being passed, as well as calling
- * {@link ActivityTestInfo#modifyActivity(SnapshotActivity)} in order to
- * perform some modification on the activity itself that is different for
- * each test.
- */
-public class SnapshotActivity extends Activity {
- private int mActionItemState;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- mActionItemState = -1;
-
- updateWindowSize();
-
- Intent intent = getIntent();
-
- // set the orientation
- int orientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
- ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-
- setRequestedOrientation(orientation);
-
- // set the theme
- int themeId = intent.getIntExtra(ThemeTests.EXTRA_THEME_ID, 0);
-
- setTheme(themeId);
-
- setContentView(R.layout.empty);
-
- int testIndex = intent.getIntExtra(ThemeTests.EXTRA_ACTIVITY_TEST_INDEX, -1);
-
- if (testIndex < 0) {
- return;
- }
-
- // modify the Activity in some way
- ThemeTests.getActivityTests()[testIndex].modifyActivity(this);
- }
-
- @Override
- public void onConfigurationChanged(Configuration newConfig) {
- super.onConfigurationChanged(newConfig);
-
- updateWindowSize();
- }
-
- public void updateWindowSize() {
- Resources resources = getResources();
-
- // set the window to a known size so that we don't have issues with different
- // screen sizes
- int referenceWidthDp = resources.getDimensionPixelSize(R.dimen.reference_width);
- int referenceHeightDp = resources.getDimensionPixelSize(R.dimen.reference_height);
-
- LayoutParams attrs = getWindow().getAttributes();
-
- // set layout when the orientation has changed
- if (attrs.width != referenceWidthDp || attrs.height != referenceHeightDp) {
- getWindow().setLayout(referenceWidthDp, referenceHeightDp);
- }
- }
-
- /**
- * Returns a {@link Bitmap} of the Activity's decor view.
- * @return A {@link Bitmap} of the Activity's decor view.
- */
- public Bitmap getBitmapOfWindow() {
- View decorView = getWindow().getDecorView();
-
- decorView.setFocusable(false);
-
- Bitmap bitmap = Bitmap.createBitmap(
- decorView.getWidth(), decorView.getHeight(), Bitmap.Config.ARGB_8888);
-
- Canvas canvas = new Canvas(bitmap);
- decorView.draw(canvas);
-
- return bitmap;
- }
-
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- MenuItem actionItem;
- SearchView searchView;
- switch (mActionItemState) {
- case ActionBarModifier.ACTION_ITEMS:
- actionItem = menu.add("Share").setIcon(android.R.drawable.ic_menu_share);
- actionItem.setShowAsAction(
- MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-
- actionItem = menu.add("Add").setIcon(android.R.drawable.ic_menu_add);
- actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
- actionItem = menu.add("Save").setIcon(android.R.drawable.ic_menu_save);
- actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
- return true;
- case ActionBarModifier.ACTION_VIEW:
- getMenuInflater().inflate(R.menu.menu_searchview, menu);
- searchView
- = (SearchView) menu.findItem(R.id.menu_search).getActionView();
- searchView.setIconifiedByDefault(false);
- return super.onCreateOptionsMenu(menu);
- case ActionBarModifier.COLLAPSED_ACTION_VIEW: // TODO - fix this test: currently broken
- getMenuInflater().inflate(R.menu.menu_searchview, menu);
- actionItem = menu.findItem(R.id.menu_search);
- actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
- searchView = (SearchView) actionItem.getActionView();
- searchView.setFocusable(false);
- actionItem.expandActionView();
- return super.onCreateOptionsMenu(menu);
- default:
- return false;
- }
- }
-
- /**
- * Sets the actionItemState that will be used to figure out how to
- * modify the {@link ActionBar}'s action items in {@link Activity#onCreateOptionsMenu}.
- * @param actionItemState The actionItemState to use. Corrensponds to the public
- * constants in {@link ActionBarModifier}.
- */
- public void setActionItemState(int actionItemState) {
- mActionItemState = actionItemState;
- }
-}
diff --git a/tests/src/android/theme/cts/SplitSnapshotActivity.java b/tests/src/android/theme/cts/SplitSnapshotActivity.java
deleted file mode 100644
index f97c638..0000000
--- a/tests/src/android/theme/cts/SplitSnapshotActivity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-/**
- * This class is a stub so that we can run the Activity tests using the
- * uiOption SplitActionBarWhenNarrow. Its implementation is deliberately empty
- * since it is supposed to run the same tests as those carried out by its
- * base class {@link SnapshotActivity}. Changes to the tests, if necessary,
- * should be carried out there.
- */
-public class SplitSnapshotActivity extends SnapshotActivity {
- // EMPTY BY DESIGN
-}
diff --git a/tests/src/android/theme/cts/TabHostModifier.java b/tests/src/android/theme/cts/TabHostModifier.java
deleted file mode 100644
index 86197f5..0000000
--- a/tests/src/android/theme/cts/TabHostModifier.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.view.View;
-import android.widget.TabHost;
-
-/**
- * Modifies {@link TabHost} widget for use in testing.
- */
-public class TabHostModifier implements ThemeTestModifier {
-
- @Override
- public View modifyView(View view) {
- TabHost tabHost = (TabHost) view;
- tabHost.setup();
- TabHost.TabSpec spec; // Reusable TabSpec for each tab
-
- // Initialize a TabSpec for each tab and add it to the TabHost
- spec = tabHost.newTabSpec("artists").setIndicator("Artists").setContent(R.id.tabInnerView);
- tabHost.addTab(spec);
-
- // Do the same for the other tabs
- spec = tabHost.newTabSpec("albums").setIndicator("Albums").setContent(R.id.tabInnerView);
- tabHost.addTab(spec);
-
- spec = tabHost.newTabSpec("songs").setIndicator("Songs").setContent(R.id.tabInnerView);
- tabHost.addTab(spec);
-
- tabHost.setCurrentTab(2);
-
- return view;
- }
-}
diff --git a/tests/src/android/theme/cts/TestListActivity.java b/tests/src/android/theme/cts/TestListActivity.java
deleted file mode 100644
index 380adab..0000000
--- a/tests/src/android/theme/cts/TestListActivity.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-
-import junit.framework.Assert;
-
-/**
- * Exists for debugging purposes. Allows the manual verifier
- * to select which test to look at. Displays a list of all of the
- * tests. Selecting one shows the reference and generated images
- * for that specific test.
- */
-public class TestListActivity extends Activity {
- private int mThemeId;
- private String mThemeName;
- private int mOrientation;
-
- /**
- * Called with the activity is first created.
- */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- Intent intent = getIntent();
- mThemeId = intent.getIntExtra(ThemeTests.EXTRA_THEME_ID, 0);
-
- // test should fail if no theme is set
- Assert.assertTrue("No Theme Resource ID set", mThemeId != 0);
-
- mThemeName = intent.getStringExtra(ThemeTests.EXTRA_THEME_NAME);
-
- setTheme(mThemeId);
-
- setContentView(R.layout.themetestlistactivity);
-
- ListView lv = (ListView) findViewById(R.id.tests_list);
- lv.setAdapter(new ThemeTestAdapter(this, ThemeTests.getTests()));
-
- lv.setOnItemClickListener(mTestClickedListener);
-
- mOrientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
- ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
- }
-
- private OnItemClickListener mTestClickedListener = new OnItemClickListener() {
- public void onItemClick(AdapterView parent, View view, int position, long id) {
- Intent intent = new Intent(TestListActivity.this, ThemeTestRunnerActivity.class);
- intent.putExtra(ThemeTests.EXTRA_THEME_ID, mThemeId);
- intent.putExtra(ThemeTests.EXTRA_THEME_NAME, mThemeName);
- intent.putExtra(ThemeTests.EXTRA_RUN_INDIVIDUAL_TEST, position);
- intent.putExtra(ThemeTests.EXTRA_ORIENTATION, mOrientation);
- startActivity(intent);
- }
- };
-}
diff --git a/tests/src/android/theme/cts/TestReset.java b/tests/src/android/theme/cts/TestReset.java
deleted file mode 100644
index 78e0fa0..0000000
--- a/tests/src/android/theme/cts/TestReset.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-/**
- * This interface exists for the sole purpose of separating the
- * {@link ActivityInstrumentationTestCase2} that runs the activity
- * screenshot tests from the actual code. In order to work properly
- * with multiple activities, the {@link ActivityInstrumentationTestCase2}
- * must {@link ActivityInstrumentationTestCase2#tearDown} and
- * {@link ActivityInstrumentationTestCase2#setUp} itself after
- * each test. Since those methods are protected, this interface
- * serves as a way to implement that functionality while allowing
- * two separate {@link ActivityInstrumentationTestCase2}s to exist,
- * one for the regular activity screenshot tests and the other one for
- * the while sharing code between both for most of the test framework.
- */
-public interface TestReset {
- public void reset();
-}
diff --git a/tests/src/android/theme/cts/TesterViewGroup.java b/tests/src/android/theme/cts/TesterViewGroup.java
deleted file mode 100644
index aa42724..0000000
--- a/tests/src/android/theme/cts/TesterViewGroup.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * Custom view group to handle density changes while maintaining screen independence.
- */
-public class TesterViewGroup extends ViewGroup {
- private int mReferenceWidthDp;
- private int mReferenceHeightDp;
-
- public TesterViewGroup(Context context) {
- this(context, null);
- }
-
- public TesterViewGroup(Context context, AttributeSet attrs) {
- super(context, attrs);
-
- Resources resources = context.getResources();
-
- mReferenceWidthDp = resources.getDimensionPixelSize(R.dimen.reference_width);
- mReferenceHeightDp = resources.getDimensionPixelSize(R.dimen.reference_height);
- }
-
- @Override
- protected void onLayout(boolean changed, int l, int t, int r, int b) {
- if (!changed) {
- return;
- }
-
- int childCount = getChildCount();
- for (int i = 0; i < childCount; i++) {
- View child = getChildAt(i);
- child.layout(0, 0, child.getMeasuredWidth(), child.getMeasuredHeight());
- }
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- widthMeasureSpec = getMeasureSpec(LayoutParams.MATCH_PARENT, mReferenceWidthDp);
- heightMeasureSpec = getMeasureSpec(LayoutParams.MATCH_PARENT, mReferenceHeightDp);
-
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
- int childCount = getChildCount();
- for (int i = 0; i < childCount; i++) {
- View child = getChildAt(i);
-
- LayoutParams params = child.getLayoutParams();
-
- int height = getMeasureSpec(params.height, mReferenceWidthDp);
- int width = getMeasureSpec(params.width, mReferenceHeightDp);
- child.measure(width, height);
- }
- }
-
- private int getMeasureSpec(int val, int referenceSize) {
- if (val == LayoutParams.MATCH_PARENT) {
- return MeasureSpec.makeMeasureSpec(referenceSize, MeasureSpec.EXACTLY);
- } else if (val == LayoutParams.WRAP_CONTENT) {
- return MeasureSpec.makeMeasureSpec(referenceSize, MeasureSpec.AT_MOST);
- } else {
- return val;
- }
- }
-}
diff --git a/tests/src/android/theme/cts/ThemeInfo.java b/tests/src/android/theme/cts/ThemeInfo.java
deleted file mode 100644
index a2556e0..0000000
--- a/tests/src/android/theme/cts/ThemeInfo.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-public class ThemeInfo {
- private int mResourceId;
- private String mThemeName;
-
- public ThemeInfo(int resourceId, String themeName) {
- mResourceId = resourceId;
- mThemeName = themeName;
- }
-
- public int getResourceId() {
- return mResourceId;
- }
-
- public String getThemeName() {
- return mThemeName;
- }
-}
diff --git a/tests/src/android/theme/cts/ThemeSelectorActivity.java b/tests/src/android/theme/cts/ThemeSelectorActivity.java
deleted file mode 100644
index d9c05d6..0000000
--- a/tests/src/android/theme/cts/ThemeSelectorActivity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.AdapterView.OnItemClickListener;
-
-/**
- * This activity exists solely for debugging purposes. It allows the manual
- * verifier to select which theme to test.
- */
-public class ThemeSelectorActivity extends Activity {
- private ThemeInfo[] mThemes;
- private int mOrientation;
- /**
- * Called with the activity is first created.
- */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.themetestlistactivity);
-
- ListView lv = (ListView) findViewById(R.id.tests_list);
-
- mThemes = ThemeTests.getThemes();
- lv.setAdapter(new ThemesAdapter(this, mThemes));
-
- lv.setOnItemClickListener(mTestClickedListener);
-
- mOrientation = getIntent().getIntExtra(ThemeTests.EXTRA_ORIENTATION,
- ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
- }
-
- private OnItemClickListener mTestClickedListener = new OnItemClickListener() {
- public void onItemClick(AdapterView parent, View view, int position, long id) {
- Intent intent = new Intent(ThemeSelectorActivity.this, TestListActivity.class);
- ThemeInfo theme = mThemes[position];
- intent.putExtra(ThemeTests.EXTRA_THEME_ID, theme.getResourceId());
- intent.putExtra(ThemeTests.EXTRA_THEME_NAME, theme.getThemeName());
- intent.putExtra(ThemeTests.EXTRA_ORIENTATION, mOrientation);
- startActivity(intent);
- }
- };
-}
diff --git a/tests/src/android/theme/cts/ThemeTestAdapter.java b/tests/src/android/theme/cts/ThemeTestAdapter.java
deleted file mode 100644
index 2172d24..0000000
--- a/tests/src/android/theme/cts/ThemeTestAdapter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.app.Activity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-public class ThemeTestAdapter extends BaseAdapter {
- private LayoutInflater mInflater;
- private ThemeTestInfo[] mTests;
-
- public ThemeTestAdapter(Activity activity, ThemeTestInfo[] tests) {
- mTests = tests;
- mInflater = activity.getLayoutInflater();
- }
-
- @Override
- public int getCount() {
- return mTests.length;
- }
-
- @Override
- public Object getItem(int position) {
- return mTests[position];
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- if (convertView == null) {
- convertView = mInflater.inflate(android.R.layout.simple_list_item_1, parent, false);
- }
-
- ((TextView) convertView).setText(mTests[position].getTestName());
-
- return convertView;
- }
-}
diff --git a/tests/src/android/theme/cts/ThemeTestGeneratorActivity.java b/tests/src/android/theme/cts/ThemeTestGeneratorActivity.java
deleted file mode 100644
index f770b5a..0000000
--- a/tests/src/android/theme/cts/ThemeTestGeneratorActivity.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-
-import junit.framework.Assert;
-
-/**
- * Generates the master bitmaps for all of the tests for the specific
- * theme and orientation requested via the intent.
- */
-public class ThemeTestGeneratorActivity extends Activity {
- private ThemeTester mTester;
-
- /**
- * Called with the activity is first created.
- */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- Intent intent = getIntent();
- int themeId = intent.getIntExtra(ThemeTests.EXTRA_THEME_ID, 0);
-
- // test should fail if no theme is set
- Assert.assertTrue("No Theme Resource ID set", themeId != 0);
-
- String themeName = intent.getStringExtra(ThemeTests.EXTRA_THEME_NAME);
-
- setTheme(themeId);
- setContentView(R.layout.testing_activity);
-
- int orientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
- ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-
- setRequestedOrientation(orientation);
-
- String oriented = "";
- if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
- oriented = "land";
- } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
- oriented = "port";
- }
-
- mTester = new ThemeTester(this, themeName + "_" + oriented);
- }
-
- public void generateTests() {
- mTester.generateTests();
- }
-}
diff --git a/tests/src/android/theme/cts/ThemeTestInfo.java b/tests/src/android/theme/cts/ThemeTestInfo.java
deleted file mode 100644
index eb28299..0000000
--- a/tests/src/android/theme/cts/ThemeTestInfo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-/**
- * Class that represents a test case. Add a new one to the list of tests in ThemeTests.java
- * in order to create a new test.
- */
-public class ThemeTestInfo {
- private int mResourceId;
- private ThemeTestModifier mModifier;
- private String mTestname;
-
- /**
- * Creates a new theme test.
- * @param layoutResourceId The resource ID of the layout to use for this test.
- * @param modifier The {@link ThemeTestModifier} to use in order to modify the layout
- * of the test.
- * @param testname The UNIQUE name of the test.
- */
- public ThemeTestInfo(int layoutResourceId, ThemeTestModifier modifier, String testname) {
- mResourceId = layoutResourceId;
- mModifier = modifier;
- mTestname = testname;
- }
-
- public int getLayoutResourceId() {
- return mResourceId;
- }
-
- public ThemeTestModifier getThemeModifier() {
- return mModifier;
- }
-
- public String getTestName() {
- return mTestname;
- }
-}
diff --git a/tests/src/android/theme/cts/ThemeTestModifier.java b/tests/src/android/theme/cts/ThemeTestModifier.java
deleted file mode 100644
index b5e3345..0000000
--- a/tests/src/android/theme/cts/ThemeTestModifier.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import android.view.View;
-
-/**
- * Interface that should be implemented if you want to modify the view being tested.
- *
- * For a sample implementation, see {@link ViewPressedModifier}.
- */
-public interface ThemeTestModifier {
- /**
- * Define this function in order to modify the layout for your test.
- * The View that is passed in is the root of layout that is specified in the test.
- * @param view The root view of the layout.
- * @return The view that will be saved as a bitmap. This view does not necessarily
- * have to be the view that was passed into modifyView, however most implementations
- * probably will return the original view.
- */
- public View modifyView(View view);
-}
diff --git a/tests/src/android/theme/cts/ThemeTestRunnerActivity.java b/tests/src/android/theme/cts/ThemeTestRunnerActivity.java
deleted file mode 100644
index d337231..0000000
--- a/tests/src/android/theme/cts/ThemeTestRunnerActivity.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-
-import junit.framework.Assert;
-
-/**
- * Builds the bitmaps for all of the tests on the fly and
- * compares them to the known master versions.
- */
-public class ThemeTestRunnerActivity extends Activity {
- private ThemeTester mTester;
- /**
- * Called with the activity is first created.
- */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- Intent intent = getIntent();
- int themeId = intent.getIntExtra(ThemeTests.EXTRA_THEME_ID, 0);
-
- // test should fail if no theme is set
- Assert.assertTrue("No Theme Resource ID set", themeId != 0);
-
- String themeName = intent.getStringExtra(ThemeTests.EXTRA_THEME_NAME);
-
- setTheme(themeId);
- setContentView(R.layout.testing_activity);
-
- int orientation = intent.getIntExtra(ThemeTests.EXTRA_ORIENTATION,
- ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-
- setRequestedOrientation(orientation);
-
- String oriented = "";
- if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
- oriented = "land";
- } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
- oriented = "port";
- }
-
- mTester = new ThemeTester(this, themeName + "_" + oriented);
-
- if (intent.getBooleanExtra(ThemeTests.EXTRA_RUN_TESTS, false)) {
- mTester.runTests();
- }
-
- int position = intent.getIntExtra(ThemeTests.EXTRA_RUN_INDIVIDUAL_TEST, -1);
- if (position != -1) {
- mTester.setShouldAssert(false);
- mTester.runTest(position);
- }
- }
-
- /**
- * Runs the theme tests for the theme that was created.
- */
- public void runTests() {
- mTester.runTests();
- }
-}
diff --git a/tests/src/android/theme/cts/ThemeTester.java b/tests/src/android/theme/cts/ThemeTester.java
deleted file mode 100644
index a69934f..0000000
--- a/tests/src/android/theme/cts/ThemeTester.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import junit.framework.Assert;
-
-/**
- * This class runs the series of tests for a specific theme in the activity.
- *
- *
- * Additionally, this class can also generate the good versions of bitmaps to use for testing.
- */
-public class ThemeTester {
- private Activity mActivity;
- private String mThemeName;
- private ImageView mReferenceImage;
- private ImageView mGeneratedImage;
- private TesterViewGroup mRoot;
- private boolean mShouldAssert;
-
- /**
- * Creates a ThemeTester to run all of the tests.
- * @param activity Activity that serves as a test harness for this theme test.
- * @param themeName Name of the theme being tested.
- */
- public ThemeTester(Activity activity, String themeName) {
- mActivity = activity;
- mThemeName = themeName;
- mRoot = (TesterViewGroup) mActivity.findViewById(R.id.test_group);
- mShouldAssert = true;
-
- mReferenceImage = (ImageView) mActivity.findViewById(R.id.reference_image);
- mGeneratedImage = (ImageView) mActivity.findViewById(R.id.generated_image);
- }
-
- public void setShouldAssert(boolean shouldAssert) {
- mShouldAssert = shouldAssert;
- }
-
- /**
- * Run all of the tests.
- */
- public void runTests() {
- ThemeTestInfo[] tests = ThemeTests.getTests();
- for (final ThemeTestInfo test : tests) {
- runTest(test);
- }
- }
-
- /**
- * Run an individual test based upon its position in the tests.
- * @param position The position of the test that you wish to run.
- */
- public void runTest(int position) {
- runTest(ThemeTests.getTests()[position]);
- }
-
- /**
- * Run an individual test.
- * @param test The {@link ThemeTestInfo} to use for this test.
- */
- private void runTest(final ThemeTestInfo test) {
- mRoot.post(new Runnable() {
- public void run() {
- testViewFromId(test);
- }
- });
- }
-
- /**
- * Generate all of the tests, saving them to Bitmaps in the application's data folder.
- */
- public void generateTests() {
- ThemeTestInfo[] tests = ThemeTests.getTests();
- for (final ThemeTestInfo test : tests) {
- mRoot.post(new Runnable() {
- public void run() {
- generateViewFromId(test);
- }
- });
- }
- }
-
- private void testViewFromId(ThemeTestInfo test) {
- processBitmapFromViewId(test.getLayoutResourceId(), test.getThemeModifier(),
- new BitmapComparer(mActivity, mReferenceImage,
- mThemeName + "_" + test.getTestName(), mShouldAssert, false));
- }
-
- private void generateViewFromId(ThemeTestInfo test) {
- processBitmapFromViewId(test.getLayoutResourceId(), test.getThemeModifier(),
- new BitmapSaver(mActivity, mThemeName + "_" + test.getTestName(), false));
- }
-
- private void processBitmapFromViewId(
- int resid, ThemeTestModifier modifier, final BitmapProcessor processor) {
- final View view = constructViewFromLayoutId(resid, modifier);
-
- view.post(new Runnable() {
- public void run() {
- Bitmap bitmap = Bitmap.createBitmap(
- view.getWidth(), view.getHeight(), Bitmap.Config.ARGB_8888);
-
- Canvas canvas = new Canvas(bitmap);
- view.draw(canvas);
- mGeneratedImage.setImageBitmap(bitmap);
-
- processor.processBitmap(bitmap);
- bitmap.recycle();
-
- mRoot.removeView(view);
- }
- });
- }
-
- /**
- * Inflates and returns the view and performs and modifications of it as required by the test.
- * @param resid The resource id of the layout that will be constructed.
- * @param modifier The ThemeTestModifier to modify the layout being tested.
- * @return The root view of the layout being tested.
- */
- private View constructViewFromLayoutId(int resid, ThemeTestModifier modifier) {
- LayoutInflater inflater = LayoutInflater.from(mActivity);
-
- View view = inflater.inflate(resid, mRoot, false);
- mRoot.addView(view);
-
- if (modifier != null) {
- view = modifier.modifyView(view);
- }
-
- mRoot.measure(0, 0); // don't care about the input values - we build our reference size
- mRoot.layout(0, 0, mRoot.getMeasuredWidth(), mRoot.getMeasuredHeight());
-
- view.setFocusable(false);
-
- return view;
- }
-
-
-
-
-}
diff --git a/tests/src/android/theme/cts/ThemeTests.java b/tests/src/android/theme/cts/ThemeTests.java
deleted file mode 100644
index 7dce779..0000000
--- a/tests/src/android/theme/cts/ThemeTests.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.theme.cts;
-
-import com.android.cts.stub.R;
-
-import android.content.pm.ActivityInfo;
-
-public class ThemeTests {
- /**
- * Theme name to test.
- */
- public static final String EXTRA_THEME_NAME = "android.intent.extra.THEME_NAME";
-
- /**
- * Theme ID to test.
- */
- public static final String EXTRA_THEME_ID = "android.intent.extra.THEME_ID";
-
- /**
- * Runs only the test supplied (by position number).
- */
- public static final String EXTRA_RUN_INDIVIDUAL_TEST
- = "android.intent.extra.RUN_INDIVIDUAL_TEST";
-
- /**
- * Use solely for debugging. The actual intent that runs the tests will not have this flag.
- */
- public static final String EXTRA_RUN_TESTS = "android.intent.extra.RUN_TESTS";
-
- /**
- * Sets the orientation of the tests. Options are
- * {@link ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE} or
- * {@link ActivityInfo.SCREEN_ORIENTATION_PORTRAIT}.
- */
- public static final String EXTRA_ORIENTATION = "android.intent.extra.ORIENTATION";
-
- /**
- * The index of the current activity test that is being run so that it can be
- * read on both sides of an intent.
- */
- public static final String EXTRA_ACTIVITY_TEST_INDEX
- = "android.intent.extra.ACTIVITY_TEST_INDEX";
-
- /**
- * The list of tests to run for each theme.
- * In order to create a new test, follow these steps.
- * 1. Create a layout file for the test you wish to run.
- *
- * In order to create a new test, follow these steps.
- * 1. Create a layout file for the test you wish to run.
- * 1. Add a new Theme to the array of Themes in
- * cts/tests/src/android/theme/cts/ThemeTests.java.
- * Make sure the "theme name" String is unique.
- * 1. Add a new Theme to the array of Themes in
- * cts/tests/src/android/theme/cts/ThemeTests.java.
- * Make sure the "theme name" String is unique.
- * In order to create a new test, follow these steps.
- * 1. Create a class that inherits from {@link ActivitytestInfo}.
- * In order to create a new test, follow these steps.
- * 1. Create a class that inherits from {@link ActivitytestInfo}. {
-
- private DefaultHttpServerConnection mConnection;
-
- private HttpRequest mRequest;
-
- public HandleResponseTask(DefaultHttpServerConnection connection,
- HttpRequest request) {
- this.mConnection = connection;
- this.mRequest = request;
- }
-
- @Override
- public Void call() throws IOException, InterruptedException, HttpException {
- HttpResponse response = mServer.getResponse(mRequest);
- mConnection.sendResponseHeader(response);
- mConnection.sendResponseEntity(response);
- mConnection.close();
- return null;
- }
- }
}
}
diff --git a/tests/src/android/widget/cts/MockTextView.java b/tests/src/android/widget/cts/MockTextView.java
deleted file mode 100644
index 138338c..0000000
--- a/tests/src/android/widget/cts/MockTextView.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.widget.cts;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.text.method.MovementMethod;
-import android.util.AttributeSet;
-import android.view.ContextMenu;
-import android.view.KeyEvent;
-import android.widget.TextView;
-
-public class MockTextView extends TextView {
- private boolean mHasCalledOnCreateContextMenu;
- private boolean mHasCalledOnFocusChanged;
- private boolean mHasCalledOnMeasure;
- private boolean mHasCalledOnTextChanged;
- private boolean mHasCalledDrawableStateChanged;
- private boolean mHasCalledOnWindowFocusChanged;
- private boolean mHasCalledOnPrivateIMECommand;
- private boolean mHasCalledOnKeyMultiple;
-
- public MockTextView(Context context) {
- super(context);
- }
-
- public MockTextView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public MockTextView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- public boolean hasCalledOnWindowFocusChanged() {
- return mHasCalledOnWindowFocusChanged;
- }
-
- public boolean hasCalledOnCreateContextMenu() {
- return mHasCalledOnCreateContextMenu;
- }
-
- public boolean hasCalledDrawableStateChanged() {
- return mHasCalledDrawableStateChanged;
- }
-
- public boolean hasCalledOnFocusChanged() {
- return mHasCalledOnFocusChanged;
- }
-
- public boolean hasCalledOnMeasure() {
- return mHasCalledOnMeasure;
- }
-
- public boolean hasCalledOnTextChanged() {
- return mHasCalledOnTextChanged;
- }
-
- public boolean hasCalledOnPrivateIMECommand() {
- return mHasCalledOnPrivateIMECommand;
- }
-
- public boolean hasCalledOnKeyMultiple(){
- return mHasCalledOnKeyMultiple;
- }
-
- public void reset() {
- mHasCalledOnWindowFocusChanged = false;
- mHasCalledDrawableStateChanged = false;
- mHasCalledOnCreateContextMenu = false;
- mHasCalledOnFocusChanged = false;
- mHasCalledOnMeasure = false;
- mHasCalledOnTextChanged = false;
- mHasCalledOnPrivateIMECommand = false;
- mHasCalledOnKeyMultiple = false;
- }
-
- public int computeHorizontalScrollRange() {
- return super.computeHorizontalScrollRange();
- }
-
- public int computeVerticalScrollRange() {
- return super.computeVerticalScrollRange();
- }
-
- @Override
- protected void drawableStateChanged() {
- super.drawableStateChanged();
- mHasCalledDrawableStateChanged = true;
- }
-
- public boolean getDefaultEditable() {
- return super.getDefaultEditable();
- }
-
- public MovementMethod getDefaultMovementMethod() {
- return super.getDefaultMovementMethod();
- }
-
- @Override
- protected void onCreateContextMenu(ContextMenu menu) {
- super.onCreateContextMenu(menu);
- mHasCalledOnCreateContextMenu = true;
- }
-
- @Override
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
- }
-
- @Override
- protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
- super.onFocusChanged(focused, direction, previouslyFocusedRect);
- mHasCalledOnFocusChanged = true;
- }
-
- @Override
- public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
- mHasCalledOnKeyMultiple = true;
- return super.onKeyMultiple(keyCode, repeatCount, event);
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- mHasCalledOnMeasure = true;
- }
-
- @Override
- protected void onTextChanged(CharSequence text, int start, int before, int after) {
- super.onTextChanged(text, start, before, after);
- mHasCalledOnTextChanged = true;
- }
-
- public boolean setFrame(int l, int t, int r, int b) {
- return super.setFrame(l, t, r, b);
- }
-
- @Override
- public void onWindowFocusChanged(boolean hasWindowFocus) {
- super.onWindowFocusChanged(hasWindowFocus);
- mHasCalledOnWindowFocusChanged = true;
- }
-
- public float getLeftFadingEdgeStrength() {
- return super.getLeftFadingEdgeStrength();
- }
-
- public float getRightFadingEdgeStrength() {
- return super.getRightFadingEdgeStrength();
- }
-
- @Override
- public boolean onPrivateIMECommand(String action, Bundle data) {
- mHasCalledOnPrivateIMECommand = true;
- return super.onPrivateIMECommand(action, data);
- }
-
- public int getFrameLeft() {
- return mLeft;
- }
-
- public int getFrameTop() {
- return mTop;
- }
-
- public int getFrameRight() {
- return mRight;
- }
-
- public int getFrameBottom() {
- return mBottom;
- }
-
- public int getBottomPaddingOffset() {
- return super.getBottomPaddingOffset();
- }
-
- public int getLeftPaddingOffset() {
- return super.getLeftPaddingOffset();
- }
-
- public int getRightPaddingOffset() {
- return super.getRightPaddingOffset();
- }
-
- public int getTopPaddingOffset() {
- return super.getTopPaddingOffset();
- }
-
- public boolean isPaddingOffsetRequired() {
- return super.isPaddingOffsetRequired();
- }
-
- public boolean verifyDrawable(Drawable who) {
- return super.verifyDrawable(who);
- }
-
- public int computeVerticalScrollExtent() {
- return super.computeVerticalScrollExtent();
- }
-}
diff --git a/tests/tests/acceleration/Android.mk b/tests/tests/acceleration/Android.mk
deleted file mode 100644
index 3e2acac..0000000
--- a/tests/tests/acceleration/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2011 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CtsAccelerationTestCases
-
-LOCAL_INSTRUMENTATION_FOR := CtsAccelerationTestStubs
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
diff --git a/tests/tests/acceleration/AndroidManifest.xml b/tests/tests/acceleration/AndroidManifest.xml
deleted file mode 100644
index 8a2f955..0000000
--- a/tests/tests/acceleration/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/tests/acceleration/src/android/acceleration/cts/BaseAccelerationTest.java b/tests/tests/acceleration/src/android/acceleration/cts/BaseAccelerationTest.java
deleted file mode 100644
index d2f1d9f..0000000
--- a/tests/tests/acceleration/src/android/acceleration/cts/BaseAccelerationTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.acceleration.cts;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.pm.ConfigurationInfo;
-import android.content.pm.FeatureInfo;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.View;
-
-abstract class BaseAccelerationTest
- extends ActivityInstrumentationTestCase2 {
-
- protected B mActivity;
-
- /** View with android:layerType="hardware" set */
- protected AcceleratedView mHardwareView;
-
- /** View with android:layerType="software" set */
- protected AcceleratedView mSoftwareView;
-
- /** View with setLayerType(HARDWARE) called */
- protected AcceleratedView mManualHardwareView;
-
- /** View with setLayerType(SOFTWARE) called */
- protected AcceleratedView mManualSoftwareView;
-
- BaseAccelerationTest(Class clazz) {
- super(clazz);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mActivity = getActivity();
- mHardwareView = mActivity.getHardwareAcceleratedView();
- mSoftwareView = mActivity.getSoftwareAcceleratedView();
- mManualHardwareView = mActivity.getManualHardwareAcceleratedView();
- mManualSoftwareView = mActivity.getManualSoftwareAcceleratedView();
- }
-
- public void testNotAttachedView() {
- // Views that are not attached can't be attached to an accelerated window.
- View view = new View(mActivity);
- assertFalse(view.isHardwareAccelerated());
- }
-
- protected static int getGlEsVersion(Context context) {
- ActivityManager activityManager =
- (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
- ConfigurationInfo configInfo = activityManager.getDeviceConfigurationInfo();
- if (configInfo.reqGlEsVersion != ConfigurationInfo.GL_ES_VERSION_UNDEFINED) {
- return getMajorVersion(configInfo.reqGlEsVersion);
- } else {
- return 1; // Lack of property means OpenGL ES version 1
- }
- }
-
- /** @see FeatureInfo#getGlEsVersion() */
- private static int getMajorVersion(int glEsVersion) {
- return ((glEsVersion & 0xffff0000) >> 16);
- }
-}
diff --git a/tests/tests/acceleration/src/android/acceleration/cts/HardwareAccelerationTest.java b/tests/tests/acceleration/src/android/acceleration/cts/HardwareAccelerationTest.java
deleted file mode 100644
index eddd34f..0000000
--- a/tests/tests/acceleration/src/android/acceleration/cts/HardwareAccelerationTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.acceleration.cts;
-
-/**
- * Test that uses an Activity with hardware acceleration enabled.
- */
-public class HardwareAccelerationTest
- extends BaseAccelerationTest {
-
- public HardwareAccelerationTest() {
- super(HardwareAcceleratedActivity.class);
- }
-
- public void testIsHardwareAccelerated() {
- // Hardware acceleration should be available on devices with GL ES 2 or higher...
- if (getGlEsVersion(mActivity) >= 2) {
- // Both of the views are attached to a hardware accelerated window
- assertTrue(mHardwareView.isHardwareAccelerated());
- assertTrue(mSoftwareView.isHardwareAccelerated());
- assertTrue(mManualHardwareView.isHardwareAccelerated());
- assertTrue(mManualSoftwareView.isHardwareAccelerated());
-
- assertTrue(mHardwareView.isCanvasHardwareAccelerated());
- assertFalse(mSoftwareView.isCanvasHardwareAccelerated());
- assertTrue(mManualHardwareView.isCanvasHardwareAccelerated());
- assertFalse(mManualSoftwareView.isCanvasHardwareAccelerated());
- } else {
- assertFalse(mHardwareView.isHardwareAccelerated());
- assertFalse(mSoftwareView.isHardwareAccelerated());
- assertFalse(mManualHardwareView.isHardwareAccelerated());
- assertFalse(mManualSoftwareView.isHardwareAccelerated());
-
- assertFalse(mHardwareView.isCanvasHardwareAccelerated());
- assertFalse(mSoftwareView.isCanvasHardwareAccelerated());
- assertFalse(mManualHardwareView.isCanvasHardwareAccelerated());
- assertFalse(mManualSoftwareView.isCanvasHardwareAccelerated());
- }
- }
-}
diff --git a/tests/tests/acceleration/src/android/acceleration/cts/SoftwareAccelerationTest.java b/tests/tests/acceleration/src/android/acceleration/cts/SoftwareAccelerationTest.java
deleted file mode 100644
index 146fa6a..0000000
--- a/tests/tests/acceleration/src/android/acceleration/cts/SoftwareAccelerationTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.acceleration.cts;
-
-/**
- * Test that uses an Activity with hardware acceleration explicitly disabled
- * and makes sure that all views are rendered using software acceleration.
- */
-public class SoftwareAccelerationTest
- extends BaseAccelerationTest {
-
- public SoftwareAccelerationTest() {
- super(SoftwareAcceleratedActivity.class);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mActivity = getActivity();
- }
-
- public void testIsHardwareAccelerated() {
- // Both of the views are not attached to a hardware accelerated window
- assertFalse(mHardwareView.isHardwareAccelerated());
- assertFalse(mSoftwareView.isHardwareAccelerated());
- assertFalse(mManualHardwareView.isHardwareAccelerated());
- assertFalse(mManualSoftwareView.isHardwareAccelerated());
-
- assertFalse(mHardwareView.isCanvasHardwareAccelerated());
- assertFalse(mSoftwareView.isCanvasHardwareAccelerated());
- assertFalse(mManualHardwareView.isCanvasHardwareAccelerated());
- assertFalse(mManualSoftwareView.isCanvasHardwareAccelerated());
- }
-}
diff --git a/tests/tests/acceleration/src/android/acceleration/cts/WindowFlagHardwareAccelerationTest.java b/tests/tests/acceleration/src/android/acceleration/cts/WindowFlagHardwareAccelerationTest.java
deleted file mode 100644
index bfbbe63..0000000
--- a/tests/tests/acceleration/src/android/acceleration/cts/WindowFlagHardwareAccelerationTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.acceleration.cts;
-
-/**
- * Test that uses an Activity with hardware acceleration enabled.
- */
-public class WindowFlagHardwareAccelerationTest
- extends BaseAccelerationTest {
-
- public WindowFlagHardwareAccelerationTest() {
- super(WindowFlagHardwareAcceleratedActivity.class);
- }
-
- public void testIsHardwareAccelerated() {
- // Hardware acceleration should be available on devices with GL ES 2 or higher...
- if (getGlEsVersion(mActivity) >= 2) {
- // Both of the views are attached to a hardware accelerated window
- assertTrue(mHardwareView.isHardwareAccelerated());
- assertTrue(mSoftwareView.isHardwareAccelerated());
- assertTrue(mManualHardwareView.isHardwareAccelerated());
- assertTrue(mManualSoftwareView.isHardwareAccelerated());
-
- assertTrue(mHardwareView.isCanvasHardwareAccelerated());
- assertFalse(mSoftwareView.isCanvasHardwareAccelerated());
- assertTrue(mManualHardwareView.isCanvasHardwareAccelerated());
- assertFalse(mManualSoftwareView.isCanvasHardwareAccelerated());
- } else {
- assertFalse(mHardwareView.isHardwareAccelerated());
- assertFalse(mSoftwareView.isHardwareAccelerated());
- assertFalse(mManualHardwareView.isHardwareAccelerated());
- assertFalse(mManualSoftwareView.isHardwareAccelerated());
-
- assertFalse(mHardwareView.isCanvasHardwareAccelerated());
- assertFalse(mSoftwareView.isCanvasHardwareAccelerated());
- assertFalse(mManualHardwareView.isCanvasHardwareAccelerated());
- assertFalse(mManualSoftwareView.isCanvasHardwareAccelerated());
- }
- }
-}
diff --git a/tests/tests/accessibilityservice/Android.mk b/tests/tests/accessibilityservice/Android.mk
index 71b7537..401f7a4 100644
--- a/tests/tests/accessibilityservice/Android.mk
+++ b/tests/tests/accessibilityservice/Android.mk
@@ -22,9 +22,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_JAVA_LIBRARIES := android.test.runner
-# TODO: include the core runner source as a library instead
-LOCAL_SRC_FILES := $(call all-java-files-under, src)\
- $(call all-java-files-under, ../../core/runner/src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SRC_FILES += \
src/android/accessibilityservice/IAccessibilityServiceDelegate.aidl \
@@ -32,6 +30,6 @@ LOCAL_SRC_FILES += \
LOCAL_PACKAGE_NAME := CtsAccessibilityServiceTestCases
-#LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)
diff --git a/tests/tests/accessibilityservice/AndroidManifest.xml b/tests/tests/accessibilityservice/AndroidManifest.xml
index ddf38c7..811c87f 100644
--- a/tests/tests/accessibilityservice/AndroidManifest.xml
+++ b/tests/tests/accessibilityservice/AndroidManifest.xml
@@ -19,21 +19,16 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/tests/accessibilityservice/res/values/strings.xml b/tests/tests/accessibilityservice/res/values/strings.xml
index 7b3cd0f..e86d3cc 100644
--- a/tests/tests/accessibilityservice/res/values/strings.xml
+++ b/tests/tests/accessibilityservice/res/values/strings.xml
@@ -44,38 +44,4 @@
Notification message
-
-
- Query window test
-
-
- Button1
-
-
- Button2
-
-
- Button3
-
-
- Button4
-
-
- Button5
-
-
- Button6
-
-
- contentDescription
-
-
- Button7
-
-
- Button8
-
-
- Button9
-
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegate.aidl b/tests/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegate.aidl
index 868bd72..b5ebf19 100644
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegate.aidl
+++ b/tests/tests/accessibilityservice/src/android/accessibilityservice/IAccessibilityServiceDelegate.aidl
@@ -20,7 +20,7 @@ import android.view.accessibility.AccessibilityEvent;
/**
* Interface for interacting with the accessibility service mock.
*/
-oneway interface IAccessibilityServiceDelegate {
+interface IAccessibilityServiceDelegate {
/**
* Delegate an {@link android.view.accessibility.AccessibilityEvent}.
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDelegateHelper.java b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDelegateHelper.java
deleted file mode 100644
index 1e7c625..0000000
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityDelegateHelper.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.accessibilityservice.cts;
-
-import static junit.framework.Assert.fail;
-
-import android.accessibilityservice.AccessibilityService;
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.accessibilityservice.IAccessibilityServiceDelegate;
-import android.accessibilityservice.IAccessibilityServiceDelegateConnection;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.ServiceInfo;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-
-import java.util.List;
-
-/**
- * This class is a helper for implementing delegation of accessibility events.
- * This is required because changing accessibility settings can be performed
- * either via writing to the secure settings, which a CTS test cannot do, or
- * by manual interaction from the settings application. However, manually
- * enabling the testing accessibility service does not work because the test
- * runner restarts the package before running the tests, thus breaking the
- * bond between the system and the manually enabled testing service. So,
- * we have a delegating service that is manually enabled which services as a
- * proxy to deliver accessibility events to the testing service.
- */
-class AccessibilityDelegateHelper implements ServiceConnection {
-
- /**
- * Timeout required for pending Binder calls or event processing to
- * complete.
- */
- public static final long TIMEOUT_ASYNC_PROCESSING = 500;
-
- /**
- * The package of the accessibility service mock interface.
- */
- private static final String DELEGATING_SERVICE_PACKAGE =
- "android.accessibilityservice.delegate";
-
- /**
- * The package of the delegating accessibility service interface.
- */
- private static final String DELEGATING_SERVICE_CLASS_NAME =
- "android.accessibilityservice.delegate.DelegatingAccessibilityService";
-
- /**
- * The package of the delegating accessibility service connection interface.
- */
- private static final String DELEGATING_SERVICE_CONNECTION_CLASS_NAME =
- "android.accessibilityservice.delegate."
- + "DelegatingAccessibilityService$DelegatingConnectionService";
-
- /**
- * The client accessibility service to which to delegate.
- */
- private final AccessibilityService mAccessibilityService;
-
- /**
- * Lock for synchronization.
- */
- private final Object mLock = new Object();
-
- /**
- * Whether this delegate is initialized.
- */
- private boolean mInitialized;
-
- /**
- * Creates a new instance.
- *
- * @param service The service to which to delegate.
- */
- public AccessibilityDelegateHelper(AccessibilityService service) {
- mAccessibilityService = service;
- }
-
- /**
- * Ensures the required setup for the test performed and that it is bound to the
- * DelegatingAccessibilityService which runs in another process. The setup is
- * enabling accessibility and installing and enabling the delegating accessibility
- * service this test binds to.
- *
- * Note: Please look at the class description for information why such an
- * approach is taken.
- */
- public void bindToDelegatingAccessibilityService(Context context) {
- // check if accessibility is enabled
- AccessibilityManager accessibilityManager = (AccessibilityManager) context
- .getSystemService(Service.ACCESSIBILITY_SERVICE);
-
- if (!accessibilityManager.isEnabled()) {
- throw new IllegalStateException("Delegating service not enabled. "
- + "(Settings -> Accessibility -> Delegating Accessibility Service)");
- }
-
- // check if the delegating service is running
- List enabledServices =
- accessibilityManager.getEnabledAccessibilityServiceList(
- AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
- boolean delegatingServiceRunning = false;
- for (AccessibilityServiceInfo enabledService : enabledServices) {
- ServiceInfo serviceInfo = enabledService.getResolveInfo().serviceInfo;
- if (DELEGATING_SERVICE_PACKAGE.equals(serviceInfo.packageName)
- && DELEGATING_SERVICE_CLASS_NAME.equals(serviceInfo.name)) {
- delegatingServiceRunning = true;
- break;
- }
- }
-
- if (!delegatingServiceRunning) {
- // delegating service not running, so check if it is installed at all
- try {
- PackageManager packageManager = context.getPackageManager();
- packageManager.getServiceInfo(new ComponentName(DELEGATING_SERVICE_PACKAGE,
- DELEGATING_SERVICE_CLASS_NAME), 0);
- } catch (NameNotFoundException nnfe) {
- throw new IllegalStateException("CtsDelegatingAccessibilityService.apk" +
- " not installed.");
- }
-
- throw new IllegalStateException("Delegating Accessibility Service not running."
- + "(Settings -> Accessibility -> Delegating Accessibility Service)");
- }
-
- Intent intent = new Intent().setClassName(DELEGATING_SERVICE_PACKAGE,
- DELEGATING_SERVICE_CONNECTION_CLASS_NAME);
- context.bindService(intent, this, Context.BIND_AUTO_CREATE);
-
- final long beginTime = SystemClock.uptimeMillis();
- synchronized (mLock) {
- while (true) {
- if (mInitialized) {
- return;
- }
- final long elapsedTime = (SystemClock.uptimeMillis() - beginTime);
- final long remainingTime = TIMEOUT_ASYNC_PROCESSING - elapsedTime;
- if (remainingTime <= 0) {
- if (!mInitialized) {
- throw new IllegalStateException("Cound not connect to the delegating"
- + " accessibility service");
- }
- return;
- }
- try {
- mLock.wait(remainingTime);
- } catch (InterruptedException ie) {
- /* ignore */
- }
- }
- }
- }
-
- /**
- * {@inheritDoc ServiceConnection#onServiceConnected(ComponentName,IBinder)}
- */
- public void onServiceConnected(ComponentName name, IBinder service) {
- IAccessibilityServiceDelegateConnection connection =
- IAccessibilityServiceDelegateConnection.Stub.asInterface(service);
- try {
- connection.setAccessibilityServiceDelegate(new IAccessibilityServiceDelegate.Stub() {
- @Override
- public void onAccessibilityEvent(AccessibilityEvent event) {
- mAccessibilityService.onAccessibilityEvent(event);
- }
- @Override
- public void onInterrupt() {
- mAccessibilityService.onInterrupt();
- }
- });
- mInitialized = true;
- synchronized (mLock) {
- mLock.notifyAll();
- }
- } catch (RemoteException re) {
- fail("Could not set delegate to the delegating service.");
- }
- }
-
- /**
- * {@inheritDoc ServiceConnection#onServiceDisconnected(ComponentName)}
- */
- public void onServiceDisconnected(ComponentName name) {
- mInitialized = false;
- /* do nothing */
- }
-}
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
index 5a565ec..5259753 100644
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
+++ b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
@@ -17,18 +17,32 @@
package android.accessibilityservice.cts;
import android.accessibilityservice.AccessibilityService;
+import android.accessibilityservice.IAccessibilityServiceDelegate;
+import android.accessibilityservice.IAccessibilityServiceDelegateConnection;
import android.app.Activity;
+import android.app.ActivityManager;
import android.app.AlertDialog;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
+import android.app.ActivityManager.RunningServiceInfo;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.RemoteException;
import android.os.SystemClock;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
+import android.util.Log;
import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ListView;
@@ -46,23 +60,19 @@ import java.util.Queue;
* This class performs end-to-end testing of the accessibility feature by
* creating an {@link Activity} and poking around so {@link AccessibilityEvent}s
* are generated and their correct dispatch verified.
- *
- * Note: The accessibility CTS tests are composed of two APKs, one with delegating
- * accessibility service and another with the instrumented activity and test cases.
- * The motivation for two APKs design is that CTS tests cannot access the secure
- * settings which is required for enabling accessibility services, hence there is
- * no way to manipulate accessibility settings programmaticaly. Further, manually
- * enabling an accessibility service in the tests APK will not work either because
- * the instrumentation restarts the process under test which would break the binding
- * between the accessibility service and the system.
- *
- * Therefore, manual installation of the
- * CtsAccessibilityServiceTestMockService.apk
- * whose source is located at cts/tests/accessibility is required.
- * Once the former package has been installed the service must be enabled
- * (Settings -> Accessibility -> Delegating Accessibility Service), and then the CTS tests
- * in this package can be successfully run.
*
+ * Note: The end-to-end test is composed of two APKs, one with a delegating accessibility
+ * service, another with the instrumented activity and test cases. The motivation for
+ * two APKs design is that CTS tests cannot access the secure settings which is
+ * required for enabling accessibility and accessibility services. Therefore, manual
+ * installation of the CtsDelegatingAccessibilityService.apk
+ * whose source is located at cts/tests/accessibilityservice is required.
+ * Once the former package has been installed accessibility must be enabled (Settings ->
+ * Accessibility), the delegating service must be enabled (Settings -> Accessibility
+ * -> Delegating Accessibility Service), and then the CTS tests in this package can be
+ * successfully run. Further, the delegate and tests run in separate processes since
+ * the instrumentation restarts the process in which it is running and this
+ * breaks the binding between the delegating accessibility service and the system.
*/
public class AccessibilityEndToEndTest extends
ActivityInstrumentationTestCase2 {
@@ -71,25 +81,54 @@ public class AccessibilityEndToEndTest extends
* Timeout required for pending Binder calls or event processing to
* complete.
*/
- private static final long TIMEOUT_ASYNC_PROCESSING = 500;
+ private static final long MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING = 1000;
/**
- * Creates a new instance for testing {@link AccessibilityEndToEndTestActivity}.
+ * The count of the polling attempts during {@link #MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING}
+ */
+ private static final long COUNT_POLLING_ATTEMPTS = 10;
+
+ /**
+ * The package of the accessibility service mock interface.
+ */
+ private static final String DELEGATING_SERVICE_PACKAGE =
+ "android.accessibilityservice.delegate";
+
+ /**
+ * The package of the delegating accessibility service interface.
+ */
+ private static final String DELEGATING_SERVICE_CLASS_NAME =
+ "android.accessibilityservice.delegate.DelegatingAccessibilityService";
+
+ /**
+ * The package of the delegating accessibility service connection interface.
+ */
+ private static final String DELEGATING_SERVICE_CONNECTION_CLASS_NAME =
+ "android.accessibilityservice.delegate."
+ + "DelegatingAccessibilityService$DelegatingConnectionService";
+
+ /**
+ * Creates a new instance for testing
+ * {@link AccessibilityEndToEndTestActivity}.
*
* @throws Exception If any error occurs.
*/
public AccessibilityEndToEndTest() throws Exception {
- super(AccessibilityEndToEndTestActivity.class);
+ super("com.android.cts.accessibilityservice", AccessibilityEndToEndTestActivity.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ // wait for the activity to settle down so we do not receive
+ // the event for its start, thus breaking the tests
+ getInstrumentation().waitForIdleSync();
}
@LargeTest
public void testTypeViewSelectedAccessibilityEvent() throws Throwable {
Activity activity = getActivity();
- // Wait for accessibility events to settle i.e. for all events generated
- // while bringing the activity up to be delivered so they do not interfere.
- SystemClock.sleep(TIMEOUT_ASYNC_PROCESSING);
-
// create and populate the expected event
AccessibilityEvent selectedEvent = AccessibilityEvent.obtain();
selectedEvent.setEventType(AccessibilityEvent.TYPE_VIEW_SELECTED);
@@ -99,9 +138,6 @@ public class AccessibilityEndToEndTest extends
selectedEvent.setItemCount(2);
selectedEvent.setCurrentItemIndex(1);
selectedEvent.setEnabled(true);
- selectedEvent.setScrollable(false);
- selectedEvent.setFromIndex(0);
- selectedEvent.setToIndex(1);
// set expectations
MockAccessibilityService service = MockAccessibilityService.getInstance(activity);
@@ -117,17 +153,13 @@ public class AccessibilityEndToEndTest extends
});
// verify if all expected methods have been called
- service.verify();
+ assertMockServiceVerifiedWithinTimeout(service);
}
@LargeTest
public void testTypeViewClickedAccessibilityEvent() throws Throwable {
Activity activity = getActivity();
- // Wait for accessibility events to settle i.e. for all events generated
- // while bringing the activity up to be delivered so they do not interfere.
- SystemClock.sleep(TIMEOUT_ASYNC_PROCESSING);
-
// create and populate the expected event
AccessibilityEvent clickedEvent = AccessibilityEvent.obtain();
clickedEvent.setEventType(AccessibilityEvent.TYPE_VIEW_CLICKED);
@@ -150,17 +182,13 @@ public class AccessibilityEndToEndTest extends
});
// verify if all expected methods have been called
- service.verify();
+ assertMockServiceVerifiedWithinTimeout(service);
}
@LargeTest
public void testTypeViewLongClickedAccessibilityEvent() throws Throwable {
Activity activity = getActivity();
- // Wait for accessibility events to settle i.e. for all events generated
- // while bringing the activity up to be delivered so they do not interfere.
- SystemClock.sleep(TIMEOUT_ASYNC_PROCESSING);
-
// create and populate the expected event
AccessibilityEvent longClickedEvent = AccessibilityEvent.obtain();
longClickedEvent.setEventType(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
@@ -183,17 +211,13 @@ public class AccessibilityEndToEndTest extends
});
// verify if all expected methods have been called
- service.verify();
+ assertMockServiceVerifiedWithinTimeout(service);
}
@LargeTest
public void testTypeViewFocusedAccessibilityEvent() throws Throwable {
Activity activity = getActivity();
- // Wait for accessibility events to settle i.e. for all events generated
- // while bringing the activity up to be delivered so they do not interfere.
- SystemClock.sleep(TIMEOUT_ASYNC_PROCESSING);
-
// create and populate the expected event
AccessibilityEvent focusedEvent = AccessibilityEvent.obtain();
focusedEvent.setEventType(AccessibilityEvent.TYPE_VIEW_FOCUSED);
@@ -218,12 +242,12 @@ public class AccessibilityEndToEndTest extends
});
// verify if all expected methods have been called
- service.verify();
+ assertMockServiceVerifiedWithinTimeout(service);
}
@LargeTest
public void testTypeViewTextChangedAccessibilityEvent() throws Throwable {
- final Activity activity = getActivity();
+ Activity activity = getActivity();
// focus the edit text
final EditText editText = (EditText) activity.findViewById(R.id.edittext);
@@ -234,8 +258,7 @@ public class AccessibilityEndToEndTest extends
});
// wait for the generated focus event to be dispatched
- SystemClock.sleep(TIMEOUT_ASYNC_PROCESSING);
-
+ Thread.sleep(MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING);
final String beforeText = activity.getString(R.string.text_input_blah);
final String newText = activity.getString(R.string.text_input_blah_blah);
@@ -266,17 +289,12 @@ public class AccessibilityEndToEndTest extends
});
// verify if all expected methods have been called
- service.verify();
+ assertMockServiceVerifiedWithinTimeout(service);
}
@LargeTest
public void testTypeWindowStateChangedAccessibilityEvent() throws Throwable {
Activity activity = getActivity();
-
- // Wait for accessibility events to settle i.e. for all events generated
- // while bringing the activity up to be delivered so they do not interfere.
- SystemClock.sleep(TIMEOUT_ASYNC_PROCESSING);
-
String title = activity.getString(R.string.alert_title);
String message = activity.getString(R.string.alert_message);
@@ -306,17 +324,12 @@ public class AccessibilityEndToEndTest extends
});
// verify if all expected methods have been called
- service.verify();
+ assertMockServiceVerifiedWithinTimeout(service);
}
@LargeTest
public void testTypeNotificationStateChangedAccessibilityEvent() throws Throwable {
Activity activity = getActivity();
-
- // Wait for accessibility events to settle i.e. for all events generated
- // while bringing the activity up to be delivered so they do not interfere.
- SystemClock.sleep(TIMEOUT_ASYNC_PROCESSING);
-
String message = activity.getString(R.string.notification_message);
// create the notification to send
@@ -347,18 +360,61 @@ public class AccessibilityEndToEndTest extends
notificationManager.notify(notificationId, notification);
// verify if all expected methods have been called
- service.verify();
+ assertMockServiceVerifiedWithinTimeout(service);
// remove the notification
notificationManager.cancel(notificationId);
}
- static class MockAccessibilityService extends AccessibilityService {
+ /**
+ * Asserts the the mock accessibility service has been successfully verified
+ * (which is it has received the expected method calls with expected
+ * arguments) within the {@link #MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING}. The
+ * verified state is checked by polling upon small intervals.
+ *
+ * @param service The service to verify.
+ * @throws Exception If the verification has failed with exception after the
+ * {@link #MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING}.
+ */
+ private void assertMockServiceVerifiedWithinTimeout(MockAccessibilityService service)
+ throws Throwable {
+ Throwable lastVerifyThrowable = null;
+ long beginTime = SystemClock.uptimeMillis();
+ long pollTmeout = MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING / COUNT_POLLING_ATTEMPTS;
+
+ // poll until the timeout has elapsed
+ while (SystemClock.uptimeMillis() - beginTime < MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING) {
+ // sleep first since immediate call will always fail
+ try {
+ Thread.sleep(pollTmeout);
+ } catch (InterruptedException ie) {
+ /* ignore */
+ }
- /**
- * Helper for connecting to the delegating accessibility service.
- */
- private final AccessibilityDelegateHelper mAccessibilityDelegateHelper;
+ try {
+ service.verify();
+ // success - reset so it is not accept more events
+ service.reset();
+ return;
+ } catch (IllegalStateException ise) {
+ // this exception is thrown if the expected event is not
+ // received yet, so we will keep trying within the timeout
+ lastVerifyThrowable = ise;
+ continue;
+ } catch (Throwable t) {
+ // we have just failed
+ lastVerifyThrowable = t;
+ break;
+ }
+ }
+
+ // failure - reset so it is not accept more events
+ service.reset();
+ throw lastVerifyThrowable;
+ }
+
+ static class MockAccessibilityService extends AccessibilityService implements
+ ServiceConnection {
/**
* The singleton instance.
@@ -372,11 +428,6 @@ public class AccessibilityEndToEndTest extends
new LinkedList();
/**
- * Reusable temporary builder.
- */
- private final StringBuilder mTempBuilder = new StringBuilder();
-
- /**
* Interruption call this service expects to receive.
*/
private boolean mExpectedInterrupt;
@@ -387,9 +438,14 @@ public class AccessibilityEndToEndTest extends
private boolean mReplaying;
/**
- * Lock for synchronization.
+ * Flag indicating if this mock is initialized.
*/
- private final Object mLock = new Object();
+ private boolean mInitialized;
+
+ /**
+ * The {@link Context} whose services to utilize.
+ */
+ private Context mContext;
/**
* Gets the {@link MockAccessibilityService} singleton.
@@ -412,57 +468,100 @@ public class AccessibilityEndToEndTest extends
* Creates a new instance.
*/
private MockAccessibilityService(Context context) {
- mAccessibilityDelegateHelper = new AccessibilityDelegateHelper(this);
- mAccessibilityDelegateHelper.bindToDelegatingAccessibilityService(
- context);
+ mContext = context;
+ ensureSetupAndBoundToDelegatingAccessibilityService();
+ }
+
+ /**
+ * Ensures the required setup for the test performed and that it is bound to the
+ * DelegatingAccessibilityService which runs in another process. The setup is
+ * enabling accessibility and installing and enabling the delegating accessibility
+ * service this test binds to.
+ *
+ * Note: Please look at the class description for information why such an
+ * approach is taken.
+ */
+ public void ensureSetupAndBoundToDelegatingAccessibilityService() {
+ // check if accessibility is enabled
+ AccessibilityManager accessibilityManager = (AccessibilityManager) mContext
+ .getSystemService(Service.ACCESSIBILITY_SERVICE);
+
+ if (!accessibilityManager.isEnabled()) {
+ throw new IllegalStateException("Accessibility not enabled. "
+ + "(Settings -> Accessibility)");
+ }
+
+ // check if the delegating service is running
+ ComponentName delegatingServiceName = new ComponentName(
+ DELEGATING_SERVICE_PACKAGE, DELEGATING_SERVICE_CLASS_NAME);
+ ActivityManager activityManager = (ActivityManager) mContext
+ .getSystemService(Service.ACTIVITY_SERVICE);
+ boolean delegatingServiceRunning = false;
+
+ for (RunningServiceInfo runningServiceInfo : activityManager.getRunningServices(100)) {
+ if (delegatingServiceName.equals(runningServiceInfo.service)) {
+ delegatingServiceRunning = true;
+ break;
+ }
+ }
+
+ if (!delegatingServiceRunning) {
+ // delegating service not running, so check if it is installed at all
+ try {
+ PackageManager packageManager = mContext.getPackageManager();
+ packageManager.getServiceInfo(delegatingServiceName, 0);
+ } catch (NameNotFoundException nnfe) {
+ throw new IllegalStateException("CtsDelegatingAccessibilityService.apk" +
+ " not installed.");
+ }
+
+ throw new IllegalStateException("Delegating Accessibility Service not running."
+ + "(Settings -> Accessibility -> Delegating Accessibility Service)");
+ }
+
+ Intent intent = new Intent().setClassName(DELEGATING_SERVICE_PACKAGE,
+ DELEGATING_SERVICE_CONNECTION_CLASS_NAME);
+ mContext.bindService(intent, this, Context.BIND_AUTO_CREATE);
+
+ long beginTime = SystemClock.uptimeMillis();
+ long pollTmeout = MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING / COUNT_POLLING_ATTEMPTS;
+
+ // bind to the delegating service which runs in another process by
+ // polling until the binder connection is established
+ while (SystemClock.uptimeMillis() - beginTime < MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING) {
+ if (mInitialized) {
+ // success
+ return;
+ }
+ try {
+ Thread.sleep(pollTmeout);
+ } catch (InterruptedException ie) {
+ /* ignore */
+ }
+ }
}
/**
* Starts replaying the mock.
*/
- public void replay() {
+ private void replay() {
mReplaying = true;
}
/**
- * Verifies the mock service.
- *
- * @throws IllegalStateException If the verification has failed.
+ * Verifies if all expected service methods have been called.
*/
- public void verify() throws IllegalStateException {
- StringBuilder problems = mTempBuilder;
- final long startTime = SystemClock.uptimeMillis();
- synchronized (mLock) {
- while (true) {
- if (!mReplaying) {
- throw new IllegalStateException("Did you forget to call replay()?");
- }
- if (!mExpectedInterrupt && mExpectedEvents.isEmpty()) {
- reset();
- return; // success
- }
- problems.setLength(0);
- if (mExpectedInterrupt) {
- problems.append("Expected call to #interrupt() not received.");
- }
- if (!mExpectedEvents.isEmpty()) {
- problems.append("Expected a call to onAccessibilityEvent() for events \""
- + mExpectedEvents + "\" not received.");
- }
- final long elapsedTime = SystemClock.uptimeMillis() - startTime;
- final long remainingTime = TIMEOUT_ASYNC_PROCESSING - elapsedTime;
- if (remainingTime <= 0) {
- reset();
- if (problems.length() > 0) {
- throw new IllegalStateException(problems.toString());
- }
- return;
- }
- try {
- mLock.wait(remainingTime);
- } catch (InterruptedException ie) {
- /* ignore */
- }
+ private void verify() {
+ synchronized (this) {
+ if (!mReplaying) {
+ throw new IllegalStateException("Did you forget to call replay()");
+ }
+ if (mExpectedInterrupt) {
+ throw new IllegalStateException("Expected call to #interrupt() not received");
+ }
+ if (!mExpectedEvents.isEmpty()) {
+ throw new IllegalStateException("Expected a call to onAccessibilityEvent() for "
+ + "events \"" + mExpectedEvents + "\" not received");
}
}
}
@@ -471,11 +570,10 @@ public class AccessibilityEndToEndTest extends
* Resets this instance so it can be reused.
*/
private void reset() {
- synchronized (mLock) {
+ synchronized (this) {
mExpectedEvents.clear();
mExpectedInterrupt = false;
mReplaying = false;
- mLock.notifyAll();
}
}
@@ -499,7 +597,7 @@ public class AccessibilityEndToEndTest extends
@Override
public void onAccessibilityEvent(AccessibilityEvent receivedEvent) {
- synchronized (mLock) {
+ synchronized (this) {
if (!mReplaying) {
return;
}
@@ -508,25 +606,49 @@ public class AccessibilityEndToEndTest extends
}
AccessibilityEvent expectedEvent = mExpectedEvents.poll();
assertEqualsAccessiblityEvent(expectedEvent, receivedEvent);
- mLock.notifyAll();
+
}
}
@Override
public void onInterrupt() {
- synchronized (mLock) {
+ synchronized (this) {
if (!mReplaying) {
return;
}
+
if (!mExpectedInterrupt) {
throw new IllegalStateException("Unexpected call to onInterrupt()");
}
+
mExpectedInterrupt = false;
- mLock.notifyAll();
}
}
/**
+ * {@inheritDoc ServiceConnection#onServiceConnected(ComponentName,IBinder)}
+ */
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ IAccessibilityServiceDelegateConnection connection =
+ IAccessibilityServiceDelegateConnection.Stub
+ .asInterface(service);
+ try {
+ connection.setAccessibilityServiceDelegate(new AccessibilityServiceDelegate(this));
+ mInitialized = true;
+ } catch (RemoteException re) {
+ fail("Could not set delegate to the delegating service.");
+ }
+ }
+
+ /**
+ * {@inheritDoc ServiceConnection#onServiceDisconnected(ComponentName)}
+ */
+ public void onServiceDisconnected(ComponentName name) {
+ mInitialized = false;
+ /* do nothing */
+ }
+
+ /**
* Compares all properties of the expectedEvent and the
* receviedEvent to verify that the received event is the
* one that is expected.
@@ -555,50 +677,16 @@ public class AccessibilityEndToEndTest extends
receivedEvent.isFullScreen());
TestCase.assertEquals("itemCount has incorrect value", expectedEvent.getItemCount(),
receivedEvent.getItemCount());
- assertEqualsNotificationAsParcelableData(expectedEvent, receivedEvent);
+ // This will fail due to a bug fixed in Gingerbread. Bug 2593810 (removed the method).
+ // assertEqualsNotificationAsParcelableData(expectedEvent, receivedEvent);
TestCase.assertEquals("password has incorrect value", expectedEvent.isPassword(),
receivedEvent.isPassword());
TestCase.assertEquals("removedCount has incorrect value", expectedEvent
.getRemovedCount(), receivedEvent.getRemovedCount());
- TestCase.assertEquals("scrollable has incorrect value", expectedEvent.isScrollable(),
- receivedEvent.isScrollable());
- TestCase.assertEquals("toIndex has incorrect value", expectedEvent.getToIndex(),
- receivedEvent.getToIndex());
- TestCase.assertEquals("recordCount has incorrect value", expectedEvent.getRecordCount(),
- receivedEvent.getRecordCount());
- TestCase.assertEquals("scrollX has incorrect value", expectedEvent.getScrollX(),
- receivedEvent.getScrollX());
- TestCase.assertEquals("scrollY has incorrect value", expectedEvent.getScrollY(),
- receivedEvent.getScrollY());
-
assertEqualsText(expectedEvent, receivedEvent);
}
/**
- * Compares the {@link android.os.Parcelable} data of the
- * expectedEvent and receivedEvent to verify
- * that the received event is the one that is expected.
- */
- private void assertEqualsNotificationAsParcelableData(AccessibilityEvent expectedEvent,
- AccessibilityEvent receivedEvent) {
- String message = "parcelableData has incorrect value";
- Notification expectedNotification = (Notification) expectedEvent.getParcelableData();
- Notification receivedNotification = (Notification) receivedEvent.getParcelableData();
-
- if (expectedNotification == null) {
- if (receivedNotification == null) {
- return;
- }
- }
-
- TestCase.assertNotNull(message, receivedNotification);
-
- // we do a very simple sanity check
- TestCase.assertEquals(message, expectedNotification.tickerText.toString(),
- receivedNotification.tickerText.toString());
- }
-
- /**
* Compares the text of the expectedEvent and
* receivedEvent by comparing the string representation of
* the corresponding {@link CharSequence}s.
@@ -620,5 +708,84 @@ public class AccessibilityEndToEndTest extends
receivedTextIterator.next().toString());
}
}
+
+ /**
+ * This class is the delegate called by the DelegatingAccessibilityService.
+ */
+ private class AccessibilityServiceDelegate extends
+ IAccessibilityServiceDelegate.Stub implements Handler.Callback {
+
+ /**
+ * Tag for logging.
+ */
+ private static final String LOG_TAG = "AccessibilityServiceDelegate";
+
+ /**
+ * Message type for calling {@link #onInterrupt()}
+ */
+ private static final int DO_ON_INTERRUPT = 10;
+
+ /**
+ * Message type for calling {@link #onAccessibilityEvent(AccessibilityEvent)}
+ */
+ private static final int DO_ON_ACCESSIBILITY_EVENT = 20;
+
+ /**
+ * Caller for handling {@link Message}s
+ */
+ private final Handler mHandler;
+
+ /**
+ * The {@link MockAccessibilityService} to which to delegate;
+ */
+ private MockAccessibilityService mMockAccessibilityService;
+
+ /**
+ * Creates a new instance.
+ *
+ * @param mockAccessibilityService The service to whcih to delegate.
+ */
+ public AccessibilityServiceDelegate(MockAccessibilityService mockAccessibilityService) {
+ mMockAccessibilityService = mockAccessibilityService;
+ mHandler = new Handler(this);
+ }
+
+ /**
+ * {@inheritDoc IAccessibilityServiceDelegate#onAccessibilityEvent(AccessibilityEvent)}
+ */
+ public void onAccessibilityEvent(AccessibilityEvent event) {
+ Message message = Message.obtain(mHandler, DO_ON_ACCESSIBILITY_EVENT, event);
+ mHandler.sendMessage(message);
+ }
+
+ /**
+ * {@inheritDoc IAccessibilityServiceDelegate#onInterrupt()}
+ */
+ public void onInterrupt() {
+ Message message = mHandler.obtainMessage(DO_ON_INTERRUPT);
+ mHandler.sendMessage(message);
+ }
+
+ /**
+ * {@inheritDoc Handler.Callback#handleMessage(Message)}
+ */
+ public boolean handleMessage(Message message) {
+ switch (message.what) {
+ case DO_ON_ACCESSIBILITY_EVENT:
+ AccessibilityEvent event = (AccessibilityEvent) message.obj;
+ if (event != null) {
+ mMockAccessibilityService.onAccessibilityEvent(event);
+ event.recycle();
+ }
+ return true;
+ case DO_ON_INTERRUPT:
+ mMockAccessibilityService.onInterrupt();
+ return true;
+ default:
+ Log.w(LOG_TAG, "Unknown message type " + message.what);
+ return false;
+ }
+ }
+ }
}
}
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTestActivity.java b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTestActivity.java
index adfc9e6..e806622 100644
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTestActivity.java
+++ b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTestActivity.java
@@ -16,8 +16,6 @@
package android.accessibilityservice.cts;
-import com.android.cts.accessibilityservice.R;
-
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
@@ -28,6 +26,8 @@ import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
+import com.android.cts.accessibilityservice.R;
+
/**
* This class is an {@link Activity} used to perform end-to-end
* testing of the accessibility feature by interaction with the
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityServiceInfoTest.java b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityServiceInfoTest.java
index ab7ecd7..48b4aae 100644
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityServiceInfoTest.java
+++ b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityServiceInfoTest.java
@@ -72,7 +72,8 @@ public class AccessibilityServiceInfoTest extends TestCase {
receivedInfo.eventTypes);
assertEquals("feedbackType not marshalled properly", sentInfo.feedbackType,
receivedInfo.feedbackType);
- assertEquals("flags not marshalled properly", sentInfo.flags, receivedInfo.flags);
+ // This will fail here and is fixed in Froyo. Bug 2448479.
+ // assertEquals("flags not marshalled properly", sentInfo.flags, receivedInfo.flags);
assertEquals("notificationTimeout not marshalled properly", sentInfo.notificationTimeout,
receivedInfo.notificationTimeout);
assertEquals("packageNames not marshalled properly", sentInfo.packageNames.length,
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryActivity.java b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryActivity.java
deleted file mode 100644
index 6f72a75..0000000
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryActivity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright (C) 2011 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 android.accessibilityservice.cts;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-
-import com.android.cts.accessibilityservice.R;
-
-/**
- * Activity for testing the accessibility APIs for querying of
- * the screen content. These APIs allow exploring the screen and
- * requesting an action to be performed on a given view from an
- * AccessiiblityService.
- */
-public class AccessibilityWindowQueryActivity extends Activity {
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.query_window_test);
-
- findViewById(R.id.button5).setOnClickListener(new View.OnClickListener() {
- public void onClick(View v) {
- /* do nothing */
- }
- });
- findViewById(R.id.button5).setOnLongClickListener(new View.OnLongClickListener() {
- public boolean onLongClick(View v) {
- return true;
- }
- });
- }
-}
diff --git a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryActivityTest.java b/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryActivityTest.java
deleted file mode 100644
index d798052..0000000
--- a/tests/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryActivityTest.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/**
- * Copyright (C) 2011 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 android.accessibilityservice.cts;
-
-import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLEAR_FOCUS;
-import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLEAR_SELECTION;
-import static android.view.accessibility.AccessibilityNodeInfo.ACTION_FOCUS;
-import static android.view.accessibility.AccessibilityNodeInfo.ACTION_SELECT;
-
-import android.accessibilityservice.AccessibilityService;
-import android.content.Context;
-import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.android.cts.accessibilityservice.R;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.BrokenBarrierException;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * Activity for testing the accessibility APIs for querying of
- * the screen content. These APIs allow exploring the screen and
- * requesting an action to be performed on a given view from an
- * AccessiiblityService.
- *
- * Note: The accessibility CTS tests are composed of two APKs, one with delegating
- * accessibility service and another with the instrumented activity and test cases.
- * The motivation for two APKs design is that CTS tests cannot access the secure
- * settings which is required for enabling accessibility services, hence there is
- * no way to manipulate accessibility settings programmaticaly. Further, manually
- * enabling an accessibility service in the tests APK will not work either because
- * the instrumentation restarts the process under test which would break the binding
- * between the accessibility service and the system.
- *
- * Therefore, manual installation of the
- * CtsAccessibilityServiceTestMockService.apk
- * whose source is located at cts/tests/accessibility is required.
- * Once the former package has been installed the service must be enabled
- * (Settings -> Accessibility -> Delegating Accessibility Service), and then the CTS tests
- * in this package can be successfully run.
- *
- */
-public class AccessibilityWindowQueryActivityTest
- extends ActivityInstrumentationTestCase2 {
-
- private interface AccessibilityEventFilter {
- public boolean accept(AccessibilityEvent event);
- }
-
- public AccessibilityWindowQueryActivityTest() {
- super(AccessibilityWindowQueryActivity.class);
- }
-
- @Override
- public void setUp() {
- // start the activity and wait for a handle to its window root.
- startActivityAndWaitForFirstEvent();
- }
-
- @LargeTest
- public void testFindByText() throws Exception {
- // find a view by text
- List buttons = findAccessibilityNodeInfosByText(
- getAwaitedAccessibilityEventSource(), "butto");
- assertEquals(9, buttons.size());
- }
-
- @LargeTest
- public void testFindByContentDescription() throws Exception {
- // find a view by text
- AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
- getAwaitedAccessibilityEventSource(), R.string.contentDescription);
- assertNotNull(button);
- }
-
- @LargeTest
- public void testTraverseWindow() throws Exception {
- // make list of expected nodes
- List classNameAndTextList = new ArrayList();
- classNameAndTextList.add("com.android.internal.policy.impl.PhoneWindow$DecorView");
- classNameAndTextList.add("android.widget.LinearLayout");
- classNameAndTextList.add("android.widget.FrameLayout");
- classNameAndTextList.add("android.widget.LinearLayout");
- classNameAndTextList.add("android.widget.LinearLayout");
- classNameAndTextList.add("android.widget.LinearLayout");
- classNameAndTextList.add("android.widget.LinearLayout");
- classNameAndTextList.add("android.widget.ButtonButton1");
- classNameAndTextList.add("android.widget.ButtonButton2");
- classNameAndTextList.add("android.widget.ButtonButton3");
- classNameAndTextList.add("android.widget.ButtonButton4");
- classNameAndTextList.add("android.widget.ButtonButton5");
- classNameAndTextList.add("android.widget.ButtonButton6");
- classNameAndTextList.add("android.widget.ButtonButton7");
- classNameAndTextList.add("android.widget.ButtonButton8");
- classNameAndTextList.add("android.widget.ButtonButton9");
-
- Queue fringe = new LinkedList();
- fringe.add(getAwaitedAccessibilityEventSource());
-
- // do a BFS traversal and check nodes
- while (!fringe.isEmpty()) {
- AccessibilityNodeInfo current = fringe.poll();
-
- CharSequence text = current.getText();
- String receivedClassNameAndText = current.getClassName().toString()
- + ((text != null) ? text.toString() : "");
- String expectedClassNameAndText = classNameAndTextList.remove(0);
-
- assertEquals("Did not get the expected node info",
- expectedClassNameAndText, receivedClassNameAndText);
-
- final int childCount = current.getChildCount();
- for (int i = 0; i < childCount; i++) {
- AccessibilityNodeInfo child = current.getChild(i);
- fringe.add(child);
- }
- }
- }
-
- @LargeTest
- public void testPerformActionFocus() throws Exception {
- // find a view and make sure it is not focused
- AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
- getAwaitedAccessibilityEventSource(), R.string.button5);
- assertFalse(button.isFocused());
-
- // focus the view
- assertTrue(button.performAction(ACTION_FOCUS));
-
- // find the view again and make sure it is focused
- button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),
- R.string.button5);
- assertTrue(button.isFocused());
- }
-
- @LargeTest
- public void testPerformActionClearFocus() throws Exception {
- // find a view and make sure it is not focused
- AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
- getAwaitedAccessibilityEventSource(), R.string.button5);
- assertFalse(button.isFocused());
-
- // focus the view
- assertTrue(button.performAction(ACTION_FOCUS));
-
- // find the view again and make sure it is focused
- button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),
- R.string.button5);
- assertTrue(button.isFocused());
-
- // unfocus the view
- assertTrue(button.performAction(ACTION_CLEAR_FOCUS));
-
- // find the view again and make sure it is not focused
- button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),
- R.string.button5);
- assertFalse(button.isFocused());
- }
-
- @LargeTest
- public void testPerformActionSelect() throws Exception {
- // find a view and make sure it is not selected
- AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
- getAwaitedAccessibilityEventSource(), R.string.button5);
- assertFalse(button.isSelected());
-
- // select the view
- assertTrue(button.performAction(ACTION_SELECT));
-
- // find the view again and make sure it is selected
- button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),
- R.string.button5);
- assertTrue(button.isSelected());
- }
-
- @LargeTest
- public void testPerformActionClearSelection() throws Exception {
- // find a view and make sure it is not selected
- AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
- getAwaitedAccessibilityEventSource(), R.string.button5);
- assertFalse(button.isSelected());
-
- // select the view
- assertTrue(button.performAction(ACTION_SELECT));
-
- // find the view again and make sure it is selected
- button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),R
- .string.button5);
-
- assertTrue(button.isSelected());
-
- // unselect the view
- assertTrue(button.performAction(ACTION_CLEAR_SELECTION));
-
- // find the view again and make sure it is not selected
- button = findAccessibilityNodeInfoByText(getAwaitedAccessibilityEventSource(),
- R.string.button5);
- assertFalse(button.isSelected());
- }
-
- @LargeTest
- public void testGetEventSource() throws Exception {
- // find a view and make sure it is not focused
- final AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
- getAwaitedAccessibilityEventSource(), R.string.button5);
- assertFalse(button.isSelected());
-
- // focus and wait for the event
- AccessibilityQueryBridge bridge = AccessibilityQueryBridge.getInstance(
- getInstrumentation().getContext());
- bridge.perfromActionAndWaitForEvent(
- new Runnable() {
- @Override
- public void run() {
- assertTrue(button.performAction(ACTION_FOCUS));
- }
- },
- new AccessibilityEventFilter() {
- @Override
- public boolean accept(AccessibilityEvent event) {
- return (event.getEventType() == AccessibilityEvent.TYPE_VIEW_FOCUSED);
- }
- });
-
- // check that last event source
- AccessibilityNodeInfo source = getAwaitedAccessibilityEventSource();
- assertNotNull(source);
-
- // bounds
- Rect buttonBounds = new Rect();
- button.getBoundsInParent(buttonBounds);
- Rect sourceBounds = new Rect();
- source.getBoundsInParent(sourceBounds);
-
- assertEquals(buttonBounds.left, sourceBounds.left);
- assertEquals(buttonBounds.right, sourceBounds.right);
- assertEquals(buttonBounds.top, sourceBounds.top);
- assertEquals(buttonBounds.bottom, sourceBounds.bottom);
-
- // char sequence attributes
- assertEquals(button.getPackageName(), source.getPackageName());
- assertEquals(button.getClassName(), source.getClassName());
- assertEquals(button.getText(), source.getText());
- assertSame(button.getContentDescription(), source.getContentDescription());
-
- // boolean attributes
- assertSame(button.isFocusable(), source.isFocusable());
- assertSame(button.isClickable(), source.isClickable());
- assertSame(button.isEnabled(), source.isEnabled());
- assertNotSame(button.isFocused(), source.isFocused());
- assertSame(button.isLongClickable(), source.isLongClickable());
- assertSame(button.isPassword(), source.isPassword());
- assertSame(button.isSelected(), source.isSelected());
- assertSame(button.isCheckable(), source.isCheckable());
- assertSame(button.isChecked(), source.isChecked());
- }
-
- @LargeTest
- public void testObjectContract() throws Exception {
- // find a view and make sure it is not focused
- AccessibilityNodeInfo button = findAccessibilityNodeInfoByText(
- getAwaitedAccessibilityEventSource(), R.string.button5);
- AccessibilityNodeInfo parent = button.getParent();
- final int childCount = parent.getChildCount();
- for (int i = 0; i < childCount; i++) {
- AccessibilityNodeInfo child = parent.getChild(i);
- assertNotNull(child);
- if (child.equals(button)) {
- assertEquals("Equal objects must have same hasCode.", button.hashCode(),
- child.hashCode());
- return;
- }
- }
- fail("Parent's children do not have the info whose parent is the parent.");
- }
-
- @Override
- protected void scrubClass(Class testCaseClass) {
- /* intentionally do not scrub */
- }
-
- /**
- * Starts the activity under tests and waits for the first accessibility
- * event from that activity.
- */
- private void startActivityAndWaitForFirstEvent() {
- AccessibilityQueryBridge bridge = AccessibilityQueryBridge.getInstance(
- getInstrumentation().getContext());
- bridge.perfromActionAndWaitForEvent(
- new Runnable() {
- @Override
- public void run() {
- getActivity();
- }
- },
- new AccessibilityEventFilter() {
- @Override
- public boolean accept(AccessibilityEvent event) {
- final int eventType = event.getEventType();
- CharSequence packageName = event.getPackageName();
- Context targetContext = getInstrumentation().getTargetContext();
- return (eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED
- && targetContext.getPackageName().equals(packageName));
- }
- });
- }
-
- /**
- * @return The source of the last accessibility event.
- */
- private AccessibilityNodeInfo getAwaitedAccessibilityEventSource() {
- AccessibilityQueryBridge bridge = AccessibilityQueryBridge.getInstance(
- getInstrumentation().getContext());
- AccessibilityEvent event = bridge.getAwaitedAccessibilityEvent();
- if (event != null) {
- return event.getSource();
- }
- return null;
- }
-
- private List findAccessibilityNodeInfosByText(AccessibilityNodeInfo root,
- String text) {
- if (root != null) {
- return root.findAccessibilityNodeInfosByText(text);
- }
- return Collections.emptyList();
- }
-
- /**
- * Finds the first accessibility info that contains text. The search starts
- * from the given root
- *
- * @param root Node from which to start the search.
- * @param resId Resource id of the searched text.
- * @return The node with this text or null.
- */
- private AccessibilityNodeInfo findAccessibilityNodeInfoByText(AccessibilityNodeInfo root,
- int resId) {
- return findAccessibilityNodeInfoByText(root,
- getInstrumentation().getContext().getString(resId));
- }
-
- /**
- * Finds the first accessibility info that contains text. The search starts
- * from the given root
- *
- * @param root Node from which to start the search.
- * @param text The searched text.
- * @return The node with this text or null.
- */
- private AccessibilityNodeInfo findAccessibilityNodeInfoByText(AccessibilityNodeInfo root,
- String text) {
- List nodes = findAccessibilityNodeInfosByText(root, text);
- if (nodes != null && !nodes.isEmpty()) {
- return nodes.get(0);
- }
- return null;
- }
-
- /**
- * This class serves as a bridge for querying the screen content.
- * The bride is connected of a delegating accessibility service.
- */
- static class AccessibilityQueryBridge extends AccessibilityService {
-
- /**
- * The singleton instance.
- */
- private static AccessibilityQueryBridge sInstance;
-
- /**
- * Helper for connecting to the delegating accessibility service.
- */
- private final AccessibilityDelegateHelper mAccessibilityDelegateHelper;
-
- /**
- * The last received accessibility event.
- */
- private AccessibilityEvent mAwaitedAccessbiliyEvent;
-
- /**
- * Barrier for synchronizing waiting client and this bridge.
- */
- private CyclicBarrier mBarrier = new CyclicBarrier(2);
-
- /**
- * Filter for the currently waited event.
- */
- private AccessibilityEventFilter mWaitedFilter;
-
- /**
- * Gets the {@link AccessibilityQueryBridge} singleton.
- *
- * @param context A context handle.
- * @return The mock service.
- */
- public static AccessibilityQueryBridge getInstance(Context context) {
- if (sInstance == null) {
- // since we do bind once and do not unbind from the delegating
- // service and JUnit3 does not support @BeforeTest and @AfterTest,
- // we will leak a service connection after the test but this
- // does not affect the test results and the test is twice as fast
- sInstance = new AccessibilityQueryBridge(context);
- }
- return sInstance;
- }
-
- private AccessibilityQueryBridge(Context context) {
- mAccessibilityDelegateHelper = new AccessibilityDelegateHelper(this);
- mAccessibilityDelegateHelper.bindToDelegatingAccessibilityService(context);
- }
-
- @Override
- public void onAccessibilityEvent(AccessibilityEvent event) {
- if (mWaitedFilter != null && mWaitedFilter.accept(event)) {
- mAwaitedAccessbiliyEvent = AccessibilityEvent.obtain(event);
- awaitOnBarrier();
- }
- }
-
- @Override
- public void onInterrupt() {
- /* do nothing */
- }
-
- /**
- * @return The event that was waited for.
- */
- public AccessibilityEvent getAwaitedAccessibilityEvent() {
- return mAwaitedAccessbiliyEvent;
- }
-
- /**
- * Performs an action and waits for the resulting event.
- *
- * @param action The action to perform.
- * @param filter Filter for recognizing the waited event.
- */
- public void perfromActionAndWaitForEvent(Runnable action,
- AccessibilityEventFilter filter) {
- reset();
- mWaitedFilter = filter;
- action.run();
- awaitOnBarrier();
- }
-
- /**
- * Rests the internal state.
- */
- private void reset() {
- if (mAwaitedAccessbiliyEvent != null) {
- mAwaitedAccessbiliyEvent.recycle();
- mAwaitedAccessbiliyEvent = null;
- }
- mBarrier.reset();
- mWaitedFilter = null;
- }
-
- /**
- * Calls await of the barrier taking care of the exceptions.
- */
- private void awaitOnBarrier() {
- try {
- mBarrier.await(AccessibilityDelegateHelper.TIMEOUT_ASYNC_PROCESSING,
- TimeUnit.MILLISECONDS);
- } catch (InterruptedException ie) {
- /* ignore */
- } catch (BrokenBarrierException bbe) {
- /* ignore */
- } catch (TimeoutException te) {
- /* ignore */
- }
- }
- }
-}
diff --git a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
index 5315cec..c306c79 100644
--- a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
+++ b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
@@ -28,7 +28,6 @@ import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
-import android.os.StrictMode;
import android.test.AndroidTestCase;
import java.io.IOException;
@@ -150,21 +149,17 @@ public class AccountManagerTest extends AndroidTestCase {
}
private void validateOptions(Bundle expectedOptions, Bundle actualOptions) {
- // In ICS AccountManager may add options to indicate the caller id.
- // We only validate that the passed in options are present in the actual ones
- if (expectedOptions != null) {
+ if (expectedOptions == null) {
+ if (actualOptions != null) {
+ assertTrue(actualOptions.isEmpty());
+ }
+ } else {
assertNotNull(actualOptions);
assertEquals(expectedOptions.get(OPTION_NAME_1), actualOptions.get(OPTION_NAME_1));
assertEquals(expectedOptions.get(OPTION_NAME_2), actualOptions.get(OPTION_NAME_2));
}
}
- private void validateSystemOptions(Bundle options) {
- assertNotNull(options.getString(AccountManager.KEY_ANDROID_PACKAGE_NAME));
- assertTrue(options.containsKey(AccountManager.KEY_CALLER_UID));
- assertTrue(options.containsKey(AccountManager.KEY_CALLER_PID));
- }
-
private void validateCredentials() {
assertEquals(ACCOUNT, mockAuthenticator.getAccount());
}
@@ -275,7 +270,6 @@ public class AccountManagerTest extends AndroidTestCase {
validateAccountAndAuthTokenType();
validateFeatures();
validateOptions(OPTIONS_BUNDLE, mockAuthenticator.mOptionsAddAccount);
- validateSystemOptions(mockAuthenticator.mOptionsAddAccount);
validateOptions(null, mockAuthenticator.mOptionsUpdateCredentials);
validateOptions(null, mockAuthenticator.mOptionsConfirmCredentials);
validateOptions(null, mockAuthenticator.mOptionsGetAuthToken);
@@ -727,7 +721,7 @@ public class AccountManagerTest extends AndroidTestCase {
validateOptions(null, mockAuthenticator.mOptionsUpdateCredentials);
validateOptions(null, mockAuthenticator.mOptionsConfirmCredentials);
validateOptions(OPTIONS_BUNDLE, mockAuthenticator.mOptionsGetAuthToken);
- validateSystemOptions(mockAuthenticator.mOptionsGetAuthToken);
+
}
/**
@@ -1334,28 +1328,4 @@ public class AccountManagerTest extends AndroidTestCase {
handler);
waitForLatch(latch);
}
-
- /**
- * Tests that AccountManagerService is properly caching data.
- */
- public void testGetsAreCached() throws IOException, AuthenticatorException,
- OperationCanceledException {
-
- // Add an account,
- assertEquals(false, isAccountPresent(am.getAccounts(), ACCOUNT));
- addAccountExplicitly(ACCOUNT, ACCOUNT_PASSWORD, null /* userData */);
-
- // Then verify that we don't hit disk retrieving it,
- StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
- try {
- StrictMode.setThreadPolicy(
- new StrictMode.ThreadPolicy.Builder().detectDiskReads().penaltyDeath().build());
- Account[] accounts = am.getAccounts();
- assertNotNull(accounts);
- assertTrue(accounts.length > 0);
- } finally {
- StrictMode.setThreadPolicy(oldPolicy);
- }
- }
-
}
diff --git a/tests/tests/admin/Android.mk b/tests/tests/admin/Android.mk
deleted file mode 100644
index 3228d85..0000000
--- a/tests/tests/admin/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2011 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CtsAdminTestCases
-
-LOCAL_INSTRUMENTATION_FOR := CtsDeviceAdmin
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
diff --git a/tests/tests/admin/AndroidManifest.xml b/tests/tests/admin/AndroidManifest.xml
deleted file mode 100644
index 102c7ec..0000000
--- a/tests/tests/admin/AndroidManifest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/tests/admin/src/android/admin/cts/DeviceAdminInfoTest.java b/tests/tests/admin/src/android/admin/cts/DeviceAdminInfoTest.java
deleted file mode 100644
index b38ef4c..0000000
--- a/tests/tests/admin/src/android/admin/cts/DeviceAdminInfoTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.admin.cts;
-
-import android.app.admin.DeviceAdminInfo;
-import android.content.ComponentName;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.test.AndroidTestCase;
-
-public class DeviceAdminInfoTest extends AndroidTestCase {
-
- private PackageManager mPackageManager;
-
- private ComponentName mComponent;
-
- private ComponentName mSecondComponent;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mPackageManager = mContext.getPackageManager();
- mComponent = getReceiverComponent();
- mSecondComponent = getSecondReceiverComponent();
- }
-
- static ComponentName getReceiverComponent() {
- return new ComponentName("android.deviceadmin.cts",
- "android.deviceadmin.cts.CtsDeviceAdminReceiver");
- }
-
- static ComponentName getSecondReceiverComponent() {
- return new ComponentName("android.deviceadmin.cts",
- "android.deviceadmin.cts.CtsDeviceAdminReceiver2");
- }
-
- public void testDeviceAdminInfo() throws Exception {
- ResolveInfo resolveInfo = new ResolveInfo();
- resolveInfo.activityInfo = mPackageManager.getReceiverInfo(mComponent,
- PackageManager.GET_META_DATA);
-
- DeviceAdminInfo info = new DeviceAdminInfo(mContext, resolveInfo);
- assertEquals(mComponent, info.getComponent());
- assertEquals(mComponent.getPackageName(), info.getPackageName());
- assertEquals(mComponent.getClassName(), info.getReceiverName());
-
- assertTrue(info.usesPolicy(DeviceAdminInfo.USES_POLICY_FORCE_LOCK));
- assertTrue(info.usesPolicy(DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD));
- assertTrue(info.usesPolicy(DeviceAdminInfo.USES_POLICY_RESET_PASSWORD));
- assertTrue(info.usesPolicy(DeviceAdminInfo.USES_POLICY_WATCH_LOGIN));
- assertTrue(info.usesPolicy(DeviceAdminInfo.USES_POLICY_WIPE_DATA));
-
- assertEquals("force-lock",
- info.getTagForPolicy(DeviceAdminInfo.USES_POLICY_FORCE_LOCK));
- assertEquals("limit-password",
- info.getTagForPolicy(DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD));
- assertEquals("reset-password",
- info.getTagForPolicy(DeviceAdminInfo.USES_POLICY_RESET_PASSWORD));
- assertEquals("watch-login",
- info.getTagForPolicy(DeviceAdminInfo.USES_POLICY_WATCH_LOGIN));
- assertEquals("wipe-data",
- info.getTagForPolicy(DeviceAdminInfo.USES_POLICY_WIPE_DATA));
- }
-
- public void testDeviceAdminInfo2() throws Exception {
- ResolveInfo resolveInfo = new ResolveInfo();
- resolveInfo.activityInfo = mPackageManager.getReceiverInfo(mSecondComponent,
- PackageManager.GET_META_DATA);
-
- DeviceAdminInfo info = new DeviceAdminInfo(mContext, resolveInfo);
- assertEquals(mSecondComponent, info.getComponent());
- assertEquals(mSecondComponent.getPackageName(), info.getPackageName());
- assertEquals(mSecondComponent.getClassName(), info.getReceiverName());
-
- assertFalse(info.usesPolicy(DeviceAdminInfo.USES_POLICY_FORCE_LOCK));
- assertTrue(info.usesPolicy(DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD));
- assertTrue(info.usesPolicy(DeviceAdminInfo.USES_POLICY_RESET_PASSWORD));
- assertFalse(info.usesPolicy(DeviceAdminInfo.USES_POLICY_WATCH_LOGIN));
- assertTrue(info.usesPolicy(DeviceAdminInfo.USES_POLICY_WIPE_DATA));
-
- assertEquals("force-lock",
- info.getTagForPolicy(DeviceAdminInfo.USES_POLICY_FORCE_LOCK));
- assertEquals("limit-password",
- info.getTagForPolicy(DeviceAdminInfo.USES_POLICY_LIMIT_PASSWORD));
- assertEquals("reset-password",
- info.getTagForPolicy(DeviceAdminInfo.USES_POLICY_RESET_PASSWORD));
- assertEquals("watch-login",
- info.getTagForPolicy(DeviceAdminInfo.USES_POLICY_WATCH_LOGIN));
- assertEquals("wipe-data",
- info.getTagForPolicy(DeviceAdminInfo.USES_POLICY_WIPE_DATA));
- }
-}
diff --git a/tests/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java b/tests/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java
deleted file mode 100644
index b9f842d..0000000
--- a/tests/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.admin.cts;
-
-import android.app.admin.DeviceAdminReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.test.AndroidTestCase;
-
-public class DeviceAdminReceiverTest extends AndroidTestCase {
-
- private static final String DISABLE_WARNING = "Disable Warning";
-
- private static final int PASSWORD_CHANGED = 0x1;
- private static final int PASSWORD_FAILED = 0x2;
- private static final int PASSWORD_SUCCEEDED = 0x4;
- private static final int DEVICE_ADMIN_ENABLED = 0x8;
- private static final int DEVICE_ADMIN_DISABLE_REQUESTED = 0x10;
- private static final int DEVICE_ADMIN_DISABLED = 0x20;
-
- private TestReceiver mReceiver;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mReceiver = new TestReceiver();
- }
-
- public void testOnReceive() {
- mReceiver.reset();
- mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_PASSWORD_CHANGED));
- assertTrue(mReceiver.hasFlags(PASSWORD_CHANGED));
-
- mReceiver.reset();
- mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_PASSWORD_FAILED));
- assertTrue(mReceiver.hasFlags(PASSWORD_FAILED));
-
- mReceiver.reset();
- mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_PASSWORD_SUCCEEDED));
- assertTrue(mReceiver.hasFlags(PASSWORD_SUCCEEDED));
-
- mReceiver.reset();
- mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED));
- assertTrue(mReceiver.hasFlags(DEVICE_ADMIN_ENABLED));
-
- mReceiver.reset();
- mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLED));
- assertTrue(mReceiver.hasFlags(DEVICE_ADMIN_DISABLED));
- }
-
- private class TestReceiver extends DeviceAdminReceiver {
-
- private int mFlags = 0;
-
- void reset() {
- mFlags = 0;
- }
-
- boolean hasFlags(int flags) {
- return mFlags == flags;
- }
-
- @Override
- public void onPasswordChanged(Context context, Intent intent) {
- super.onPasswordChanged(context, intent);
- mFlags |= PASSWORD_CHANGED;
- }
-
- @Override
- public void onPasswordFailed(Context context, Intent intent) {
- super.onPasswordFailed(context, intent);
- mFlags |= PASSWORD_FAILED;
- }
-
- @Override
- public void onPasswordSucceeded(Context context, Intent intent) {
- super.onPasswordSucceeded(context, intent);
- mFlags |= PASSWORD_SUCCEEDED;
- }
-
- @Override
- public void onEnabled(Context context, Intent intent) {
- super.onEnabled(context, intent);
- mFlags |= DEVICE_ADMIN_ENABLED;
- }
-
- @Override
- public CharSequence onDisableRequested(Context context, Intent intent) {
- mFlags |= DEVICE_ADMIN_DISABLE_REQUESTED;
- return DISABLE_WARNING;
- }
-
- @Override
- public void onDisabled(Context context, Intent intent) {
- super.onDisabled(context, intent);
- mFlags |= DEVICE_ADMIN_DISABLED;
- }
- }
-}
diff --git a/tests/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java b/tests/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
deleted file mode 100644
index af47299..0000000
--- a/tests/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.admin.cts;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.test.AndroidTestCase;
-
-import java.util.List;
-
-/**
- * Test that exercises {@link DevicePolicyManager}. The test requires that the
- * CtsDeviceAdminReceiver be installed via the CtsDeviceAdmin.apk and be
- * activated via "Settings > Location & security > Select device administrators".
- */
-public class DevicePolicyManagerTest extends AndroidTestCase {
-
- private DevicePolicyManager mDevicePolicyManager;
-
- private ComponentName mComponent;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mDevicePolicyManager = (DevicePolicyManager)
- mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
- mComponent = DeviceAdminInfoTest.getReceiverComponent();
- setBlankPassword();
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- setBlankPassword();
- }
-
- private void setBlankPassword() {
- // Reset the password to nothing for future tests...
- mDevicePolicyManager.setPasswordQuality(mComponent,
- DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
- mDevicePolicyManager.setPasswordMinimumLength(mComponent, 0);
- assertTrue(mDevicePolicyManager.resetPassword("", 0));
- }
-
- public void testGetActiveAdmins() {
- List activeAdmins = mDevicePolicyManager.getActiveAdmins();
- assertFalse(activeAdmins.isEmpty());
- assertTrue(activeAdmins.contains(mComponent));
- assertTrue(mDevicePolicyManager.isAdminActive(mComponent));
- }
-
- public void testGetMaximumTimeToLock() {
- mDevicePolicyManager.setMaximumTimeToLock(mComponent, 3000);
- assertEquals(3000, mDevicePolicyManager.getMaximumTimeToLock(mComponent));
-
- mDevicePolicyManager.setMaximumTimeToLock(mComponent, 5000);
- assertEquals(5000, mDevicePolicyManager.getMaximumTimeToLock(mComponent));
- }
-
- public void testGetMaximumFailedPasswordsForWipe() {
- mDevicePolicyManager.setMaximumFailedPasswordsForWipe(mComponent, 3);
- assertEquals(3, mDevicePolicyManager.getMaximumFailedPasswordsForWipe(mComponent));
-
- mDevicePolicyManager.setMaximumFailedPasswordsForWipe(mComponent, 5);
- assertEquals(5, mDevicePolicyManager.getMaximumFailedPasswordsForWipe(mComponent));
- }
-
- public void testPasswordQuality_something() {
- mDevicePolicyManager.setPasswordQuality(mComponent,
- DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
- assertEquals(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,
- mDevicePolicyManager.getPasswordQuality(mComponent));
- assertFalse(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertTrue(mDevicePolicyManager.resetPassword("123", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd123", 0));
- assertTrue(mDevicePolicyManager.isActivePasswordSufficient());
-
- mDevicePolicyManager.setPasswordMinimumLength(mComponent, 10);
- assertEquals(10, mDevicePolicyManager.getPasswordMinimumLength(mComponent));
- assertFalse(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertFalse(mDevicePolicyManager.resetPassword("123", 0));
- assertFalse(mDevicePolicyManager.resetPassword("abcd", 0));
- assertFalse(mDevicePolicyManager.resetPassword("abcd123", 0));
-
- mDevicePolicyManager.setPasswordMinimumLength(mComponent, 3);
- assertEquals(3, mDevicePolicyManager.getPasswordMinimumLength(mComponent));
- assertTrue(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertTrue(mDevicePolicyManager.resetPassword("123", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd123", 0));
- }
-
- public void testPasswordQuality_numeric() {
- mDevicePolicyManager.setPasswordQuality(mComponent,
- DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
- assertEquals(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC,
- mDevicePolicyManager.getPasswordQuality(mComponent));
- assertFalse(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertTrue(mDevicePolicyManager.resetPassword("123", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd123", 0));
- assertTrue(mDevicePolicyManager.isActivePasswordSufficient());
-
- mDevicePolicyManager.setPasswordMinimumLength(mComponent, 10);
- assertEquals(10, mDevicePolicyManager.getPasswordMinimumLength(mComponent));
- assertFalse(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertFalse(mDevicePolicyManager.resetPassword("123", 0));
- assertFalse(mDevicePolicyManager.resetPassword("abcd", 0));
- assertFalse(mDevicePolicyManager.resetPassword("abcd123", 0));
-
- mDevicePolicyManager.setPasswordMinimumLength(mComponent, 3);
- assertEquals(3, mDevicePolicyManager.getPasswordMinimumLength(mComponent));
- assertTrue(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertTrue(mDevicePolicyManager.resetPassword("123", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd123", 0));
- }
-
- public void testPasswordQuality_alphabetic() {
- mDevicePolicyManager.setPasswordQuality(mComponent,
- DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
- assertEquals(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC,
- mDevicePolicyManager.getPasswordQuality(mComponent));
- assertFalse(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertFalse(mDevicePolicyManager.resetPassword("123", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd123", 0));
- assertTrue(mDevicePolicyManager.isActivePasswordSufficient());
-
- mDevicePolicyManager.setPasswordMinimumLength(mComponent, 10);
- assertEquals(10, mDevicePolicyManager.getPasswordMinimumLength(mComponent));
- assertFalse(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertFalse(mDevicePolicyManager.resetPassword("123", 0));
- assertFalse(mDevicePolicyManager.resetPassword("abcd", 0));
- assertFalse(mDevicePolicyManager.resetPassword("abcd123", 0));
-
- mDevicePolicyManager.setPasswordMinimumLength(mComponent, 3);
- assertEquals(3, mDevicePolicyManager.getPasswordMinimumLength(mComponent));
- assertTrue(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertFalse(mDevicePolicyManager.resetPassword("123", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd123", 0));
- }
-
- public void testPasswordQuality_alphanumeric() {
- mDevicePolicyManager.setPasswordQuality(mComponent,
- DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC);
- assertEquals(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC,
- mDevicePolicyManager.getPasswordQuality(mComponent));
- assertFalse(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertFalse(mDevicePolicyManager.resetPassword("123", 0));
- assertFalse(mDevicePolicyManager.resetPassword("abcd", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd123", 0));
- assertTrue(mDevicePolicyManager.isActivePasswordSufficient());
-
- mDevicePolicyManager.setPasswordMinimumLength(mComponent, 10);
- assertEquals(10, mDevicePolicyManager.getPasswordMinimumLength(mComponent));
- assertFalse(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertFalse(mDevicePolicyManager.resetPassword("123", 0));
- assertFalse(mDevicePolicyManager.resetPassword("abcd", 0));
- assertFalse(mDevicePolicyManager.resetPassword("abcd123", 0));
-
- mDevicePolicyManager.setPasswordMinimumLength(mComponent, 3);
- assertEquals(3, mDevicePolicyManager.getPasswordMinimumLength(mComponent));
- assertTrue(mDevicePolicyManager.isActivePasswordSufficient());
-
- assertFalse(mDevicePolicyManager.resetPassword("123", 0));
- assertFalse(mDevicePolicyManager.resetPassword("abcd", 0));
- assertTrue(mDevicePolicyManager.resetPassword("abcd123", 0));
- }
-}
diff --git a/tests/tests/app/src/android/app/backup/cts/BackupAgentHelperTest.java b/tests/tests/app/src/android/app/backup/cts/BackupAgentHelperTest.java
deleted file mode 100644
index 67e09a7..0000000
--- a/tests/tests/app/src/android/app/backup/cts/BackupAgentHelperTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.app.backup.cts;
-
-import android.app.backup.BackupAgentHelper;
-import android.app.backup.FileBackupHelper;
-import android.app.backup.SharedPreferencesBackupHelper;
-import android.test.AndroidTestCase;
-
-public class BackupAgentHelperTest extends AndroidTestCase {
-
- public void testBackupAgentHelper() {
- BackupAgentHelper helper = new BackupAgentHelper();
- helper.addHelper("prefs", new SharedPreferencesBackupHelper(mContext));
- helper.addHelper("files", new FileBackupHelper(mContext));
- }
-}
diff --git a/tests/tests/app/src/android/app/backup/cts/BackupAgentTest.java b/tests/tests/app/src/android/app/backup/cts/BackupAgentTest.java
deleted file mode 100644
index d3c3fd7..0000000
--- a/tests/tests/app/src/android/app/backup/cts/BackupAgentTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.app.backup.cts;
-
-import android.app.backup.BackupAgent;
-import android.app.backup.BackupDataInput;
-import android.app.backup.BackupDataOutput;
-import android.os.ParcelFileDescriptor;
-import android.test.AndroidTestCase;
-
-import java.io.IOException;
-
-public class BackupAgentTest extends AndroidTestCase {
-
- public void testBackupAgent() {
- BackupAgent agent = new TestBackupAgent();
- agent.onCreate();
- agent.onDestroy();
- }
-
- class TestBackupAgent extends BackupAgent {
-
- @Override
- public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data,
- ParcelFileDescriptor newState) throws IOException {
- }
-
- @Override
- public void onRestore(BackupDataInput data, int appVersionCode,
- ParcelFileDescriptor newState) throws IOException {
- }
- }
-}
diff --git a/tests/tests/app/src/android/app/backup/cts/BackupManagerTest.java b/tests/tests/app/src/android/app/backup/cts/BackupManagerTest.java
deleted file mode 100644
index f21f847..0000000
--- a/tests/tests/app/src/android/app/backup/cts/BackupManagerTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.app.backup.cts;
-
-import android.app.backup.BackupManager;
-import android.app.backup.RestoreObserver;
-import android.test.AndroidTestCase;
-
-public class BackupManagerTest extends AndroidTestCase {
-
- public void testBackupManager() throws Exception {
- // Check that these don't crash as if they were called in an app...
- BackupManager backupManager = new BackupManager(mContext);
- backupManager.dataChanged();
- BackupManager.dataChanged("com.android.cts.stub");
-
- // Backup isn't expected to work in this test but check for obvious bugs...
- int result = backupManager.requestRestore(new RestoreObserver() {});
- assertTrue(result != 0);
- }
-}
diff --git a/tests/tests/app/src/android/app/backup/cts/FileBackupHelperTest.java b/tests/tests/app/src/android/app/backup/cts/FileBackupHelperTest.java
deleted file mode 100644
index bb09b7e..0000000
--- a/tests/tests/app/src/android/app/backup/cts/FileBackupHelperTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.app.backup.cts;
-
-import android.app.backup.FileBackupHelper;
-import android.test.AndroidTestCase;
-
-public class FileBackupHelperTest extends AndroidTestCase {
-
- public void testConstructor() {
- new FileBackupHelper(mContext);
- new FileBackupHelper(mContext, "test-file-1");
- new FileBackupHelper(mContext, "test-file-1", "test-file-2");
- }
-}
diff --git a/tests/tests/app/src/android/app/backup/cts/SharedPreferencesBackupHelperTest.java b/tests/tests/app/src/android/app/backup/cts/SharedPreferencesBackupHelperTest.java
deleted file mode 100644
index a1f2488..0000000
--- a/tests/tests/app/src/android/app/backup/cts/SharedPreferencesBackupHelperTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.app.backup.cts;
-
-import android.app.backup.SharedPreferencesBackupHelper;
-import android.test.AndroidTestCase;
-
-public class SharedPreferencesBackupHelperTest extends AndroidTestCase {
-
- public void testConstructor() {
- new SharedPreferencesBackupHelper(mContext);
- new SharedPreferencesBackupHelper(mContext, "test-prefs-group-1");
- new SharedPreferencesBackupHelper(mContext, "test-prefs-group-1", "test-prefs-group-2");
- }
-}
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
deleted file mode 100644
index 1db04ea..0000000
--- a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.app.cts;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.DisplayMetrics;
-import android.view.Display;
-import android.view.WindowManager;
-
-/**
- * {@link ActivityInstrumentationTestCase2} that tests {@link ActivityManager#getMemoryClass()}
- * by checking that the memory class matches the proper screen density and by launching an
- * application that attempts to allocate memory on the heap.
- */
-public class ActivityManagerMemoryClassTest
- extends ActivityInstrumentationTestCase2 {
-
- public ActivityManagerMemoryClassTest() {
- super(ActivityManagerMemoryClassLaunchActivity.class);
- }
-
- public void testGetMemoryClass() throws Exception {
- int memoryClass = getMemoryClass();
- int screenDensity = getScreenDensity();
- int screenSize = getScreenSize();
- assertMemoryForScreenDensity(memoryClass, screenDensity, screenSize);
-
- runHeapTestApp(memoryClass);
- }
-
- private int getMemoryClass() {
- Context context = getInstrumentation().getTargetContext();
- ActivityManager activityManager =
- (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
- return activityManager.getMemoryClass();
- }
-
- private int getScreenDensity() {
- Context context = getInstrumentation().getTargetContext();
- WindowManager windowManager =
- (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
- Display display = windowManager.getDefaultDisplay();
- DisplayMetrics metrics = new DisplayMetrics();
- display.getMetrics(metrics);
- return metrics.densityDpi;
- }
-
- private int getScreenSize() {
- Context context = getInstrumentation().getTargetContext();
- Configuration config = context.getResources().getConfiguration();
- return config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
- }
-
- private void assertMemoryForScreenDensity(int memoryClass, int screenDensity, int screenSize) {
- int expectedMinimumMemory = -1;
- boolean isXLarge = screenSize == Configuration.SCREENLAYOUT_SIZE_XLARGE;
- switch (screenDensity) {
- case DisplayMetrics.DENSITY_LOW:
- expectedMinimumMemory = 16;
- break;
-
- case DisplayMetrics.DENSITY_MEDIUM:
- expectedMinimumMemory = isXLarge ? 32 : 16;
- break;
-
- case DisplayMetrics.DENSITY_HIGH:
- case DisplayMetrics.DENSITY_TV:
- expectedMinimumMemory = isXLarge ? 64 : 32;
- break;
-
- case DisplayMetrics.DENSITY_XHIGH:
- expectedMinimumMemory = isXLarge ? 128 : 64;
- break;
-
- default:
- throw new IllegalArgumentException("No memory requirement specified "
- + " for screen density " + screenDensity);
- }
-
- assertTrue("Expected to have at least " + expectedMinimumMemory
- + "mb of memory for screen density " + screenDensity,
- memoryClass >= expectedMinimumMemory);
- }
-
- private void runHeapTestApp(int memoryClass) throws InterruptedException {
- Intent intent = new Intent();
- intent.putExtra(ActivityManagerMemoryClassLaunchActivity.MEMORY_CLASS_EXTRA,
- memoryClass);
- setActivityIntent(intent);
- ActivityManagerMemoryClassLaunchActivity activity = getActivity();
- assertEquals("The test application couldn't allocate memory close to the amount "
- + " specified by the memory class.", Activity.RESULT_OK, activity.getResult());
- }
-}
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerTest.java
index 217a17c..5b1c2b3 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerTest.java
@@ -305,21 +305,4 @@ public class ActivityManagerTest extends InstrumentationTestCase {
ConfigurationInfo conInf = mActivityManager.getDeviceConfigurationInfo();
assertNotNull(conInf);
}
-
- /**
- * Simple test for {@link ActivityManager.isUserAMonkey()} - verifies its false.
- *
- * TODO: test positive case
- */
- public void testIsUserAMonkey() {
- assertFalse(ActivityManager.isUserAMonkey());
- }
-
- /**
- * Verify that {@link ActivityManager.isRunningInTestHarness()} is false.
- */
- public void testIsRunningInTestHarness() {
- assertFalse("isRunningInTestHarness must be false in production builds",
- ActivityManager.isRunningInTestHarness());
- }
}
diff --git a/tests/tests/app/src/android/app/cts/AlertDialogTest.java b/tests/tests/app/src/android/app/cts/AlertDialogTest.java
index b5711ed..4ab57da 100644
--- a/tests/tests/app/src/android/app/cts/AlertDialogTest.java
+++ b/tests/tests/app/src/android/app/cts/AlertDialogTest.java
@@ -16,11 +16,6 @@
package android.app.cts;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
import android.app.AlertDialog;
import android.app.Instrumentation;
import android.content.Context;
@@ -34,6 +29,10 @@ import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
import android.view.View;
import android.widget.Button;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
/*
* Test AlertDialog
@@ -56,10 +55,15 @@ public class AlertDialogTest extends ActivityInstrumentationTestCase2 {
protected static final long SLEEP_TIME = 200;
+ private static final long MOTION_DOWN_TIME = 0L;
+ private static final long MOTION_EVENT_TIME = 0L;
+ private static final float MOTION_X = -20.0f;
+ private static final float MOTION_Y = -20.0f;
private static final String STUB_ACTIVITY_PACKAGE = "com.android.cts.stub";
private static final long TEST_TIMEOUT = 1000L;
@@ -84,12 +86,30 @@ public class DialogTest extends ActivityInstrumentationTestCase2= 0);
+
+ while (index != 0) {
+ sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
+ index--;
+ }
+
+ sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
}
@TestTargets({
@@ -121,7 +141,7 @@ public class DialogTest extends ActivityInstrumentationTestCase2 0);
+
+ while (index != 0) {
+ sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
+ index--;
+ }
+
+ sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
}
}
diff --git a/tests/tests/app/src/android/app/cts/WallpaperManagerTest.java b/tests/tests/app/src/android/app/cts/WallpaperManagerTest.java
deleted file mode 100644
index 62e00e9..0000000
--- a/tests/tests/app/src/android/app/cts/WallpaperManagerTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.app.cts;
-
-import android.app.WallpaperManager;
-import android.test.AndroidTestCase;
-
-public class WallpaperManagerTest extends AndroidTestCase {
-
- private WallpaperManager mWallpaperManager;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mWallpaperManager = WallpaperManager.getInstance(mContext);
- }
-
- public void testSuggestDesiredDimensions() {
- mWallpaperManager.suggestDesiredDimensions(320, 480);
- int desiredMinimumWidth = mWallpaperManager.getDesiredMinimumWidth();
- int desiredMinimumHeight = mWallpaperManager.getDesiredMinimumHeight();
- assertEquals(320, desiredMinimumWidth);
- assertEquals(480, desiredMinimumHeight);
- }
-}
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
index b0d3bf1..796298d 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
@@ -219,7 +219,6 @@ public class BasicAdapterTest extends AndroidTestCase {
assertTrue(adapter.isEnabled());
adapter.disable();
for (int i=0; i {
-
- private ClipboardManagerListenerActivity mActivity;
-
- private CountingClipChangedListener mListener;
-
- public ClipboardManagerListenerTest() {
- super(ClipboardManagerListenerActivity.class);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mActivity = getActivity();
- mListener = new CountingClipChangedListener();
- }
-
- public void testListener() throws Exception {
- mActivity.addPrimaryClipChangedListener(mListener);
- assertClipChangedCount(0);
-
- mActivity.setPrimaryClip(ClipData.newPlainText("Label", "Text"));
- assertClipChangedCount(1);
-
- mActivity.setPrimaryClip(ClipData.newPlainText("Label", "Text"));
- assertClipChangedCount(2);
-
- mActivity.removePrimaryClipChangedListener(mListener);
- mActivity.setPrimaryClip(ClipData.newRawUri("Label", Uri.parse("http://www.google.com")));
- assertNoClipChange(2);
- }
-
- private void assertClipChangedCount(final int expectedCount) {
- new DelayedCheck() {
- @Override
- protected boolean check() {
- return expectedCount == mListener.getCount();
- }
- }.run();
- }
-
- private void assertNoClipChange(int expectedCount) throws InterruptedException {
- Thread.sleep(1000);
- assertEquals(expectedCount, mListener.getCount());
- }
-
- class CountingClipChangedListener implements OnPrimaryClipChangedListener {
-
- private int mCount = 0;
-
- @Override
- public void onPrimaryClipChanged() {
- synchronized (this) {
- mCount++;
- }
- }
-
- public synchronized int getCount() {
- return mCount;
- }
- }
-}
diff --git a/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java b/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java
deleted file mode 100644
index bf0a175..0000000
--- a/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.content.cts;
-
-import android.content.ClipData;
-import android.content.ClipDescription;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ClipData.Item;
-import android.net.Uri;
-import android.test.AndroidTestCase;
-
-public class ClipboardManagerTest extends AndroidTestCase {
-
- private ClipboardManager mClipboardManager;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mClipboardManager = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
- }
-
- public void testSetGetText() {
- mClipboardManager.setText("Test Text 1");
- assertEquals("Test Text 1", mClipboardManager.getText());
-
- mClipboardManager.setText("Test Text 2");
- assertEquals("Test Text 2", mClipboardManager.getText());
- }
-
- public void testHasPrimaryClip() {
- if (mClipboardManager.hasPrimaryClip()) {
- assertNotNull(mClipboardManager.getPrimaryClip());
- assertNotNull(mClipboardManager.getPrimaryClipDescription());
- } else {
- assertNull(mClipboardManager.getPrimaryClip());
- assertNull(mClipboardManager.getPrimaryClipDescription());
- }
-
- mClipboardManager.setPrimaryClip(ClipData.newPlainText("Label", "Text"));
- assertTrue(mClipboardManager.hasPrimaryClip());
- }
-
- public void testSetPrimaryClip_plainText() {
- ClipData textData = ClipData.newPlainText("TextLabel", "Text");
- assertSetPrimaryClip(textData, "TextLabel",
- new String[] {ClipDescription.MIMETYPE_TEXT_PLAIN},
- new ExpectedClipItem("Text", null, null));
- }
-
- public void testSetPrimaryClip_intent() {
- Intent intent = new Intent(mContext, ClipboardManagerTest.class);
- ClipData intentData = ClipData.newIntent("IntentLabel", intent);
- assertSetPrimaryClip(intentData, "IntentLabel",
- new String[] {ClipDescription.MIMETYPE_TEXT_INTENT},
- new ExpectedClipItem(null, intent, null));
- }
-
- public void testSetPrimaryClip_rawUri() {
- Uri uri = Uri.parse("http://www.google.com");
- ClipData uriData = ClipData.newRawUri("UriLabel", uri);
- assertSetPrimaryClip(uriData, "UriLabel",
- new String[] {ClipDescription.MIMETYPE_TEXT_URILIST},
- new ExpectedClipItem(null, null, uri));
- }
-
- public void testSetPrimaryClip_contentUri() {
- Uri contentUri = Uri.parse("content://cts/test/for/clipboardmanager");
- ClipData contentUriData = ClipData.newUri(getContext().getContentResolver(),
- "ContentUriLabel", contentUri);
- assertSetPrimaryClip(contentUriData, "ContentUriLabel",
- new String[] {ClipDescription.MIMETYPE_TEXT_URILIST},
- new ExpectedClipItem(null, null, contentUri));
- }
-
- public void testSetPrimaryClip_complexItem() {
- Intent intent = new Intent(mContext, ClipboardManagerTest.class);
- Uri uri = Uri.parse("http://www.google.com");
- ClipData multiData = new ClipData(new ClipDescription("ComplexItemLabel",
- new String[] {ClipDescription.MIMETYPE_TEXT_PLAIN,
- ClipDescription.MIMETYPE_TEXT_INTENT,
- ClipDescription.MIMETYPE_TEXT_URILIST}),
- new Item("Text", intent, uri));
- assertSetPrimaryClip(multiData, "ComplexItemLabel",
- new String[] {ClipDescription.MIMETYPE_TEXT_PLAIN,
- ClipDescription.MIMETYPE_TEXT_INTENT,
- ClipDescription.MIMETYPE_TEXT_URILIST},
- new ExpectedClipItem("Text", intent, uri));
- }
-
- public void testSetPrimaryClip_multipleItems() {
- Intent intent = new Intent(mContext, ClipboardManagerTest.class);
- Uri uri = Uri.parse("http://www.google.com");
- ClipData textData = ClipData.newPlainText("TextLabel", "Text");
- textData.addItem(new Item("More Text"));
- textData.addItem(new Item(intent));
- textData.addItem(new Item(uri));
- assertSetPrimaryClip(textData, "TextLabel",
- new String[] {ClipDescription.MIMETYPE_TEXT_PLAIN},
- new ExpectedClipItem("Text", null, null),
- new ExpectedClipItem("More Text", null, null),
- new ExpectedClipItem(null, intent, null),
- new ExpectedClipItem(null, null, uri));
- }
-
- private class ExpectedClipItem {
- CharSequence mText;
- Intent mIntent;
- Uri mUri;
-
- ExpectedClipItem(CharSequence text, Intent intent, Uri uri) {
- mText = text;
- mIntent = intent;
- mUri = uri;
- }
- }
-
- private void assertSetPrimaryClip(ClipData clipData,
- String expectedLabel,
- String[] expectedMimeTypes,
- ExpectedClipItem... expectedClipItems) {
-
- mClipboardManager.setPrimaryClip(clipData);
- assertTrue(mClipboardManager.hasPrimaryClip());
-
- if (expectedClipItems != null
- && expectedClipItems.length > 0
- && expectedClipItems[0].mText != null) {
- assertTrue(mClipboardManager.hasText());
- } else {
- assertFalse(mClipboardManager.hasText());
- }
-
- assertNotNull(mClipboardManager.getPrimaryClip());
- assertNotNull(mClipboardManager.getPrimaryClipDescription());
-
- ClipData data = mClipboardManager.getPrimaryClip();
- if (expectedClipItems != null) {
- assertEquals(expectedClipItems.length, data.getItemCount());
- for (int i = 0; i < expectedClipItems.length; i++) {
- assertClipItem(expectedClipItems[i], data.getItemAt(i));
- }
- } else {
- throw new IllegalArgumentException("Should have at least one expectedClipItem...");
- }
-
- assertClipDescription(data.getDescription(),
- expectedLabel, expectedMimeTypes);
-
- assertClipDescription(mClipboardManager.getPrimaryClipDescription(),
- expectedLabel, expectedMimeTypes);
- }
-
- private void assertClipDescription(ClipDescription description, String expectedLabel,
- String... mimeTypes) {
- assertEquals(expectedLabel, description.getLabel());
- assertEquals(mimeTypes.length, description.getMimeTypeCount());
- int mimeTypeCount = description.getMimeTypeCount();
- for (int i = 0; i < mimeTypeCount; i++) {
- assertEquals(mimeTypes[i], description.getMimeType(i));
- }
- }
-
- private void assertClipItem(ExpectedClipItem expectedItem, Item item) {
- assertEquals(expectedItem.mText, item.getText());
- if (expectedItem.mIntent != null) {
- assertNotNull(item.getIntent());
- } else {
- assertNull(item.getIntent());
- }
- if (expectedItem.mUri != null) {
- assertEquals(expectedItem.mUri.toString(), item.getUri().toString());
- } else {
- assertNull(item.getUri());
- }
- }
-}
diff --git a/tests/tests/content/src/android/content/cts/ContentProviderTest.java b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
index ed44b56..0824e84 100644
--- a/tests/tests/content/src/android/content/cts/ContentProviderTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
@@ -28,12 +28,16 @@ import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.IContentProvider;
+import android.content.EntityIterator;
import android.content.ContentProviderResult;
import android.content.ContentProviderOperation;
import android.content.OperationApplicationException;
import android.content.pm.ProviderInfo;
import android.content.res.AssetFileDescriptor;
import android.database.Cursor;
+import android.database.CursorWindow;
+import android.database.IBulkCursor;
+import android.database.IContentObserver;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.os.Bundle;
@@ -326,75 +330,70 @@ public class ContentProviderTest extends AndroidTestCase {
assertSame(mockContentProvider, ContentProvider.coerceToLocalContentProvider(transport));
IContentProvider iContentProvider = new IContentProvider() {
- @Override
+ public IBulkCursor bulkQuery(Uri url, String[] projection, String selection,
+ String[] selectionArgs, String sortOrder, IContentObserver observer,
+ CursorWindow window) throws RemoteException {
+ return null;
+ }
+
public int bulkInsert(Uri url, ContentValues[] initialValues) {
return 0;
}
- @Override
public int delete(Uri url, String selection, String[] selectionArgs) {
return 0;
}
- @Override
public String getType(Uri url) {
return null;
}
- @Override
public Uri insert(Uri url, ContentValues initialValues) {
return null;
}
- @Override
public ParcelFileDescriptor openFile(Uri url, String mode) {
return null;
}
- @Override
public AssetFileDescriptor openAssetFile(Uri url, String mode) {
return null;
}
- @Override
public ContentProviderResult[] applyBatch(
ArrayList operations)
throws RemoteException, OperationApplicationException {
return null;
}
- @Override
public Cursor query(Uri url, String[] projection, String selection,
String[] selectionArgs, String sortOrder) {
return null;
}
- @Override
+ /**
+ * @hide
+ */
+ public EntityIterator queryEntities(Uri url, String selection, String[] selectionArgs,
+ String sortOrder) throws RemoteException {
+ return null;
+ }
+
public int update(Uri url, ContentValues values, String selection,
String[] selectionArgs) {
return 0;
}
- @Override
public IBinder asBinder() {
return null;
}
- @Override
+ /**
+ * @hide
+ */
public Bundle call(String method, String request, Bundle args) {
return null;
}
-
- @Override
- public String[] getStreamTypes(Uri url, String mimeTypeFilter) throws RemoteException {
- return null;
- }
-
- @Override
- public AssetFileDescriptor openTypedAssetFile(Uri url, String mimeType, Bundle opts)
- throws RemoteException, FileNotFoundException {
- return null;
- }
};
assertNull(ContentProvider.coerceToLocalContentProvider(iContentProvider));
}
diff --git a/tests/tests/content/src/android/content/cts/ContentQueryMapTest.java b/tests/tests/content/src/android/content/cts/ContentQueryMapTest.java
index ecb1c05..d5d9666 100644
--- a/tests/tests/content/src/android/content/cts/ContentQueryMapTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentQueryMapTest.java
@@ -263,16 +263,9 @@ public class ContentQueryMapTest extends AndroidTestCase {
public void run() {
Looper.prepare();
mContentQueryMap.setKeepUpdated(true);
- synchronized (ContentQueryMapTest.this) {
- //listener is ready, release the sender thread
- ContentQueryMapTest.this.notify();
- }
Looper.loop();
}
}).start();
- synchronized (this) {
- wait(TEST_TIME_OUT);
- }//wait the listener to be ready before launching onChange event
// insert NAME3 and VALUE3
values = new ContentValues();
@@ -292,16 +285,9 @@ public class ContentQueryMapTest extends AndroidTestCase {
public void run() {
Looper.prepare();
mContentQueryMap.setKeepUpdated(false);
- synchronized (ContentQueryMapTest.this) {
- //listener is ready, release the sender thread
- ContentQueryMapTest.this.notify();
- }
Looper.loop();
}
}).start();
- synchronized (this) {
- wait(TEST_TIME_OUT);
- }//wait the listener to be ready before launching onChange event
// update NAME3 and VALUE3
values = new ContentValues();
values.put(DummyProvider.NAME, NAME0);
diff --git a/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java b/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java
index 1cc4cfb..ecad3e4 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java
@@ -93,7 +93,7 @@ public class ContentResolverSyncTestCase extends AndroidTestCase {
}
private void addAccountAndVerifyInitSync(Account account, String password,
- String authority, int latchTimeoutMs, int accountIndex) {
+ String authority, int latchTimeoutMs) {
CountDownLatch latch = setNewLatch(new CountDownLatch(1));
@@ -109,7 +109,7 @@ public class ContentResolverSyncTestCase extends AndroidTestCase {
assertFalse(getMockSyncAdapter().isStartSync());
assertFalse(getMockSyncAdapter().isCancelSync());
assertTrue(getMockSyncAdapter().isInitialized());
- assertEquals(account, getMockSyncAdapter().getAccounts().get(accountIndex));
+ assertEquals(account, getMockSyncAdapter().getAccount());
assertEquals(authority, getMockSyncAdapter().getAuthority());
}
@@ -159,11 +159,8 @@ public class ContentResolverSyncTestCase extends AndroidTestCase {
ContentResolver.setMasterSyncAutomatically(false);
assertEquals(false, ContentResolver.getMasterSyncAutomatically());
- addAccountAndVerifyInitSync(ACCOUNT,
- MockAccountAuthenticator.ACCOUNT_PASSWORD,
- AUTHORITY,
- LATCH_TIMEOUT_MS,
- 0);
+ addAccountAndVerifyInitSync(ACCOUNT, MockAccountAuthenticator.ACCOUNT_PASSWORD, AUTHORITY,
+ LATCH_TIMEOUT_MS);
getMockSyncAdapter().clearData();
@@ -177,7 +174,7 @@ public class ContentResolverSyncTestCase extends AndroidTestCase {
assertTrue(getMockSyncAdapter().isStartSync());
assertFalse(getMockSyncAdapter().isCancelSync());
assertFalse(getMockSyncAdapter().isInitialized());
- assertEquals(ACCOUNT, getMockSyncAdapter().getAccounts().get(0));
+ assertEquals(ACCOUNT, getMockSyncAdapter().getAccount());
assertEquals(AUTHORITY, getMockSyncAdapter().getAuthority());
}
@@ -191,11 +188,8 @@ public class ContentResolverSyncTestCase extends AndroidTestCase {
ContentResolver.setMasterSyncAutomatically(false);
assertEquals(false, ContentResolver.getMasterSyncAutomatically());
- addAccountAndVerifyInitSync(ACCOUNT,
- MockAccountAuthenticator.ACCOUNT_PASSWORD,
- AUTHORITY,
- LATCH_TIMEOUT_MS,
- 0);
+ addAccountAndVerifyInitSync(ACCOUNT, MockAccountAuthenticator.ACCOUNT_PASSWORD, AUTHORITY,
+ LATCH_TIMEOUT_MS);
getMockSyncAdapter().clearData();
@@ -230,10 +224,6 @@ public class ContentResolverSyncTestCase extends AndroidTestCase {
* Test if we can set and get the SyncAutomatically switch for an account
*/
public void testGetAndSetSyncAutomatically() {
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
- }
// Prevent auto sync
ContentResolver.setMasterSyncAutomatically(false);
assertEquals(false, ContentResolver.getMasterSyncAutomatically());
@@ -326,35 +316,4 @@ public class ContentResolverSyncTestCase extends AndroidTestCase {
//expected.
}
}
-
- /**
- * Test to verify that a SyncAdapter is called on all the accounts accounts
- */
- public void testCallMultipleAccounts() {
- // Prevent auto sync
- ContentResolver.setMasterSyncAutomatically(false);
- assertEquals(false, ContentResolver.getMasterSyncAutomatically());
-
- addAccountAndVerifyInitSync(ACCOUNT,
- MockAccountAuthenticator.ACCOUNT_PASSWORD,
- AUTHORITY,
- LATCH_TIMEOUT_MS,
- 0);
-
- getMockSyncAdapter().clearData();
-
- setIsSyncable(ACCOUNT, AUTHORITY, true);
- cancelSync(ACCOUNT, AUTHORITY, LATCH_TIMEOUT_MS);
-
- getMockSyncAdapter().clearData();
-
- requestSync(null /* all accounts */, AUTHORITY, LATCH_TIMEOUT_MS);
-
- assertTrue(getMockSyncAdapter().isStartSync());
- assertFalse(getMockSyncAdapter().isCancelSync());
- assertFalse(getMockSyncAdapter().isInitialized());
- assertEquals(ACCOUNT, getMockSyncAdapter().getAccounts().get(0));
- assertEquals(AUTHORITY, getMockSyncAdapter().getAuthority());
-
- }
}
diff --git a/tests/tests/content/src/android/content/cts/ContextTest.java b/tests/tests/content/src/android/content/cts/ContextTest.java
index 9661a1d..c2a27ae 100644
--- a/tests/tests/content/src/android/content/cts/ContextTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextTest.java
@@ -174,6 +174,7 @@ public class ContextTest extends AndroidTestCase {
args = {android.util.AttributeSet.class, int[].class}
)
})
+ @ToBeFixed(bug=" ", explanation = "Wrong resource ID can not result in a exception.")
public void testObtainStyledAttributes() {
// Test obtainStyledAttributes(int[])
TypedArray testTypedArray = mContext
@@ -206,18 +207,17 @@ public class ContextTest extends AndroidTestCase {
testTypedArray.recycle();
// Test obtainStyledAttributes(AttributeSet, int[])
- int[] attrs = android.R.styleable.DatePicker;
testTypedArray = mContext.obtainStyledAttributes(getAttributeSet(R.layout.context_layout),
- attrs);
+ android.R.styleable.DatePicker);
assertNotNull(testTypedArray);
- assertEquals(attrs.length, testTypedArray.length());
+ assertEquals(2, testTypedArray.length());
testTypedArray.recycle();
// Test obtainStyledAttributes(AttributeSet, int[], int, int)
testTypedArray = mContext.obtainStyledAttributes(getAttributeSet(R.layout.context_layout),
- attrs, 0, 0);
+ android.R.styleable.DatePicker, 0, 0);
assertNotNull(testTypedArray);
- assertEquals(attrs.length, testTypedArray.length());
+ assertEquals(2, testTypedArray.length());
testTypedArray.recycle();
}
diff --git a/tests/tests/content/src/android/content/cts/IntentTest.java b/tests/tests/content/src/android/content/cts/IntentTest.java
index 995c668..15400be 100644
--- a/tests/tests/content/src/android/content/cts/IntentTest.java
+++ b/tests/tests/content/src/android/content/cts/IntentTest.java
@@ -16,13 +16,11 @@
package android.content.cts;
-import com.android.internal.app.ResolverActivity;
-import com.android.internal.util.XmlUtils;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Set;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -47,11 +45,13 @@ import android.test.AndroidTestCase;
import android.util.AttributeSet;
import android.util.Xml;
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Set;
+import com.android.internal.app.ResolverActivity;
+import com.android.internal.util.XmlUtils;
+
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
@TestTargetClass(Intent.class)
public class IntentTest extends AndroidTestCase {
@@ -1746,7 +1746,7 @@ public class IntentTest extends AndroidTestCase {
assertEquals(Intent.FILL_IN_DATA, destIntent.fillIn(sourceIntent, Intent.FILL_IN_DATA));
assertEquals(TEST_URI, destIntent.getData());
}
-
+
/**
* Test that fillIn copies data type.
*/
@@ -2087,6 +2087,8 @@ public class IntentTest extends AndroidTestCase {
assertFalse(mIntent.filterEquals(target));
mIntent.addCategory(TEST_CATEGORY + "test");
assertFalse(mIntent.filterEquals(target));
+ mIntent.addCategory(null);
+ assertFalse(mIntent.filterEquals(target));
mIntent.addCategory(TEST_CATEGORY);
assertFalse(mIntent.filterEquals(target));
}
diff --git a/tests/tests/content/src/android/content/cts/SharedPreferencesTest.java b/tests/tests/content/src/android/content/cts/SharedPreferencesTest.java
index 004fa9e..bc81c4c 100644
--- a/tests/tests/content/src/android/content/cts/SharedPreferencesTest.java
+++ b/tests/tests/content/src/android/content/cts/SharedPreferencesTest.java
@@ -29,7 +29,6 @@ import android.app.QueuedWork;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.SharedPreferences;
-import android.os.StrictMode;
import android.preference.PreferenceManager;
import android.test.AndroidTestCase;
import android.util.Log;
@@ -318,30 +317,4 @@ public class SharedPreferencesTest extends AndroidTestCase {
}
}
- public void testModeMultiProcess() {
- // Pre-load it.
- mContext.getSharedPreferences("multiprocessTest", 0);
-
- final StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
- try {
- StrictMode.ThreadPolicy diskReadDeath =
- new StrictMode.ThreadPolicy.Builder().detectDiskReads().penaltyDeath().build();
- StrictMode.setThreadPolicy(diskReadDeath);
-
- // This shouldn't hit disk. (it was already pre-loaded above)
- mContext.getSharedPreferences("multiprocessTest", 0);
-
- boolean didRead = false;
- // This SHOULD hit disk. (multi-process flag is set)
- try {
- mContext.getSharedPreferences("multiprocessTest", Context.MODE_MULTI_PROCESS);
- fail(); // we shouldn't get here.
- } catch (StrictMode.StrictModeViolation e) {
- didRead = true;
- }
- assertTrue(didRead);
- } finally {
- StrictMode.setThreadPolicy(oldPolicy);
- }
- }
}
diff --git a/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java b/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
index 512aa7a..3f0c4ae 100644
--- a/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
@@ -181,24 +181,6 @@ public class ComponentInfoTest extends AndroidTestCase {
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "isEnabled",
- args = {}
- )
- public void testIsEnabled() {
- mComponentInfo = new ComponentInfo();
- mComponentInfo.applicationInfo = new ApplicationInfo();
- assertTrue(mComponentInfo.isEnabled());
-
- mComponentInfo.enabled = false;
- assertFalse(mComponentInfo.isEnabled());
-
- mComponentInfo.enabled = true;
- mComponentInfo.applicationInfo.enabled = false;
- assertFalse(mComponentInfo.isEnabled());
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "dumpFront",
args = {android.util.Printer.class, java.lang.String.class}
)
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageManagerTest.java b/tests/tests/content/src/android/content/pm/cts/PackageManagerTest.java
index 3e8eb0d..1857f13 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageManagerTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageManagerTest.java
@@ -785,19 +785,4 @@ public class PackageManagerTest extends AndroidTestCase {
assertEquals(xmlName, mPackageManager.getResourcesForApplication(PACKAGE_NAME)
.getResourceName(resourceId));
}
-
- public void testGetPackageArchiveInfo() throws Exception {
- final String apkPath = getContext().getPackageCodePath();
- final String apkName = getContext().getPackageName();
-
- final int flags = PackageManager.GET_SIGNATURES;
-
- final PackageInfo pkgInfo = mPackageManager.getPackageArchiveInfo(apkPath, flags);
-
- assertEquals("getPackageArchiveInfo should return the correct package name",
- apkName, pkgInfo.packageName);
-
- assertNotNull("Signatures should have been collected when GET_SIGNATURES flag specified",
- pkgInfo.signatures);
- }
}
diff --git a/tests/tests/content/src/android/content/pm/cts/SignatureTest.java b/tests/tests/content/src/android/content/pm/cts/SignatureTest.java
index 6bd77dd..16e1027 100644
--- a/tests/tests/content/src/android/content/pm/cts/SignatureTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/SignatureTest.java
@@ -30,138 +30,110 @@ import java.util.Arrays;
@TestTargetClass(Signature.class)
public class SignatureTest extends AndroidTestCase {
- private static final String SIGNATURE_STRING = "1234567890abcdef";
- // SIGNATURE_BYTE_ARRAY is the byte code of SIGNATURE_STRING.
- private static final byte[] SIGNATURE_BYTE_ARRAY = { (byte) 0x12, (byte) 0x34, (byte) 0x56,
+ private static final String mSignatureString = "1234567890abcdef";
+ // mSignatureByteArray is the byte code of mSignatureString.
+ private static final byte[] mSignatureByteArray = { (byte) 0x12, (byte) 0x34, (byte) 0x56,
(byte) 0x78, (byte) 0x90, (byte) 0xab, (byte) 0xcd, (byte) 0xef };
- // DIFF_BYTE_ARRAY has different content to SIGNATURE_STRING.
- private static final byte[] DIFF_BYTE_ARRAY = { (byte) 0xfe, (byte) 0xdc, (byte) 0xba,
+ // mDiffByteArray has different content to mSignatureString.
+ private static final byte[] mDiffByteArray = { (byte) 0xfe, (byte) 0xdc, (byte) 0xba,
(byte) 0x09, (byte) 0x87, (byte) 0x65, (byte) 0x43, (byte) 0x21 };
- public void testSignatureStringConstructorValid() {
- Signature signature = new Signature(SIGNATURE_STRING);
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor",
+ method = "Signature",
+ args = {byte[].class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test constructor",
+ method = "Signature",
+ args = {java.lang.String.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test toByteArray",
+ method = "toByteArray",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test toCharsString",
+ method = "toCharsString",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test toChars",
+ method = "toChars",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test toChars",
+ method = "toChars",
+ args = {char[].class, int[].class}
+ )
+ })
+ public void testSignature() {
+ Signature signature = new Signature(mSignatureString);
byte[] actualByteArray = signature.toByteArray();
- assertTrue("Output byte array should match constructor byte array.",
- Arrays.equals(SIGNATURE_BYTE_ARRAY, actualByteArray));
- }
-
- public void testSignatureStringConstructorNull() {
- String sig = null;
+ assertTrue(Arrays.equals(mSignatureByteArray, actualByteArray));
- try {
- Signature signature = new Signature(sig);
- fail("Should throw NullPointerException on null input");
- } catch (NullPointerException e) {
- // pass
- }
- }
-
- public void testSignatureStringConstructorInvalidLength() {
- try {
- Signature signature = new Signature("123");
- fail("Should throw IllegalArgumentException on odd-sized input");
- } catch (IllegalArgumentException e) {
- // pass
- }
- }
-
- public void testSignatureByteArrayToCharsString() {
- Signature signature = new Signature(SIGNATURE_BYTE_ARRAY);
+ signature = new Signature(mSignatureByteArray);
String actualString = signature.toCharsString();
- assertEquals(SIGNATURE_STRING, actualString);
- }
+ assertEquals(mSignatureString, actualString);
- public void testSignatureByteArrayConstructorNull() {
- byte[] sig = null;
-
- try {
- Signature signature = new Signature(sig);
- fail("Should throw NullPointerException on null input");
- } catch (NullPointerException e) {
- // pass
- }
- }
-
- public void testSignatureToChars() {
- Signature signature = new Signature(SIGNATURE_BYTE_ARRAY);
char[] charArray = signature.toChars();
- String actualString = new String(charArray);
- assertEquals(SIGNATURE_STRING, actualString);
- }
-
- public void testSignatureToCharsExistingArrayCorrectlySized() {
- char[] existingCharArray = new char[SIGNATURE_STRING.length()];
- int[] intArray = new int[1];
-
- Signature signature = new Signature(SIGNATURE_BYTE_ARRAY);
-
- char[] charArray = signature.toChars(existingCharArray, intArray);
-
- assertTrue("Should return the same object since it's correctly sized.",
- existingCharArray == charArray);
-
- String actualString = new String(charArray);
- assertEquals("The re-encoded Signature should match the constructor input",
- SIGNATURE_STRING, actualString);
+ actualString = new String(charArray);
+ assertEquals(mSignatureString, actualString);
- // intArray[0] represents the length of array.
- assertEquals(intArray[0], SIGNATURE_BYTE_ARRAY.length);
- }
-
- public void testSignatureToCharsExistingArrayTooSmall() {
- char[] existingCharArray = new char[0];
+ char[] existingCharArray = new char[mSignatureString.length()];
int[] intArray = new int[1];
-
- Signature signature = new Signature(SIGNATURE_BYTE_ARRAY);
- char[] charArray = signature.toChars(existingCharArray, intArray);
-
- assertFalse("Should return a new array since the existing one is too small",
- existingCharArray == charArray);
-
- String actualString = new String(charArray);
- assertEquals("The re-encoded Signature should match the constructor input",
- SIGNATURE_STRING, actualString);
-
+ charArray = signature.toChars(existingCharArray, intArray);
+ actualString = new String(charArray);
+ assertEquals(mSignatureString, actualString);
// intArray[0] represents the length of array.
- assertEquals(intArray[0], SIGNATURE_BYTE_ARRAY.length);
- }
-
- public void testSignatureToCharsNullArrays() {
- char[] existingCharArray = null;
- int[] intArray = null;
-
- Signature signature = new Signature(SIGNATURE_BYTE_ARRAY);
- char[] charArray = signature.toChars(existingCharArray, intArray);
-
- assertFalse("Should return a new array since the existing one is too small",
- existingCharArray == charArray);
-
- String actualString = new String(charArray);
- assertEquals("The re-encoded Signature should match the constructor input",
- SIGNATURE_STRING, actualString);
- }
-
- public void testSignatureStringToByteArray() {
- Signature signature = new Signature(SIGNATURE_BYTE_ARRAY);
- byte[] actualByteArray = signature.toByteArray();
-
- assertFalse("Should return a different array to avoid modification",
- SIGNATURE_BYTE_ARRAY == actualByteArray);
-
- assertTrue("Output byte array should match constructor byte array.",
- Arrays.equals(SIGNATURE_BYTE_ARRAY, actualByteArray));
+ assertEquals(intArray[0], mSignatureByteArray.length);
}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test equals",
+ method = "equals",
+ args = {java.lang.Object.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test hashCode",
+ method = "hashCode",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test describeContents",
+ method = "describeContents",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test writeToParcel",
+ method = "writeToParcel",
+ args = {android.os.Parcel.class, int.class}
+ )
+ })
public void testTools() {
- Signature byteSignature = new Signature(SIGNATURE_BYTE_ARRAY);
- Signature stringSignature = new Signature(SIGNATURE_STRING);
+ Signature byteSignature = new Signature(mSignatureByteArray);
+ Signature stringSignature = new Signature(mSignatureString);
// Test describeContents, equals
assertEquals(0, byteSignature.describeContents());
assertTrue(byteSignature.equals(stringSignature));
// Test hashCode
- byteSignature = new Signature(DIFF_BYTE_ARRAY);
+ byteSignature = new Signature(mDiffByteArray);
assertNotSame(byteSignature.hashCode(), stringSignature.hashCode());
// Test writeToParcel
diff --git a/tests/tests/content/src/android/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java b/tests/tests/content/src/android/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java
index de9f0e3..1ff3f49 100644
--- a/tests/tests/content/src/android/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java
+++ b/tests/tests/content/src/android/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java
@@ -16,252 +16,80 @@
package android.content.res.cts;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
import android.content.res.AssetFileDescriptor;
import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
@TestTargetClass(AssetFileDescriptor.AutoCloseInputStream.class)
public class AssetFileDescriptor_AutoCloseInputStreamTest extends AndroidTestCase {
private static final int FILE_END = -1;
+ private static final int FILE_LENGTH = 10;
private static final String FILE_NAME = "testAssertFileDescriptorAutoCloseInputStream";
private static final byte[] FILE_DATA = new byte[] {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
};
- private static final int FILE_LENGTH = FILE_DATA.length;
+ private static final int OFFSET = 0;
+ private static final int READ_LENGTH = 1;
private File mFile;
- private AssetFileDescriptor mFd;
- private AssetFileDescriptor.AutoCloseInputStream mInput;
+ private AssetFileDescriptor mAssetFileDes;
@Override
protected void setUp() throws Exception {
super.setUp();
mFile = new File(getContext().getFilesDir(), FILE_NAME);
- FileOutputStream outputStream = new FileOutputStream(mFile);
- outputStream.write(FILE_DATA);
- outputStream.close();
+ mFile.createNewFile();
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
- if (mFd != null) {
- mFd.close();
- mFd = null;
+ // As {@link AssetFileDescripter#createOutputStream()}
+ // and {@link AssetFileDescripter#createInputStream()} doc,
+ // the input and output stream will be auto closed when the AssetFileDescriptor closed.
+ // Here is no need to close AutoCloseInputStream, as AssetFileDescriptor will do it for us.
+ if (mAssetFileDes != null) {
+ mAssetFileDes.close();
}
- mFile.delete();
+ getContext().deleteFile(FILE_NAME);
}
+ /*
+ * Test AutoInputStream life circle.
+ * Test point:
+ * 1. Test AutoInputStream read what we write into file.
+ */
@TestTargets({
@TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "AssetFileDescriptor.AutoCloseInputStream",
- args = {AssetFileDescriptor.class}
- ),
- @TestTargetNew(
level = TestLevel.COMPLETE,
- method = "skip",
- args = {long.class}
- )
- })
- public void testSkip() throws IOException {
- openInput(0, FILE_LENGTH);
- assertEquals(FILE_DATA[0], mInput.read());
- assertEquals(0, mInput.skip(0));
- assertEquals(FILE_DATA[1], mInput.read());
- assertEquals(3, mInput.skip(3));
- assertEquals(FILE_DATA[5], mInput.read());
- assertEquals(3, mInput.skip(10));
- assertEquals(FILE_END, mInput.read());
- }
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
method = "AssetFileDescriptor.AutoCloseInputStream",
args = {AssetFileDescriptor.class}
),
@TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
+ level = TestLevel.COMPLETE,
method = "read",
args = {}
- )
- })
- public void testRead() throws IOException {
- openInput(0, FILE_LENGTH);
- for (int i = 0; i < FILE_LENGTH; i++) {
- assertEquals(FILE_DATA[i], mInput.read());
- }
- assertEquals(FILE_END, mInput.read());
- }
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "AssetFileDescriptor.AutoCloseInputStream",
- args = {AssetFileDescriptor.class}
),
@TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
+ level = TestLevel.COMPLETE,
method = "read",
- args = {}
- )
- })
- public void testReadPartial() throws IOException {
- long len = 6;
- openInput(0, len);
- for (int i = 0; i < len; i++) {
- assertEquals(FILE_DATA[i], mInput.read());
- }
- assertEquals(FILE_END, mInput.read());
- }
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "AssetFileDescriptor.AutoCloseInputStream",
- args = {AssetFileDescriptor.class}
+ args = {byte[].class, int.class, int.class}
),
@TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "read",
- args = {byte[].class, int.class, int.class}
- )
- })
- public void testReadBufferLen() throws IOException {
- openInput(0, FILE_LENGTH);
- byte[] buf = new byte[FILE_LENGTH];
- assertEquals(3, mInput.read(buf, 0, 3));
- assertEquals(3, mInput.read(buf, 3, 3));
- assertEquals(3, mInput.read(buf, 6, 4));
- MoreAsserts.assertEquals(FILE_DATA, buf);
- assertEquals(FILE_END, mInput.read(buf, 0, 4));
- }
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "AssetFileDescriptor.AutoCloseInputStream",
- args = {AssetFileDescriptor.class}
- ),
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "read",
- args = {byte[].class}
- )
- })
- public void testReadBuffer() throws IOException {
- openInput(0, FILE_LENGTH);
- byte[] buf = new byte[6];
- assertEquals(6, mInput.read(buf));
- assertEquals(FILE_DATA[0], buf[0]);
- assertEquals(3, mInput.read(buf));
- assertEquals(FILE_DATA[6], buf[0]);
- assertEquals(FILE_END, mInput.read(buf));
- }
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "AssetFileDescriptor.AutoCloseInputStream",
- args = {AssetFileDescriptor.class}
- ),
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "read",
- args = {byte[].class}
- )
- })
- public void testReadBufferPartial() throws IOException {
- long len = 8;
- openInput(0, len);
- byte[] buf = new byte[6];
- assertEquals(6, mInput.read(buf));
- assertEquals(FILE_DATA[0], buf[0]);
- assertEquals(2, mInput.read(buf));
- assertEquals(FILE_DATA[6], buf[0]);
- assertEquals(FILE_END, mInput.read(buf));
- }
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "AssetFileDescriptor.AutoCloseInputStream",
- args = {AssetFileDescriptor.class}
- ),
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "available",
- args = {}
- )
- })
- public void testAvailableRead() throws IOException {
- openInput(0, FILE_LENGTH);
- assertEquals(FILE_LENGTH, mInput.available());
- assertEquals(FILE_DATA[0], mInput.read());
- assertEquals(FILE_LENGTH -1 , mInput.available());
- }
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "AssetFileDescriptor.AutoCloseInputStream",
- args = {AssetFileDescriptor.class}
- ),
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "available",
- args = {}
- )
- })
- public void testAvailableReadBuffer() throws IOException {
- openInput(0, FILE_LENGTH);
- byte[] buf = new byte[3];
- assertEquals(FILE_LENGTH, mInput.available());
- assertEquals(buf.length, mInput.read(buf));
- assertEquals(FILE_LENGTH - buf.length, mInput.available());
- }
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "AssetFileDescriptor.AutoCloseInputStream",
- args = {AssetFileDescriptor.class}
+ level = TestLevel.COMPLETE,
+ method = "read",
+ args = {byte[].class}
),
@TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "available",
- args = {}
- )
- })
- public void testAvailableReadBufferLen() throws IOException {
- openInput(0, FILE_LENGTH);
- byte[] buf = new byte[3];
- assertEquals(FILE_LENGTH, mInput.available());
- assertEquals(2, mInput.read(buf, 0, 2));
- assertEquals(FILE_LENGTH - 2, mInput.available());
- }
-
- /*
- * Tests that AutoInputStream doesn't support mark().
- */
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "AssetFileDescriptor.AutoCloseInputStream",
- args = {AssetFileDescriptor.class}
- ),
- @TestTargetNew(
level = TestLevel.COMPLETE,
method = "mark",
args = {int.class}
@@ -275,27 +103,57 @@ public class AssetFileDescriptor_AutoCloseInputStreamTest extends AndroidTestCas
level = TestLevel.COMPLETE,
method = "markSupported",
args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "skip",
+ args = {long.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "available",
+ args = {}
)
})
- public void testMark() throws IOException {
- openInput(0, FILE_LENGTH);
- assertFalse(mInput.markSupported());
- assertEquals(FILE_DATA[0], mInput.read());
- mInput.mark(FILE_LENGTH); // should do nothing
- assertEquals(FILE_DATA[1], mInput.read());
- mInput.reset(); // should do nothing
- assertEquals(FILE_DATA[2], mInput.read());
+ public void testInputStream() throws IOException {
+ initAssetFileDescriptor();
+ FileOutputStream outputStream = null;
+ outputStream = mAssetFileDes.createOutputStream();
+ outputStream.write(FILE_DATA);
+ mAssetFileDes.close();
+
+ initAssetFileDescriptor();
+ AssetFileDescriptor.AutoCloseInputStream inputStream = null;
+ inputStream = new AssetFileDescriptor.AutoCloseInputStream(mAssetFileDes);
+ assertEquals(FILE_LENGTH, inputStream.available());
+ assertEquals(FILE_DATA[0], inputStream.read());
+ byte[] readFromFile = new byte[2];
+ int readBytes = inputStream.read(readFromFile);
+ assertTrue(FILE_END != readBytes);
+ while (readBytes < readFromFile.length) {
+ readFromFile[readBytes] = (byte) inputStream.read();
+ readBytes++;
+ }
+ assertEquals(FILE_DATA[1], readFromFile[0]);
+ assertEquals(FILE_DATA[2], readFromFile[1]);
+ inputStream.mark(FILE_LENGTH);
+ assertEquals(5, inputStream.skip(5));
+ readBytes = inputStream.read(readFromFile, OFFSET, READ_LENGTH);
+ while (readBytes < READ_LENGTH) {
+ readFromFile[readBytes] = (byte) inputStream.read();
+ readBytes++;
+ }
+ assertEquals(FILE_DATA[8], readFromFile[0]);
+ assertEquals(FILE_END, inputStream.read());
+ inputStream.reset();
+ assertEquals(FILE_END, inputStream.read(readFromFile));
+ assertEquals(FILE_END, inputStream.read(readFromFile, 0, 1));
+ assertFalse(inputStream.markSupported());
}
- private void openInput(long startOffset, long length)
- throws IOException {
- if (mFd != null) {
- mFd.close();
- mFd = null;
- }
+ private void initAssetFileDescriptor() throws FileNotFoundException {
ParcelFileDescriptor fd =
- ParcelFileDescriptor.open(mFile, ParcelFileDescriptor.MODE_READ_WRITE);
- mFd = new AssetFileDescriptor(fd, startOffset, length);
- mInput = new AssetFileDescriptor.AutoCloseInputStream(mFd);
+ ParcelFileDescriptor.open(mFile, ParcelFileDescriptor.MODE_READ_WRITE);
+ mAssetFileDes = new AssetFileDescriptor(fd, 0, FILE_LENGTH);
}
}
diff --git a/tests/tests/content/src/android/content/res/cts/ConfigTest.java b/tests/tests/content/src/android/content/res/cts/ConfigTest.java
index 144c2f2..d68fd19 100755
--- a/tests/tests/content/src/android/content/res/cts/ConfigTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ConfigTest.java
@@ -27,7 +27,6 @@ import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
import android.util.DisplayMetrics;
-import android.util.Log;
import com.android.cts.stub.R;
@@ -45,10 +44,7 @@ public class ConfigTest extends AndroidTestCase {
WIDTH,
HEIGHT,
DENSITY,
- SCREENLAYOUT,
- SWIDTH_DP,
- WIDTH_DP,
- HEIGHT_DP
+ SCREENLAYOUT
}
private static void checkValue(final Resources res, final int resId,
@@ -82,13 +78,25 @@ public class ConfigTest extends AndroidTestCase {
}
private class TotalConfig {
- final Configuration mConfig;
- final DisplayMetrics mMetrics;
+ private Configuration mConfig;
+ private DisplayMetrics mMetrics;
public TotalConfig() {
mConfig = new Configuration();
+ // don't rely on build settings - they may change
+ mConfig.locale = new Locale("en", "US");
+ mConfig.mcc = 310;
+ mConfig.mnc = 001; // unused
+ mConfig.touchscreen = Configuration.TOUCHSCREEN_FINGER;
+ mConfig.keyboard = Configuration.KEYBOARD_QWERTY;
+ mConfig.keyboardHidden = Configuration.KEYBOARDHIDDEN_YES;
+ mConfig.navigation = Configuration.NAVIGATION_TRACKBALL;
+ mConfig.orientation = Configuration.ORIENTATION_PORTRAIT;
+
mMetrics = new DisplayMetrics();
- mConfig.locale = new Locale("++", "++");
+ mMetrics.widthPixels = 200;
+ mMetrics.heightPixels = 320;
+ mMetrics.density = 1;
}
public void setProperty(final Properties p, final int value) {
@@ -127,15 +135,6 @@ public class ConfigTest extends AndroidTestCase {
case SCREENLAYOUT:
mConfig.screenLayout = value;
break;
- case SWIDTH_DP:
- mConfig.smallestScreenWidthDp = value;
- break;
- case WIDTH_DP:
- mConfig.screenWidthDp = value;
- break;
- case HEIGHT_DP:
- mConfig.screenHeightDp = value;
- break;
default:
assert(false);
break;
@@ -165,29 +164,6 @@ public class ConfigTest extends AndroidTestCase {
}
}
- public TotalConfig makeEmptyConfig() {
- return new TotalConfig();
- }
-
- public TotalConfig makeClassicConfig() {
- TotalConfig config = new TotalConfig();
- config.mConfig.locale = new Locale("en", "US");
- config.mConfig.mcc = 310;
- config.mConfig.mnc = 001; // unused
- config.mConfig.touchscreen = Configuration.TOUCHSCREEN_FINGER;
- config.mConfig.keyboard = Configuration.KEYBOARD_QWERTY;
- config.mConfig.keyboardHidden = Configuration.KEYBOARDHIDDEN_YES;
- config.mConfig.navigation = Configuration.NAVIGATION_TRACKBALL;
- config.mConfig.orientation = Configuration.ORIENTATION_PORTRAIT;
- config.mConfig.smallestScreenWidthDp = 320;
- config.mConfig.screenWidthDp = 320;
- config.mConfig.screenHeightDp = 480;
- config.mMetrics.widthPixels = 200;
- config.mMetrics.heightPixels = 320;
- config.mMetrics.density = 1;
- return config;
- }
-
private static void checkPair(Resources res, int[] notResIds,
int simpleRes, String simpleString,
int bagRes, String bagString) {
@@ -206,25 +182,25 @@ public class ConfigTest extends AndroidTestCase {
}
@SmallTest
- public void testAllEmptyConfigs() {
+ public void testAllConfigs() {
/**
* Test a resource that contains a value for each possible single
* configuration value.
*/
- TotalConfig config = makeEmptyConfig();
+ TotalConfig config = new TotalConfig();
Resources res = config.getResources();
checkValue(res, R.configVarying.simple, "simple default");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag default"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.LANGUAGE, "xx");
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple xx");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag xx"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.LANGUAGE, "xx");
config.setProperty(Properties.COUNTRY, "YY");
res = config.getResources();
@@ -232,77 +208,77 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag xx-rYY"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.MCC, 111);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple mcc111");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag mcc111"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.MNC, 222);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple mnc222");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag mnc222"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_NOTOUCH);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple notouch");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag notouch"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_STYLUS);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple stylus");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag stylus"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_NOKEYS);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple nokeys");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag nokeys"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_12KEY);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple 12key");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag 12key"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.KEYBOARDHIDDEN, Configuration.KEYBOARDHIDDEN_NO);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple keysexposed");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag keysexposed"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_NONAV);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple nonav");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag nonav"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_DPAD);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple dpad");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag dpad"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_WHEEL);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple wheel");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag wheel"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.HEIGHT, 480);
config.setProperty(Properties.WIDTH, 320);
res = config.getResources();
@@ -310,308 +286,54 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag 480x320"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.DENSITY, 240);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple 240dpi");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag 240dpi"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple landscape");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag landscape"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_SQUARE);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple square");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag square"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_SMALL);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple small");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag small"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_NORMAL);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple normal");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag normal"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple large");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag large"});
- config = makeEmptyConfig();
+ config = new TotalConfig();
config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple xlarge");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag xlarge"});
-
- config = makeEmptyConfig();
- config.setProperty(Properties.SWIDTH_DP, 600);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw600");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag sw600"});
-
- config = makeEmptyConfig();
- config.setProperty(Properties.SWIDTH_DP, 600);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw600");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag sw600"});
-
- config = makeEmptyConfig();
- config.setProperty(Properties.SWIDTH_DP, 720);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw720");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag sw720"});
-
- config = makeEmptyConfig();
- config.setProperty(Properties.WIDTH_DP, 600);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple w600");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag w600"});
-
- config = makeEmptyConfig();
- config.setProperty(Properties.WIDTH_DP, 720);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple w720");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag w720"});
-
- config = makeEmptyConfig();
- config.setProperty(Properties.HEIGHT_DP, 550);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple h550");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag h550"});
-
- config = makeEmptyConfig();
- config.setProperty(Properties.HEIGHT_DP, 670);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple h670");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag h670"});
- }
-
- @SmallTest
- public void testAllClassicConfigs() {
- /**
- * Test a resource that contains a value for each possible single
- * configuration value.
- */
- TotalConfig config = makeClassicConfig();
- Resources res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple default");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag default"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.LANGUAGE, "xx");
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple xx");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag xx"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.LANGUAGE, "xx");
- config.setProperty(Properties.COUNTRY, "YY");
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple xx-rYY");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag xx-rYY"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.MCC, 111);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple mcc111");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag mcc111"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.MNC, 222);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple mnc222");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag mnc222"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_NOTOUCH);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple notouch");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag notouch"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_STYLUS);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple stylus");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag stylus"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_NOKEYS);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple nokeys");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag nokeys"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_12KEY);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple 12key 63x57");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag 12key 63x57"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.KEYBOARDHIDDEN, Configuration.KEYBOARDHIDDEN_NO);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple keysexposed");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag keysexposed"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_NONAV);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple nonav");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag nonav"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_DPAD);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple dpad 63x57");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag dpad 63x57"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_WHEEL);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple wheel");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag wheel"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.HEIGHT, 480);
- config.setProperty(Properties.WIDTH, 320);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple 480x320");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag 480x320"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.DENSITY, 240);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple 240dpi");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag 240dpi"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple landscape");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag landscape"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_SQUARE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple square");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag square"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_SMALL);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple small");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag small"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_NORMAL);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple normal");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag normal"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple large");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag large"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple xlarge");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag xlarge"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.SWIDTH_DP, 600);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw600");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag sw600"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.SWIDTH_DP, 600);
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw600 land");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag sw600 land"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.SWIDTH_DP, 720);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw720");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag sw720"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.WIDTH_DP, 600);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple w600");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag w600"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.WIDTH_DP, 720);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple w720");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag w720"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.HEIGHT_DP, 550);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple h550");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag h550"});
-
- config = makeClassicConfig();
- config.setProperty(Properties.HEIGHT_DP, 670);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple h670");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag h670"});
}
@MediumTest
@@ -623,63 +345,63 @@ public class ConfigTest extends AndroidTestCase {
// SO, X < 49 goes to 32
// 49 >= X < 182 goes to 160
// X >= 182 goes to 240
- TotalConfig config = makeClassicConfig();
+ TotalConfig config = new TotalConfig();
config.setProperty(Properties.DENSITY, 2);
Resources res = config.getResources();
checkValue(res, R.configVarying.simple, "simple 32dpi");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag 32dpi"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.DENSITY, 32);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple 32dpi");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag 32dpi"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.DENSITY, 48);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple 32dpi");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag 32dpi"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.DENSITY, 49);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple default");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag default"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.DENSITY, 150);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple default");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag default"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.DENSITY, 181);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple default");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag default"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.DENSITY, 182);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple 240dpi");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag 240dpi"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.DENSITY, 239);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple 240dpi");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag 240dpi"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.DENSITY, 490);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple 240dpi");
@@ -691,7 +413,7 @@ public class ConfigTest extends AndroidTestCase {
public void testScreenSize() throws Exception {
// ensure that we fall back to the best available screen size
// for a given configuration.
- TotalConfig config = makeClassicConfig();
+ TotalConfig config = new TotalConfig();
config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_SMALL);
Resources res = config.getResources();
checkValue(res, R.configVarying.simple, "simple small");
@@ -700,7 +422,7 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.large, "default");
checkValue(res, R.configVarying.xlarge, "default");
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_NORMAL);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple normal");
@@ -709,7 +431,7 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.large, "default");
checkValue(res, R.configVarying.xlarge, "default");
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple large");
@@ -718,7 +440,7 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.large, "large");
checkValue(res, R.configVarying.xlarge, "default");
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple xlarge");
@@ -728,216 +450,59 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.xlarge, "xlarge");
}
- @MediumTest
- public void testNewScreenSize() throws Exception {
- // ensure that swNNNdp, wNNNdp, and hNNNdp are working correctly
- // for various common screen configurations.
- TotalConfig config = makeClassicConfig();
- config.setProperty(Properties.SWIDTH_DP, 599);
- config.setProperty(Properties.WIDTH_DP, 599);
- config.setProperty(Properties.HEIGHT_DP, 549);
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
- Resources res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple large");
- checkValue(res, R.configVarying.sw, "default");
- checkValue(res, R.configVarying.w, "default");
- checkValue(res, R.configVarying.h, "default");
- checkValue(res, R.configVarying.wh, "default");
-
- config = makeClassicConfig();
- config.setProperty(Properties.SWIDTH_DP, 480);
- config.setProperty(Properties.WIDTH_DP, 800);
- config.setProperty(Properties.HEIGHT_DP, 480);
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple w720");
- checkValue(res, R.configVarying.sw, "default");
- checkValue(res, R.configVarying.w, "720");
- checkValue(res, R.configVarying.h, "default");
- checkValue(res, R.configVarying.wh, "600");
-
- config = makeClassicConfig();
- config.setProperty(Properties.SWIDTH_DP, 600);
- config.setProperty(Properties.WIDTH_DP, 1024);
- config.setProperty(Properties.HEIGHT_DP, 552);
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw600 land");
- checkValue(res, R.configVarying.sw, "600 land");
- checkValue(res, R.configVarying.w, "720");
- checkValue(res, R.configVarying.h, "550");
- checkValue(res, R.configVarying.wh, "600-550");
-
- config = makeClassicConfig();
- config.setProperty(Properties.SWIDTH_DP, 600);
- config.setProperty(Properties.WIDTH_DP, 600);
- config.setProperty(Properties.HEIGHT_DP, 974);
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_PORTRAIT);
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw600");
- checkValue(res, R.configVarying.sw, "600");
- checkValue(res, R.configVarying.w, "600");
- checkValue(res, R.configVarying.h, "670");
- checkValue(res, R.configVarying.wh, "600-550");
-
- config = makeClassicConfig();
- config.setProperty(Properties.SWIDTH_DP, 719);
- config.setProperty(Properties.WIDTH_DP, 1279);
- config.setProperty(Properties.HEIGHT_DP, 669);
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw600 land");
- checkValue(res, R.configVarying.sw, "600 land");
- checkValue(res, R.configVarying.w, "720");
- checkValue(res, R.configVarying.h, "550");
- checkValue(res, R.configVarying.wh, "600-550");
-
- config = makeClassicConfig();
- config.setProperty(Properties.SWIDTH_DP, 800);
- config.setProperty(Properties.WIDTH_DP, 1280);
- config.setProperty(Properties.HEIGHT_DP, 672);
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw720");
- checkValue(res, R.configVarying.sw, "720");
- checkValue(res, R.configVarying.w, "720");
- checkValue(res, R.configVarying.h, "670");
- checkValue(res, R.configVarying.wh, "720-670");
-
- config = makeClassicConfig();
- config.setProperty(Properties.SWIDTH_DP, 800);
- config.setProperty(Properties.WIDTH_DP, 720);
- config.setProperty(Properties.HEIGHT_DP, 1230);
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_PORTRAIT);
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw720");
- checkValue(res, R.configVarying.sw, "720");
- checkValue(res, R.configVarying.w, "720");
- checkValue(res, R.configVarying.h, "670");
- checkValue(res, R.configVarying.wh, "720-670");
- }
-
// TODO - add tests for special cases - ie, other key params seem ignored if
// nokeys is set
@MediumTest
- public void testPrecidence() {
+ public void testCombinations() {
/**
- * Check for precidence of resources selected when there are multiple
- * options matching the current config.
+ * Verify that proper strings are found for multiple-selectivity case
+ * (ie, a string set for locale and mcc is found only when both are
+ * true).
*/
- TotalConfig config = makeEmptyConfig();
- config.setProperty(Properties.HEIGHT, 640);
- config.setProperty(Properties.WIDTH, 400);
+ TotalConfig config = new TotalConfig();
+ config.setProperty(Properties.LANGUAGE, "xx");
+ config.setProperty(Properties.COUNTRY, "YY");
+ config.setProperty(Properties.MCC, 111);
Resources res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple 640x400");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag 640x400"});
-
- config.setProperty(Properties.NAVIGATION, Configuration.NAVIGATION_NONAV);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple nonav");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag nonav"});
-
- config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_NOKEYS);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple nokeys");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag nokeys"});
-
- config.setProperty(Properties.KEYBOARDHIDDEN, Configuration.KEYBOARDHIDDEN_NO);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple keysexposed");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag keysexposed"});
-
- config.setProperty(Properties.TOUCHSCREEN, Configuration.TOUCHSCREEN_NOTOUCH);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple notouch");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag notouch"});
-
- config.setProperty(Properties.DENSITY, 240);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple 240dpi");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag 240dpi"});
-
- config.setProperty(Properties.ORIENTATION, Configuration.ORIENTATION_LANDSCAPE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple landscape");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag landscape"});
-
- config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple xlarge");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag xlarge"});
-
- config.setProperty(Properties.HEIGHT_DP, 670);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple h670");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag h670"});
-
- config.setProperty(Properties.WIDTH_DP, 720);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple 720-670");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag 720-670"});
-
- config.setProperty(Properties.SWIDTH_DP, 720);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple sw720");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag sw720"});
+ checkValue(res, R.configVarying.simple, "simple mcc111 xx-rYY");
+ checkValue(res, R.configVarying.bag, R.styleable.TestConfig,
+ new String[] { "bag mcc111 xx-rYY" });
+ config = new TotalConfig();
config.setProperty(Properties.LANGUAGE, "xx");
config.setProperty(Properties.COUNTRY, "YY");
+ config.setProperty(Properties.MCC, 333);
res = config.getResources();
checkValue(res, R.configVarying.simple, "simple xx-rYY");
checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag xx-rYY"});
-
- config.setProperty(Properties.MCC, 111);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple mcc111 xx-rYY");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag mcc111 xx-rYY"});
+ R.styleable.TestConfig, new String[] { "bag xx-rYY" });
- config.setProperty(Properties.MNC, 222);
+ config = new TotalConfig();
+ config.setProperty(Properties.MNC, 333);
res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple mcc111 mnc222");
+ checkValue(res, R.configVarying.simple, "simple default");
checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag mcc111 mnc222"});
+ R.styleable.TestConfig, new String[]{"bag default"});
}
@MediumTest
- public void testCombinations() {
+ public void testPrecidence() {
/**
* Verify that in cases of ties, the specific ordering is followed
*/
/**
- * Precidence order: mcc, mnc, locale, swdp, wdp, hdp, screenlayout-size,
+ * Precidence order: mcc, mnc, locale, screenlayout-size,
* screenlayout-long, orientation, density,
* touchscreen, hidden, keyboard, navigation, width-height
*/
/**
* verify mcc trumps mnc. Have 110-xx, 220-xx but no 110-220
- * so which is selected? Should be mcc110-xx.
+ * so with is selected? Should be mcc110-xx.
*/
- TotalConfig config = makeClassicConfig();
+ TotalConfig config = new TotalConfig();
config.setProperty(Properties.MCC, 110);
config.setProperty(Properties.MNC, 220);
config.setProperty(Properties.LANGUAGE, "xx");
@@ -948,7 +513,7 @@ public class ConfigTest extends AndroidTestCase {
/* full A + B + C doesn't exist. Do we get A + C or B + C?
*/
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.MCC, 111);
config.setProperty(Properties.MNC, 222);
config.setProperty(Properties.LANGUAGE, "xx");
@@ -957,7 +522,7 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag mcc111 mnc222"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.MNC, 222);
config.setProperty(Properties.LANGUAGE, "xx");
config.setProperty(Properties.ORIENTATION,
@@ -967,7 +532,7 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag mnc222 xx"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.LANGUAGE, "xx");
config.setProperty(Properties.ORIENTATION,
Configuration.ORIENTATION_SQUARE);
@@ -977,37 +542,7 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag xx square"});
- /**
- * Verify that proper strings are found for multiple-selectivity case
- * (ie, a string set for locale and mcc is found only when both are
- * true).
- */
- config = makeClassicConfig();
- config.setProperty(Properties.LANGUAGE, "xx");
- config.setProperty(Properties.COUNTRY, "YY");
- config.setProperty(Properties.MCC, 111);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple mcc111 xx-rYY");
- checkValue(res, R.configVarying.bag, R.styleable.TestConfig,
- new String[] { "bag mcc111 xx-rYY" });
-
- config = makeClassicConfig();
- config.setProperty(Properties.LANGUAGE, "xx");
- config.setProperty(Properties.COUNTRY, "YY");
- config.setProperty(Properties.MCC, 333);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple xx-rYY");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[] { "bag xx-rYY" });
-
- config = makeClassicConfig();
- config.setProperty(Properties.MNC, 333);
- res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple default");
- checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag default"});
-
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.ORIENTATION,
Configuration.ORIENTATION_SQUARE);
config.setProperty(Properties.DENSITY, 32);
@@ -1018,7 +553,7 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag square 32dpi"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.DENSITY, 32);
config.setProperty(Properties.TOUCHSCREEN,
Configuration.TOUCHSCREEN_STYLUS);
@@ -1029,7 +564,7 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag 32dpi stylus"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.TOUCHSCREEN,
Configuration.TOUCHSCREEN_STYLUS);
config.setProperty(Properties.KEYBOARDHIDDEN,
@@ -1040,7 +575,7 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag stylus keysexposed"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.KEYBOARDHIDDEN,
Configuration.KEYBOARDHIDDEN_NO);
config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_12KEY);
@@ -1051,7 +586,7 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag keysexposed 12key"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.KEYBOARD, Configuration.KEYBOARD_12KEY);
config.setProperty(Properties.NAVIGATION,
Configuration.NAVIGATION_DPAD);
@@ -1062,15 +597,15 @@ public class ConfigTest extends AndroidTestCase {
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag 12key dpad"});
- config = makeClassicConfig();
+ config = new TotalConfig();
config.setProperty(Properties.NAVIGATION,
Configuration.NAVIGATION_DPAD);
config.setProperty(Properties.HEIGHT, 640);
config.setProperty(Properties.WIDTH, 400);
res = config.getResources();
- checkValue(res, R.configVarying.simple, "simple dpad 63x57");
+ checkValue(res, R.configVarying.simple, "simple dpad");
checkValue(res, R.configVarying.bag,
- R.styleable.TestConfig, new String[]{"bag dpad 63x57"});
+ R.styleable.TestConfig, new String[]{"bag dpad"});
}
@MediumTest
diff --git a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
index 014b08c..01620b5 100644
--- a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
@@ -376,8 +376,29 @@ public class ConfigurationTest extends AndroidTestCase {
private void assertWriteToParcel(Configuration config, Parcel parcel) {
config.writeToParcel(parcel, 0);
parcel.setDataPosition(0);
- Configuration readConf = new Configuration();
- readConf.readFromParcel(parcel);
- assertEquals(config, readConf);
+ assertEquals(config.fontScale, parcel.readFloat());
+ assertEquals(config.mcc, parcel.readInt());
+ assertEquals(config.mnc, parcel.readInt());
+ if (config.locale == null) {
+ assertEquals(0, parcel.readInt());
+ } else {
+ assertEquals(1, parcel.readInt());
+ assertEquals(config.locale.getLanguage(),
+ parcel.readString());
+ assertEquals(config.locale.getCountry(),
+ parcel.readString());
+ assertEquals(config.locale.getVariant(),
+ parcel.readString());
+ }
+ parcel.readInt();
+ assertEquals(config.touchscreen, parcel.readInt());
+ assertEquals(config.keyboard, parcel.readInt());
+ assertEquals(config.keyboardHidden, parcel.readInt());
+ assertEquals(config.hardKeyboardHidden, parcel.readInt());
+ assertEquals(config.navigation, parcel.readInt());
+ assertEquals(config.navigationHidden, parcel.readInt());
+ assertEquals(config.orientation, parcel.readInt());
+ assertEquals(config.screenLayout, parcel.readInt());
}
+
}
diff --git a/tests/tests/content/src/android/content/res/cts/ResourcesTest.java b/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
index b8f2cb1..1ea5edb 100644
--- a/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
@@ -315,6 +315,30 @@ public class ResourcesTest extends AndroidTestCase {
assertEquals(5.0f, cfgNew.fontScale, 0.001f);
}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getDisplayMetrics",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "updateSystemConfiguration",
+ args = {Configuration.class, DisplayMetrics.class}
+ )
+ })
+ public void testGetDisplayMetrics() {
+ final DisplayMetrics dM1 = mResources.getDisplayMetrics();
+ dM1.widthPixels = 11;
+ dM1.heightPixels = 27;
+
+ Resources.updateSystemConfiguration(new Configuration(), dM1);
+
+ final DisplayMetrics dM2 = mResources.getDisplayMetrics();
+ assertEquals(11, dM2.widthPixels);
+ assertEquals(27, dM2.heightPixels);
+ }
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "getDimensionPixelSize",
diff --git a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
index 5ae0a49..47c52ba 100644
--- a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
+++ b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
@@ -453,9 +453,16 @@ public class AbstractCursorTest extends InstrumentationTestCase {
method = "getUpdatedField",
args = {int.class}
)
+ @ToBeFixed(bug = "1569265", explanation = "All other updating-related methods are 'hide' and "
+ + "'deprecated.")
public void testGetUpdatedField() {
mTestAbstractCursor.moveToFirst();
- assertNull(mTestAbstractCursor.getUpdatedField(0));
+ try {
+ assertEquals("hello", mTestAbstractCursor.getUpdatedField(0));
+ fail("getUpdatedField should throws a NullPointerException here.");
+ } catch (NullPointerException e) {
+ // expected
+ }
}
@TestTargetNew(
@@ -546,6 +553,19 @@ public class AbstractCursorTest extends InstrumentationTestCase {
assertEquals(COLUMN_NAMES1.length, mDatabaseCursor.getColumnCount());
}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "deactivateInternal",
+ args = {}
+ )
+ public void testDeactivateInternal() {
+ MockDataSetObserver mock = new MockDataSetObserver();
+ mDatabaseCursor.registerDataSetObserver(mock);
+ assertFalse(mock.hadCalledOnInvalid());
+ mDatabaseCursor.deactivateInternal();
+ assertTrue(mock.hadCalledOnInvalid());
+ }
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -726,6 +746,12 @@ public class AbstractCursorTest extends InstrumentationTestCase {
return mRows.length;
}
+ @Deprecated
+ @Override
+ public boolean deleteRow() {
+ return false;
+ }
+
@Override
public String[] getColumnNames() {
return mColumnNames;
diff --git a/tests/tests/database/src/android/database/cts/CursorWindowTest.java b/tests/tests/database/src/android/database/cts/CursorWindowTest.java
index 1febfd0..5b6db60 100644
--- a/tests/tests/database/src/android/database/cts/CursorWindowTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorWindowTest.java
@@ -212,7 +212,7 @@ public class CursorWindowTest extends AndroidTestCase {
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "createFromParcel",
+ method = "newFromParcel",
args = {android.os.Parcel.class}
),
@TestTargetNew(
@@ -221,6 +221,7 @@ public class CursorWindowTest extends AndroidTestCase {
args = {android.os.Parcel.class, int.class}
)
})
+ @ToBeFixed(bug = " ", explanation = "Can't create a remote binder for newFromParcel here.")
public void testConstructors() {
int TEST_NUMBER = 5;
CursorWindow cursorWindow;
@@ -235,17 +236,19 @@ public class CursorWindowTest extends AndroidTestCase {
// Test newFromParcel
Parcel parcel = Parcel.obtain();
+ try {
+ cursorWindow = CursorWindow.newFromParcel(parcel);
+ fail("Can't accept a local binder.");
+ } catch (IllegalStateException e) {
+ // expected
+ }
+
cursorWindow = new CursorWindow(true);
cursorWindow.setStartPosition(TEST_NUMBER);
- cursorWindow.setNumColumns(1);
- cursorWindow.allocRow();
- cursorWindow.putString(TEST_STRING, TEST_NUMBER, 0);
cursorWindow.writeToParcel(parcel, 0);
-
parcel.setDataPosition(0);
- cursorWindow = CursorWindow.CREATOR.createFromParcel(parcel);
- assertEquals(TEST_NUMBER, cursorWindow.getStartPosition());
- assertEquals(TEST_STRING, cursorWindow.getString(TEST_NUMBER, 0));
+ assertNotNull(parcel.readStrongBinder());
+ assertEquals(TEST_NUMBER, parcel.readInt());
}
@TestTargets({
diff --git a/tests/tests/database/src/android/database/cts/CursorWrapperTest.java b/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
index df90237..dba9784 100644
--- a/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorWrapperTest.java
@@ -750,17 +750,7 @@ public class CursorWrapperTest extends AndroidTestCase {
private void setupDatabase() {
File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
- /* don't use the same database name as the one in super class
- * this class's setUp() method deletes a database file just opened by super.setUp().
- * that can cause corruption in database in the following situation:
- * super.setUp() creates the database, inserts some data into it.
- * this class setUp() deletes just the database file but not the associated
- * database files such as wal, shm files.
- * solution is to have this class delete the whole database directory.
- * better yet, this class shouldn't extend DatabaseCursortest at all.
- * TODO: fix this bogus cts class hierarchy
- */
- mDatabaseFile = new File(dbDir, "cursor_test.db");
+ mDatabaseFile = new File(dbDir, "database_test.db");
if (mDatabaseFile.exists()) {
mDatabaseFile.delete();
}
diff --git a/tests/tests/database/src/android/database/cts/DatabaseCursorTest.java b/tests/tests/database/src/android/database/cts/DatabaseCursorTest.java
index e5d182e..4d0c6ac 100644
--- a/tests/tests/database/src/android/database/cts/DatabaseCursorTest.java
+++ b/tests/tests/database/src/android/database/cts/DatabaseCursorTest.java
@@ -103,6 +103,43 @@ public class DatabaseCursorTest extends AndroidTestCase implements PerformanceTe
}
@MediumTest
+ public void testCursorUpdate() {
+ mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, d INTEGER, s INTEGER);");
+ for (int i = 0; i < 20; i++) {
+ mDatabase.execSQL("INSERT INTO test (d, s) VALUES (" + i + "," + i % 2 + ");");
+ }
+
+ Cursor testCursor = getTestCursor(mDatabase.query("test", null, "s = 0", null, null, null,
+ null));
+
+ int dCol = testCursor.getColumnIndexOrThrow("d");
+ int sCol = testCursor.getColumnIndexOrThrow("s");
+
+ int count = 0;
+ while (testCursor.moveToNext()) {
+ assertTrue(testCursor.updateInt(dCol, 3));
+ count++;
+ }
+ assertEquals(10, count);
+
+ assertTrue(testCursor.commitUpdates());
+
+ assertTrue(testCursor.requery());
+
+ count = 0;
+ while (testCursor.moveToNext()) {
+ assertEquals(3, testCursor.getInt(dCol));
+ count++;
+ }
+
+ assertEquals(10, count);
+ assertTrue(testCursor.moveToFirst());
+ assertTrue(testCursor.deleteRow());
+ assertEquals(9, testCursor.getCount());
+ testCursor.close();
+ }
+
+ @MediumTest
public void testBlob() throws Exception {
// create table
mDatabase.execSQL(
@@ -141,6 +178,23 @@ public class DatabaseCursorTest extends AndroidTestCase implements PerformanceTe
assertEquals(s, testCursor.getString(sCol));
assertEquals((double) d, testCursor.getDouble(dCol));
assertEquals((long) l, testCursor.getLong(lCol));
+
+ // new byte[]
+ byte[] newblob = new byte[1000];
+ value = 98;
+ Arrays.fill(blob, value);
+
+ testCursor.updateBlob(bCol, newblob);
+ cBlob = testCursor.getBlob(bCol);
+ assertTrue(Arrays.equals(newblob, cBlob));
+
+ // commit
+ assertTrue(testCursor.commitUpdates());
+ assertTrue(testCursor.requery());
+ testCursor.moveToNext();
+ cBlob = testCursor.getBlob(bCol);
+ assertTrue(Arrays.equals(newblob, cBlob));
+ testCursor.close();
}
@MediumTest
@@ -313,6 +367,53 @@ public class DatabaseCursorTest extends AndroidTestCase implements PerformanceTe
}
@LargeTest
+ public void testLoadingThreadClose() throws Exception {
+ mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data INT);");
+
+ final int count = 1000;
+ String sql = "INSERT INTO test (data) VALUES (?);";
+ SQLiteStatement s = mDatabase.compileStatement(sql);
+ for (int i = 0; i < count; i++) {
+ s.bindLong(1, i);
+ s.execute();
+ }
+
+ int maxRead = 11;
+ int initialRead = 5;
+ SQLiteCursor testCursor = (SQLiteCursor) mDatabase.rawQuery("select * from test;", null,
+ initialRead, maxRead);
+
+ TestObserver observer = new TestObserver(count, testCursor);
+ testCursor.registerDataSetObserver(observer);
+ testCursor.getCount();
+ testCursor.close();
+ }
+
+ @LargeTest
+ public void testLoadingThreadDeactivate() throws Exception {
+ mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data INT);");
+
+ final int count = 1000;
+ String sql = "INSERT INTO test (data) VALUES (?);";
+ SQLiteStatement s = mDatabase.compileStatement(sql);
+ for (int i = 0; i < count; i++) {
+ s.bindLong(1, i);
+ s.execute();
+ }
+
+ int maxRead = 11;
+ int initialRead = 5;
+ SQLiteCursor testCursor = (SQLiteCursor) mDatabase.rawQuery("select * from test;", null,
+ initialRead, maxRead);
+
+ TestObserver observer = new TestObserver(count, testCursor);
+ testCursor.registerDataSetObserver(observer);
+ testCursor.getCount();
+ testCursor.deactivate();
+ testCursor.close();
+ }
+
+ @LargeTest
public void testManyRowsLong() throws Exception {
mDatabase.beginTransaction();
final int count = 9000;
diff --git a/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java b/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java
index ae2a204..c67002c 100644
--- a/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java
+++ b/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java
@@ -33,15 +33,11 @@ import android.database.sqlite.SQLiteDoneException;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteStatement;
import android.os.Parcel;
-import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
import java.io.PrintStream;
@TestTargetClass(android.database.DatabaseUtils.class)
@@ -54,7 +50,6 @@ public class DatabaseUtilsTest extends AndroidTestCase {
"age", // 2
"address" // 3
};
- private static final String TABLE_NAME = "test";
@Override
protected void setUp() throws Exception {
@@ -66,10 +61,8 @@ public class DatabaseUtilsTest extends AndroidTestCase {
}
mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null);
assertNotNull(mDatabase);
- mDatabase.execSQL("CREATE TABLE " + TABLE_NAME + " (_id INTEGER PRIMARY KEY, " +
+ mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, " +
"name TEXT, age INTEGER, address TEXT);");
- mDatabase.execSQL(
- "CREATE TABLE blob_test (_id INTEGER PRIMARY KEY, name TEXT, data BLOB)");
}
@Override
@@ -139,12 +132,11 @@ public class DatabaseUtilsTest extends AndroidTestCase {
String address = "LA";
// at the beginning, there are no records in the database.
- Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
- null, null, null, null, null);
+ Cursor cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
assertEquals(0, cursor.getCount());
- String sql = "INSERT INTO " + TABLE_NAME + " (name, age, address) VALUES (?, ?, ?);";
+ String sql = "INSERT INTO test (name, age, address) VALUES (?, ?, ?);";
SQLiteStatement statement = mDatabase.compileStatement(sql);
DatabaseUtils.bindObjectToProgram(statement, 1, name);
DatabaseUtils.bindObjectToProgram(statement, 2, age);
@@ -152,7 +144,7 @@ public class DatabaseUtilsTest extends AndroidTestCase {
statement.execute();
statement.close();
- cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
+ cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
assertEquals(1, cursor.getCount());
cursor.moveToFirst();
@@ -169,8 +161,8 @@ public class DatabaseUtilsTest extends AndroidTestCase {
)
public void testCreateDbFromSqlStatements() {
String dbName = "ExampleName";
- String sqls = "CREATE TABLE " + TABLE_NAME + " (_id INTEGER PRIMARY KEY, name TEXT);\n"
- + "INSERT INTO " + TABLE_NAME + " (name) VALUES ('Mike');\n";
+ String sqls = "CREATE TABLE test (_id INTEGER PRIMARY KEY, name TEXT);\n"
+ + "INSERT INTO test (name) VALUES ('Mike');\n";
DatabaseUtils.createDbFromSqlStatements(getContext(), dbName, 1, sqls);
SQLiteDatabase db = getContext().openOrCreateDatabase(dbName, 0, null);
@@ -178,7 +170,7 @@ public class DatabaseUtilsTest extends AndroidTestCase {
"_id", // 0
"name" // 1
};
- Cursor cursor = db.query(TABLE_NAME, PROJECTION, null, null, null, null, null);
+ Cursor cursor = db.query("test", PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
assertEquals(1, cursor.getCount());
cursor.moveToFirst();
@@ -193,10 +185,8 @@ public class DatabaseUtilsTest extends AndroidTestCase {
android.content.ContentValues.class, java.lang.String.class}
)
public void testCursorDoubleToContentValues() {
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
- Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
- null, null, null, null, null);
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
+ Cursor cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
ContentValues contentValues = new ContentValues();
@@ -220,10 +210,8 @@ public class DatabaseUtilsTest extends AndroidTestCase {
)
@ToBeFixed(bug = "1586458", explanation = "It's probably a typo.")
public void testCursorDoubleToCursorValues() {
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
- Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
- null, null, null, null, null);
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
+ Cursor cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
ContentValues contentValues = new ContentValues();
@@ -253,9 +241,8 @@ public class DatabaseUtilsTest extends AndroidTestCase {
)
})
public void testCursorIntToContentValues() {
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
- Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
+ Cursor cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
ContentValues contentValues = new ContentValues();
@@ -296,9 +283,8 @@ public class DatabaseUtilsTest extends AndroidTestCase {
)
})
public void testcursorLongToContentValues() {
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
- Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
+ Cursor cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
ContentValues contentValues = new ContentValues();
@@ -330,10 +316,8 @@ public class DatabaseUtilsTest extends AndroidTestCase {
args = {android.database.Cursor.class, android.content.ContentValues.class}
)
public void testCursorRowToContentValues() {
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
- Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
- null, null, null, null, null);
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
+ Cursor cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
ContentValues contentValues = new ContentValues();
@@ -359,10 +343,8 @@ public class DatabaseUtilsTest extends AndroidTestCase {
)
})
public void testCursorStringToContentValues() {
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
- Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
- null, null, null, null, null);
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
+ Cursor cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
ContentValues contentValues = new ContentValues();
@@ -408,8 +390,7 @@ public class DatabaseUtilsTest extends AndroidTestCase {
mDatabase.execSQL("CREATE TABLE test_copy (_id INTEGER PRIMARY KEY, " +
"name TEXT, age INTEGER, address TEXT);");
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
Cursor cursor = mDatabase.query("test_copy", TEST_PROJECTION, null, null, null, null, null);
assertEquals(0, cursor.getCount());
@@ -418,7 +399,7 @@ public class DatabaseUtilsTest extends AndroidTestCase {
int indexAge = insertHelper.getColumnIndex("age");
int indexAddress = insertHelper.getColumnIndex("address");
- cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
+ cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
cursor.moveToNext();
insertHelper.prepareForInsert();
DatabaseUtils.cursorStringToInsertHelper(cursor, "name", insertHelper, indexName);
@@ -457,10 +438,8 @@ public class DatabaseUtilsTest extends AndroidTestCase {
)
})
public void testDumpCurrentRow() {
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
- Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
- null, null, null, null, null);
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
+ Cursor cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
cursor.moveToNext();
String expected = "0 {\n _id=1\n name=Mike\n age=20\n address=LA\n}\n";
@@ -504,12 +483,9 @@ public class DatabaseUtilsTest extends AndroidTestCase {
)
})
public void testDumpCursor() {
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Jack', '30', 'London');");
- Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION,
- null, null, null, null, null);
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Jack', '30', 'London');");
+ Cursor cursor = mDatabase.query("test", TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
int pos = cursor.getPosition();
String expected = ">>>>> Dumping cursor " + cursor + "\n" +
@@ -588,15 +564,13 @@ public class DatabaseUtilsTest extends AndroidTestCase {
)
})
public void testLongForQuery() {
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
- String query = "SELECT age FROM " + TABLE_NAME;
+ String query = "SELECT age FROM test";
assertEquals(20, DatabaseUtils.longForQuery(mDatabase, query, null));
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Jack', '35', 'London');");
- query = "SELECT age FROM " + TABLE_NAME + " WHERE name = ?";
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Jack', '35', 'London');");
+ query = "SELECT age FROM test WHERE name = ?";
String[] args = new String[] { "Jack" };
assertEquals(35, DatabaseUtils.longForQuery(mDatabase, query, args));
args = new String[] { "No such name" };
@@ -607,11 +581,11 @@ public class DatabaseUtilsTest extends AndroidTestCase {
// expected
}
- query = "SELECT count(*) FROM " + TABLE_NAME + ";";
+ query = "SELECT count(*) FROM test;";
SQLiteStatement statement = mDatabase.compileStatement(query);
assertEquals(2, DatabaseUtils.longForQuery(statement, null));
- query = "SELECT age FROM " + TABLE_NAME + " WHERE address = ?;";
+ query = "SELECT age FROM test WHERE address = ?;";
statement = mDatabase.compileStatement(query);
args = new String[] { "London" };
assertEquals(35, DatabaseUtils.longForQuery(statement, args));
@@ -626,47 +600,19 @@ public class DatabaseUtilsTest extends AndroidTestCase {
statement.close();
}
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "queryNumEntries",
- args = {android.database.sqlite.SQLiteDatabase.class, java.lang.String.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "queryNumEntries",
- args = {android.database.sqlite.SQLiteDatabase.class, java.lang.String.class,
- java.lang.String.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "queryNumEntries",
- args = {android.database.sqlite.SQLiteDatabase.class, java.lang.String.class,
- java.lang.String.class, java.lang.String[].class}
- )
- })
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "queryNumEntries",
+ args = {android.database.sqlite.SQLiteDatabase.class, java.lang.String.class}
+ )
public void testQueryNumEntries() {
- assertEquals(0, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME));
+ assertEquals(0, DatabaseUtils.queryNumEntries(mDatabase, "test"));
- mDatabase.execSQL(
- "INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
- assertEquals(1, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME));
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
+ assertEquals(1, DatabaseUtils.queryNumEntries(mDatabase, "test"));
- mDatabase.execSQL(
- "INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Susan', '20', 'AR');");
- assertEquals(2, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME));
-
- mDatabase.execSQL(
- "INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Christian', '25', 'AT');");
- assertEquals(3, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME));
-
- assertEquals(2, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME, "AGE = 20"));
-
- assertEquals(1, DatabaseUtils.queryNumEntries(mDatabase, TABLE_NAME, "AGE = ?",
- new String[] { "25" }));
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
+ assertEquals(2, DatabaseUtils.queryNumEntries(mDatabase, "test"));
try {
DatabaseUtils.queryNumEntries(mDatabase, "NoSuchTable");
@@ -749,15 +695,13 @@ public class DatabaseUtilsTest extends AndroidTestCase {
)
})
public void testStringForQuery() {
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Mike', '20', 'LA');");
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Mike', '20', 'LA');");
- String query = "SELECT name FROM " + TABLE_NAME;
+ String query = "SELECT name FROM test";
assertEquals("Mike", DatabaseUtils.stringForQuery(mDatabase, query, null));
- mDatabase.execSQL("INSERT INTO " + TABLE_NAME + " (name, age, address)" +
- " VALUES ('Jack', '35', 'London');");
- query = "SELECT name FROM " + TABLE_NAME + " WHERE address = ?";
+ mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Jack', '35', 'London');");
+ query = "SELECT name FROM test WHERE address = ?";
String[] args = new String[] { "London" };
assertEquals("Jack", DatabaseUtils.stringForQuery(mDatabase, query, args));
args = new String[] { "No such address" };
@@ -768,105 +712,18 @@ public class DatabaseUtilsTest extends AndroidTestCase {
// expected
}
- query = "SELECT name FROM " + TABLE_NAME + " WHERE age = ?;";
+ query = "SELECT name FROM test WHERE age = ?;";
SQLiteStatement statement = mDatabase.compileStatement(query);
args = new String[] { "20" };
assertEquals("Mike", DatabaseUtils.stringForQuery(statement, args));
args = new String[] { "1000" }; // NO people can be older than this.
try {
- DatabaseUtils.blobFileDescriptorForQuery(statement, args);
+ DatabaseUtils.stringForQuery(statement, args);
fail("should throw SQLiteDoneException");
} catch (SQLiteDoneException e) {
// expected
}
statement.close();
}
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "blobFileDescriptorForQuery",
- args = {android.database.sqlite.SQLiteDatabase.class, java.lang.String.class,
- java.lang.String[].class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "blobFileDescriptorForQuery",
- args = {android.database.sqlite.SQLiteStatement.class, java.lang.String[].class}
- )
- })
- public void testBlobFileDescriptorForQuery() throws Exception {
- String data1 = "5300FEFF";
- String data2 = "DECAFBAD";
- mDatabase.execSQL("INSERT INTO blob_test (name, data) VALUES ('Mike', X'" + data1 + "')");
-
- String query = "SELECT data FROM blob_test";
- assertFileDescriptorContent(parseBlob(data1),
- DatabaseUtils.blobFileDescriptorForQuery(mDatabase, query, null));
-
- mDatabase.execSQL("INSERT INTO blob_test (name, data) VALUES ('Jack', X'" + data2 + "');");
- query = "SELECT data FROM blob_test WHERE name = ?";
- String[] args = new String[] { "Jack" };
- assertFileDescriptorContent(parseBlob(data2),
- DatabaseUtils.blobFileDescriptorForQuery(mDatabase, query, args));
-
- args = new String[] { "No such name" };
- try {
- DatabaseUtils.stringForQuery(mDatabase, query, args);
- fail("should throw SQLiteDoneException");
- } catch (SQLiteDoneException e) {
- // expected
- }
-
- query = "SELECT data FROM blob_test WHERE name = ?;";
- SQLiteStatement statement = mDatabase.compileStatement(query);
- args = new String[] { "Mike" };
- assertFileDescriptorContent(parseBlob(data1),
- DatabaseUtils.blobFileDescriptorForQuery(statement, args));
-
- args = new String[] { "No such name" };
- try {
- DatabaseUtils.blobFileDescriptorForQuery(statement, args);
- fail("should throw SQLiteDoneException");
- } catch (SQLiteDoneException e) {
- // expected
- }
- statement.close();
- }
-
- private static byte[] parseBlob(String src) {
- int len = src.length();
- byte[] result = new byte[len / 2];
-
- for (int i = 0; i < len/2; i++) {
- int val;
- char c1 = src.charAt(i*2);
- char c2 = src.charAt(i*2+1);
- int val1 = Character.digit(c1, 16);
- int val2 = Character.digit(c2, 16);
- val = (val1 << 4) | val2;
- result[i] = (byte)val;
- }
- return result;
- }
-
- private static void assertFileDescriptorContent(byte[] expected, ParcelFileDescriptor fd)
- throws IOException {
- assertInputStreamContent(expected, new ParcelFileDescriptor.AutoCloseInputStream(fd));
- }
-
- private static void assertInputStreamContent(byte[] expected, InputStream is)
- throws IOException {
- try {
- byte[] observed = new byte[expected.length];
- int count = is.read(observed);
- assertEquals(expected.length, count);
- assertEquals(-1, is.read());
- MoreAsserts.assertEquals(expected, observed);
- } finally {
- is.close();
- }
- }
-
}
diff --git a/tests/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java b/tests/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java
index c684a69..ae5b9d4 100644
--- a/tests/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java
+++ b/tests/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java
@@ -24,7 +24,6 @@ import dalvik.annotation.ToBeFixed;
import android.content.Context;
import android.database.AbstractCursor;
-import android.database.Cursor;
import android.database.CursorWindow;
import android.database.DataSetObserver;
import android.database.StaleDataException;
@@ -80,8 +79,8 @@ public class SQLiteCursorTest extends AndroidTestCase {
TEST_SQL, TABLE_NAME);
try {
new SQLiteCursor(mDatabase, cursorDriver, TABLE_NAME, null);
- fail("constructor didn't throw IllegalArgumentException when SQLiteQuery is null");
- } catch (IllegalArgumentException e) {
+ fail("constructor didn't throw NullPointerException when SQLiteQuery is null");
+ } catch (NullPointerException e) {
}
// get SQLiteCursor by querying database
@@ -222,39 +221,6 @@ public class SQLiteCursorTest extends AndroidTestCase {
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "requery",
- args = {}
- )
- })
- public void testRequery2() {
- mDatabase.disableWriteAheadLogging();
- mDatabase.execSQL("create table testRequery2 (i int);");
- mDatabase.execSQL("insert into testRequery2 values(1);");
- mDatabase.execSQL("insert into testRequery2 values(2);");
- Cursor c = mDatabase.rawQuery("select * from testRequery2 order by i", null);
- assertEquals(2, c.getCount());
- assertTrue(c.moveToFirst());
- assertEquals(1, c.getInt(0));
- assertTrue(c.moveToNext());
- assertEquals(2, c.getInt(0));
- // add more data to the table and requery
- mDatabase.execSQL("insert into testRequery2 values(3);");
- assertTrue(c.requery());
- assertEquals(3, c.getCount());
- assertTrue(c.moveToFirst());
- assertEquals(1, c.getInt(0));
- assertTrue(c.moveToNext());
- assertEquals(2, c.getInt(0));
- assertTrue(c.moveToNext());
- assertEquals(3, c.getInt(0));
- // close the database and see if requery throws an exception
- mDatabase.close();
- assertFalse(c.requery());
- }
-
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "getColumnIndex",
args = {java.lang.String.class}
),
@@ -276,6 +242,16 @@ public class SQLiteCursorTest extends AndroidTestCase {
@TestTargetNew(
level = TestLevel.COMPLETE,
+ method = "getDatabase",
+ args = {}
+ )
+ public void testGetDatabase() {
+ SQLiteCursor cursor = getCursor();
+ assertSame(mDatabase, cursor.getDatabase());
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
method = "setSelectionArguments",
args = {java.lang.String[].class}
)
diff --git a/tests/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java b/tests/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java
index 4d2724a..7a18cd8 100644
--- a/tests/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java
+++ b/tests/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java
@@ -18,7 +18,10 @@ package android.database.sqlite.cts;
import java.io.File;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
import android.content.ContentValues;
import android.database.Cursor;
@@ -34,8 +37,6 @@ import android.database.sqlite.SQLiteStatement;
import android.database.sqlite.SQLiteTransactionListener;
import android.test.AndroidTestCase;
import android.test.MoreAsserts;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.SmallTest;
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestLevel;
@@ -138,8 +139,17 @@ public class SQLiteDatabaseTest extends AndroidTestCase {
assertNotNull(db);
db.close();
+ try {
+ // do not allow to create file in the directory
+ SQLiteDatabase.openDatabase("/system/database.db", factory,
+ SQLiteDatabase.CREATE_IF_NECESSARY);
+ fail("didn't throw SQLiteException when do not allow to create database file");
+ } catch (SQLiteException e) {
+ } finally {
+ db.close();
+ }
+
File dbFile = new File(mDatabaseDir, "database_test12345678.db");
- dbFile.delete();
assertFalse(dbFile.exists());
db = SQLiteDatabase.openOrCreateDatabase(dbFile.getPath(), factory);
assertNotNull(db);
@@ -328,6 +338,88 @@ public class SQLiteDatabaseTest extends AndroidTestCase {
}
}
+ @SuppressWarnings("deprecation")
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getSyncedTables()",
+ method = "getSyncedTables",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test markTableSyncable(String, String)",
+ method = "markTableSyncable",
+ args = {java.lang.String.class, java.lang.String.class}
+ )
+ })
+ public void testGetSyncedTables() {
+ mDatabase.execSQL("CREATE TABLE people (_id INTEGER PRIMARY KEY, name TEXT, "
+ + "_sync_dirty INTEGER);");
+ mDatabase.execSQL("CREATE TABLE _delete_people (name TEXT);");
+ Map tableMap = mDatabase.getSyncedTables();
+ assertEquals(0, tableMap.size());
+ mDatabase.markTableSyncable("people", "_delete_people");
+ tableMap = mDatabase.getSyncedTables();
+ assertEquals(1, tableMap.size());
+ Set keys = tableMap.keySet();
+ Iterator iterator = keys.iterator();
+ assertTrue(iterator.hasNext());
+ assertEquals("people", iterator.next());
+ assertEquals("_delete_people", tableMap.get("people"));
+ assertFalse(iterator.hasNext());
+
+ // test sync
+ mDatabase.execSQL("INSERT INTO people VALUES (0, \"foo\", 0);");
+ Cursor c = mDatabase.query("people", new String[] {"_id", "name" },
+ "_id = 0", null, null, null, null);
+ assertTrue(c.moveToFirst());
+ c.updateString(1, "updated");
+ c.commitUpdates();
+ c.close();
+ c = mDatabase.query("people", new String[] {"_id", "_sync_dirty" },
+ "_id = 0", null, null, null, null);
+ assertTrue(c.moveToFirst());
+ // _sync_dirty flag has been set
+ assertEquals(1, c.getInt(1));
+ c.close();
+ }
+
+ @SuppressWarnings("deprecation")
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test markTableSyncable(String, String, String)",
+ method = "markTableSyncable",
+ args = {java.lang.String.class, java.lang.String.class, java.lang.String.class}
+ )
+ public void testMarkTableSyncable() {
+ mDatabase.execSQL("CREATE TABLE phone (_id INTEGER PRIMARY KEY, _people_id INTEGER, " +
+ "name TEXT);");
+ mDatabase.execSQL("CREATE TABLE people (_id INTEGER PRIMARY KEY, " +
+ "name TEXT, _sync_dirty INTEGER);");
+ mDatabase.markTableSyncable("phone", "_people_id", "people");
+
+ Map tableMap = mDatabase.getSyncedTables();
+ // since no delete table was given, there is no mapping
+ assertEquals(0, tableMap.size());
+
+ // test sync
+ mDatabase.execSQL("INSERT INTO people VALUES (13, \"foo\", 0);");
+ mDatabase.execSQL("INSERT INTO phone VALUES (0, 13, \"bar\");");
+ Cursor c = mDatabase.query("phone", new String[] {"_id", "name" },
+ "_id = 0", null, null, null, null);
+ assertTrue(c.moveToFirst());
+ c.updateString(1, "updated");
+ c.commitUpdates();
+ c.close();
+ c = mDatabase.query("people", new String[] {"_id", "_sync_dirty" },
+ "_id = 13", null, null, null, null);
+ assertTrue(c.moveToFirst());
+ // _sync_dirty flag has been set
+ assertEquals(1, c.getInt(1));
+ c.close();
+ }
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -454,8 +546,7 @@ public class SQLiteDatabaseTest extends AndroidTestCase {
mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Jim', 35, 'Chicago');");
// delete one record.
- int count = mDatabase.delete(TABLE_NAME, "name = 'Mike'", null);
- assertEquals(1, count);
+ mDatabase.delete(TABLE_NAME, "name = 'Mike'", null);
Cursor cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null,
null, null, null, null);
@@ -473,8 +564,7 @@ public class SQLiteDatabaseTest extends AndroidTestCase {
cursor.close();
// delete another record.
- count = mDatabase.delete(TABLE_NAME, "name = ?", new String[] { "Jack" });
- assertEquals(1, count);
+ mDatabase.delete(TABLE_NAME, "name = ?", new String[] { "Jack" });
cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null,
null, null);
@@ -491,8 +581,7 @@ public class SQLiteDatabaseTest extends AndroidTestCase {
mDatabase.execSQL("INSERT INTO test (name, age, address) VALUES ('Jack', 30, 'London');");
// delete all records.
- count = mDatabase.delete(TABLE_NAME, null, null);
- assertEquals(3, count);
+ mDatabase.delete(TABLE_NAME, null, null);
cursor = mDatabase.query(TABLE_NAME, TEST_PROJECTION, null, null, null, null, null);
assertNotNull(cursor);
@@ -1505,128 +1594,4 @@ public class SQLiteDatabaseTest extends AndroidTestCase {
assertEquals(1, cursor.getInt(0));
assertEquals(2, cursor.getInt(1));
}
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- notes = "test enableWriteAheadLogging",
- method = "enableWriteAheadLogging",
- args = {}
- )
- /**
- * With sqlite's write-ahead-logging (WAL) enabled, readers get old version of data
- * from the table that a writer is modifying at the same time.
- *
- * This method does the following to test this sqlite3 feature
- *
- * creates a table in the database and populates it with 5 rows of data
- * do "select count(*) from this_table" and expect to receive 5
- * start a writer thread who BEGINs a transaction, INSERTs a single row
- * into this_table
- * writer stops the transaction at this point, kicks off a reader thread - which will
- * do the above SELECT query: "select count(*) from this_table"
- * this query should return value 5 - because writer is still in transaction and
- * sqlite returns OLD version of the data
- * writer ends the transaction, thus making the extra row now visible to everyone
- * reader is kicked off again to do the same query. this time query should
- * return value = 6 which includes the newly inserted row into this_table.
- *
- * @throws InterruptedException
- */
- @LargeTest
- public void testReaderGetsOldVersionOfDataWhenWriterIsInXact() throws InterruptedException {
- // redo setup to create WAL enabled database
- mDatabase.close();
- new File(mDatabase.getPath()).delete();
- mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null, null);
- boolean rslt = mDatabase.enableWriteAheadLogging();
- assertTrue(rslt);
- assertNotNull(mDatabase);
-
- // create a new table and insert 5 records into it.
- mDatabase.execSQL("CREATE TABLE t1 (i int, j int);");
- mDatabase.beginTransaction();
- for (int i = 0; i < 5; i++) {
- mDatabase.execSQL("insert into t1 values(?,?);", new String[] {i+"", i+""});
- }
- mDatabase.setTransactionSuccessful();
- mDatabase.endTransaction();
-
- // make sure a reader can read the above data
- ReaderQueryingData r1 = new ReaderQueryingData(5);
- r1.start();
- Thread.yield();
- try {r1.join();} catch (Exception e) {}
-
- WriterDoingSingleTransaction w = new WriterDoingSingleTransaction();
- w.start();
- w.join();
- }
-
- private class WriterDoingSingleTransaction extends Thread {
- @Override public void run() {
- // start a transaction
- mDatabase.beginTransactionNonExclusive();
- mDatabase.execSQL("insert into t1 values(?,?);", new String[] {"11", "11"});
- assertTrue(mDatabase.isOpen());
-
- // while the writer is in a transaction, start a reader and make sure it can still
- // read 5 rows of data (= old data prior to the current transaction)
- ReaderQueryingData r1 = new ReaderQueryingData(5);
- r1.start();
- try {r1.join();} catch (Exception e) {}
-
- // now, have the writer do the select count(*)
- // it should execute on the same connection as this transaction
- // and count(*) should reflect the newly inserted row
- Long l = DatabaseUtils.longForQuery(mDatabase, "select count(*) from t1", null);
- assertEquals(6, l.intValue());
-
- // end transaction
- mDatabase.setTransactionSuccessful();
- mDatabase.endTransaction();
-
- // reader should now be able to read 6 rows = new data AFTER this transaction
- r1 = new ReaderQueryingData(6);
- r1.start();
- try {r1.join();} catch (Exception e) {}
- }
- }
-
- private class ReaderQueryingData extends Thread {
- private int count;
- /**
- * constructor with a param to indicate the number of rows expected to be read
- */
- public ReaderQueryingData(int count) {
- this.count = count;
- }
- @Override public void run() {
- Long l = DatabaseUtils.longForQuery(mDatabase, "select count(*) from t1", null);
- assertEquals(count, l.intValue());
- }
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- notes = "test exceptions from enableWriteAheadLogging().",
- method = "enableWriteAheadLogging",
- args = {}
- )
- public void testExceptionsFromEnableWriteAheadLogging() {
- // attach a database
- // redo setup to create WAL enabled database
- mDatabase.close();
- new File(mDatabase.getPath()).delete();
- mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null, null);
-
- // attach a database and call enableWriteAheadLogging - should not be allowed
- mDatabase.execSQL("attach database ':memory:' as memoryDb");
- boolean rslt = mDatabase.enableWriteAheadLogging();
- assertFalse(rslt);
- // enableWriteAheadLogging on memory database is not allowed
- SQLiteDatabase db = SQLiteDatabase.create(null);
- rslt = db.enableWriteAheadLogging();
- assertFalse(rslt);
- db.close();
- }
}
diff --git a/tests/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java b/tests/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java
index a9a3293..89918a1 100644
--- a/tests/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java
+++ b/tests/tests/database/src/android/database/sqlite/cts/SQLiteProgramTest.java
@@ -20,13 +20,13 @@ import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDoneException;
import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteQuery;
import android.database.sqlite.SQLiteStatement;
import android.test.AndroidTestCase;
import android.test.MoreAsserts;
@@ -37,6 +37,9 @@ public class SQLiteProgramTest extends AndroidTestCase {
private SQLiteDatabase mDatabase;
+ @ToBeFixed(bug="1448885", explanation="SQLiteProgram is an abstract class and its " +
+ "constructor is package private, so it can not be extended directly to test. " +
+ "For this reason, the test uses SQLiteStatement instead.")
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -54,6 +57,79 @@ public class SQLiteProgramTest extends AndroidTestCase {
super.tearDown();
}
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test getUniqueId()",
+ method = "getUniqueId",
+ args = {}
+ )
+ public void testGetUniqueId() {
+ mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, text1 TEXT, text2 TEXT, " +
+ "num1 INTEGER, num2 INTEGER, image BLOB);");
+ final String statement = "DELETE FROM test WHERE _id=?;";
+ SQLiteStatement statementOne = mDatabase.compileStatement(statement);
+ SQLiteStatement statementTwo = mDatabase.compileStatement(statement);
+ // since the same compiled statement is being accessed at the same time by 2 different
+ // objects, they each get their own statement id
+ assertTrue(statementOne.getUniqueId() != statementTwo.getUniqueId());
+ statementOne.close();
+ statementTwo.close();
+
+ statementOne = mDatabase.compileStatement(statement);
+ int n = statementOne.getUniqueId();
+ statementOne.close();
+ statementTwo = mDatabase.compileStatement(statement);
+ assertEquals(n, statementTwo.getUniqueId());
+ statementTwo.close();
+
+ // now try to compile 2 different statements and they should have different uniquerIds.
+ SQLiteStatement statement1 = mDatabase.compileStatement("DELETE FROM test WHERE _id=1;");
+ SQLiteStatement statement2 = mDatabase.compileStatement("DELETE FROM test WHERE _id=2;");
+ assertTrue(statement1.getUniqueId() != statement2.getUniqueId());
+ statement1.close();
+ statement2.close();
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onAllReferencesReleased(). Since sql statements are always cached in " +
+ "SQLiteDatabase, compiledSql should NOT be released " +
+ "when onAllReferencesReleased() is called",
+ method = "onAllReferencesReleased",
+ args = {}
+ )
+ public void testOnAllReferencesReleased() {
+ mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, text1 TEXT, text2 TEXT, " +
+ "num1 INTEGER, num2 INTEGER, image BLOB);");
+ final String statement = "DELETE FROM test WHERE _id=?;";
+ SQLiteStatement statementOne = mDatabase.compileStatement(statement);
+ assertTrue(statementOne.getUniqueId() > 0);
+ int nStatement = statementOne.getUniqueId();
+ statementOne.releaseReference();
+ assertTrue(statementOne.getUniqueId() == nStatement);
+ statementOne.close();
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ notes = "Test onAllReferencesReleasedFromContainer(). " +
+ "Since sql statements are always cached in " +
+ "SQLiteDatabase, compiledSql should NOT be released " +
+ "when onAllReferencesReleasedFromContainer() is called",
+ args = {}
+ )
+ public void testOnAllReferencesReleasedFromContainer() {
+ mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, text1 TEXT, text2 TEXT, " +
+ "num1 INTEGER, num2 INTEGER, image BLOB);");
+ final String statement = "DELETE FROM test WHERE _id=?;";
+ SQLiteStatement statementOne = mDatabase.compileStatement(statement);
+ assertTrue(statementOne.getUniqueId() > 0);
+ int nStatement = statementOne.getUniqueId();
+ statementOne.releaseReferenceFromContainer();
+ assertTrue(statementOne.getUniqueId() == nStatement);
+ statementOne.close();
+ }
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -119,36 +195,39 @@ public class SQLiteProgramTest extends AndroidTestCase {
}
statement.close();
- Cursor cursor = null;
+ statement = mDatabase.compileStatement("SELECT text1 FROM test;");
try {
- cursor = mDatabase.query("test", new String[]{"text1"}, "where text1='a'",
- new String[]{"foo"}, null, null, null);
+ statement.bindString(1, "foo");
fail("Should throw exception (no value to bind)");
} catch (SQLiteException expected) {
// expected
- } finally {
- if (cursor != null) {
- cursor.close();
- }
+ }
+
+ statement =
+ mDatabase.compileStatement("SELECT text1 FROM test WHERE text2 = ? AND num2 = ?;");
+
+ try {
+ statement.bindString(0, "Jack");
+ fail("Should throw exception (index is 0)");
+ } catch (SQLiteException expected) {
+ // expected
+ }
+ try {
+ statement.bindLong(-1, 30);
+ fail("Should throw exception (index is negative)");
+ } catch (SQLiteException expected) {
+ // expected
}
try {
- cursor = mDatabase.query("test", new String[]{"text1"}, "where text1='a'",
- new String[]{"foo", "bar"}, null, null, null);
+ statement.bindDouble(3, 589.0);
fail("Should throw exception (index too large)");
} catch (SQLiteException expected) {
// expected
- } finally {
- if (cursor != null) {
- cursor.close();
- }
}
// test positive case
- statement = mDatabase.compileStatement(
- "SELECT text1 FROM test WHERE text2 = ? AND num2 = ?;");
statement.bindString(1, "Jack");
statement.bindLong(2, 30);
assertEquals("Mike", statement.simpleQueryForString());
- statement.close();
}
@TestTargetNew(
@@ -224,4 +303,64 @@ public class SQLiteProgramTest extends AndroidTestCase {
MoreAsserts.assertEquals(blob, value);
cursor.close();
}
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.NOT_FEASIBLE,
+ method = "onAllReferencesReleased",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.NOT_FEASIBLE,
+ method = "onAllReferencesReleasedFromContainer",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.NOT_FEASIBLE,
+ method = "compile",
+ args = {java.lang.String.class, boolean.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.NOT_FEASIBLE,
+ method = "native_bind_blob",
+ args = {int.class, byte[].class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.NOT_FEASIBLE,
+ method = "native_bind_double",
+ args = {int.class, double.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.NOT_FEASIBLE,
+ method = "native_bind_long",
+ args = {int.class, long.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.NOT_FEASIBLE,
+ method = "native_bind_null",
+ args = {int.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.NOT_FEASIBLE,
+ method = "native_compile",
+ args = {java.lang.String.class}
+ )
+ })
+ @ToBeFixed(bug = "1448885", explanation = "Cannot test protected methods, since constructor" +
+ " is private.")
+ public void testProtectedMethods() {
+ // cannot test
+ }
+
+ private void closeDatabaseWithOrphanedStatement(){
+ try {
+ mDatabase.close();
+ } catch (SQLiteException e) {
+ // A SQLiteException is thrown if there are some unfinialized exceptions
+ // This is expected as some tests explicitly leave statements in this state
+ if (!e.getMessage().equals("Unable to close due to unfinalised statements")) {
+ throw e;
+ }
+ }
+ }
}
diff --git a/tests/tests/database/src/android/database/sqlite/cts/SQLiteStatementTest.java b/tests/tests/database/src/android/database/sqlite/cts/SQLiteStatementTest.java
index b568b8c..ec6b79a 100644
--- a/tests/tests/database/src/android/database/sqlite/cts/SQLiteStatementTest.java
+++ b/tests/tests/database/src/android/database/sqlite/cts/SQLiteStatementTest.java
@@ -21,35 +21,19 @@ import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
-import android.database.DatabaseUtils;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDoneException;
import android.database.sqlite.SQLiteStatement;
-import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-import java.io.IOException;
-import java.io.InputStream;
@TestTargetClass(android.database.sqlite.SQLiteStatement.class)
public class SQLiteStatementTest extends AndroidTestCase {
private static final String STRING1 = "this is a test";
private static final String STRING2 = "another test";
- private static final byte[][] BLOBS = new byte [][] {
- parseBlob("86FADCF1A820666AEBD0789F47932151A2EF734269E8AC4E39630AB60519DFD8"),
- new byte[1],
- null,
- parseBlob("00"),
- parseBlob("FF"),
- parseBlob("D7B500FECF25F7A4D83BF823D3858690790F2526013DE6CAE9A69170E2A1E47238"),
- };
-
private static final String DATABASE_NAME = "database_test.db";
private static final int CURRENT_DATABASE_VERSION = 42;
@@ -76,62 +60,40 @@ public class SQLiteStatementTest extends AndroidTestCase {
mDatabase.execSQL("CREATE TABLE test (_id INTEGER PRIMARY KEY, data TEXT);");
}
- private void populateBlobTable() {
- mDatabase.execSQL("CREATE TABLE blob_test (_id INTEGER PRIMARY KEY, data BLOB)");
- for (int i = 0; i < BLOBS.length; i++) {
- ContentValues values = new ContentValues();
- values.put("_id", i);
- values.put("data", BLOBS[i]);
- mDatabase.insert("blob_test", null, values);
- }
- }
-
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "executeUpdateDelete",
+ method = "execute",
args = {}
)
public void testExecute() {
- mDatabase.disableWriteAheadLogging();
populateDefaultTable();
- assertEquals(0, DatabaseUtils.longForQuery(mDatabase, "select count(*) from test", null));
+ Cursor c = mDatabase.query("test", null, null, null, null, null, null);
+ assertEquals(0, c.getCount());
+
+ // test insert
+ SQLiteStatement statement = mDatabase.compileStatement(
+ "INSERT INTO test (data) VALUES ('" + STRING1 + "')");
+ statement.execute();
- // test update
- // insert 2 rows and then update them.
- SQLiteStatement statement1 = mDatabase.compileStatement(
- "INSERT INTO test (data) VALUES ('" + STRING2 + "')");
- assertEquals(1, statement1.executeInsert());
- assertEquals(2, statement1.executeInsert());
- SQLiteStatement statement2 =
- mDatabase.compileStatement("UPDATE test set data = 'a' WHERE _id > 0");
- assertEquals(2, statement2.executeUpdateDelete());
- statement2.close();
- // should still have 2 rows in the table
- assertEquals(2, DatabaseUtils.longForQuery(mDatabase, "select count(*) from test", null));
-
- // test delete
- // insert 2 more rows and delete 3 of them
- assertEquals(3, statement1.executeInsert());
- assertEquals(4, statement1.executeInsert());
- statement1.close();
- statement2 = mDatabase.compileStatement("DELETE from test WHERE _id < 4");
- assertEquals(3, statement2.executeUpdateDelete());
- statement2.close();
- // should still have 1 row1 in the table
- assertEquals(1, DatabaseUtils.longForQuery(mDatabase, "select count(*) from test", null));
-
- // if the SQL statement is something that causes rows of data to
- // be returned, executeUpdateDelete() (and execute()) throw an exception.
- statement2 = mDatabase.compileStatement("SELECT count(*) FROM test");
+ c = mDatabase.query("test", null, null, null, null, null, null);
+ assertEquals(1, c.getCount());
+
+ c.moveToFirst();
+ assertEquals(STRING1, c.getString(c.getColumnIndex("data")));
+
+ // invalid SQL statement
+ statement = mDatabase.compileStatement(
+ "SELECT * FROM test WHERE data=\"" + STRING1 + "\"");
try {
- statement2.executeUpdateDelete();
- fail("exception expected");
+ statement.execute();
+ fail("There should be a SQLException thrown out.");
} catch (SQLException e) {
- // expected
- } finally {
- statement2.close();
+ // expected.
}
+
+ c.deactivate();
+ statement.close();
}
@TestTargets({
@@ -156,33 +118,25 @@ public class SQLiteStatementTest extends AndroidTestCase {
SQLiteStatement statement = mDatabase.compileStatement(
"INSERT INTO test (data) VALUES ('" + STRING2 + "')");
assertEquals(1, statement.executeInsert());
- statement.close();
-
- // try to insert another row with the same id. last inserted rowid should be -1
- statement = mDatabase.compileStatement("insert or ignore into test values(1, 1);");
- assertEquals(-1, statement.executeInsert());
- statement.close();
c = mDatabase.query("test", null, null, null, null, null, null);
assertEquals(1, c.getCount());
c.moveToFirst();
assertEquals(STRING2, c.getString(c.getColumnIndex("data")));
- c.close();
- // if the sql statement is something that causes rows of data to
- // be returned, executeInsert() throws an exception
+ // invalid SQL statement
statement = mDatabase.compileStatement(
"SELECT * FROM test WHERE data=\"" + STRING2 + "\"");
try {
statement.executeInsert();
- fail("exception expected");
+ fail("There should be a SQLException thrown out.");
} catch (SQLException e) {
- // expected
- } finally {
- statement.close();
-
+ // expected.
}
+
+ c.deactivate();
+ statement.close();
}
@TestTargetNew(
@@ -242,177 +196,4 @@ public class SQLiteStatementTest extends AndroidTestCase {
statement.close();
}
-
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "simpleQueryForBlobFileDescriptor",
- args = {}
- )
- public void testSimpleQueryForBlobFileDescriptorSuccessNormal() throws IOException {
- doTestSimpleQueryForBlobFileDescriptorSuccess(0);
- }
-
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "simpleQueryForBlobFileDescriptor",
- args = {}
- )
- public void testSimpleQueryForBlobFileDescriptorSuccessEmpty() throws IOException {
- doTestSimpleQueryForBlobFileDescriptorSuccess(1);
- }
-
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "simpleQueryForBlobFileDescriptor",
- args = {}
- )
- public void testSimpleQueryForBlobFileDescriptorSuccessNull() {
- populateBlobTable();
-
- String sql = "SELECT data FROM blob_test WHERE _id = " + 2;
- SQLiteStatement stm = mDatabase.compileStatement(sql);
- assertNull(stm.simpleQueryForBlobFileDescriptor());
- }
-
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "simpleQueryForBlobFileDescriptor",
- args = {}
- )
- public void testSimpleQueryForBlobFileDescriptorSuccess00() throws IOException {
- doTestSimpleQueryForBlobFileDescriptorSuccess(3);
- }
-
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "simpleQueryForBlobFileDescriptor",
- args = {}
- )
- public void testSimpleQueryForBlobFileDescriptorSuccessFF() throws IOException {
- doTestSimpleQueryForBlobFileDescriptorSuccess(4);
- }
-
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "simpleQueryForBlobFileDescriptor",
- args = {}
- )
- public void testSimpleQueryForBlobFileDescriptorSuccessEmbeddedNul() throws IOException {
- doTestSimpleQueryForBlobFileDescriptorSuccess(5);
- }
-
- private void doTestSimpleQueryForBlobFileDescriptorSuccess(int i) throws IOException {
- populateBlobTable();
-
- String sql = "SELECT data FROM blob_test WHERE _id = " + i;
- SQLiteStatement stm = mDatabase.compileStatement(sql);
- ParcelFileDescriptor fd = stm.simpleQueryForBlobFileDescriptor();
- assertFileDescriptorContent(BLOBS[i], fd);
- }
-
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "simpleQueryForBlobFileDescriptor",
- args = {}
- )
- public void testSimpleQueryForBlobFileDescriptorSuccessParam() throws IOException {
- populateBlobTable();
-
- String sql = "SELECT data FROM blob_test WHERE _id = ?";
- SQLiteStatement stm = mDatabase.compileStatement(sql);
- stm.bindLong(1, 0);
- ParcelFileDescriptor fd = stm.simpleQueryForBlobFileDescriptor();
- assertFileDescriptorContent(BLOBS[0], fd);
- }
-
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "simpleQueryForBlobFileDescriptor",
- args = {}
- )
- public void testGetBlobFailureNoParam() throws Exception {
- populateBlobTable();
-
- String sql = "SELECT data FROM blob_test WHERE _id = 100";
- SQLiteStatement stm = mDatabase.compileStatement(sql);
- ParcelFileDescriptor fd = null;
- SQLiteDoneException expectedException = null;
- try {
- fd = stm.simpleQueryForBlobFileDescriptor();
- } catch (SQLiteDoneException ex) {
- expectedException = ex;
- } finally {
- if (fd != null) {
- fd.close();
- fd = null;
- }
- }
- assertNotNull("Should have thrown SQLiteDoneException", expectedException);
- }
-
- @TestTargetNew(
- level = TestLevel.PARTIAL_COMPLETE,
- method = "simpleQueryForBlobFileDescriptor",
- args = {}
- )
- public void testGetBlobFailureParam() throws Exception {
- populateBlobTable();
-
- String sql = "SELECT data FROM blob_test WHERE _id = ?";
- SQLiteStatement stm = mDatabase.compileStatement(sql);
- stm.bindLong(1, 100);
- ParcelFileDescriptor fd = null;
- SQLiteDoneException expectedException = null;
- try {
- fd = stm.simpleQueryForBlobFileDescriptor();
- } catch (SQLiteDoneException ex) {
- expectedException = ex;
- } finally {
- if (fd != null) {
- fd.close();
- fd = null;
- }
- }
- assertNotNull("Should have thrown SQLiteDoneException", expectedException);
- }
-
- /*
- * Convert string of hex digits to byte array.
- * Results are undefined for poorly formed string.
- *
- * @param src hex string
- */
- private static byte[] parseBlob(String src) {
- int len = src.length();
- byte[] result = new byte[len / 2];
-
- for (int i = 0; i < len/2; i++) {
- int val;
- char c1 = src.charAt(i*2);
- char c2 = src.charAt(i*2+1);
- int val1 = Character.digit(c1, 16);
- int val2 = Character.digit(c2, 16);
- val = (val1 << 4) | val2;
- result[i] = (byte)val;
- }
- return result;
- }
-
- private static void assertFileDescriptorContent(byte[] expected, ParcelFileDescriptor fd)
- throws IOException {
- assertInputStreamContent(expected, new ParcelFileDescriptor.AutoCloseInputStream(fd));
- }
-
- private static void assertInputStreamContent(byte[] expected, InputStream is)
- throws IOException {
- try {
- byte[] observed = new byte[expected.length];
- int count = is.read(observed);
- assertEquals(expected.length, count);
- assertEquals(-1, is.read());
- MoreAsserts.assertEquals(expected, observed);
- } finally {
- is.close();
- }
- }
}
diff --git a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
index 316933d..624f35a 100644
--- a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
@@ -17,15 +17,11 @@
package android.dpi.cts;
import android.content.Context;
-import android.content.res.Configuration;
import android.test.AndroidTestCase;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.WindowManager;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* Test for verifying a device's screen configuration.
*/
@@ -33,7 +29,7 @@ public class ConfigurationTest extends AndroidTestCase {
public void testScreenConfiguration() {
WindowManager windowManager =
- (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
+ (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
Display display = windowManager.getDefaultDisplay();
DisplayMetrics metrics = new DisplayMetrics();
display.getMetrics(metrics);
@@ -49,48 +45,9 @@ public class ConfigurationTest extends AndroidTestCase {
int max = Math.max(metrics.widthPixels, metrics.heightPixels);
int min = Math.min(metrics.widthPixels, metrics.heightPixels);
- double aspectRatio = (double) max / min;
- assertTrue("Aspect ratio must be between 1.333 and 1.86. It was " + aspectRatio,
- aspectRatio >= 1.333 && aspectRatio <= 1.86);
-
- Set allowedDensities = new HashSet();
- allowedDensities.add(DisplayMetrics.DENSITY_LOW);
- allowedDensities.add(DisplayMetrics.DENSITY_MEDIUM);
- allowedDensities.add(DisplayMetrics.DENSITY_TV);
- allowedDensities.add(DisplayMetrics.DENSITY_HIGH);
- allowedDensities.add(DisplayMetrics.DENSITY_XHIGH);
- assertTrue("DisplayMetrics#densityDpi must be one of the DisplayMetrics.DENSITY_* values: "
- + allowedDensities, allowedDensities.contains(metrics.densityDpi));
-
- assertEquals(metrics.density,
- (float) metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT,
- 0.5f / DisplayMetrics.DENSITY_DEFAULT);
-
- Configuration mConfig = mContext.getResources().getConfiguration();
- int screenLayout = mConfig.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
- int screenLayoutLong = mConfig.screenLayout & Configuration.SCREENLAYOUT_LONG_MASK;
-
- int longSize = (int) (max / metrics.density);
- int shortSize = (int) (min / metrics.density);
-
- // Logic copied from WindowManagerService...
- if (longSize < 470) {
- assertEquals(Configuration.SCREENLAYOUT_SIZE_SMALL, screenLayout);
- assertEquals(Configuration.SCREENLAYOUT_LONG_NO, screenLayoutLong);
- } else {
- if (longSize >= 960 && shortSize >= 720) {
- assertEquals(Configuration.SCREENLAYOUT_SIZE_XLARGE, screenLayout);
- } else if (longSize >= 640 && shortSize >= 480) {
- assertEquals(Configuration.SCREENLAYOUT_SIZE_LARGE, screenLayout);
- } else {
- assertEquals(Configuration.SCREENLAYOUT_SIZE_NORMAL, screenLayout);
- }
-
- if (((longSize * 3) / 5) >= (shortSize - 1)) {
- assertEquals(Configuration.SCREENLAYOUT_LONG_YES, screenLayoutLong);
- } else {
- assertEquals(Configuration.SCREENLAYOUT_LONG_NO, screenLayoutLong);
- }
- }
+ boolean format16x9 = Math.floor(max * 9.0d / 16.0d) <= min;
+ boolean format4x3 = Math.ceil(max * 3.0d / 4.0d) >= min;
+ assertTrue("Aspect ratio must be between 4:3 and 16:9. It was " + max + ":" + min,
+ format4x3 && format16x9);
}
}
diff --git a/tests/tests/drm/Android.mk b/tests/tests/drm/Android.mk
deleted file mode 100644
index 61e1f10..0000000
--- a/tests/tests/drm/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2011 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CtsDrmTestCases
-
-LOCAL_INSTRUMENTATION_FOR := CtsTestStubs
-
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
diff --git a/tests/tests/drm/AndroidManifest.xml b/tests/tests/drm/AndroidManifest.xml
deleted file mode 100644
index fe515f3..0000000
--- a/tests/tests/drm/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/tests/drm/README b/tests/tests/drm/README
deleted file mode 100644
index dd0ef17..0000000
--- a/tests/tests/drm/README
+++ /dev/null
@@ -1,6 +0,0 @@
-- User of CTS code needs to edit configuration files in
- "src/android/drm/cts/configs/" according to the specification
- of user's DRM plug-in.
-- If new plug-in is added, user should add corresponding configuration
- file under "src/android/drm/cts/configs/" and update
- "src/android/drm/cts/ConfigFactory.java".
diff --git a/tests/tests/drm/src/android/drm/cts/Config.java b/tests/tests/drm/src/android/drm/cts/Config.java
deleted file mode 100644
index 736c0ad..0000000
--- a/tests/tests/drm/src/android/drm/cts/Config.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.drm.cts;
-
-import java.util.HashMap;
-
-public interface Config {
- String getPluginName();
- String getMimeType();
- String getAccountId();
- String getRightsPath();
- String getContentPath();
- HashMap getInfoOfRegistration();
- HashMap getInfoOfUnregistration();
- HashMap getInfoOfRightsAcquisition();
-}
diff --git a/tests/tests/drm/src/android/drm/cts/ConfigFactory.java b/tests/tests/drm/src/android/drm/cts/ConfigFactory.java
deleted file mode 100644
index 643bb67..0000000
--- a/tests/tests/drm/src/android/drm/cts/ConfigFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.drm.cts;
-
-import android.util.Log;
-
-import android.drm.cts.configs.PassthruConfig;
-import android.drm.cts.configs.FwdLockConfig;
-
-public final class ConfigFactory {
- private static final String TAG = "ConfigFactory";
-
- /**
- * Get configurations of specified plug-in name.
- *
- * @param plugInName Name of DRM plug-in. The name SHOULD be consistent with
- * the name defined in plug-in's onGetSupportInfo().
- */
- public static Config getConfig(String plugInName) {
- if (plugInName.equals("Passthru plug-in")) {
- return PassthruConfig.getInstance();
- } else if (plugInName.equals("OMA V1 Forward Lock")) {
- return FwdLockConfig.getInstance();
- } else {
- Log.e(TAG, "Configuration for " + plugInName + " is not registered.");
- return null;
- }
- }
-}
diff --git a/tests/tests/drm/src/android/drm/cts/DRMTest.java b/tests/tests/drm/src/android/drm/cts/DRMTest.java
deleted file mode 100644
index 631446c..0000000
--- a/tests/tests/drm/src/android/drm/cts/DRMTest.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.drm.cts;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-
-import android.content.ContentValues;
-import android.test.AndroidTestCase;
-import android.util.Log;
-import java.io.IOException;
-import java.io.File;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import android.drm.DrmManagerClient;
-import android.drm.DrmConvertedStatus;
-import android.drm.DrmEvent;
-import android.drm.DrmInfo;
-import android.drm.DrmInfoRequest;
-import android.drm.DrmInfoStatus;
-import android.drm.DrmRights;
-import android.drm.DrmStore;
-import android.drm.DrmUtils;
-
-@TestTargetClass(DrmManagerClient.class)
-public class DRMTest extends AndroidTestCase {
- private static String TAG = "CtsDRMTest";
- private static final int WAIT_TIME = 60000; // 1 min max
-
- private Object mLock = new Object();
- private ArrayList mConfigs = new ArrayList();
- private DrmRights mDrmRights;
- private DrmManagerClient mDrmManagerClient;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mDrmManagerClient = new DrmManagerClient(getContext());
- String[] plugins = mDrmManagerClient.getAvailableDrmEngines();
-
- mConfigs.clear();
- for(String plugInName : plugins) {
- Config config = ConfigFactory.getConfig(plugInName);
- if (null != config) {
- mConfigs.add(config);
- }
- }
- }
-
- private void register(Config config) throws Exception {
- DrmInfo drmInfo = executeAcquireDrmInfo(DrmInfoRequest.TYPE_REGISTRATION_INFO,
- config.getInfoOfRegistration(),
- config.getMimeType());
- executeProcessDrmInfo(drmInfo, config);
- }
-
- private void acquireRights(Config config) throws Exception {
- DrmInfo drmInfo = executeAcquireDrmInfo(DrmInfoRequest.TYPE_RIGHTS_ACQUISITION_INFO,
- config.getInfoOfRightsAcquisition(),
- config.getMimeType());
- executeProcessDrmInfo(drmInfo, config);
- }
-
- private void deregister(Config config) throws Exception {
- DrmInfo drmInfo = executeAcquireDrmInfo(DrmInfoRequest.TYPE_UNREGISTRATION_INFO,
- config.getInfoOfRegistration(),
- config.getMimeType());
- executeProcessDrmInfo(drmInfo, config);
- }
-
- public void testIsDrmDirectoryExist() {
- assertTrue("/data/drm/ does not exist", new File("/data/drm/").exists());
- }
-
- public void testRegisterAndDeregister() throws Exception {
- for (Config config : mConfigs) {
- register(config);
- deregister(config);
- }
- }
-
- public void testAcquireRights() throws Exception {
- for (Config config : mConfigs) {
- register(config);
- acquireRights(config);
- deregister(config);
- }
- }
-
- public void testGetConstraints() throws Exception {
- for (Config config : mConfigs) {
- register(config);
- acquireRights(config);
- ContentValues constraints = mDrmManagerClient.getConstraints(
- config.getContentPath(),
- DrmStore.Action.DEFAULT);
- assertNotNull("Failed on plugin: " + config.getPluginName(), constraints);
- deregister(config);
- }
- }
-
- public void testCanHandle() throws Exception {
- for (Config config : mConfigs) {
- assertTrue("Failed on plugin: " + config.getPluginName(),
- mDrmManagerClient.canHandle(config.getContentPath(), config.getMimeType()));
- }
- }
-
- public void testGetOriginalMimeType() throws Exception {
- for (Config config : mConfigs) {
- assertNotNull("Failed on plugin: " + config.getPluginName(),
- mDrmManagerClient.getOriginalMimeType(config.getContentPath()));
- }
- }
-
- public void testCheckRightsStatus() throws Exception {
- for (Config config : mConfigs) {
- register(config);
- acquireRights(config);
- int rightsStatus = mDrmManagerClient.checkRightsStatus(
- config.getContentPath(),
- DrmStore.Action.PLAY);
- assertEquals("Failed on plugin: " + config.getPluginName(),
- DrmStore.RightsStatus.RIGHTS_VALID, rightsStatus);
- deregister(config);
- }
- }
-
- public void testRemoveRights() throws Exception {
- for (Config config : mConfigs) {
- assertEquals("Failed on plugin: " + config.getPluginName(),
- DrmManagerClient.ERROR_NONE,
- mDrmManagerClient.removeRights(config.getContentPath()));
- }
- }
-
- public void testRemoveAllRights() throws Exception {
- for (Config config : mConfigs) {
- assertEquals("Failed on plugin: " + config.getPluginName(),
- mDrmManagerClient.removeAllRights(), DrmManagerClient.ERROR_NONE);
- }
- }
-
- public void testConvertData() throws Exception {
- for (Config config : mConfigs) {
- byte[] inputData = new byte[]{'T','E','S','T'};
-
- int convertId = mDrmManagerClient.openConvertSession(config.getMimeType());
- DrmConvertedStatus drmConvertStatus
- = mDrmManagerClient.convertData(convertId, inputData);
- mDrmManagerClient.closeConvertSession(convertId);
- }
- }
-
- private DrmInfo executeAcquireDrmInfo(
- int type, HashMap request, String mimeType) throws Exception {
- DrmInfoRequest infoRequest = new DrmInfoRequest(type, mimeType);
-
- for (Iterator it = request.keySet().iterator(); it.hasNext(); ) {
- String key = (String) it.next();
- String value = request.get(key);
- infoRequest.put(key, value);
- }
-
- return mDrmManagerClient.acquireDrmInfo(infoRequest);
- }
-
- private void executeProcessDrmInfo(DrmInfo drmInfo, Config config) throws Exception {
- if (drmInfo == null) {
- return;
- }
-
- mDrmManagerClient.setOnEventListener(new OnEventListenerImpl(config));
- drmInfo.put(DrmInfoRequest.ACCOUNT_ID, config.getAccountId());
- assertEquals("Failed on plugin: " + config.getPluginName(),
- DrmManagerClient.ERROR_NONE, mDrmManagerClient.processDrmInfo(drmInfo));
-
- synchronized(mLock) {
- try {
- mLock.wait(WAIT_TIME);
- } catch(Exception e) {
- Log.v(TAG, "ProcessDrmInfo: wait was interrupted.");
- }
- }
- }
-
- private class OnEventListenerImpl implements DrmManagerClient.OnEventListener {
- private Config mConfig;
- public OnEventListenerImpl(Config config) {
- mConfig = config;
- }
-
- @Override
- public void onEvent(DrmManagerClient client, DrmEvent event) {
- switch (event.getType()) {
- case DrmEvent.TYPE_DRM_INFO_PROCESSED:
- Log.d(TAG, "processDrmInfo() completed");
- DrmInfoStatus infoStatus
- = (DrmInfoStatus) event.getAttribute(DrmEvent.DRM_INFO_STATUS_OBJECT);
- switch (infoStatus.infoType) {
- case DrmInfoRequest.TYPE_RIGHTS_ACQUISITION_INFO:
- mDrmRights = new DrmRights(infoStatus.data, infoStatus.mimeType);
- assertNotNull(mDrmRights);
- try {
- assertEquals(DrmManagerClient.ERROR_NONE, mDrmManagerClient.saveRights(
- mDrmRights, mConfig.getRightsPath(), mConfig.getContentPath()));
- Log.d(TAG, "Rights saved");
- } catch (IOException e) {
- Log.e(TAG, "Save Rights failed");
- e.printStackTrace();
- }
- break;
- case DrmInfoRequest.TYPE_REGISTRATION_INFO:
- Log.d(TAG, "Registration completed");
- break;
- case DrmInfoRequest.TYPE_UNREGISTRATION_INFO:
- Log.d(TAG, "Deregistration completed");
- break;
- default:
- break;
- }
- break;
- default:
- break;
- }
- synchronized (mLock) {
- mLock.notify();
- }
- }
- }
-}
diff --git a/tests/tests/drm/src/android/drm/cts/configs/FwdLockConfig.java b/tests/tests/drm/src/android/drm/cts/configs/FwdLockConfig.java
deleted file mode 100644
index e67ff03..0000000
--- a/tests/tests/drm/src/android/drm/cts/configs/FwdLockConfig.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.drm.cts.configs;
-
-import java.util.HashMap;
-
-import android.drm.cts.Config;
-
-public class FwdLockConfig implements Config {
- private static FwdLockConfig sInstance = new FwdLockConfig();
- private FwdLockConfig() {}
- public static FwdLockConfig getInstance() {
- return sInstance;
- }
- public String getPluginName() {
- return "Forward Lock";
- }
- public String getMimeType() {
- return "application/x-android-drm-fl";
- }
- public String getAccountId() {
- return "01234567";
- }
- public String getRightsPath() {
- // Fwd lock does not have rights but send back dummy string anyways.
- return "/sdcard/non_existing_rights.xml";
- }
- public String getContentPath() {
- return "/sdcard/dummy_fwdlock_content.dm";
- }
- public HashMap getInfoOfRegistration() {
- return sInfoOfRegistration;
- }
- public HashMap getInfoOfUnregistration() {
- return sInfoOfUnregistration;
- }
- public HashMap getInfoOfRightsAcquisition(){
- return sInfoOfRightsAcquisition;
- }
-
- private static HashMap sInfoOfRegistration = new HashMap();
- private static HashMap sInfoOfUnregistration = new HashMap();
- private static HashMap sInfoOfRightsAcquisition =
- new HashMap();
-
- static {
- sInfoOfRegistration.put("Dummy-FwdLock-1", "Dummy-FwdLock-1");
-
- sInfoOfUnregistration.put("Dummy-FwdLock-2", "Dummy-FwdLock-2");
-
- sInfoOfRightsAcquisition.put("Dummy-FwdLock-3", "Dummy-FwdLock-3");
- }
-}
diff --git a/tests/tests/drm/src/android/drm/cts/configs/PassthruConfig.java b/tests/tests/drm/src/android/drm/cts/configs/PassthruConfig.java
deleted file mode 100644
index 7310825..0000000
--- a/tests/tests/drm/src/android/drm/cts/configs/PassthruConfig.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.drm.cts.configs;
-
-import java.util.HashMap;
-
-import android.drm.cts.Config;
-
-public class PassthruConfig implements Config {
- private static PassthruConfig sInstance = new PassthruConfig();
- private PassthruConfig() {}
- public static PassthruConfig getInstance() {
- return sInstance;
- }
- public String getPluginName() {
- return "Passthru";
- }
- public String getMimeType() {
- return "application/vnd.passthru.drm";
- }
- public String getAccountId() {
- return "01234567";
- }
- public String getRightsPath() {
- return "/sdcard/dummy_passthru_rights.xml";
- }
- public String getContentPath() {
- return "/sdcard/dummy_passthru_content.passthru";
- }
- public HashMap getInfoOfRegistration() {
- return sInfoOfRegistration;
- }
- public HashMap getInfoOfUnregistration() {
- return sInfoOfUnregistration;
- }
- public HashMap getInfoOfRightsAcquisition(){
- return sInfoOfRightsAcquisition;
- }
-
- private static HashMap sInfoOfRegistration = new HashMap();
- private static HashMap sInfoOfUnregistration = new HashMap();
- private static HashMap sInfoOfRightsAcquisition = new HashMap();
-
- static {
- sInfoOfRegistration.put("Foo-1", "foo-1");
-
- sInfoOfUnregistration.put("Foo-2", "foo-2");
-
- sInfoOfRightsAcquisition.put("Foo-3", "foo-3");
- }
-}
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
old mode 100755
new mode 100644
index 73a712b..4c6259c
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
@@ -25,24 +25,18 @@ import dalvik.annotation.TestTargetNew;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
-import android.graphics.Color;
import android.graphics.Rect;
-import android.graphics.Bitmap.CompressFormat;
-import android.graphics.Bitmap.Config;
import android.graphics.BitmapFactory.Options;
import android.os.ParcelFileDescriptor;
import android.test.InstrumentationTestCase;
import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
@TestTargetClass(BitmapFactory.class)
public class BitmapFactoryTest extends InstrumentationTestCase {
@@ -57,25 +51,6 @@ public class BitmapFactoryTest extends InstrumentationTestCase {
private int mDefaultDensity;
private int mTargetDensity;
- // The test images, including baseline JPEG, a PNG, a GIF, a BMP AND a WEBP.
- private static int[] RES_IDS = new int[] {
- R.drawable.baseline_jpeg, R.drawable.png_test, R.drawable.gif_test,
- R.drawable.bmp_test, R.drawable.webp_test
- };
- private static String[] NAMES_TEMP_FILES = new String[] {
- "baseline_temp.jpg", "png_temp.png", "gif_temp.gif",
- "bmp_temp.bmp", "webp_temp.webp"
- };
-
- // The width and height of the above image.
- private static int WIDTHS[] = new int[] { 1280, 640, 320, 320, 640 };
- private static int HEIGHTS[] = new int[] { 960, 480, 240, 240, 480 };
-
- // Configurations for BitmapFactory.Options
- private static Config[] COLOR_CONFIGS = new Config[] {Config.ARGB_8888, Config.RGB_565,
- Config.ARGB_4444};
- private static int[] COLOR_TOLS = new int[] {16, 49, 576};
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -132,24 +107,6 @@ public class BitmapFactoryTest extends InstrumentationTestCase {
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "decodeResourceStream",
- args = {android.content.res.Resources.class, android.util.TypedValue.class,
- java.io.InputStream.class, android.graphics.Rect.class,
- android.graphics.BitmapFactory.Options.class}
- )
- public void testDecodeResourceStream() {
- InputStream is = obtainInputStream();
- Rect r = new Rect(1, 1, 1, 1);
- TypedValue value = new TypedValue();
- Bitmap b = BitmapFactory.decodeResourceStream(mRes, value, is, r, mOpt1);
- assertNotNull(b);
- // Test the bitmap size
- assertEquals(START_HEIGHT, b.getHeight());
- assertEquals(START_WIDTH, b.getWidth());
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "decodeByteArray",
args = {byte[].class, int.class, int.class, android.graphics.BitmapFactory.Options.class}
)
@@ -212,62 +169,12 @@ public class BitmapFactoryTest extends InstrumentationTestCase {
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "decodeStream",
- args = {java.io.InputStream.class}
- )
- public void testDecodeStream3() throws IOException {
- for (int i = 0; i < RES_IDS.length; ++i) {
- InputStream is = obtainInputStream(RES_IDS[i]);
- Bitmap b = BitmapFactory.decodeStream(is);
- assertNotNull(b);
- // Test the bitmap size
- assertEquals(WIDTHS[i], b.getWidth());
- assertEquals(HEIGHTS[i], b.getHeight());
- }
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "decodeStream",
- args = {java.io.InputStream.class}
- )
- public void testDecodeStream4() throws IOException {
- BitmapFactory.Options options = new BitmapFactory.Options();
- for (int k = 0; k < COLOR_CONFIGS.length; ++k) {
- options.inPreferredConfig = COLOR_CONFIGS[k];
-
- // Decode the PNG & WebP test images. The WebP test image has been encoded from PNG test
- // image and should have same similar (within some error-tolerance) Bitmap data.
- InputStream iStreamPng = obtainInputStream(R.drawable.png_test);
- Bitmap bPng = BitmapFactory.decodeStream(iStreamPng, null, options);
- assertNotNull(bPng);
- assertEquals(bPng.getConfig(), COLOR_CONFIGS[k]);
-
- InputStream iStreamWebp1 = obtainInputStream(R.drawable.webp_test);
- Bitmap bWebp1 = BitmapFactory.decodeStream(iStreamWebp1, null, options);
- assertNotNull(bWebp1);
- compareBitmaps(bPng, bWebp1, COLOR_TOLS[k], true);
-
- // Compress the PNG image to WebP format (Quality=90) and decode it back.
- // This will test end-to-end WebP encoding and decoding.
- ByteArrayOutputStream oStreamWebp = new ByteArrayOutputStream();
- assertTrue(bPng.compress(CompressFormat.WEBP, 90, oStreamWebp));
- InputStream iStreamWebp2 = new ByteArrayInputStream(oStreamWebp.toByteArray());
- Bitmap bWebp2 = BitmapFactory.decodeStream(iStreamWebp2, null, options);
- assertNotNull(bWebp2);
- compareBitmaps(bPng, bWebp2, COLOR_TOLS[k], true);
- }
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "decodeFileDescriptor",
args = {java.io.FileDescriptor.class, android.graphics.Rect.class,
android.graphics.BitmapFactory.Options.class}
)
public void testDecodeFileDescriptor1() throws IOException {
- ParcelFileDescriptor pfd = obtainParcelDescriptor(obtainPath());
- FileDescriptor input = pfd.getFileDescriptor();
+ FileDescriptor input = obtainDescriptor(obtainPath());
Rect r = new Rect(1, 1, 1, 1);
Bitmap b = BitmapFactory.decodeFileDescriptor(input, r, mOpt1);
assertNotNull(b);
@@ -284,8 +191,7 @@ public class BitmapFactoryTest extends InstrumentationTestCase {
args = {java.io.FileDescriptor.class}
)
public void testDecodeFileDescriptor2() throws IOException {
- ParcelFileDescriptor pfd = obtainParcelDescriptor(obtainPath());
- FileDescriptor input = pfd.getFileDescriptor();
+ FileDescriptor input = obtainDescriptor(obtainPath());
Bitmap b = BitmapFactory.decodeFileDescriptor(input);
assertNotNull(b);
// Test the bitmap size
@@ -334,15 +240,10 @@ public class BitmapFactoryTest extends InstrumentationTestCase {
return mRes.openRawResource(R.drawable.start);
}
- private InputStream obtainInputStream(int resId) {
- return mRes.openRawResource(resId);
- }
-
- private ParcelFileDescriptor obtainParcelDescriptor(String path)
- throws IOException {
- File file = new File(path);
- return(ParcelFileDescriptor.open(file,
- ParcelFileDescriptor.MODE_READ_ONLY));
+ private FileDescriptor obtainDescriptor(String path) throws IOException {
+ File file = new File(path);
+ return(ParcelFileDescriptor.open(file,
+ ParcelFileDescriptor.MODE_READ_ONLY).getFileDescriptor());
}
private String obtainPath() throws IOException {
@@ -365,48 +266,4 @@ public class BitmapFactoryTest extends InstrumentationTestCase {
fOutput.close();
return (file.getPath());
}
-
- // Compare expected to actual to see if their diff is less then mseMargin.
- // lessThanMargin is to indicate whether we expect the mean square error
- // to be "less than" or "no less than".
- private void compareBitmaps(Bitmap expected, Bitmap actual,
- int mseMargin, boolean lessThanMargin) {
- final int width = expected.getWidth();
- final int height = expected.getHeight();
-
- assertEquals("mismatching widths", width, actual.getWidth());
- assertEquals("mismatching heights", height, actual.getHeight());
- assertEquals("mismatching configs", expected.getConfig(),
- actual.getConfig());
-
- double mse = 0;
- int[] expectedColors = new int [width * height];
- int[] actualColors = new int [width * height];
-
- expected.getPixels(expectedColors, 0, width, 0, 0, width, height);
- actual.getPixels(actualColors, 0, width, 0, 0, width, height);
-
- for (int row = 0; row < height; ++row) {
- for (int col = 0; col < width; ++col) {
- int idx = row * width + col;
- mse += distance(expectedColors[idx], actualColors[idx]);
- }
- }
- mse /= width * height;
-
- if (lessThanMargin) {
- assertTrue("MSE too large for normal case: " + mse,
- mse <= mseMargin);
- } else {
- assertFalse("MSE too small for abnormal case: " + mse,
- mse <= mseMargin);
- }
- }
-
- private double distance(int expect, int actual) {
- final int r = Color.red(actual) - Color.red(expect);
- final int g = Color.green(actual) - Color.green(expect);
- final int b = Color.blue(actual) - Color.blue(expect);
- return r * r + g * g + b * b;
- }
}
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java
old mode 100755
new mode 100644
index 93d8bd6..e1ba12a
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java
@@ -34,7 +34,6 @@ import com.android.cts.stub.R;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -53,28 +52,27 @@ public class BitmapRegionDecoderTest extends InstrumentationTestCase {
private Resources mRes;
// The test images, including baseline JPEGs and progressive JPEGs, a PNG,
- // a WEBP, a GIF and a BMP.
+ // a GIF and a BMP.
private static int[] RES_IDS = new int[] {
R.drawable.baseline_jpeg, R.drawable.progressive_jpeg,
R.drawable.baseline_restart_jpeg,
R.drawable.progressive_restart_jpeg,
- R.drawable.png_test, R.drawable.webp_test,
- R.drawable.gif_test, R.drawable.bmp_test
+ R.drawable.png_test, R.drawable.gif_test, R.drawable.bmp_test
};
private static String[] NAMES_TEMP_FILES = new String[] {
- "baseline_temp.jpg", "progressive_temp.jpg", "baseline_restart_temp.jpg",
- "progressive_restart_temp.jpg", "png_temp.png", "webp_temp.webp",
- "gif_temp.gif", "bmp_temp.bmp"
+ "baseline_temp.jpg", "progressive_temp.jpg", "baseline_restart_temp.jpg"
+ , "progressive_restart_temp.jpg", "png_temp.png", "gif_temp.gif",
+ "bmp_temp.bmp"
};
// The width and height of the above image.
// -1 denotes that the image format is not supported by BitmapRegionDecoder
private static int WIDTHS[] = new int[] {
- 1280, 1280, 1280, 1280, 640, 640, -1, -1};
- private static int HEIGHTS[] = new int[] {960, 960, 960, 960, 480, 480, -1, -1};
+ 1280, 1280, 1280, 1280, 640, -1, -1};
+ private static int HEIGHTS[] = new int[] {960, 960, 960, 960, 480, -1, -1};
// The number of test images, format of which is supported by BitmapRegionDecoder
- private static int NUM_TEST_IMAGES = 6;
+ private static int NUM_TEST_IMAGES = 5;
private static int TILE_SIZE = 256;
@@ -92,9 +90,6 @@ public class BitmapRegionDecoderTest extends InstrumentationTestCase {
// square error of 3 * (1 * 1) among the RGB values.
private int mMseMargin = 3 * (1 * 1);
- // MSE margin for WebP Region-Decoding for 'Config.RGB_565' is little bigger.
- private int mMseMarginWebPConfigRgb565 = 5;
-
@Override
protected void setUp() throws Exception {
@@ -162,8 +157,7 @@ public class BitmapRegionDecoderTest extends InstrumentationTestCase {
public void testNewInstanceStringAndFileDescriptor() throws IOException {
for (int i = 0; i < RES_IDS.length; ++i) {
String filepath = obtainPath(i);
- ParcelFileDescriptor pfd = obtainParcelDescriptor(filepath);
- FileDescriptor fd = pfd.getFileDescriptor();
+ FileDescriptor fd = obtainDescriptor(filepath);
try {
BitmapRegionDecoder decoder1 =
BitmapRegionDecoder.newInstance(filepath, false);
@@ -199,12 +193,7 @@ public class BitmapRegionDecoderTest extends InstrumentationTestCase {
InputStream is2 = obtainInputStream(RES_IDS[i]);
Bitmap wholeImage = BitmapFactory.decodeStream(is2, null, opts);
- if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
- compareRegionByRegion(decoder, opts, mMseMarginWebPConfigRgb565,
- wholeImage);
- } else {
- compareRegionByRegion(decoder, opts, mMseMargin, wholeImage);
- }
+ compareRegionByRegion(decoder, opts, wholeImage);
wholeImage.recycle();
}
}
@@ -230,12 +219,7 @@ public class BitmapRegionDecoderTest extends InstrumentationTestCase {
Bitmap wholeImage = BitmapFactory.decodeByteArray(imageData,
0, imageData.length, opts);
- if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
- compareRegionByRegion(decoder, opts, mMseMarginWebPConfigRgb565,
- wholeImage);
- } else {
- compareRegionByRegion(decoder, opts, mMseMargin, wholeImage);
- }
+ compareRegionByRegion(decoder, opts, wholeImage);
wholeImage.recycle();
}
}
@@ -259,47 +243,27 @@ public class BitmapRegionDecoderTest extends InstrumentationTestCase {
BitmapRegionDecoder decoder =
BitmapRegionDecoder.newInstance(filepath, false);
Bitmap wholeImage = BitmapFactory.decodeFile(filepath, opts);
- if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
- compareRegionByRegion(decoder, opts, mMseMarginWebPConfigRgb565,
- wholeImage);
- } else {
- compareRegionByRegion(decoder, opts, mMseMargin, wholeImage);
- }
-
- ParcelFileDescriptor pfd1 = obtainParcelDescriptor(filepath);
- FileDescriptor fd1 = pfd1.getFileDescriptor();
+ compareRegionByRegion(decoder, opts, wholeImage);
+
+ FileDescriptor fd1 = obtainDescriptor(filepath);
decoder = BitmapRegionDecoder.newInstance(fd1, false);
- ParcelFileDescriptor pfd2 = obtainParcelDescriptor(filepath);
- FileDescriptor fd2 = pfd2.getFileDescriptor();
- if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
- compareRegionByRegion(decoder, opts, mMseMarginWebPConfigRgb565,
- wholeImage);
- } else {
- compareRegionByRegion(decoder, opts, mMseMargin, wholeImage);
- }
+ FileDescriptor fd2 = obtainDescriptor(filepath);
+ compareRegionByRegion(decoder, opts, wholeImage);
wholeImage.recycle();
}
}
}
}
- @TestTargets ({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "recycle",
- args = {}
- ),
- @TestTargetNew(
+ @TestTargetNew(
level = TestLevel.COMPLETE,
- method = "isRecycled",
+ method = "recycle",
args = {}
- )
- })
+ )
public void testRecycle() throws IOException {
InputStream is = obtainInputStream(RES_IDS[0]);
BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
decoder.recycle();
- assertTrue(decoder.isRecycled());
try {
decoder.getWidth();
fail("Should throw an exception!");
@@ -322,7 +286,7 @@ public class BitmapRegionDecoderTest extends InstrumentationTestCase {
}
private void compareRegionByRegion(BitmapRegionDecoder decoder,
- Options opts, int mseMargin, Bitmap wholeImage) {
+ Options opts, Bitmap wholeImage) {
int width = decoder.getWidth();
int height = decoder.getHeight();
Rect rect = new Rect(0, 0, width, height);
@@ -342,7 +306,7 @@ public class BitmapRegionDecoderTest extends InstrumentationTestCase {
Rect rect2 = new Rect(left, top, left + actual.getWidth(),
top + actual.getHeight());
expected = cropBitmap(wholeImage, rect2);
- compareBitmaps(expected, actual, mseMargin, true);
+ compareBitmaps(expected, actual, mMseMargin, true);
actual.recycle();
expected.recycle();
}
@@ -393,14 +357,12 @@ public class BitmapRegionDecoderTest extends InstrumentationTestCase {
return (file.getPath());
}
- private ParcelFileDescriptor obtainParcelDescriptor(String path)
- throws IOException {
+ private FileDescriptor obtainDescriptor(String path) throws IOException {
File file = new File(path);
return(ParcelFileDescriptor.open(file,
- ParcelFileDescriptor.MODE_READ_ONLY));
+ ParcelFileDescriptor.MODE_READ_ONLY).getFileDescriptor());
}
-
// Compare expected to actual to see if their diff is less then mseMargin.
// lessThanMargin is to indicate whether we expect the diff to be
// "less than" or "no less than".
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
index f8d3ee9..7287834 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
@@ -25,7 +25,6 @@ import dalvik.annotation.TestTargets;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.Paint;
@@ -33,7 +32,6 @@ import android.graphics.Bitmap.CompressFormat;
import android.graphics.Bitmap.Config;
import android.os.Parcel;
import android.test.AndroidTestCase;
-import android.util.DisplayMetrics;
import android.widget.cts.WidgetTestUtils;
import java.io.ByteArrayOutputStream;
@@ -790,98 +788,6 @@ public class BitmapTest extends AndroidTestCase {
mBitmap.equals(Bitmap.CREATOR.createFromParcel(p));
}
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getScaledHeight",
- args = {int.class}
- )
- public void testGetScaledHeight1() {
- int dummyDensity = 5;
- Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
- int scaledHeight = scaleFromDensity(ret.getHeight(), ret.getDensity(), dummyDensity);
- assertNotNull(ret);
- assertEquals(scaledHeight, ret.getScaledHeight(dummyDensity));
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getScaledHeight",
- args = {android.util.DisplayMetrics.class}
- )
- public void testGetScaledHeight2() {
- Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
- DisplayMetrics metrics = new DisplayMetrics();
- metrics = getContext().getResources().getDisplayMetrics();
- int scaledHeight = scaleFromDensity(ret.getHeight(), ret.getDensity(), metrics.densityDpi);
- assertEquals(scaledHeight, ret.getScaledHeight(metrics));
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getScaledHeight",
- args = {android.graphics.Canvas.class}
- )
- public void testGetScaledHeight3() {
- Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
- Bitmap mMutableBitmap = Bitmap.createBitmap(100, 200, Config.ARGB_8888);
- Canvas mCanvas = new Canvas(mMutableBitmap);
- // set Density
- mCanvas.setDensity(DisplayMetrics.DENSITY_HIGH);
- int scaledHeight = scaleFromDensity(
- ret.getHeight(), ret.getDensity(), mCanvas.getDensity());
- assertEquals(scaledHeight, ret.getScaledHeight(mCanvas));
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getScaledWidth",
- args = {android.graphics.Canvas.class}
- )
- public void testGetScaledWidth1() {
- int dummyDensity = 5;
- Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
- int scaledWidth = scaleFromDensity(ret.getWidth(), ret.getDensity(), dummyDensity);
- assertNotNull(ret);
- assertEquals(scaledWidth, ret.getScaledWidth(dummyDensity));
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getScaledWidth",
- args = {android.util.DisplayMetrics.class}
- )
- public void testGetScaledWidth2() {
- Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
- DisplayMetrics metrics = new DisplayMetrics();
- metrics = getContext().getResources().getDisplayMetrics();
- int scaledWidth = scaleFromDensity(ret.getWidth(), ret.getDensity(), metrics.densityDpi);
- assertEquals(scaledWidth, ret.getScaledWidth(metrics));
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getScaledWidth",
- args = {android.graphics.Canvas.class}
- )
- public void testGetScaledWidth3() {
- Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
- Bitmap mMutableBitmap = Bitmap.createBitmap(100, 200, Config.ARGB_8888);
- Canvas mCanvas = new Canvas(mMutableBitmap);
- // set Density
- mCanvas.setDensity(DisplayMetrics.DENSITY_HIGH);
- int scaledWidth = scaleFromDensity(ret.getWidth(), ret.getDensity(), mCanvas.getDensity());
- assertEquals(scaledWidth, ret.getScaledWidth(mCanvas));
- }
-
- private int scaleFromDensity(int size, int sdensity, int tdensity) {
- if (sdensity == Bitmap.DENSITY_NONE || sdensity == tdensity) {
- return size;
- }
-
- // Scale by tdensity / sdensity, rounding up.
- return ((size * tdensity) + (sdensity >> 1)) / sdensity;
- }
-
private int[] createColors(int size){
int[] colors = new int[size];
diff --git a/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java b/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java
index afe3409..44c91e3 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java
@@ -37,7 +37,6 @@ public class Bitmap_CompressFormatTest extends AndroidTestCase{
public void testValueOf(){
assertEquals(CompressFormat.JPEG, CompressFormat.valueOf("JPEG"));
assertEquals(CompressFormat.PNG, CompressFormat.valueOf("PNG"));
- assertEquals(CompressFormat.WEBP, CompressFormat.valueOf("WEBP"));
}
@TestTargets({
@@ -56,15 +55,13 @@ public class Bitmap_CompressFormatTest extends AndroidTestCase{
public void testValues(){
CompressFormat[] comFormat = CompressFormat.values();
- assertEquals(3, comFormat.length);
+ assertEquals(2, comFormat.length);
assertEquals(CompressFormat.JPEG, comFormat[0]);
assertEquals(CompressFormat.PNG, comFormat[1]);
- assertEquals(CompressFormat.WEBP, comFormat[2]);
//CompressFormat is used as a argument here for all the methods that use it
Bitmap b = Bitmap.createBitmap(10, 24, Config.ARGB_8888);
assertTrue(b.compress(CompressFormat.JPEG, 24, new ByteArrayOutputStream()));
assertTrue(b.compress(CompressFormat.PNG, 24, new ByteArrayOutputStream()));
- assertTrue(b.compress(CompressFormat.WEBP, 24, new ByteArrayOutputStream()));
}
}
diff --git a/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java b/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
index 5f20ae6..07612d4 100644
--- a/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
@@ -21,7 +21,6 @@ import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
-import android.util.DisplayMetrics;
import android.graphics.DrawFilter;
import android.graphics.Matrix;
import android.graphics.Paint;
@@ -97,6 +96,7 @@ public class CanvasTest extends InstrumentationTestCase {
)
public void testCanvas1() {
final Canvas c = new Canvas();
+ assertNull(c.getGL());
}
@TestTargetNew(
@@ -128,6 +128,36 @@ public class CanvasTest extends InstrumentationTestCase {
new Canvas(mMutableBitmap);
}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "Canvas",
+ args = {javax.microedition.khronos.opengles.GL.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getGL",
+ args = {}
+ )
+ })
+ public void testCanvas3() {
+ Canvas c = new Canvas();
+ assertNull(c.getGL());
+ final MyGL myGL = new MyGL();
+ c = new Canvas(myGL);
+ assertTrue(myGL.equals(c.getGL()));
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "freeGlCaches",
+ args = {}
+ )
+ public void testFreeGlCaches() {
+ // can't get the changed state
+ Canvas.freeGlCaches();
+ }
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "setBitmap",
@@ -143,6 +173,16 @@ public class CanvasTest extends InstrumentationTestCase {
// expected
}
+ // abnormal case: GL not null
+ final Canvas c = new Canvas(new MyGL());
+ try {
+ c.setBitmap(mMutableBitmap);
+ fail("should throw out RuntimeException when setting MutableBitmap to Canvas "
+ + "when the Canvas is created with GL");
+ } catch (RuntimeException e) {
+ // expected
+ }
+
// abnormal case: bitmap to be set has been recycled
mMutableBitmap.recycle();
try {
@@ -159,6 +199,39 @@ public class CanvasTest extends InstrumentationTestCase {
assertEquals(31, mCanvas.getHeight());
}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setViewport",
+ args = {int.class, int.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getWidth",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getHeight",
+ args = {}
+ )
+ })
+ public void testSetViewport() {
+ assertEquals(BITMAP_WIDTH, mCanvas.getWidth());
+ assertEquals(BITMAP_HEIGHT, mCanvas.getHeight());
+
+ // set viewport has no effect for bitmap based canvas
+ mCanvas.setViewport(BITMAP_HEIGHT, BITMAP_WIDTH);
+ assertEquals(BITMAP_WIDTH, mCanvas.getWidth());
+ assertEquals(BITMAP_HEIGHT, mCanvas.getHeight());
+
+ // only GL based canvas that can set viewport
+ mCanvas = new Canvas(new MyGL());
+ mCanvas.setViewport(BITMAP_HEIGHT, BITMAP_WIDTH);
+ assertEquals(BITMAP_HEIGHT, mCanvas.getWidth());
+ assertEquals(BITMAP_WIDTH, mCanvas.getHeight());
+ }
+
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "isOpaque",
@@ -1071,7 +1144,7 @@ public class CanvasTest extends InstrumentationTestCase {
args = {float.class, float.class, float.class, float.class}
)
public void testClipRect6() {
- assertTrue(mCanvas.clipRect(0.5f, 0.5f, 10.5f, 31.5f));
+ assertTrue(mCanvas.clipRect(0, 0, 10, 31));
}
@TestTargetNew(
@@ -2180,28 +2253,6 @@ public class CanvasTest extends InstrumentationTestCase {
mCanvas.drawPicture(p, dst);
}
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "setDensity",
- args = {int.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getDensity",
- args = {android.util.DisplayMetrics.class}
- )
- })
- public void testDensity() {
- // set Density
- mCanvas.setDensity(DisplayMetrics.DENSITY_DEFAULT);
- assertEquals(DisplayMetrics.DENSITY_DEFAULT, mCanvas.getDensity());
-
- // set Density
- mCanvas.setDensity(DisplayMetrics.DENSITY_HIGH);
- assertEquals(DisplayMetrics.DENSITY_HIGH, mCanvas.getDensity());
- }
-
private void preCompare() {
final float[] values = new float[FLOAT_ARRAY_LEN];
mCanvas.getMatrix().getValues(values);
@@ -2215,4 +2266,8 @@ public class CanvasTest extends InstrumentationTestCase {
assertEquals(0.0f, values[7]);
assertEquals(1.0f, values[8]);
}
+
+ private class MyGL implements GL {
+ //do nothing
+ }
}
diff --git a/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java b/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java
index 82419db..3c79581 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java
@@ -18,8 +18,6 @@ package android.graphics.cts;
import junit.framework.TestCase;
import android.graphics.Interpolator.Result;
-import android.graphics.Shader.TileMode;
-
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
@@ -33,9 +31,8 @@ public class Interpolator_ResultTest extends TestCase {
args = {java.lang.String.class}
)
public void testValueOf() {
- assertEquals(Result.FREEZE_START, Result.valueOf("FREEZE_START"));
- assertEquals(Result.FREEZE_END, Result.valueOf("FREEZE_END"));
- assertEquals(Result.NORMAL, Result.valueOf("NORMAL"));
+ // this enum type is tested in
+ // android.graphics.InterpolatorTest#testTimeToValues1()
}
@TestTargetNew(
@@ -44,10 +41,8 @@ public class Interpolator_ResultTest extends TestCase {
args = {}
)
public void testValues() {
- Result[] result = Result.values();
- assertEquals(3, result.length);
- assertEquals(Result.NORMAL, result[0]);
- assertEquals(Result.FREEZE_START, result[1]);
- assertEquals(Result.FREEZE_END, result[2]);
+ // this enum type is tested in
+ // android.graphics.InterpolatorTest#testTimeToValues1()
}
-}
\ No newline at end of file
+
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java b/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
index d2b9af0..041de94 100644
--- a/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
@@ -207,18 +207,6 @@ public class NinePatchTest extends AndroidTestCase {
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "getDensity",
- args = {}
- )
- public void testGetDensity() {
- mBitmap.setDensity(11);
- assertEquals(11, mNinePatch.getDensity());
- mNinePatch = new NinePatch(mBitmap, mChunk, NAME);
- assertEquals(mNinePatch.getDensity(), mBitmap.getDensity());
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "getTransparentRegion",
args = {android.graphics.Rect.class}
)
diff --git a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
index 42c5f58..20701cb 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
@@ -24,30 +24,22 @@ import dalvik.annotation.TestTargets;
import android.graphics.ColorFilter;
import android.graphics.MaskFilter;
import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.Paint.Cap;
-import android.graphics.Paint.Join;
-import android.graphics.Paint.Style;
import android.graphics.Path;
import android.graphics.PathEffect;
import android.graphics.Rasterizer;
import android.graphics.Shader;
import android.graphics.Typeface;
import android.graphics.Xfermode;
+import android.graphics.Paint.Align;
+import android.graphics.Paint.Cap;
+import android.graphics.Paint.Join;
+import android.graphics.Paint.Style;
import android.test.AndroidTestCase;
import android.text.SpannedString;
@TestTargetClass(Paint.class)
public class PaintTest extends AndroidTestCase {
- private static final Typeface[] TYPEFACES = new Typeface[] {
- Typeface.DEFAULT,
- Typeface.DEFAULT_BOLD,
- Typeface.MONOSPACE,
- Typeface.SANS_SERIF,
- Typeface.SERIF,
- };
-
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -80,10 +72,6 @@ public class PaintTest extends AndroidTestCase {
SpannedString textSpan = new SpannedString(text);
Paint p = new Paint();
-
- // We need to turn off kerning in order to get accurate comparisons
- p.setFlags(p.getFlags() & ~Paint.DEV_KERN_TEXT_FLAG);
-
float[] widths = new float[text.length()];
assertEquals(text.length(), p.getTextWidths(text, widths));
@@ -109,7 +97,7 @@ public class PaintTest extends AndroidTestCase {
3, widths[0] + widths[1] + widths[2]);
// Measure substring from back: "MN"
- assertBreakText(text, textChars, textSpan, 5, 7, true, totalWidth,
+ assertBreakText(text, textChars, textSpan, 5, 7, false, totalWidth,
2, widths[5] + widths[6]);
// Reverse measure substring from back: "MN"
@@ -138,9 +126,6 @@ public class PaintTest extends AndroidTestCase {
float expectedWidth) {
Paint p = new Paint();
- // We need to turn off kerning in order to get accurate comparisons
- p.setFlags(p.getFlags() & ~Paint.DEV_KERN_TEXT_FLAG);
-
int count = end - start;
if (!measureForwards) {
count = -count;
@@ -476,17 +461,13 @@ public class PaintTest extends AndroidTestCase {
public void testGetFontSpacing() {
Paint p = new Paint();
- for (Typeface typeface : TYPEFACES) {
- p.setTypeface(typeface);
+ assertEquals(13.96875f, p.getFontSpacing());
- p.setTextSize(10);
- float spacing10 = p.getFontSpacing();
- assertTrue(spacing10 > 0);
+ p.setTextSize(24.0f);
+ assertEquals(27.9375f, p.getFontSpacing());
- p.setTextSize(20);
- float spacing20 = p.getFontSpacing();
- assertTrue(spacing20 > spacing10);
- }
+ p.setTypeface(Typeface.MONOSPACE);
+ assertEquals(27.9375f, p.getFontSpacing());
}
@TestTargets({
@@ -630,17 +611,25 @@ public class PaintTest extends AndroidTestCase {
public void testAscent() {
Paint p = new Paint();
- for (Typeface typeface : TYPEFACES) {
- p.setTypeface(typeface);
+ assertEquals(-11.138672f, p.ascent());
- p.setTextSize(10);
- float ascent10 = p.ascent();
- assertTrue(ascent10 < 0);
+ p.setTextSize(10.0f);
+ assertEquals(-9.282227f, p.ascent());
- p.setTextSize(20);
- float ascent20 = p.ascent();
- assertTrue(ascent20 < ascent10);
- }
+ p.setTypeface(Typeface.DEFAULT_BOLD);
+ assertEquals(-9.282227f, p.ascent());
+
+ p.setTextSize(20.0f);
+ assertEquals(-18.564453f, p.ascent());
+
+ p.setTypeface(Typeface.DEFAULT_BOLD);
+ assertEquals(-18.564453f, p.ascent());
+
+ p.setTypeface(Typeface.MONOSPACE);
+ assertEquals(-18.564453f, p.ascent());
+
+ p.setTypeface(Typeface.SANS_SERIF);
+ assertEquals(-18.564453f, p.ascent());
}
@TestTargets({
@@ -912,19 +901,36 @@ public class PaintTest extends AndroidTestCase {
Paint p = new Paint();
Paint.FontMetrics fm = new Paint.FontMetrics();
- for (Typeface typeface : TYPEFACES) {
- p.setTypeface(typeface);
+ assertEquals(13.96875f, p.getFontMetrics(fm));
+ assertEquals(-11.138672f, fm.ascent);
+ assertEquals(3.2519531f, fm.bottom);
+ assertEquals(2.8300781f, fm.descent);
+ assertEquals(0.0f, fm.leading);
+ assertEquals(-12.574219f, fm.top);
- p.setTextSize(10);
- float spacing10 = p.getFontMetrics(fm);
- assertEquals(p.ascent(), fm.ascent);
- assertEquals(p.descent(), fm.descent);
+ assertEquals(13.96875f, p.getFontMetrics(null));
+
+ p.setTextSize(24.0f);
+
+ assertEquals(27.9375f, p.getFontMetrics(fm));
+ assertEquals(-22.277344f, fm.ascent);
+ assertEquals(6.5039062f, fm.bottom);
+ assertEquals(5.6601562f, fm.descent);
+ assertEquals(0.0f, fm.leading);
+ assertEquals(-25.148438f, fm.top);
+
+ assertEquals(27.9375f, p.getFontMetrics(null));
+
+ p.setTypeface(Typeface.MONOSPACE);
+ assertEquals(27.9375f, p.getFontMetrics(fm));
+ assertEquals(-22.277344f, fm.ascent);
+ assertEquals(6.5039062f, fm.bottom);
+ assertEquals(5.6601562f, fm.descent);
+ assertEquals(0.0f, fm.leading);
+ assertEquals(-25.347656f, fm.top);
+
+ assertEquals(27.9375f, p.getFontMetrics(null));
- p.setTextSize(20);
- float spacing20 = p.getFontMetrics(fm);
- assertEquals(p.ascent(), fm.ascent);
- assertEquals(p.descent(), fm.descent);
- }
}
@TestTargetNew(
@@ -934,22 +940,34 @@ public class PaintTest extends AndroidTestCase {
)
public void testGetFontMetrics2() {
Paint p = new Paint();
+ Paint.FontMetrics fm;
- for (Typeface typeface : TYPEFACES) {
- p.setTypeface(typeface);
+ fm = p.getFontMetrics();
+ assertEquals(-11.138672f, fm.ascent);
+ assertEquals(3.2519531f, fm.bottom);
+ assertEquals(2.8300781f, fm.descent);
+ assertEquals(0.0f, fm.leading);
+ assertEquals(-12.574219f, fm.top);
- p.setTextSize(10);
- Paint.FontMetrics fm = p.getFontMetrics();
- assertEquals(p.ascent(), fm.ascent);
- assertEquals(p.descent(), fm.descent);
+ p.setTextSize(24.0f);
- p.setTextSize(20);
- fm = p.getFontMetrics();
- assertEquals(p.ascent(), fm.ascent);
- assertEquals(p.descent(), fm.descent);
- }
- }
+ fm = p.getFontMetrics();
+ assertEquals(-22.277344f, fm.ascent);
+ assertEquals(6.5039062f, fm.bottom);
+ assertEquals(5.6601562f, fm.descent);
+ assertEquals(0.0f, fm.leading);
+ assertEquals(-25.148438f, fm.top);
+ p.setTypeface(Typeface.MONOSPACE);
+
+ fm = p.getFontMetrics();
+ assertEquals(-22.277344f, fm.ascent);
+ assertEquals(6.5039062f, fm.bottom);
+ assertEquals(5.6601562f, fm.descent);
+ assertEquals(0.0f, fm.leading);
+ assertEquals(-25.347656f, fm.top);
+
+ }
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -1037,17 +1055,25 @@ public class PaintTest extends AndroidTestCase {
public void testDescent() {
Paint p = new Paint();
- for (Typeface typeface : TYPEFACES) {
- p.setTypeface(typeface);
+ assertEquals(2.8300781f, p.descent());
- p.setTextSize(10);
- float descent10 = p.descent();
- assertTrue(descent10 > 0);
+ p.setTextSize(10.0f);
+ assertEquals(2.3583984f, p.descent());
- p.setTextSize(20);
- float descent20 = p.descent();
- assertTrue(descent20 > descent10);
- }
+ p.setTypeface(Typeface.DEFAULT_BOLD);
+ assertEquals(2.3583984f, p.descent());
+
+ p.setTextSize(20.0f);
+ assertEquals(4.716797f, p.descent());
+
+ p.setTypeface(Typeface.DEFAULT_BOLD);
+ assertEquals(4.716797f, p.descent());
+
+ p.setTypeface(Typeface.MONOSPACE);
+ assertEquals(4.716797f, p.descent());
+
+ p.setTypeface(Typeface.SANS_SERIF);
+ assertEquals(4.716797f, p.descent());
}
@TestTargets({
@@ -1174,19 +1200,36 @@ public class PaintTest extends AndroidTestCase {
Paint p = new Paint();
Paint.FontMetricsInt fmi = new Paint.FontMetricsInt();
- for (Typeface typeface : TYPEFACES) {
- p.setTypeface(typeface);
+ assertEquals(14, p.getFontMetricsInt(fmi));
+ assertEquals(-11, fmi.ascent);
+ assertEquals(4, fmi.bottom);
+ assertEquals(3, fmi.descent);
+ assertEquals(0, fmi.leading);
+ assertEquals(-13, fmi.top);
- p.setTextSize(10);
- p.getFontMetricsInt(fmi);
- assertEquals(Math.round(p.ascent()), fmi.ascent);
- assertEquals(Math.round(p.descent()), fmi.descent);
+ assertEquals(14, p.getFontMetricsInt(null));
+
+ p.setTextSize(24);
+
+ assertEquals(28, p.getFontMetricsInt(fmi));
+ assertEquals(-22, fmi.ascent);
+ assertEquals(7, fmi.bottom);
+ assertEquals(6, fmi.descent);
+ assertEquals(0, fmi.leading);
+ assertEquals(-26, fmi.top);
+
+ assertEquals(28, p.getFontMetricsInt(null));
+
+ p.setTypeface(Typeface.MONOSPACE);
+ assertEquals(28, p.getFontMetricsInt(fmi));
+ assertEquals(-22, fmi.ascent);
+ assertEquals(7, fmi.bottom);
+ assertEquals(6, fmi.descent);
+ assertEquals(0, fmi.leading);
+ assertEquals(-26, fmi.top);
+
+ assertEquals(28, p.getFontMetricsInt(null));
- p.setTextSize(20);
- p.getFontMetricsInt(fmi);
- assertEquals(Math.round(p.ascent()), fmi.ascent);
- assertEquals(Math.round(p.descent()), fmi.descent);
- }
}
@TestTargetNew(
@@ -1198,19 +1241,29 @@ public class PaintTest extends AndroidTestCase {
Paint p = new Paint();
Paint.FontMetricsInt fmi;
- for (Typeface typeface : TYPEFACES) {
- p.setTypeface(typeface);
-
- p.setTextSize(10);
- fmi = p.getFontMetricsInt();
- assertEquals(Math.round(p.ascent()), fmi.ascent);
- assertEquals(Math.round(p.descent()), fmi.descent);
-
- p.setTextSize(20);
- fmi = p.getFontMetricsInt();
- assertEquals(Math.round(p.ascent()), fmi.ascent);
- assertEquals(Math.round(p.descent()), fmi.descent);
- }
+ fmi = p.getFontMetricsInt();
+ assertEquals(-11, fmi.ascent);
+ assertEquals(4, fmi.bottom);
+ assertEquals(3, fmi.descent);
+ assertEquals(0, fmi.leading);
+ assertEquals(-13, fmi.top);
+
+ p.setTextSize(24);
+
+ fmi = p.getFontMetricsInt();
+ assertEquals(-22, fmi.ascent);
+ assertEquals(7, fmi.bottom);
+ assertEquals(6, fmi.descent);
+ assertEquals(0, fmi.leading);
+ assertEquals(-26, fmi.top);
+
+ p.setTypeface(Typeface.MONOSPACE);
+ fmi = p.getFontMetricsInt();
+ assertEquals(-22, fmi.ascent);
+ assertEquals(7, fmi.bottom);
+ assertEquals(6, fmi.descent);
+ assertEquals(0, fmi.leading);
+ assertEquals(-26, fmi.top);
}
public void testMeasureText() {
@@ -1219,10 +1272,6 @@ public class PaintTest extends AndroidTestCase {
SpannedString textSpan = new SpannedString(text);
Paint p = new Paint();
-
- // We need to turn off kerning in order to get accurate comparisons
- p.setFlags(p.getFlags() & ~Paint.DEV_KERN_TEXT_FLAG);
-
float[] widths = new float[text.length()];
for (int i = 0; i < widths.length; i++) {
widths[i] = p.measureText(text, i, i + 1);
@@ -1251,10 +1300,6 @@ public class PaintTest extends AndroidTestCase {
private void assertMeasureText(String text, char[] textChars, SpannedString textSpan,
int start, int end, float expectedWidth) {
Paint p = new Paint();
-
- // We need to turn off kerning in order to get accurate comparisons
- p.setFlags(p.getFlags() & ~Paint.DEV_KERN_TEXT_FLAG);
-
int count = end - start;
float[] widths = new float[] {-1, -1, -1, -1};
diff --git a/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java b/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java
index 94e352a..614a44e 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java
@@ -157,9 +157,6 @@ public class PathMeasureTest extends AndroidTestCase {
mPath.addRect(1, 2, 3, 4, Path.Direction.CW);
mPathMeasure.setPath(mPath, true);
assertEquals(8f, mPathMeasure.getLength());
- Path dst = new Path();
- assertTrue(mPathMeasure.getSegment(0, mPathMeasure.getLength(), dst, true));
- assertFalse(mPathMeasure.getSegment(mPathMeasure.getLength(), 0, dst, true));
}
@TestTargetNew(
diff --git a/tests/tests/graphics/src/android/graphics/cts/PorterDuff_ModeTest.java b/tests/tests/graphics/src/android/graphics/cts/PorterDuff_ModeTest.java
new file mode 100644
index 0000000..170992d
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/cts/PorterDuff_ModeTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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 android.graphics.cts;
+
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuff.Mode;
+import android.test.AndroidTestCase;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+
+@TestTargetClass(PorterDuff.Mode.class)
+public class PorterDuff_ModeTest extends AndroidTestCase {
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "valueOf",
+ args = {java.lang.String.class}
+ )
+ public void testValueOf() {
+ assertEquals(Mode.CLEAR, Mode.valueOf("CLEAR"));
+ assertEquals(Mode.SRC, Mode.valueOf("SRC"));
+ assertEquals(Mode.DST, Mode.valueOf("DST"));
+ assertEquals(Mode.SRC_OVER, Mode.valueOf("SRC_OVER"));
+ assertEquals(Mode.DST_OVER, Mode.valueOf("DST_OVER"));
+ assertEquals(Mode.SRC_IN, Mode.valueOf("SRC_IN"));
+ assertEquals(Mode.DST_IN, Mode.valueOf("DST_IN"));
+ assertEquals(Mode.SRC_OUT, Mode.valueOf("SRC_OUT"));
+ assertEquals(Mode.DST_OUT, Mode.valueOf("DST_OUT"));
+ assertEquals(Mode.SRC_ATOP, Mode.valueOf("SRC_ATOP"));
+ assertEquals(Mode.DST_ATOP, Mode.valueOf("DST_ATOP"));
+ assertEquals(Mode.XOR, Mode.valueOf("XOR"));
+ assertEquals(Mode.DARKEN, Mode.valueOf("DARKEN"));
+ assertEquals(Mode.LIGHTEN, Mode.valueOf("LIGHTEN"));
+ assertEquals(Mode.MULTIPLY, Mode.valueOf("MULTIPLY"));
+ assertEquals(Mode.SCREEN, Mode.valueOf("SCREEN"));
+ // Every Mode element will be tested in other test cases.
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "values",
+ args = {}
+ )
+ public void testValues() {
+ // set the expected value
+ Mode[] expected = {
+ Mode.CLEAR,
+ Mode.SRC,
+ Mode.DST,
+ Mode.SRC_OVER,
+ Mode.DST_OVER,
+ Mode.SRC_IN,
+ Mode.DST_IN,
+ Mode.SRC_OUT,
+ Mode.DST_OUT,
+ Mode.SRC_ATOP,
+ Mode.DST_ATOP,
+ Mode.XOR,
+ Mode.DARKEN,
+ Mode.LIGHTEN,
+ Mode.MULTIPLY,
+ Mode.SCREEN};
+ Mode[] actual = Mode.values();
+ assertEquals(expected.length, actual.length);
+ for (int i = 0; i < actual.length; i ++) {
+ assertEquals(expected[i], actual[i]);
+ }
+ }
+
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/RadialGradientTest.java b/tests/tests/graphics/src/android/graphics/cts/RadialGradientTest.java
new file mode 100644
index 0000000..3db864b
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/cts/RadialGradientTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2009 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 android.graphics.cts;
+
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RadialGradient;
+import android.graphics.Shader;
+import android.graphics.Shader.TileMode;
+
+import junit.framework.TestCase;
+
+@TestTargetClass(RadialGradient.class)
+public class RadialGradientTest extends TestCase {
+ private static final int SIZE = 200;
+ private static final int RADIUS = 80;
+ private static final int CENTER = SIZE / 2;
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "RadialGradient",
+ args = {float.class, float.class, float.class, int[].class, float[].class,
+ TileMode.class}
+ )
+ public void testRadialGradient() {
+ final int[] colors = { Color.BLUE, Color.GREEN, Color.RED };
+ final float[] positions = { 0f, 0.3f, 1f };
+ int tolerance = (int)(0xFF / (0.3f * RADIUS) * 2);
+ RadialGradient rg = new RadialGradient(CENTER, CENTER, RADIUS, colors, positions,
+ Shader.TileMode.CLAMP);
+ Bitmap b = Bitmap.createBitmap(SIZE, SIZE, Bitmap.Config.ARGB_8888);
+ Canvas canvas = new Canvas(b);
+ Paint p = new Paint();
+ p.setShader(rg);
+ canvas.drawRect(0, 0, SIZE, SIZE, p);
+ checkPixels(b, colors, positions, tolerance);
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "RadialGradient",
+ args = {float.class, float.class, float.class, int.class, int.class, TileMode.class}
+ )
+ public void testRadialGradientWithColor() {
+ final int[] colors = { Color.BLUE, Color.GREEN };
+ final float[] positions = { 0f, 1f };
+ int tolerance = (int)(0xFF / RADIUS * 2);
+ RadialGradient rg = new RadialGradient(CENTER, CENTER, RADIUS, colors[0], colors[1],
+ Shader.TileMode.CLAMP);
+ Bitmap b = Bitmap.createBitmap(SIZE, SIZE, Bitmap.Config.ARGB_8888);
+ Canvas canvas = new Canvas(b);
+ Paint p = new Paint();
+ p.setShader(rg);
+ canvas.drawRect(0, 0, SIZE, SIZE, p);
+ checkPixels(b, colors, positions, tolerance);
+ }
+
+ private void checkPixels(Bitmap bitmap, int[] colors, float[] positions, int tolerance) {
+ for (int y = 0; y < SIZE; y++) {
+ for (int x = 0; x < SIZE; x++) {
+ double dist = dist(x, y, CENTER, CENTER) / RADIUS;
+ int idx;
+ int color;
+ for (idx = 0; idx < positions.length; idx++) {
+ if (positions[idx] > dist) {
+ break;
+ }
+ }
+ if (idx == 0) {
+ // use start color
+ color = colors[0];
+ } else if (idx == positions.length) {
+ // clamp to end color
+ color = colors[positions.length - 1];
+ } else {
+ // linear interpolation
+ int i1 = idx - 1; // index of next lower color and position
+ int i2 = idx; // index of next higher color and position
+ double delta = (dist - positions[i1]) / (positions[i2] - positions[i1]);
+ int alpha = (int) ((1d - delta) * Color.alpha(colors[i1]) +
+ delta * Color.alpha(colors[i2]));
+ int red = (int) ((1d - delta) * Color.red(colors[i1]) +
+ delta * Color.red(colors[i2]));
+ int green = (int) ((1d - delta) * Color.green(colors[i1]) +
+ delta * Color.green(colors[i2]));
+ int blue = (int) ((1d - delta) * Color.blue(colors[i1]) +
+ delta * Color.blue(colors[i2]));
+ color = Color.argb(alpha, red, green, blue);
+ }
+ int pixel = bitmap.getPixel(x, y);
+
+ assertEquals(Color.alpha(color), Color.alpha(pixel), tolerance);
+ assertEquals(Color.red(color), Color.red(pixel), tolerance);
+ assertEquals(Color.green(color), Color.green(pixel), tolerance);
+ assertEquals(Color.blue(color), Color.blue(pixel), tolerance);
+ }
+ }
+ }
+
+ /**
+ * Calculate distance between two points.
+ */
+ private double dist(int x1, int y1, int x2, int y2) {
+ int distX = x1 - x2;
+ int distY = y1 - y2;
+ return Math.sqrt(distX * distX + distY * distY);
+ }
+
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/RectTest.java b/tests/tests/graphics/src/android/graphics/cts/RectTest.java
index 5eb788f..2176987 100644
--- a/tests/tests/graphics/src/android/graphics/cts/RectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/RectTest.java
@@ -677,30 +677,6 @@ public class RectTest extends AndroidTestCase {
}
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "flattenToString",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "unflattenFromString",
- args = {java.lang.String.class}
- )
- })
- public void testFlattenToString() {
- Rect mRect = new Rect(1, 2, 3, 4);
- String flattenString = mRect.flattenToString();
- assertNotNull(flattenString);
- String unDefinedFormat = "TOPLEFT";
- Rect rect = Rect.unflattenFromString(flattenString);
- assertEquals(mRect, rect);
- rect = null;
- rect = Rect.unflattenFromString(unDefinedFormat);
- assertNull(rect);
- }
-
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "describeContents",
diff --git a/tests/tests/graphics/src/android/graphics/cts/Shader_TileModeTest.java b/tests/tests/graphics/src/android/graphics/cts/Shader_TileModeTest.java
index 4389032..135bf36 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Shader_TileModeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Shader_TileModeTest.java
@@ -18,7 +18,6 @@ package android.graphics.cts;
import junit.framework.TestCase;
import android.graphics.Shader;
-import android.graphics.Shader.TileMode;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
@@ -27,27 +26,18 @@ import dalvik.annotation.TestTargets;
@TestTargetClass(Shader.TileMode.class)
public class Shader_TileModeTest extends TestCase {
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "valueOf",
- args = {java.lang.String.class}
- )
- public void testValueOf() {
- assertEquals(TileMode.CLAMP, TileMode.valueOf("CLAMP"));
- assertEquals(TileMode.MIRROR, TileMode.valueOf("MIRROR"));
- assertEquals(TileMode.REPEAT, TileMode.valueOf("REPEAT"));
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "values",
- args = {}
- )
- public void testValues() {
- TileMode[] tileMode = TileMode.values();
- assertEquals(3, tileMode.length);
- assertEquals(TileMode.CLAMP, tileMode[0]);
- assertEquals(TileMode.REPEAT, tileMode[1]);
- assertEquals(TileMode.MIRROR, tileMode[2]);
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.NOT_NECESSARY,
+ method = "values",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.NOT_NECESSARY,
+ method = "valueOf",
+ args = {java.lang.String.class}
+ )
+ })
+ public void testTileMode() {
}
}
diff --git a/tests/tests/graphics/src/android/graphics/cts/TypefaceTest.java b/tests/tests/graphics/src/android/graphics/cts/TypefaceTest.java
index 19f3f46..c861b3e 100755
--- a/tests/tests/graphics/src/android/graphics/cts/TypefaceTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/TypefaceTest.java
@@ -22,19 +22,8 @@ import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import android.graphics.Typeface;
-import android.content.res.AssetFileDescriptor;
-import android.content.res.AssetManager;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
@TestTargetClass(android.graphics.Typeface.class)
public class TypefaceTest extends AndroidTestCase {
@@ -177,61 +166,4 @@ public class TypefaceTest extends AndroidTestCase {
Typeface typeface = Typeface.createFromAsset(getContext().getAssets(), "samplefont.ttf");
assertNotNull(typeface);
}
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "createFromFile",
- args = {java.io.File.class}
- )
- public void testCreateFromFile1() throws IOException {
- // input abnormal params.
- try {
- Typeface.createFromFile((File)null);
- fail("Should throw a NullPointerException.");
- } catch (NullPointerException e) {
- // except here
- }
- File file = new File(obtainPath());
- Typeface typeface = Typeface.createFromFile(file);
- assertNotNull(typeface);
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "createFromFile",
- args = {java.lang.String.class}
- )
- public void testCreateFromFile2() throws IOException {
- // input abnormal params.
- try {
- Typeface.createFromFile((String)null);
- fail("Should throw a NullPointerException.");
- } catch (NullPointerException e) {
- // except here
- }
-
- Typeface typeface = Typeface.createFromFile(obtainPath());
- assertNotNull(typeface);
- }
-
- private String obtainPath() throws IOException {
- File dir = getContext().getFilesDir();
- dir.mkdirs();
- File file = new File(dir, "test.jpg");
- if (!file.createNewFile()) {
- if (!file.exists()) {
- fail("Failed to create new File!");
- }
- }
- InputStream is = getContext().getAssets().open("samplefont.ttf");
- FileOutputStream fOutput = new FileOutputStream(file);
- byte[] dataBuffer = new byte[1024];
- int readLength = 0;
- while ((readLength = is.read(dataBuffer)) != -1) {
- fOutput.write(dataBuffer, 0, readLength);
- }
- is.close();
- fOutput.close();
- return (file.getPath());
- }
}
diff --git a/tests/tests/graphics/src/android/graphics/cts/YuvImageTest.java b/tests/tests/graphics/src/android/graphics/cts/YuvImageTest.java
index eb0b21f..6613e92 100755
--- a/tests/tests/graphics/src/android/graphics/cts/YuvImageTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/YuvImageTest.java
@@ -203,56 +203,6 @@ public class YuvImageTest extends AndroidTestCase {
}
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getHeight",
- args = {}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getWidth",
- args = {}
- )
- })
- public void testGetHeight() {
- generateTestBitmaps(WIDTH, HEIGHT);
- YuvImage image = generateYuvImage(ImageFormat.YUY2, mTestBitmaps[0], 0);
- assertEquals(mTestBitmaps[0].getHeight(), image.getHeight());
- assertEquals(mTestBitmaps[0].getWidth(), image.getWidth());
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getYuvData",
- args = {}
- )
- public void testGetYuvData() {
- generateTestBitmaps(WIDTH, HEIGHT);
- int width = mTestBitmaps[0].getWidth();
- int height = mTestBitmaps[0].getHeight();
- int stride = width;
- int[] argb = new int[stride * height];
- mTestBitmaps[0].getPixels(argb, 0, stride, 0, 0, width, height);
- byte[] yuv = convertArgbsToYuvs(argb, stride, height, ImageFormat.NV21);
- int[] strides = new int[] {
- stride, stride
- };
- YuvImage image = new YuvImage(yuv, ImageFormat.NV21, width, height, strides);
- assertEquals(yuv, image.getYuvData());
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "getYuvFormat",
- args = {}
- )
- public void testGetYuvFormat() {
- generateTestBitmaps(WIDTH, HEIGHT);
- YuvImage image = generateYuvImage(ImageFormat.YUY2, mTestBitmaps[0], 0);
- assertEquals(ImageFormat.YUY2, image.getYuvFormat());
- }
-
private void generateTestBitmaps(int width, int height) {
Bitmap dst = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
Canvas c = new Canvas(dst);
@@ -270,7 +220,7 @@ public class YuvImageTest extends AndroidTestCase {
int width = bitmap.getWidth();
int height = bitmap.getHeight();
- int stride = width + paddings;
+ int stride = width + paddings;;
YuvImage image = null;
int[] argb = new int [stride * height];
@@ -301,6 +251,7 @@ public class YuvImageTest extends AndroidTestCase {
Rect expectedRect = sameRect ? actualRect : rect1;
expected = Bitmap.createBitmap(testBitmap, expectedRect.left, expectedRect.top, expectedRect.width(), expectedRect.height());
+
compareBitmaps(expected, actual, mMseMargin, sameRect);
}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
index 5e9e88d..a27aa9d 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
@@ -41,7 +41,6 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable.ConstantState;
import android.test.InstrumentationTestCase;
import android.util.AttributeSet;
-import android.util.DisplayMetrics;
import android.view.Gravity;
import java.io.ByteArrayInputStream;
@@ -68,40 +67,20 @@ public class BitmapDrawableTest extends InstrumentationTestCase {
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "BitmapDrawable",
- args = {android.content.res.Resources.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "BitmapDrawable",
args = {android.graphics.Bitmap.class}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "BitmapDrawable",
- args = {android.content.res.Resources.class, android.graphics.Bitmap.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "BitmapDrawable",
args = {java.lang.String.class}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "BitmapDrawable",
- args = {android.content.res.Resources.class, java.lang.String.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "BitmapDrawable",
args = {java.io.InputStream.class}
),
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "BitmapDrawable",
- args = {android.content.res.Resources.class, java.io.InputStream.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "getPaint",
args = {}
),
@@ -129,10 +108,6 @@ public class BitmapDrawableTest extends InstrumentationTestCase {
bitmapDrawable.getPaint().getFlags());
assertEquals(bitmap, bitmapDrawable.getBitmap());
- new BitmapDrawable(mContext.getResources());
-
- new BitmapDrawable(mContext.getResources(), bitmap);
-
new BitmapDrawable(mContext.getFilesDir().getPath());
new BitmapDrawable(new ByteArrayInputStream("test constructor".getBytes()));
@@ -140,12 +115,8 @@ public class BitmapDrawableTest extends InstrumentationTestCase {
// exceptional test
new BitmapDrawable((Bitmap) null);
- new BitmapDrawable(mContext.getResources(), (String) null);
-
new BitmapDrawable((String) null);
- new BitmapDrawable(mContext.getResources(), (InputStream) null);
-
new BitmapDrawable((InputStream) null);
}
@@ -445,38 +416,6 @@ public class BitmapDrawableTest extends InstrumentationTestCase {
assertEquals(48, bitmapDrawable.getIntrinsicHeight());
}
- @TestTargets({
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "setTargetDensity",
- args = {android.graphics.Canvas.class}
- ),
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "setTargetDensity",
- args = {android.util.DisplayMetrics.class}
- )
- })
- @SuppressWarnings("deprecation")
- public void testSetTargetDensity() {
- BitmapDrawable bitmapDrawable = new BitmapDrawable();
-
- Bitmap bitmap = Bitmap.createBitmap(200, 300, Config.RGB_565);
- Canvas canvas = new Canvas(bitmap);
- bitmapDrawable = new BitmapDrawable(bitmap);
- bitmapDrawable.setTargetDensity(canvas.getDensity());
- assertEquals(200, bitmapDrawable.getIntrinsicWidth());
- assertEquals(300, bitmapDrawable.getIntrinsicHeight());
-
- DisplayMetrics disMetrics = new DisplayMetrics();
- disMetrics = getInstrumentation().getTargetContext().getResources().getDisplayMetrics();
- InputStream source = mContext.getResources().openRawResource(R.drawable.size_48x48);
- bitmapDrawable = new BitmapDrawable(source);
- bitmapDrawable.setTargetDensity(disMetrics.densityDpi);
- assertEquals(48, bitmapDrawable.getIntrinsicWidth());
- assertEquals(48, bitmapDrawable.getIntrinsicHeight());
- }
-
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "inflate",
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java
index 8a5d7aa..d503938 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java
@@ -18,30 +18,32 @@ package android.graphics.drawable.cts;
import com.android.cts.stub.R;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.ToBeFixed;
+
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
-import java.io.IOException;
-
import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.PixelFormat;
import android.graphics.Rect;
+import android.graphics.Bitmap.Config;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ClipDrawable;
import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.Callback;
import android.graphics.drawable.Drawable.ConstantState;
import android.test.AndroidTestCase;
import android.util.AttributeSet;
import android.util.StateSet;
import android.util.Xml;
import android.view.Gravity;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.ToBeFixed;
+
+import java.io.IOException;
@TestTargetClass(android.graphics.drawable.ClipDrawable.class)
public class ClipDrawableTest extends AndroidTestCase {
@@ -521,7 +523,7 @@ public class ClipDrawableTest extends AndroidTestCase {
}
}
- private class MockCallback implements Drawable.Callback2 {
+ private class MockCallback implements Callback {
private Drawable mInvalidateDrawable;
private Drawable mScheduleDrawable;
private Runnable mRunnable;
@@ -557,9 +559,5 @@ public class ClipDrawableTest extends AndroidTestCase {
mScheduleDrawable = who;
mRunnable = what;
}
-
- public int getResolvedLayoutDirection(Drawable who) {
- return 0;
- }
}
}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerStateTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerStateTest.java
index bfe3ec7..15ae0b6 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerStateTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerStateTest.java
@@ -241,8 +241,8 @@ public class DrawableContainerStateTest extends TestCase{
})
public void testConstantHeightsAndWidths() {
assertEquals(0, mDrawableContainerState.getChildCount());
- assertEquals(-1, mDrawableContainerState.getConstantHeight());
- assertEquals(-1, mDrawableContainerState.getConstantWidth());
+ assertEquals(0, mDrawableContainerState.getConstantHeight());
+ assertEquals(0, mDrawableContainerState.getConstantWidth());
assertEquals(0, mDrawableContainerState.getConstantMinimumHeight());
assertEquals(0, mDrawableContainerState.getConstantMinimumWidth());
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerTest.java
index 9191cac..c9107ab 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerTest.java
@@ -16,9 +16,11 @@
package android.graphics.drawable.cts;
-import junit.framework.TestCase;
-
-import java.util.Arrays;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
@@ -26,13 +28,13 @@ import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.DrawableContainer;
-import android.graphics.drawable.DrawableContainer.DrawableContainerState;
import android.graphics.drawable.LevelListDrawable;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
+import android.graphics.drawable.Drawable.Callback;
+import android.graphics.drawable.DrawableContainer.DrawableContainerState;
+
+import java.util.Arrays;
+
+import junit.framework.TestCase;
@TestTargetClass(DrawableContainer.class)
public class DrawableContainerTest extends TestCase {
@@ -1096,7 +1098,7 @@ public class DrawableContainerTest extends TestCase {
}
}
- private class MockCallBack implements Drawable.Callback2 {
+ private class MockCallBack implements Callback {
private boolean mCalledInvalidateDrawable;
private boolean mCalledScheduleDrawable;
@@ -1132,9 +1134,5 @@ public class DrawableContainerTest extends TestCase {
public void unscheduleDrawable(Drawable who, Runnable what) {
mCalledUnscheduleDrawable = true;
}
-
- public int getResolvedLayoutDirection(Drawable who) {
- return 0;
- }
}
}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
index 97f160f..9d586d9 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
@@ -18,37 +18,37 @@ package android.graphics.drawable.cts;
import com.android.cts.stub.R;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
+
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
import android.content.ContentResolver;
import android.content.res.Resources;
-import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.PixelFormat;
import android.graphics.PorterDuff;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.Callback;
import android.net.Uri;
import android.test.AndroidTestCase;
import android.util.AttributeSet;
import android.util.StateSet;
-import android.util.TypedValue;
import android.util.Xml;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
@TestTargetClass(Drawable.class)
public class DrawableTest extends AndroidTestCase {
@@ -236,116 +236,6 @@ public class DrawableTest extends AndroidTestCase {
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "createFromResourceStream",
- args = {android.content.res.Resources.class, android.util.TypedValue.class,
- java.io.InputStream.class, java.lang.String.class}
- )
- public void testCreateFromResourceStream1() throws FileNotFoundException, IOException {
- FileInputStream inputEmptyStream = null;
- FileInputStream inputStream = null;
- File imageFile = null;
- OutputStream outputEmptyStream = null;
-
- assertNull(Drawable.createFromResourceStream(null, null, inputStream, "test.bmp"));
-
- File emptyFile = new File(mContext.getFilesDir(), "tempemptyimage.jpg");
-
- // write some random data.
- try {
- outputEmptyStream = new FileOutputStream(emptyFile);
- outputEmptyStream.write(10);
-
- inputEmptyStream = new FileInputStream(emptyFile);
- assertNull(Drawable.createFromResourceStream(mResources, null, inputEmptyStream,
- "Sample"));
-
- imageFile = new File(mContext.getFilesDir(), "tempimage.jpg");
-
- writeSampleImage(imageFile);
-
- inputStream = new FileInputStream(imageFile);
- final TypedValue value = new TypedValue();
- assertNotNull(Drawable.createFromResourceStream(mResources, value, inputStream,
- "Sample"));
- } finally {
-
- if (null != outputEmptyStream) {
- outputEmptyStream.close();
- }
- if (null != inputEmptyStream) {
- inputEmptyStream.close();
- }
- if (null != inputStream) {
- inputStream.close();
- }
- if (emptyFile.exists()) {
- assertTrue(emptyFile.delete());
- }
- if (imageFile.exists()) {
- assertTrue(imageFile.delete());
- }
- }
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "createFromResourceStream",
- args = {android.content.res.Resources.class, android.util.TypedValue.class,
- java.io.InputStream.class, java.lang.String.class,
- android.graphics.BitmapFactory.Options.class}
- )
- public void testCreateFromResourceStream2() throws FileNotFoundException, IOException {
- FileInputStream inputEmptyStream = null;
- FileInputStream inputStream = null;
- File imageFile = null;
- OutputStream outputEmptyStream = null;
-
- BitmapFactory.Options opt = new BitmapFactory.Options();
- opt.inScaled = false;
-
- assertNull(Drawable.createFromResourceStream(null, null, inputStream, "test.bmp", opt));
-
- File emptyFile = new File(mContext.getFilesDir(), "tempemptyimage.jpg");
-
- // write some random data.
- try {
- outputEmptyStream = new FileOutputStream(emptyFile);
- outputEmptyStream.write(10);
-
- inputEmptyStream = new FileInputStream(emptyFile);
- assertNull(Drawable.createFromResourceStream(mResources, null, inputEmptyStream,
- "Sample", opt));
-
- imageFile = new File(mContext.getFilesDir(), "tempimage.jpg");
-
- writeSampleImage(imageFile);
-
- inputStream = new FileInputStream(imageFile);
- final TypedValue value = new TypedValue();
- assertNotNull(Drawable.createFromResourceStream(mResources, value, inputStream,
- "Sample", opt));
- } finally {
-
- if (null != outputEmptyStream) {
- outputEmptyStream.close();
- }
- if (null != inputEmptyStream) {
- inputEmptyStream.close();
- }
- if (null != inputStream) {
- inputStream.close();
- }
- if (emptyFile.exists()) {
- assertTrue(emptyFile.delete());
- }
- if (imageFile.exists()) {
- assertTrue(imageFile.delete());
- }
- }
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "createFromXml",
args = {android.content.res.Resources.class, org.xmlpull.v1.XmlPullParser.class}
)
@@ -806,22 +696,6 @@ public class DrawableTest extends AndroidTestCase {
assertSame(mockDrawable, mockDrawable.mutate());
}
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "isLayoutRtlSelf",
- args = {java.lang.Runnable.class}
- )
- public void getResolvedLayoutDirectionSelf() {
- MockDrawable mockDrawable = new MockDrawable();
- MockCallback mockCallback = new MockCallback(1);
- mockDrawable.setCallback(mockCallback);
- assertEquals(1, mockDrawable.getResolvedLayoutDirectionSelf());
-
- mockCallback = new MockCallback(0);
- mockDrawable.setCallback(mockCallback);
- assertEquals(0, mockDrawable.getResolvedLayoutDirectionSelf());
- }
-
private static class MockDrawable extends Drawable {
private ColorFilter mColorFilter;
@@ -856,21 +730,11 @@ public class DrawableTest extends AndroidTestCase {
}
}
- private static class MockCallback implements Drawable.Callback2 {
+ private static class MockCallback implements Callback {
private Drawable mInvalidateDrawable;
private Drawable mScheduleDrawable;
private Runnable mRunnable;
private long mWhen;
- private int mLayoutDirection;
-
- public MockCallback() {
- // 0 for LTR layout direction
- this(0);
- }
-
- public MockCallback(int direction) {
- mLayoutDirection = direction;
- }
public Drawable getInvalidateDrawable() {
return mInvalidateDrawable;
@@ -902,9 +766,5 @@ public class DrawableTest extends AndroidTestCase {
mScheduleDrawable = who;
mRunnable = what;
}
-
- public int getResolvedLayoutDirection(Drawable who) {
- return mLayoutDirection;
- }
}
}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java
index cb9b7b6..b47d906 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java
@@ -18,9 +18,13 @@ package android.graphics.drawable.cts;
import com.android.cts.stub.R;
-import org.xmlpull.v1.XmlPullParserException;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
-import java.io.IOException;
+import org.xmlpull.v1.XmlPullParserException;
import android.R.attr;
import android.content.res.Resources;
@@ -33,21 +37,19 @@ import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Drawable.ConstantState;
import android.graphics.drawable.GradientDrawable;
import android.graphics.drawable.LayerDrawable;
import android.graphics.drawable.RotateDrawable;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.StateListDrawable;
+import android.graphics.drawable.Drawable.Callback;
+import android.graphics.drawable.Drawable.ConstantState;
import android.test.AndroidTestCase;
import android.util.AttributeSet;
import android.util.StateSet;
import android.view.View;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
+
+import java.io.IOException;
@TestTargetClass(android.graphics.drawable.LayerDrawable.class)
public class LayerDrawableTest extends AndroidTestCase {
@@ -281,6 +283,9 @@ public class LayerDrawableTest extends AndroidTestCase {
assertFalse(layerDrawable.setDrawableByLayerId(30, d1));
+ layerDrawable.setDrawableByLayerId(20, null);
+ assertEquals(null, layerDrawable.getDrawable(1));
+
try {
layerDrawable.getDrawable(layerDrawable.getNumberOfLayers());
fail("Should throw IndexOutOfBoundsException");
@@ -416,7 +421,7 @@ public class LayerDrawableTest extends AndroidTestCase {
assertFalse(cb.hasCalledUnschedule());
}
- private static class MockCallback implements Drawable.Callback2 {
+ private static class MockCallback implements Callback {
private boolean mCalledInvalidate;
private boolean mCalledSchedule;
private boolean mCalledUnschedule;
@@ -445,10 +450,6 @@ public class LayerDrawableTest extends AndroidTestCase {
return mCalledUnschedule;
}
- public int getResolvedLayoutDirection(Drawable who) {
- return 0;
- }
-
public void reset() {
mCalledInvalidate = false;
mCalledSchedule = false;
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/RotateDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/RotateDrawableTest.java
index 8dde6a3..97bc210 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/RotateDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/RotateDrawableTest.java
@@ -18,11 +18,15 @@ package android.graphics.drawable.cts;
import com.android.cts.stub.R;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
+
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
-import java.io.IOException;
-
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Canvas;
@@ -31,16 +35,14 @@ import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Drawable.ConstantState;
import android.graphics.drawable.RotateDrawable;
+import android.graphics.drawable.Drawable.Callback;
+import android.graphics.drawable.Drawable.ConstantState;
import android.test.AndroidTestCase;
import android.util.AttributeSet;
import android.util.Xml;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
+
+import java.io.IOException;
@TestTargetClass(android.graphics.drawable.RotateDrawable.class)
public class RotateDrawableTest extends AndroidTestCase {
@@ -350,7 +352,7 @@ public class RotateDrawableTest extends AndroidTestCase {
assertEquals(50, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
}
- private static class MockCallback implements Drawable.Callback2 {
+ private static class MockCallback implements Callback {
private boolean mCalledInvalidate;
private boolean mCalledSchedule;
private boolean mCalledUnschedule;
@@ -379,10 +381,6 @@ public class RotateDrawableTest extends AndroidTestCase {
return mCalledUnschedule;
}
- public int getResolvedLayoutDirection(Drawable who) {
- return 0;
- }
-
public void reset() {
mCalledInvalidate = false;
mCalledSchedule = false;
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ScaleDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ScaleDrawableTest.java
index c9d9d0a..23e8745 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ScaleDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ScaleDrawableTest.java
@@ -18,9 +18,13 @@ package android.graphics.drawable.cts;
import com.android.cts.stub.R;
-import org.xmlpull.v1.XmlPullParserException;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
-import java.io.IOException;
+import org.xmlpull.v1.XmlPullParserException;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
@@ -29,18 +33,16 @@ import android.graphics.ColorFilter;
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Drawable.ConstantState;
import android.graphics.drawable.ScaleDrawable;
+import android.graphics.drawable.Drawable.Callback;
+import android.graphics.drawable.Drawable.ConstantState;
import android.test.AndroidTestCase;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.StateSet;
import android.view.Gravity;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
+
+import java.io.IOException;
@TestTargetClass(android.graphics.drawable.ScaleDrawable.class)
public class ScaleDrawableTest extends AndroidTestCase {
@@ -147,7 +149,7 @@ public class ScaleDrawableTest extends AndroidTestCase {
assertFalse(cb.hasCalledUnschedule());
}
- private static class MockCallback implements Drawable.Callback2 {
+ private static class MockCallback implements Callback {
private boolean mCalledInvalidate;
private boolean mCalledSchedule;
private boolean mCalledUnschedule;
@@ -176,10 +178,6 @@ public class ScaleDrawableTest extends AndroidTestCase {
return mCalledUnschedule;
}
- public int getResolvedLayoutDirection(Drawable who) {
- return 0;
- }
-
public void reset() {
mCalledInvalidate = false;
mCalledSchedule = false;
@@ -517,8 +515,7 @@ public class ScaleDrawableTest extends AndroidTestCase {
XmlResourceParser parser = res.getXml(R.xml.scaledrawable);
AttributeSet attrs = DrawableTestUtils.getAttributeSet(parser, "scale_allattrs");
scaleDrawable.inflate(res, parser, attrs);
- int bitmapSize = (int) Math.ceil(48.0 *
- res.getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
+ int bitmapSize = 48 * res.getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT;
assertEquals(bitmapSize, scaleDrawable.getIntrinsicWidth());
assertEquals(bitmapSize, scaleDrawable.getIntrinsicHeight());
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java
index a60bfe9..c02593f 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java
@@ -18,18 +18,20 @@ package android.graphics.drawable.cts;
import com.android.cts.stub.R;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
+
import android.content.res.Resources;
import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
import android.graphics.Canvas;
+import android.graphics.Bitmap.Config;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.TransitionDrawable;
+import android.graphics.drawable.Drawable.Callback;
import android.test.InstrumentationTestCase;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-import dalvik.annotation.ToBeFixed;
@TestTargetClass(TransitionDrawable.class)
public class TransitionDrawableTest extends InstrumentationTestCase {
@@ -312,7 +314,7 @@ public class TransitionDrawableTest extends InstrumentationTestCase {
}
}
- private class MockCallBack implements Drawable.Callback2 {
+ private class MockCallBack implements Callback {
private boolean mHasCalledInvalidateDrawable;
public boolean hasCalledInvalidateDrawable() {
@@ -331,9 +333,5 @@ public class TransitionDrawableTest extends InstrumentationTestCase {
public void unscheduleDrawable(Drawable who, Runnable what) {
}
-
- public int getResolvedLayoutDirection(Drawable who) {
- return 0;
- }
}
}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RoundRectShapeTest.java b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RoundRectShapeTest.java
index ada9d69..fa164e3 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RoundRectShapeTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RoundRectShapeTest.java
@@ -62,7 +62,11 @@ public class RoundRectShapeTest extends TestCase {
} catch (ArrayIndexOutOfBoundsException e) {
}
- new RoundRectShape(null, new RectF(), new float[8]);
+ try {
+ new RoundRectShape(null, new RectF(), new float[8]);
+ fail("Should throw NullPointerException");
+ } catch (NullPointerException e) {
+ }
try {
new RoundRectShape(new float[8], new RectF(), new float[7]);
diff --git a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ShapeTest.java b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ShapeTest.java
index 99bde2f..10c4022 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ShapeTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ShapeTest.java
@@ -21,25 +21,14 @@ import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
-import android.graphics.RectF;
-import android.graphics.Bitmap.Config;
-import android.graphics.Paint.Style;
-import android.graphics.drawable.shapes.RoundRectShape;
import android.graphics.drawable.shapes.Shape;
import junit.framework.TestCase;
@TestTargetClass(android.graphics.drawable.shapes.Shape.class)
public class ShapeTest extends TestCase {
- private static final int TEST_WIDTH = 100;
- private static final int TEST_HEIGHT = 200;
-
- private static final int TEST_COLOR_1 = 0xFF00FF00;
- private static final int TEST_COLOR_2 = 0xFFFF0000;
-
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -125,30 +114,7 @@ public class ShapeTest extends TestCase {
args = {}
)
public void testHasAlpha() {
- Shape shape = new MockShape();
- assertTrue(shape.hasAlpha());
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "draw",
- args = {android.graphics.Canvas.class, android.graphics.Paint.class}
- )
- public void testDraw() {
- Shape shape = new MockShape();
- Bitmap bitmap = Bitmap.createBitmap(TEST_WIDTH, TEST_HEIGHT, Config.ARGB_8888);
- Canvas canvas = new Canvas(bitmap);
- Paint paint = new Paint();
- paint.setStyle(Style.FILL);
- paint.setColor(TEST_COLOR_1);
- shape.resize(TEST_WIDTH, TEST_HEIGHT);
-
- shape.draw(canvas, paint);
- assertEquals(0, bitmap.getPixel(0, 0));
-
- paint.setColor(TEST_COLOR_2);
- shape.draw(canvas, paint);
- assertEquals(0, bitmap.getPixel(0, 0));
+ assertTrue(new MockShape().hasAlpha());
}
private static class MockShape extends Shape {
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
deleted file mode 100644
index 816ffaa..0000000
--- a/tests/tests/hardware/src/android/hardware/cts/CameraGLTest.java
+++ /dev/null
@@ -1,882 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.hardware.cts;
-
-import android.content.Context;
-import android.graphics.SurfaceTexture;
-import android.hardware.Camera;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.Size;
-
-import android.opengl.GLES20;
-import android.opengl.GLSurfaceView;
-import android.opengl.Matrix;
-import android.opengl.cts.GLSurfaceViewStubActivity;
-
-import android.os.ConditionVariable;
-import android.os.Environment;
-import android.os.Looper;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.MoreAsserts;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-import javax.microedition.khronos.opengles.GL10;
-
-/**
- * This test case must run with hardware. It can't be tested in emulator
- */
-@LargeTest
-@TestTargetClass(Camera.class)
-public class CameraGLTest extends ActivityInstrumentationTestCase2 {
- private static final String TAG = "CameraGLTest";
- private static final String PACKAGE = "com.android.cts.stub";
- private static final boolean LOGV = false;
- private static final boolean LOGVV = false;
- private static final int EGL_OPENGL_ES2_BIT = 0x0004;
-
- private boolean mSurfaceTextureCallbackResult = false;
-
- private static final int WAIT_FOR_COMMAND_TO_COMPLETE = 1500; // Milliseconds.
- private static final int WAIT_FOR_FOCUS_TO_COMPLETE = 3000;
- private static final int WAIT_FOR_SNAPSHOT_TO_COMPLETE = 5000;
-
- private SurfaceTextureCallback mSurfaceTextureCallback = new SurfaceTextureCallback();
- private SurfaceTextureBurstCallback mSurfaceTextureBurstCallback = new SurfaceTextureBurstCallback();
- private PreviewCallback mPreviewCallback = new PreviewCallback();
-
- private Looper mLooper = null;
- private final ConditionVariable mSurfaceTextureDone = new ConditionVariable();
- private final ConditionVariable mPreviewDone = new ConditionVariable();
-
- Camera mCamera;
- SurfaceTexture mSurfaceTexture;
- Renderer mRenderer;
- GLSurfaceView mGLView;
-
- public CameraGLTest() {
- super(PACKAGE, GLSurfaceViewStubActivity.class);
- if (LOGV) Log.v(TAG, "CameraGLTest Constructor");
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- // Set up renderer instance
- mRenderer = this.new Renderer();
- GLSurfaceViewStubActivity.setRenderer(mRenderer);
- GLSurfaceViewStubActivity.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
- GLSurfaceViewStubActivity.setGlVersion(2);
- // Start CameraStubActivity.
- GLSurfaceViewStubActivity stubActivity = getActivity();
- // Store a link to the view so we can redraw it when needed
- mGLView = stubActivity.getView();
- }
-
- @Override
- protected void tearDown() throws Exception {
- if (mCamera != null) {
- terminateMessageLooper();
- }
- // Clean up static values in stub so it can be reused
- GLSurfaceViewStubActivity.resetRenderMode();
- GLSurfaceViewStubActivity.resetRenderer();
- GLSurfaceViewStubActivity.resetGlVersion();
-
- super.tearDown();
- }
-
- /**
- * Initializes the message looper so that the Camera object can
- * receive the callback messages.
- */
- private void initializeMessageLooper(final int cameraId) {
- final ConditionVariable startDone = new ConditionVariable();
- new Thread() {
- @Override
- public void run() {
- Log.v(TAG, "Start camera/surfacetexture thread");
- // Set up a looper to be used by camera.
- Looper.prepare();
- // Save the looper so that we can terminate this thread
- // after we are done with it.
- mLooper = Looper.myLooper();
- // These must be instantiated outside the UI thread, since the
- // UI thread will be doing a lot of waiting, stopping callbacks.
- mCamera = Camera.open(cameraId);
- mSurfaceTexture = new SurfaceTexture(mRenderer.getTextureID());
- Log.v(TAG, "Camera " + cameraId + " is opened.");
- startDone.open();
- Looper.loop(); // Blocks forever until Looper.quit() is called.
- Log.v(TAG, "Stop camera/surfacetexture thread");
- }
- }.start();
-
- Log.v(TAG, "start waiting for looper");
- if (!startDone.block(WAIT_FOR_COMMAND_TO_COMPLETE)) {
- fail("initializeMessageLooper: start timeout");
- }
- }
-
- /**
- * Terminates the message looper thread.
- */
- private void terminateMessageLooper() throws Exception {
- if (LOGV) Log.v(TAG, "Shutting down camera");
- mCamera.release();
- mLooper.quit();
- // Looper.quit() is asynchronous. The looper may still has some
- // preview callbacks in the queue after quit is called. The preview
- // callback still uses the camera object (setHasPreviewCallback).
- // After camera is released, RuntimeException will be thrown from
- // the method. So we need to join the looper thread here.
- mLooper.getThread().join();
- mCamera = null;
- mSurfaceTexture = null;
- if (LOGV) Log.v(TAG, "Shutdown of camera complete.");
- }
-
- /** The camera preview callback. Stops capture after the first callback */
- private final class PreviewCallback
- implements android.hardware.Camera.PreviewCallback {
- public void onPreviewFrame(byte [] data, Camera camera) {
- if (LOGV) Log.v(TAG, "PreviewCallback");
- assertNotNull(data);
- Size size = camera.getParameters().getPreviewSize();
- assertEquals(size.width * size.height * 3 / 2, data.length);
- mCamera.stopPreview();
- mPreviewDone.open();
- }
- }
-
- /** A simple SurfaceTexture listener callback, meant to be used together with the camera preview
- * callback */
- private final class SurfaceTextureCallback
- implements android.graphics.SurfaceTexture.OnFrameAvailableListener {
- public void onFrameAvailable(SurfaceTexture surfaceTexture) {
- if (LOGV) Log.v(TAG, "SurfaceTextureCallback");
- mSurfaceTextureDone.open();
- // Assumes preview is stopped elsewhere
- }
- }
-
- /** A burst SurfaceTexture listener callback, used for multiple-frame capture */
- private final class SurfaceTextureBurstCallback
- implements android.graphics.SurfaceTexture.OnFrameAvailableListener {
-
- public void setBurstCount(int burstCount) {
- mBurstCount = burstCount;
- }
-
- public int getBurstCount() {
- return mBurstCount;
- }
-
- public void onFrameAvailable(SurfaceTexture surfaceTexture) {
- if (LOGVV) Log.v(TAG, "SurfaceTextureBurstCallback, frame #" + mBurstCount);
- mBurstCount--;
- if (!mSurfaceTextureCallbackResult) {
- if (mBurstCount <= 0) {
- if (LOGV) Log.v(TAG, "SurfaceTextureBurstCallback stopping preview.");
- mCamera.stopPreview();
- if (LOGVV) Log.v(TAG, "SurfaceTextureBurstCallback preview stopped.");
- mSurfaceTextureCallbackResult = true;
- }
- mSurfaceTextureDone.open();
- }
- }
-
- private int mBurstCount = 0;
- }
-
- /** Waits until surface texture callbacks have fired */
- private boolean waitForSurfaceTextureDone() {
- if (LOGVV) Log.v(TAG, "Wait for surface texture callback");
- if (!mSurfaceTextureDone.block(WAIT_FOR_COMMAND_TO_COMPLETE)) {
- // timeout could be expected or unexpected. The caller will decide.
- Log.v(TAG, "waitForSurfaceTextureDone: timeout");
- return false;
- }
- mSurfaceTextureDone.close();
- return true;
- }
-
- /** Waits until the camera preview callback has fired */
- private boolean waitForPreviewDone() {
- if (LOGVV) Log.v(TAG, "Wait for preview callback");
- if (!mPreviewDone.block(WAIT_FOR_COMMAND_TO_COMPLETE)) {
- // timeout could be expected or unexpected. The caller will decide.
- Log.v(TAG, "waitForPreviewDone: timeout");
- return false;
- }
- mPreviewDone.close();
- return true;
- }
-
- /** @return OpenGL ES major version 1 or 2 or some negative number for error */
- private static int getDetectedVersion() {
- /*
- * Get all the device configurations and check if any of the attributes specify the
- * the EGL_OPENGL_ES2_BIT to determine whether the device supports 2.0.
- */
- EGL10 egl = (EGL10) EGLContext.getEGL();
- EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
- int[] numConfigs = new int[1];
-
- if (egl.eglInitialize(display, null)) {
- try {
- if (egl.eglGetConfigs(display, null, 0, numConfigs)) {
- EGLConfig[] configs = new EGLConfig[numConfigs[0]];
- if (egl.eglGetConfigs(display, configs, numConfigs[0], numConfigs)) {
- int[] value = new int[1];
- for (int i = 0; i < numConfigs[0]; i++) {
- if (egl.eglGetConfigAttrib(display, configs[i],
- EGL10.EGL_RENDERABLE_TYPE, value)) {
- if ((value[0] & EGL_OPENGL_ES2_BIT) == EGL_OPENGL_ES2_BIT) {
- return 2;
- }
- } else {
- Log.w(TAG, "Getting config attribute with "
- + "EGL10#eglGetConfigAttrib failed "
- + "(" + i + "/" + numConfigs[0] + "): "
- + egl.eglGetError());
- }
- }
- return 1;
- } else {
- Log.e(TAG, "Getting configs with EGL10#eglGetConfigs failed: "
- + egl.eglGetError());
- return -1;
- }
- } else {
- Log.e(TAG, "Getting number of configs with EGL10#eglGetConfigs failed: "
- + egl.eglGetError());
- return -2;
- }
- } finally {
- egl.eglTerminate(display);
- }
- } else {
- Log.e(TAG, "Couldn't initialize EGL.");
- return -3;
- }
- }
-
- /** Generic per-camera test interface */
- private interface RunPerCamera {
- void run(int cameraId) throws Exception;
- }
-
- /** Generic camera test runner, to minimize boilerplace duplication */
- private void runForAllCameras(RunPerCamera test) throws Exception {
- /* Currently OpenGL ES 2.0 is supported for this test, so just skip it
- if only 1.0 is available. */
- int glVersion = getDetectedVersion();
- assertTrue(glVersion > 0);
- if (glVersion != 2) {
- Log.w(TAG, "Skipping test because OpenGL ES 2 is not supported");
- return;
- }
-
- /* Make sure the screen stays on while testing - otherwise the OpenGL context may disappear */
- PowerManager pm = (PowerManager) getActivity().getSystemService(Context.POWER_SERVICE);
- PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "CameraGLTest");
- wl.acquire();
- try {
- /* Run the requested test per camera */
- int nCameras = Camera.getNumberOfCameras();
- for (int id = 0; id < nCameras; id++) {
- Log.v(TAG, "Camera id=" + id);
- test.run(id);
- }
- } finally {
- wl.release();
- // If an assert failed, camera might still be active. Clean up before next test.
- if (mCamera != null) {
- terminateMessageLooper();
- }
- }
- }
-
- /** Test Camera.setPreviewTexture in conjunction with the standard Camera preview callback */
- @UiThreadTest
- public void testSetPreviewTexturePreviewCallback() throws Exception {
- runForAllCameras(testSetPreviewTexturePreviewCallbackByCamera);
- }
-
- private RunPerCamera testSetPreviewTexturePreviewCallbackByCamera = new RunPerCamera() {
- public void run(int cameraId) throws Exception {
- boolean noTimeout;
- // Check the order: startPreview->setPreviewTexture, with a PreviewCallback as well
- mPreviewDone.close();
- initializeMessageLooper(cameraId);
- mCamera.setPreviewCallback(mPreviewCallback);
- mCamera.startPreview();
- mCamera.setPreviewTexture(mSurfaceTexture);
- noTimeout = waitForPreviewDone();
- assertTrue("Timeout waiting for new preview callback!", noTimeout);
- terminateMessageLooper();
-
- // Check the order: setPreviewTexture->startPreview.
- initializeMessageLooper(cameraId);
- mCamera.setPreviewCallback(mPreviewCallback);
- mCamera.setPreviewTexture(mSurfaceTexture);
- mCamera.startPreview();
- noTimeout = waitForPreviewDone();
- assertTrue("Timeout waiting for new preview callback!", noTimeout);
-
- // Check the order: setting preview display to null->startPreview->
- // setPreviewTexture.
- mCamera.setPreviewCallback(mPreviewCallback);
- mCamera.setPreviewTexture(null);
- mCamera.startPreview();
- mCamera.setPreviewTexture(mSurfaceTexture);
- noTimeout = waitForPreviewDone();
- assertTrue("Timeout waiting for new preview callback!", noTimeout);
- terminateMessageLooper();
- }
- };
-
- /** Test Camera.setPreviewTexture in conjunction with both the standard Camera preview callback,
- and the SurfaceTexture onFrameAvailable callback */
- @UiThreadTest
- public void testSetPreviewTextureBothCallbacks() throws Exception {
- runForAllCameras(testSetPreviewTextureBothCallbacksByCamera);
- }
-
- private RunPerCamera testSetPreviewTextureBothCallbacksByCamera = new RunPerCamera() {
- public void run(int cameraId) throws Exception {
- boolean noTimeout;
- // Check SurfaceTexture callback together with preview callback
- // Check the order: setPreviewTexture->startPreview
- mSurfaceTextureDone.close();
- initializeMessageLooper(cameraId);
- mRenderer.setCameraSizing(mCamera.getParameters().getPreviewSize());
- mCamera.setPreviewCallback(mPreviewCallback);
- mSurfaceTexture.setOnFrameAvailableListener(mSurfaceTextureCallback);
- mCamera.setPreviewTexture(mSurfaceTexture);
- mCamera.startPreview();
-
- noTimeout = waitForSurfaceTextureDone();
- assertTrue("Timeout waiting for new frame from SurfaceTexture!", noTimeout);
- noTimeout = waitForPreviewDone();
- assertTrue("Timeout waiting for new preview callback!",noTimeout);
-
- mGLView.requestRender();
- terminateMessageLooper();
-
- // Check the order: startPreview->setPreviewTexture
- mSurfaceTextureDone.close();
- initializeMessageLooper(cameraId);
- mRenderer.setCameraSizing(mCamera.getParameters().getPreviewSize());
- mCamera.setPreviewCallback(mPreviewCallback);
- mSurfaceTexture.setOnFrameAvailableListener(mSurfaceTextureCallback);
- mCamera.startPreview();
- mCamera.setPreviewTexture(mSurfaceTexture);
-
- noTimeout = waitForSurfaceTextureDone();
- assertTrue("Timeout waiting for new frame from SurfaceTexture!", noTimeout);
- noTimeout = waitForPreviewDone();
- assertTrue("Timeout waiting for new preview callback!", noTimeout);
-
- mGLView.requestRender();
-
- // Check the order: setting preview to null->startPreview->setPreviewTexture
- mCamera.setPreviewCallback(mPreviewCallback);
- mCamera.setPreviewTexture(null);
- mSurfaceTexture.setOnFrameAvailableListener(mSurfaceTextureCallback);
- mCamera.startPreview();
- mCamera.setPreviewTexture(mSurfaceTexture);
- noTimeout = waitForPreviewDone();
- assertTrue(noTimeout);
- terminateMessageLooper();
- }
- };
-
- /** Test Camera.setPreviewTexture in conjunction with just the SurfaceTexture onFrameAvailable callback */
- @UiThreadTest
- public void testSetPreviewTextureTextureCallback() throws Exception {
- runForAllCameras(testSetPreviewTextureTextureCallbackByCamera);
- }
-
- private RunPerCamera testSetPreviewTextureTextureCallbackByCamera = new RunPerCamera() {
- public void run(int cameraId) throws Exception {
- boolean noTimeout;
- // Check that SurfaceTexture callbacks work with no standard
- // preview callback
- mSurfaceTextureCallbackResult = false;
- mSurfaceTextureDone.close();
- initializeMessageLooper(cameraId);
- mSurfaceTextureBurstCallback.setBurstCount(1);
- mSurfaceTexture.setOnFrameAvailableListener(mSurfaceTextureBurstCallback);
- mCamera.setPreviewTexture(mSurfaceTexture);
- mRenderer.setCameraSizing(mCamera.getParameters().getPreviewSize());
- mCamera.startPreview();
-
- noTimeout = waitForSurfaceTextureDone();
- mGLView.requestRender();
- assertTrue(noTimeout);
-
- terminateMessageLooper();
- assertTrue(mSurfaceTextureCallbackResult);
-
- // Check that SurfaceTexture callbacks also work with
- // startPreview->setPreviewTexture
- mSurfaceTextureCallbackResult = false;
- mSurfaceTextureDone.close();
- initializeMessageLooper(cameraId);
- mSurfaceTextureBurstCallback.setBurstCount(1);
- mSurfaceTexture.setOnFrameAvailableListener(mSurfaceTextureBurstCallback);
- mRenderer.setCameraSizing(mCamera.getParameters().getPreviewSize());
- mCamera.startPreview();
- mCamera.setPreviewTexture(mSurfaceTexture);
-
- noTimeout = waitForSurfaceTextureDone();
- assertTrue(noTimeout);
-
- terminateMessageLooper();
- assertTrue(mSurfaceTextureCallbackResult);
-
- // Check that SurfaceTexture callbacks also work with
- // null->startPreview->setPreviewTexture
- mSurfaceTextureCallbackResult = false;
- mSurfaceTextureDone.close();
- initializeMessageLooper(cameraId);
- mSurfaceTextureBurstCallback.setBurstCount(1);
- mSurfaceTexture.setOnFrameAvailableListener(mSurfaceTextureBurstCallback);
- mRenderer.setCameraSizing(mCamera.getParameters().getPreviewSize());
- mCamera.setPreviewTexture(null);
- mCamera.startPreview();
- mCamera.setPreviewTexture(mSurfaceTexture);
-
- noTimeout = waitForSurfaceTextureDone();
- assertTrue(noTimeout);
-
- terminateMessageLooper();
- assertTrue(mSurfaceTextureCallbackResult);
- }
- };
-
- /** Test all preview sizes and framerates along with SurfaceTexture-provided metadata (texture
- * transforms and timestamps) */
- @UiThreadTest
- public void testCameraToSurfaceTextureMetadata() throws Exception {
- runForAllCameras(testCameraToSurfaceTextureMetadataByCamera);
- }
-
- private RunPerCamera testCameraToSurfaceTextureMetadataByCamera = new RunPerCamera() {
- public void run(int cameraId) throws Exception {
- // Number of frames to test over
- int kLoopCount = 100;
- // Ignore timestamp issues before this frame
- int kFirstTestedFrame = 10;
- // Slop in timestamp testing, needed because timestamps are not
- // currently being set by driver-level code so are subject to
- // lots of variability
- float kTestSlopMargin = 30; // ms
-
- boolean noTimeout;
- initializeMessageLooper(cameraId);
- Parameters parameters = mCamera.getParameters();
-
- mSurfaceTexture.setOnFrameAvailableListener(mSurfaceTextureBurstCallback);
- mCamera.setPreviewTexture(mSurfaceTexture);
-
- for (Size size: parameters.getSupportedPreviewSizes()) {
- for (int[] fps: parameters.getSupportedPreviewFpsRange()) {
- if (LOGV) {
- Log.v(TAG, "Testing camera #" + cameraId +
- ", preview size:" + size.width + "x" + size.height +
- ", frame rate range: [" +
- (fps[Parameters.PREVIEW_FPS_MIN_INDEX] / 1000.) + "," +
- (fps[Parameters.PREVIEW_FPS_MAX_INDEX] / 1000.) + "]");
- }
- parameters.setPreviewSize(size.width, size.height);
- parameters.setPreviewFpsRange(fps[Parameters.PREVIEW_FPS_MIN_INDEX],
- fps[Parameters.PREVIEW_FPS_MAX_INDEX]);
- mCamera.setParameters(parameters);
-
- assertEquals(size, mCamera.getParameters().getPreviewSize());
-
- int[] actualFps = new int[2];
- mCamera.getParameters().getPreviewFpsRange(actualFps);
- assertEquals(fps[Parameters.PREVIEW_FPS_MIN_INDEX],
- actualFps[Parameters.PREVIEW_FPS_MIN_INDEX]);
- assertEquals(fps[Parameters.PREVIEW_FPS_MAX_INDEX],
- actualFps[Parameters.PREVIEW_FPS_MAX_INDEX]);
-
- mSurfaceTextureBurstCallback.setBurstCount(kLoopCount);
- mSurfaceTextureCallbackResult = false;
- mSurfaceTextureDone.close();
-
- mRenderer.setCameraSizing(mCamera.getParameters().getPreviewSize());
- if (LOGV) Log.v(TAG, "Starting preview");
- mCamera.startPreview();
- if (LOGVV) Log.v(TAG, "Preview started");
-
- long[] timestamps = new long[kLoopCount];
- for (int i = 0; i < kLoopCount; i++) {
- noTimeout = waitForSurfaceTextureDone();
- assertTrue("Timeout waiting for frame " + i +
- " (burst callback thinks " +
- (kLoopCount - mSurfaceTextureBurstCallback.getBurstCount()) +
- ")! (Size " + size.width + "x" + size.height + ", fps [" +
- (fps[Parameters.PREVIEW_FPS_MIN_INDEX] / 1000.) + ", " +
- (fps[Parameters.PREVIEW_FPS_MAX_INDEX] / 1000.) + "])",
- noTimeout);
-
- if (LOGVV) Log.v(TAG, "Frame #" + i + " completed");
- // Draw the frame (and update the SurfaceTexture)
- mGLView.requestRender();
- // Wait until frame is drawn, so that the SurfaceTexture has new
- // metadata
- noTimeout = mRenderer.waitForDrawDone();
- assertTrue(noTimeout);
-
- // Store timestamps for later
- timestamps[i] = mSurfaceTexture.getTimestamp();
- // Verify that the surfaceTexture transform has at least one non-zero
- // entry
- float[] transform = new float[16];
- mSurfaceTexture.getTransformMatrix(transform);
- boolean nonZero = false;
- for (int k = 0; k < 16; k++) {
- if (transform[k] != 0.f) {
- nonZero = true;
- break;
- }
- }
- assertTrue(nonZero);
- }
- assertTrue(mSurfaceTextureCallbackResult);
-
- float expectedMaxFrameDurationMs = 1000.f * 1000.f /
- fps[Parameters.PREVIEW_FPS_MIN_INDEX];
- float slopMaxFrameDurationMs = expectedMaxFrameDurationMs +
- kTestSlopMargin;
- float expectedMinFrameDurationMs = 1000.f * 1000.f /
- fps[Parameters.PREVIEW_FPS_MAX_INDEX];
- float slopMinFrameDurationMs = expectedMinFrameDurationMs -
- kTestSlopMargin;
-
- for (int i = kFirstTestedFrame; i < kLoopCount; i++) {
- float frameDurationMs = (timestamps[i] - timestamps[i - 1]) / 1000000.f;
- if (LOGVV) {
- Log.v(TAG, "Frame " + i + " duration: " + frameDurationMs +
- " ms, expecting [" + expectedMinFrameDurationMs + "," +
- expectedMaxFrameDurationMs + "], slop range [" +
- slopMinFrameDurationMs + "," + slopMaxFrameDurationMs + "].");
- }
- assertTrue("Frame " + i + " duration out of bounds! ("+
- frameDurationMs + " ms, expecting [" +
- slopMinFrameDurationMs + "," +
- slopMaxFrameDurationMs + "] ms)",
- (frameDurationMs > slopMinFrameDurationMs) &&
- (frameDurationMs < slopMaxFrameDurationMs) );
- }
- }
- }
- terminateMessageLooper();
- } // void run(int cameraId)
- };
-
- /** Basic OpenGL ES 2.0 renderer to draw SurfaceTexture-sourced frames to the screen */
- private class Renderer implements GLSurfaceView.Renderer {
- public Renderer() {
- mTriangleVertices =
- ByteBuffer.allocateDirect(mTriangleVerticesData.length * FLOAT_SIZE_BYTES).
- order(ByteOrder.nativeOrder()).asFloatBuffer();
- mTriangleVertices.put(mTriangleVerticesData).position(0);
-
- Matrix.setIdentityM(mSTMatrix, 0);
- Matrix.setIdentityM(mMMatrix, 0);
-
- mTextureID = 0;
- }
-
- public void setCameraSizing(Camera.Size previewSize) {
- mCameraRatio = (float)previewSize.width/previewSize.height;
- }
-
- public boolean waitForDrawDone() {
- if (!mDrawDone.block(WAIT_FOR_COMMAND_TO_COMPLETE) ) {
- // timeout could be expected or unexpected. The caller will decide.
- Log.e(TAG, "waitForDrawDone: timeout");
- return false;
- }
- mDrawDone.close();
- return true;
- }
-
- private final ConditionVariable mDrawDone = new ConditionVariable();
-
- public void onDrawFrame(GL10 glUnused) {
- if (LOGVV) Log.v(TAG, "onDrawFrame()");
- if (CameraGLTest.this.mSurfaceTexture != null) {
- CameraGLTest.this.mSurfaceTexture.updateTexImage();
- CameraGLTest.this.mSurfaceTexture.getTransformMatrix(mSTMatrix);
- mDrawDone.open();
- }
-
- // Ignore the passed-in GL10 interface, and use the GLES20
- // class's static methods instead.
- GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
- GLES20.glUseProgram(mProgram);
- checkGlError("glUseProgram");
-
- GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
- GLES20.glBindTexture(GL_TEXTURE_EXTERNAL_OES, mTextureID);
-
- mTriangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
- GLES20.glVertexAttribPointer(maPositionHandle, 3, GLES20.GL_FLOAT, false,
- TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
- checkGlError("glVertexAttribPointer maPosition");
- GLES20.glEnableVertexAttribArray(maPositionHandle);
- checkGlError("glEnableVertexAttribArray maPositionHandle");
-
- mTriangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
- GLES20.glVertexAttribPointer(maTextureHandle, 3, GLES20.GL_FLOAT, false,
- TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
- checkGlError("glVertexAttribPointer maTextureHandle");
- GLES20.glEnableVertexAttribArray(maTextureHandle);
- checkGlError("glEnableVertexAttribArray maTextureHandle");
-
- Matrix.multiplyMM(mMVPMatrix, 0, mVMatrix, 0, mMMatrix, 0);
- Matrix.multiplyMM(mMVPMatrix, 0, mProjMatrix, 0, mMVPMatrix, 0);
-
- GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
- GLES20.glUniformMatrix4fv(muSTMatrixHandle, 1, false, mSTMatrix, 0);
- GLES20.glUniform1f(muCRatioHandle, mCameraRatio);
-
- GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
- checkGlError("glDrawArrays");
- }
-
- public void onSurfaceChanged(GL10 glUnused, int width, int height) {
- if (LOGV) Log.v(TAG, "onSurfaceChanged()");
- // Ignore the passed-in GL10 interface, and use the GLES20
- // class's static methods instead.
- GLES20.glViewport(0, 0, width, height);
- mRatio = (float) width / height;
- Matrix.frustumM(mProjMatrix, 0, -mRatio, mRatio, -1, 1, 3, 7);
- }
-
- public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
- if (LOGV) Log.v(TAG, "onSurfaceCreated()");
- // Ignore the passed-in GL10 interface, and use the GLES20
- // class's static methods instead.
-
- /* Set up shaders and handles to their variables */
- mProgram = createProgram(mVertexShader, mFragmentShader);
- if (mProgram == 0) {
- return;
- }
- maPositionHandle = GLES20.glGetAttribLocation(mProgram, "aPosition");
- checkGlError("glGetAttribLocation aPosition");
- if (maPositionHandle == -1) {
- throw new RuntimeException("Could not get attrib location for aPosition");
- }
- maTextureHandle = GLES20.glGetAttribLocation(mProgram, "aTextureCoord");
- checkGlError("glGetAttribLocation aTextureCoord");
- if (maTextureHandle == -1) {
- throw new RuntimeException("Could not get attrib location for aTextureCoord");
- }
-
- muMVPMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMVPMatrix");
- checkGlError("glGetUniformLocation uMVPMatrix");
- if (muMVPMatrixHandle == -1) {
- throw new RuntimeException("Could not get attrib location for uMVPMatrix");
- }
-
- muSTMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uSTMatrix");
- checkGlError("glGetUniformLocation uSTMatrix");
- if (muMVPMatrixHandle == -1) {
- throw new RuntimeException("Could not get attrib location for uSTMatrix");
- }
-
- muCRatioHandle = GLES20.glGetUniformLocation(mProgram, "uCRatio");
- checkGlError("glGetUniformLocation uCRatio");
- if (muMVPMatrixHandle == -1) {
- throw new RuntimeException("Could not get attrib location for uCRatio");
- }
-
- /*
- * Create our texture. This has to be done each time the
- * surface is created.
- */
-
- int[] textures = new int[1];
- GLES20.glGenTextures(1, textures, 0);
-
- mTextureID = textures[0];
- GLES20.glBindTexture(GL_TEXTURE_EXTERNAL_OES, mTextureID);
- checkGlError("glBindTexture mTextureID");
-
- // Can't do mipmapping with camera source
- GLES20.glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MIN_FILTER,
- GLES20.GL_NEAREST);
- GLES20.glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_MAG_FILTER,
- GLES20.GL_LINEAR);
- // Clamp to edge is the only option
- GLES20.glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_WRAP_S,
- GLES20.GL_CLAMP_TO_EDGE);
- GLES20.glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GLES20.GL_TEXTURE_WRAP_T,
- GLES20.GL_CLAMP_TO_EDGE);
- checkGlError("glTexParameteri mTextureID");
-
- Matrix.setLookAtM(mVMatrix, 0, 0, 0, 4f, 0f, 0f, 0f, 0f, 1.0f, 0.0f);
- }
-
- public int getTextureID() {
- return mTextureID;
- }
-
- private int loadShader(int shaderType, String source) {
- int shader = GLES20.glCreateShader(shaderType);
- if (shader != 0) {
- GLES20.glShaderSource(shader, source);
- GLES20.glCompileShader(shader);
- int[] compiled = new int[1];
- GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
- if (compiled[0] == 0) {
- Log.e(TAG, "Could not compile shader " + shaderType + ":");
- Log.e(TAG, GLES20.glGetShaderInfoLog(shader));
- GLES20.glDeleteShader(shader);
- shader = 0;
- }
- }
- return shader;
- }
-
- private int createProgram(String vertexSource, String fragmentSource) {
- int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
- if (vertexShader == 0) {
- return 0;
- }
- int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
- if (pixelShader == 0) {
- return 0;
- }
-
- int program = GLES20.glCreateProgram();
- if (program != 0) {
- GLES20.glAttachShader(program, vertexShader);
- checkGlError("glAttachShader");
- GLES20.glAttachShader(program, pixelShader);
- checkGlError("glAttachShader");
- GLES20.glLinkProgram(program);
- int[] linkStatus = new int[1];
- GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
- if (linkStatus[0] != GLES20.GL_TRUE) {
- Log.e(TAG, "Could not link program: ");
- Log.e(TAG, GLES20.glGetProgramInfoLog(program));
- GLES20.glDeleteProgram(program);
- program = 0;
- }
- }
- return program;
- }
-
- private void checkGlError(String op) {
- int error;
- while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
- Log.e(TAG, op + ": glError " + error);
- throw new RuntimeException(op + ": glError " + error);
- }
- }
-
- private static final int FLOAT_SIZE_BYTES = 4;
- private static final int TRIANGLE_VERTICES_DATA_STRIDE_BYTES = 5 * FLOAT_SIZE_BYTES;
- private static final int TRIANGLE_VERTICES_DATA_POS_OFFSET = 0;
- private static final int TRIANGLE_VERTICES_DATA_UV_OFFSET = 3;
- private final float[] mTriangleVerticesData = {
- // X, Y, Z, U, V
- -1.0f, -1.0f, 0, 0.f, 0.f,
- 1.0f, -1.0f, 0, 1.f, 0.f,
- -1.0f, 1.0f, 0, 0.f, 1.f,
- 1.0f, 1.0f, 0, 1.f, 1.f,
- };
-
- private FloatBuffer mTriangleVertices;
-
- private final String mVertexShader =
- "uniform mat4 uMVPMatrix;\n" +
- "uniform mat4 uSTMatrix;\n" +
- "uniform float uCRatio;\n" +
- "attribute vec4 aPosition;\n" +
- "attribute vec4 aTextureCoord;\n" +
- "varying vec2 vTextureCoord;\n" +
- "void main() {\n" +
- " gl_Position = vec4(uCRatio,1,1,1) * uMVPMatrix * aPosition;\n" +
- " vTextureCoord = (uSTMatrix * aTextureCoord).xy;\n" +
- "}\n";
-
- private final String mFragmentShader =
- "#extension GL_OES_EGL_image_external : require\n" +
- "precision mediump float;\n" +
- "varying vec2 vTextureCoord;\n" +
- "uniform samplerExternalOES sTexture;\n" +
- "void main() {\n" +
- " gl_FragColor = texture2D(sTexture, vTextureCoord);\n" +
- "}\n";
-
- private float[] mMVPMatrix = new float[16];
- private float[] mProjMatrix = new float[16];
- private float[] mMMatrix = new float[16];
- private float[] mVMatrix = new float[16];
- private float[] mSTMatrix = new float[16];
-
- private int mProgram;
- private int mTextureID;
- private int muMVPMatrixHandle;
- private int muSTMatrixHandle;
- private int muCRatioHandle;
- private int maPositionHandle;
- private int maTextureHandle;
-
- private float mRatio = 1.0f;
- private float mCameraRatio = 1.0f;
-
- private Context mContext;
- private static final String TAG = "CameraGLTest.Renderer";
-
- // Magic key
- private static final int GL_TEXTURE_EXTERNAL_OES = 0x8D65;
- }
-
-}
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index 309bfc7..60b8459 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -16,20 +16,21 @@
package android.hardware.cts;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+
+import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.ImageFormat;
-import android.graphics.Rect;
import android.hardware.Camera;
-import android.hardware.Camera.Area;
import android.hardware.Camera.CameraInfo;
import android.hardware.Camera.ErrorCallback;
-import android.hardware.Camera.Face;
-import android.hardware.Camera.FaceDetectionListener;
import android.hardware.Camera.Parameters;
import android.hardware.Camera.PictureCallback;
import android.hardware.Camera.ShutterCallback;
import android.hardware.Camera.Size;
-import android.media.CamcorderProfile;
import android.media.ExifInterface;
import android.media.MediaRecorder;
import android.os.ConditionVariable;
@@ -42,11 +43,6 @@ import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
import android.view.SurfaceHolder;
-import dalvik.annotation.TestLevel;
-import dalvik.annotation.TestTargetClass;
-import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -68,29 +64,17 @@ public class CameraTest extends ActivityInstrumentationTestCase2startPreview.
initializeMessageLooper(cameraId);
- mPreviewCallbackResult = PREVIEW_CALLBACK_NOT_RECEIVED;
+ mPreviewCallbackResult = false;
mCamera.setOneShotPreviewCallback(mPreviewCallback);
mCamera.setPreviewDisplay(holder);
mCamera.startPreview();
waitForPreviewDone();
mCamera.stopPreview();
- assertEquals(PREVIEW_CALLBACK_RECEIVED, mPreviewCallbackResult);
+ assertTrue(mPreviewCallbackResult);
// Check the order: setting preview display to null->startPreview->
// setPreviewDisplay.
- mPreviewCallbackResult = PREVIEW_CALLBACK_NOT_RECEIVED;
+ mPreviewCallbackResult = false;
mCamera.setOneShotPreviewCallback(mPreviewCallback);
mCamera.setPreviewDisplay(null);
mCamera.startPreview();
mCamera.setPreviewDisplay(holder);
waitForPreviewDone();
terminateMessageLooper();
- assertEquals(PREVIEW_CALLBACK_RECEIVED, mPreviewCallbackResult);
+ assertTrue(mPreviewCallbackResult);
}
@TestTargetNew(
@@ -558,13 +526,16 @@ public class CameraTest extends ActivityInstrumentationTestCase2 previewSizes = parameters.getSupportedPreviewSizes();
@@ -648,9 +616,7 @@ public class CameraTest extends ActivityInstrumentationTestCase2= 2);
- assertTrue(previewFormats.contains(ImageFormat.NV21));
- assertTrue(previewFormats.contains(ImageFormat.YV12));
+ assertTrue(previewFormats != null && previewFormats.size() != 0);
assertTrue(pictureFormats != null && pictureFormats.size() != 0);
assertTrue(frameRates != null && frameRates.size() != 0);
assertTrue(focusModes != null && focusModes.size() != 0);
@@ -728,45 +694,6 @@ public class CameraTest extends ActivityInstrumentationTestCase2 0);
checkExposureCompensation(parameters);
- checkPreferredPreviewSizeForVideo(parameters);
- }
-
- private void checkPreferredPreviewSizeForVideo(Parameters parameters) {
- List videoSizes = parameters.getSupportedVideoSizes();
- Size preferredPreviewSize = parameters.getPreferredPreviewSizeForVideo();
-
- // If getSupportedVideoSizes() returns null,
- // getPreferredPreviewSizeForVideo() will return null;
- // otherwise, if getSupportedVideoSizes() does not return null,
- // getPreferredPreviewSizeForVideo() will not return null.
- if (videoSizes == null) {
- assertNull(preferredPreviewSize);
- } else {
- assertNotNull(preferredPreviewSize);
- }
-
- // If getPreferredPreviewSizeForVideo() returns null,
- // getSupportedVideoSizes() will return null;
- // otherwise, if getPreferredPreviewSizeForVideo() does not return null,
- // getSupportedVideoSizes() will not return null.
- if (preferredPreviewSize == null) {
- assertNull(videoSizes);
- } else {
- assertNotNull(videoSizes);
- }
-
- if (videoSizes != null) { // implies: preferredPreviewSize != null
- // If getSupportedVideoSizes() does not return null,
- // the returned list will contain at least one size.
- assertTrue(videoSizes.size() > 0);
-
- // In addition, getPreferredPreviewSizeForVideo() returns a size
- // that is among the supported preview sizes.
- List previewSizes = parameters.getSupportedPreviewSizes();
- assertNotNull(previewSizes);
- assertTrue(previewSizes.size() > 0);
- assertTrue(previewSizes.contains(preferredPreviewSize));
- }
}
private void checkExposureCompensation(Parameters parameters) {
@@ -810,13 +737,12 @@ public class CameraTest extends ActivityInstrumentationTestCase2 sizes = parameters.getSupportedPreviewSizes();
- Size preferred = parameters.getPreferredPreviewSizeForVideo();
- int product = preferred.width * preferred.height;
- for (Size size: sizes) {
- if (size.width * size.height <= product) {
- parameters.setPreviewSize(size.width, size.height);
- break;
- }
- }
- }
- }
-
- private void recordVideo(CamcorderProfile profile,
- SurfaceHolder holder) throws Exception {
+ private void recordVideo(Size size, SurfaceHolder surfaceHolder) throws Exception {
MediaRecorder recorder = new MediaRecorder();
try {
- // Pass the camera from the test application to media recorder.
recorder.setCamera(mCamera);
- recorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER);
recorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
- recorder.setProfile(profile);
+ recorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
recorder.setOutputFile("/dev/null");
- recorder.setPreviewDisplay(holder.getSurface());
+ recorder.setVideoSize(size.width, size.height);
+ recorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
+ recorder.setPreviewDisplay(surfaceHolder.getSurface());
recorder.prepare();
recorder.start();
-
- // Apps can use the camera after start since API level 13.
- Parameters parameters = mCamera.getParameters();
- if (parameters.isZoomSupported()) {
- if (parameters.getMaxZoom() > 0) {
- parameters.setZoom(1);
- mCamera.setParameters(parameters);
- parameters.setZoom(0);
- mCamera.setParameters(parameters);
- }
- }
- if (parameters.isSmoothZoomSupported()) {
- if (parameters.getMaxZoom() > 0) {
- ZoomListener zoomListener = new ZoomListener();
- mCamera.setZoomChangeListener(zoomListener);
- mCamera.startSmoothZoom(1);
- assertTrue(zoomListener.mZoomDone.block(1000));
- }
- }
-
- try {
- mCamera.unlock();
- fail("unlock should not succeed during recording.");
- } catch(RuntimeException e) {
- // expected
- }
-
- Thread.sleep(2000);
+ Thread.sleep(5000);
recorder.stop();
} finally {
recorder.release();
@@ -1094,11 +962,9 @@ public class CameraTest extends ActivityInstrumentationTestCase2 1) {
- zoomListener.mValues.clear();
- zoomListener.mStopped.clear();
+ zoomListener.mValues = new ArrayList();
+ zoomListener.mStopped = false;
Log.e(TAG, "zoomListener.mStopped = " + zoomListener.mStopped);
zoomListener.mZoomDone.close();
mCamera.startSmoothZoom(maxZoom / 2);
assertTrue(zoomListener.mZoomDone.block(5000));
- assertEquals(maxZoom / 2, mCamera.getParameters().getZoom());
assertEquals(maxZoom - (maxZoom / 2), zoomListener.mValues.size());
- for(int i = 0; i < zoomListener.mValues.size(); i++) {
- int value = zoomListener.mValues.get(i);
- boolean stopped = zoomListener.mStopped.get(i);
- // Make sure we get all the zoom values in order.
- assertEquals(maxZoom - 1 - i, value);
- // All "stopped" except the last should be false.
- assertEquals(i == zoomListener.mValues.size() - 1, stopped);
+ int i = maxZoom - 1;
+ for(Integer value: zoomListener.mValues) {
+ assertEquals(i, value.intValue());
+ i--;
}
}
@@ -1323,8 +1151,8 @@ public class CameraTest extends ActivityInstrumentationTestCase2();
+ zoomListener.mStopped = false;
zoomListener.mZoomDone.close();
parameters.setZoom(0);
mCamera.setParameters(parameters);
@@ -1332,31 +1160,22 @@ public class CameraTest extends ActivityInstrumentationTestCase2 mValues = new ArrayList();
- public ArrayList mStopped = new ArrayList();
+ public boolean mStopped;
public final ConditionVariable mZoomDone = new ConditionVariable();
public void onZoomChange(int value, boolean stopped, Camera camera) {
mValues.add(value);
- mStopped.add(stopped);
+ assertFalse(mStopped);
+ mStopped = stopped;
if (stopped) {
mZoomDone.open();
}
@@ -1374,6 +1193,7 @@ public class CameraTest extends ActivityInstrumentationTestCase2 areas) {
- Parameters parameters = mCamera.getParameters();
- parameters.setMeteringAreas(areas);
- mCamera.setParameters(parameters);
- parameters = mCamera.getParameters();
- assertEquals(areas, parameters.getMeteringAreas());
- }
-
- private void testInvalidMeteringAreas(ArrayList mFacesArray = new ArrayList();
-
- @Override
- public void onFaceDetection(Face[] faces, Camera camera) {
- mFacesArray.add(faces);
- }
- }
-
- private void testFaces(Face[] faces, int maxNumOfFaces,
- boolean optionalFieldSupported) {
- Rect bounds = new Rect(-1000, -1000, 1000, 1000);
- assertNotNull(faces);
- assertTrue(faces.length <= maxNumOfFaces);
- for (int i = 0; i < faces.length; i++) {
- Face face = faces[i];
- Rect rect = face.rect;
- // Check the bounds.
- assertNotNull(rect);
- assertTrue(rect.width() > 0);
- assertTrue(rect.height() > 0);
- assertTrue("Coordinates out of bounds. rect=" + rect,
- bounds.contains(rect) || Rect.intersects(bounds, rect));
-
- // Check the score.
- assertTrue(face.score >= 1 && face.score <= 100);
-
- // Check id, left eye, right eye, and the mouth.
- // Optional fields should be all valid or none of them.
- if (!optionalFieldSupported) {
- assertEquals(-1, face.id);
- assertNull(face.leftEye);
- assertNull(face.rightEye);
- assertNull(face.mouth);
- } else {
- assertTrue(face.id != -1);
- assertNotNull(face.leftEye);
- assertNotNull(face.rightEye);
- assertNotNull(face.mouth);
- assertTrue(bounds.contains(face.leftEye.x, face.leftEye.y));
- assertTrue(bounds.contains(face.rightEye.x, face.rightEye.y));
- assertTrue(bounds.contains(face.mouth.x, face.mouth.y));
- // ID should be unique.
- if (i != faces.length - 1) {
- assertTrue(face.id != faces[i + 1].id);
- }
- }
- }
- }
-
- @UiThreadTest
- public void testVideoSnapshot() throws Exception {
- int nCameras = Camera.getNumberOfCameras();
- for (int id = 0; id < nCameras; id++) {
- Log.v(TAG, "Camera id=" + id);
- testVideoSnapshotByCamera(id);
- }
- }
-
- private void testVideoSnapshotByCamera(int cameraId) throws Exception {
- initializeMessageLooper(cameraId);
- Camera.Parameters parameters = mCamera.getParameters();
- if (!parameters.isVideoSnapshotSupported()) return;
-
- SurfaceHolder holder = getActivity().getSurfaceView().getHolder();
-
- // Set the preview size.
- CamcorderProfile profile = CamcorderProfile.get(cameraId,
- CamcorderProfile.QUALITY_LOW);
- setPreviewSizeByProfile(parameters, profile);
-
- // Set the biggest picture size.
- Size biggestSize = mCamera.new Size(-1, -1);
- for (Size size: parameters.getSupportedPictureSizes()) {
- if (biggestSize.width < size.width) {
- biggestSize = size;
- }
- }
- parameters.setPictureSize(biggestSize.width, biggestSize.height);
-
- mCamera.setParameters(parameters);
- mCamera.startPreview();
- mCamera.unlock();
- MediaRecorder recorder = new MediaRecorder();
- try {
- recorder.setCamera(mCamera);
- recorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER);
- recorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
- recorder.setProfile(profile);
- recorder.setOutputFile("/dev/null");
- recorder.setPreviewDisplay(holder.getSurface());
- recorder.prepare();
- recorder.start();
- testTakePictureByCamera();
- testJpegExifByCamera(true);
- testJpegThumbnailSizeByCamera(true);
- recorder.stop();
- } finally {
- recorder.release();
- mCamera.lock();
- }
- terminateMessageLooper();
- }
}
diff --git a/tests/tests/jni/libjnitest/Android.mk b/tests/tests/jni/libjnitest/Android.mk
index d7d1bad..84856b3 100644
--- a/tests/tests/jni/libjnitest/Android.mk
+++ b/tests/tests/jni/libjnitest/Android.mk
@@ -25,6 +25,9 @@ LOCAL_MODULE := libjnitest
# Don't include this package in any configuration by default.
LOCAL_MODULE_TAGS := optional
+# This isn't part of the system, so don't prelink it.
+LOCAL_PRELINK_MODULE := false
+
LOCAL_SRC_FILES := \
android_jni_cts_InstanceNonce.c \
android_jni_cts_JniCTest.c \
diff --git a/tests/tests/jni/src/android/jni/cts/InstanceNonce.java b/tests/tests/jni/src/android/jni/cts/InstanceNonce.java
index e1a7dea..a5bb01d 100644
--- a/tests/tests/jni/src/android/jni/cts/InstanceNonce.java
+++ b/tests/tests/jni/src/android/jni/cts/InstanceNonce.java
@@ -22,9 +22,7 @@ package android.jni.cts;
*/
public class InstanceNonce {
static {
- if (!JniTestCase.isCpuAbiNone()) {
- System.loadLibrary("jnitest");
- }
+ System.loadLibrary("jnitest");
}
/**
diff --git a/tests/tests/jni/src/android/jni/cts/JniCTest.java b/tests/tests/jni/src/android/jni/cts/JniCTest.java
index eb14504..950b534 100644
--- a/tests/tests/jni/src/android/jni/cts/JniCTest.java
+++ b/tests/tests/jni/src/android/jni/cts/JniCTest.java
@@ -16,17 +16,16 @@
package android.jni.cts;
+import junit.framework.TestCase;
/**
* Basic tests of calling the C functions that make up the JNI. This
* class merely calls into native code and reports back if there was
* a problem.
*/
-public class JniCTest extends JniTestCase {
+public class JniCTest extends TestCase {
static {
- if (!JniTestCase.isCpuAbiNone()) {
- System.loadLibrary("jnitest");
- }
+ System.loadLibrary("jnitest");
}
/**
diff --git a/tests/tests/jni/src/android/jni/cts/JniCppTest.java b/tests/tests/jni/src/android/jni/cts/JniCppTest.java
index 6993b29..ad4f377 100644
--- a/tests/tests/jni/src/android/jni/cts/JniCppTest.java
+++ b/tests/tests/jni/src/android/jni/cts/JniCppTest.java
@@ -16,17 +16,16 @@
package android.jni.cts;
+import junit.framework.TestCase;
/**
* Basic tests of calling the C++ functions that make up the JNI. This
* class merely calls into native code and reports back if there was
* a problem.
*/
-public class JniCppTest extends JniTestCase {
+public class JniCppTest extends TestCase {
static {
- if (!JniTestCase.isCpuAbiNone()) {
- System.loadLibrary("jnitest");
- }
+ System.loadLibrary("jnitest");
}
/**
diff --git a/tests/tests/jni/src/android/jni/cts/JniInstanceTest.java b/tests/tests/jni/src/android/jni/cts/JniInstanceTest.java
index 7c16a3a..a66e072 100644
--- a/tests/tests/jni/src/android/jni/cts/JniInstanceTest.java
+++ b/tests/tests/jni/src/android/jni/cts/JniInstanceTest.java
@@ -16,13 +16,14 @@
package android.jni.cts;
+import junit.framework.TestCase;
/**
* Basic native instance method tests. The "nonce" class being tested
* by this class is a class defined in this package that declares the
* bulk of its methods as native.
*/
-public class JniInstanceTest extends JniTestCase {
+public class JniInstanceTest extends TestCase {
/** instance to use for all the tests */
private InstanceNonce target;
@@ -164,7 +165,7 @@ public class JniInstanceTest extends JniTestCase {
public void test_takeShort() {
assertTrue(target.takeShort((short) 19991));
}
-
+
/**
* Test a simple value-taking method call, that returns whether it
* got the expected value.
diff --git a/tests/tests/jni/src/android/jni/cts/JniStaticTest.java b/tests/tests/jni/src/android/jni/cts/JniStaticTest.java
index 3036c71..ff4411d 100644
--- a/tests/tests/jni/src/android/jni/cts/JniStaticTest.java
+++ b/tests/tests/jni/src/android/jni/cts/JniStaticTest.java
@@ -16,14 +16,14 @@
package android.jni.cts;
+import junit.framework.TestCase;
/**
* Basic static method tests. The "nonce" class being tested by this
* class is a class defined in this package that declares the bulk of
* its methods as native.
*/
-public class JniStaticTest extends JniTestCase {
-
+public class JniStaticTest extends TestCase {
/**
* Test a simple no-op and void-returning method call.
*/
@@ -166,7 +166,7 @@ public class JniStaticTest extends JniTestCase {
public void test_takeShort() {
assertTrue(StaticNonce.takeShort((short) 19991));
}
-
+
/**
* Test a simple value-taking method call, that returns whether it
* got the expected value.
diff --git a/tests/tests/jni/src/android/jni/cts/JniTestCase.java b/tests/tests/jni/src/android/jni/cts/JniTestCase.java
deleted file mode 100644
index a137ff7..0000000
--- a/tests/tests/jni/src/android/jni/cts/JniTestCase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.jni.cts;
-
-import android.os.Build;
-
-import junit.framework.TestCase;
-
-class JniTestCase extends TestCase {
-
- static boolean isCpuAbiNone() {
- return "none".equalsIgnoreCase(Build.CPU_ABI);
- }
-
- @Override
- protected void runTest() throws Throwable {
- // Skip the JNI tests if ABI is none...
- if (!isCpuAbiNone()) {
- super.runTest();
- }
- }
-}
diff --git a/tests/tests/jni/src/android/jni/cts/StaticNonce.java b/tests/tests/jni/src/android/jni/cts/StaticNonce.java
index c84e899..f9b3310 100644
--- a/tests/tests/jni/src/android/jni/cts/StaticNonce.java
+++ b/tests/tests/jni/src/android/jni/cts/StaticNonce.java
@@ -22,9 +22,7 @@ package android.jni.cts;
*/
public class StaticNonce {
static {
- if (!JniTestCase.isCpuAbiNone()) {
- System.loadLibrary("jnitest");
- }
+ System.loadLibrary("jnitest");
}
/**
diff --git a/tests/tests/location/src/android/location/cts/LocationManagerTest.java b/tests/tests/location/src/android/location/cts/LocationManagerTest.java
index 620ee82..51623d0 100755
--- a/tests/tests/location/src/android/location/cts/LocationManagerTest.java
+++ b/tests/tests/location/src/android/location/cts/LocationManagerTest.java
@@ -576,6 +576,9 @@ public class LocationManagerTest extends InstrumentationTestCase {
mManager.addProximityAlert(0, 0, 0, 5000, pi);
mManager.removeProximityAlert(pi);
+
+ mManager.addProximityAlert(0, 0, 0, 5000, null);
+ mManager.removeProximityAlert(null);
}
@TestTargets({
diff --git a/tests/tests/media/src/android/media/cts/AudioEffectTest.java b/tests/tests/media/src/android/media/cts/AudioEffectTest.java
index c40f169..0aaf11f 100644
--- a/tests/tests/media/src/android/media/cts/AudioEffectTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioEffectTest.java
@@ -22,13 +22,11 @@ import android.content.res.AssetFileDescriptor;
import android.media.audiofx.AudioEffect;
import android.media.AudioFormat;
import android.media.AudioManager;
-import android.media.AudioRecord;
import android.media.AudioTrack;
import android.media.audiofx.PresetReverb;
import android.media.audiofx.EnvironmentalReverb;
import android.media.audiofx.Equalizer;
import android.media.MediaPlayer;
-import android.media.MediaRecorder;
import android.os.Looper;
import android.test.AndroidTestCase;
@@ -48,8 +46,6 @@ public class AudioEffectTest extends AndroidTestCase {
private final static float DELAY_TOLERANCE = 1.05f;
// allow +/- 5% tolerance between set and get ratios
private final static float RATIO_TOLERANCE = 1.05f;
- // AudioRecord sampling rate
- private final static int SAMPLING_RATE = 44100;
private AudioEffect mEffect = null;
private AudioEffect mEffect2 = null;
@@ -119,25 +115,6 @@ public class AudioEffectTest extends AndroidTestCase {
// 1 - constructor
//----------------------------------
- private AudioRecord getAudioRecord() {
- AudioRecord ar = null;
- try {
- ar = new AudioRecord(MediaRecorder.AudioSource.DEFAULT,
- SAMPLING_RATE,
- AudioFormat.CHANNEL_CONFIGURATION_MONO,
- AudioFormat.ENCODING_PCM_16BIT,
- AudioRecord.getMinBufferSize(SAMPLING_RATE,
- AudioFormat.CHANNEL_CONFIGURATION_MONO,
- AudioFormat.ENCODING_PCM_16BIT) * 10);
- assertNotNull("Could not create AudioRecord", ar);
- assertEquals("AudioRecord not initialized",
- AudioRecord.STATE_INITIALIZED, ar.getState());
- } catch (IllegalArgumentException e) {
- fail("AudioRecord invalid parameter");
- }
- return ar;
- }
-
//Test case 1.0: test constructor from effect type and get effect ID
@TestTargets({
@TestTargetNew(
@@ -162,19 +139,10 @@ public class AudioEffectTest extends AndroidTestCase {
for (int i = 0; i < desc.length; i++) {
if (!desc[i].type.equals(AudioEffect.EFFECT_TYPE_NULL)) {
try {
- int sessionId;
- AudioRecord ar = null;
- if (AudioEffect.EFFECT_PRE_PROCESSING.equals(desc[i].connectMode)) {
- ar = getAudioRecord();
- sessionId = ar.getAudioSessionId();
- } else {
- sessionId = 0;
- }
AudioEffect effect = new AudioEffect(desc[i].type,
AudioEffect.EFFECT_TYPE_NULL,
0,
- sessionId);
-
+ 0);
assertNotNull("could not create AudioEffect", effect);
try {
assertTrue("invalid effect ID", (effect.getId() != 0));
@@ -182,9 +150,6 @@ public class AudioEffectTest extends AndroidTestCase {
fail("AudioEffect not initialized");
} finally {
effect.release();
- if (ar != null) {
- ar.release();
- }
}
} catch (IllegalArgumentException e) {
fail("Effect not found: "+desc[i].name);
@@ -218,18 +183,10 @@ public class AudioEffectTest extends AndroidTestCase {
assertTrue("no effects found", (desc.length != 0));
for (int i = 0; i < desc.length; i++) {
try {
- int sessionId;
- AudioRecord ar = null;
- if (AudioEffect.EFFECT_PRE_PROCESSING.equals(desc[i].connectMode)) {
- ar = getAudioRecord();
- sessionId = ar.getAudioSessionId();
- } else {
- sessionId = 0;
- }
AudioEffect effect = new AudioEffect(AudioEffect.EFFECT_TYPE_NULL,
desc[i].uuid,
0,
- sessionId);
+ 0);
assertNotNull("could not create AudioEffect", effect);
try {
assertTrue("invalid effect ID", (effect.getId() != 0));
@@ -237,9 +194,6 @@ public class AudioEffectTest extends AndroidTestCase {
fail("AudioEffect not initialized");
} finally {
effect.release();
- if (ar != null) {
- ar.release();
- }
}
} catch (IllegalArgumentException e) {
fail("Effect not found: "+desc[i].name);
@@ -612,7 +566,7 @@ public class AudioEffectTest extends AndroidTestCase {
byte[] param = mEffect.intToByteArray(PresetReverb.PARAM_PRESET);
byte[] value = new byte[2];
int status = mEffect.getParameter(param, value);
- assertFalse("getParameter 1 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 1 failed", AudioEffect.SUCCESS, status);
short preset = PresetReverb.PRESET_SMALLROOM;
if (mEffect.byteArrayToShort(value) == preset) {
preset = PresetReverb.PRESET_MEDIUMROOM;
@@ -621,7 +575,7 @@ public class AudioEffectTest extends AndroidTestCase {
status = mEffect.setParameter(param, value);
assertEquals("setParameter failed", AudioEffect.SUCCESS, status);
status = mEffect.getParameter(param, value);
- assertFalse("getParameter 2 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 2 failed", AudioEffect.SUCCESS, status);
assertEquals("get/set Parameter failed", preset,
mEffect.byteArrayToShort(value));
@@ -655,7 +609,7 @@ public class AudioEffectTest extends AndroidTestCase {
int param = EnvironmentalReverb.PARAM_DECAY_TIME;
int[] value = new int[1];
int status = mEffect.getParameter(param, value);
- assertFalse("getParameter 1 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 1 failed", AudioEffect.SUCCESS, status);
int time = 500;
if (value[0] == time) {
time = 1000;
@@ -663,7 +617,7 @@ public class AudioEffectTest extends AndroidTestCase {
status = mEffect.setParameter(param, time);
assertEquals("setParameter failed", AudioEffect.SUCCESS, status);
status = mEffect.getParameter(param, value);
- assertFalse("getParameter 2 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 2 failed", AudioEffect.SUCCESS, status);
assertTrue("got incorrect decay time",
((float)value[0] > (float)(time / DELAY_TOLERANCE)) &&
((float)value[0] < (float)(time * DELAY_TOLERANCE)));
@@ -698,7 +652,7 @@ public class AudioEffectTest extends AndroidTestCase {
int param = PresetReverb.PARAM_PRESET;
short[] value = new short[1];
int status = mEffect.getParameter(param, value);
- assertFalse("getParameter 1 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 1 failed", AudioEffect.SUCCESS, status);
short preset = PresetReverb.PRESET_SMALLROOM;
if (value[0] == preset) {
preset = PresetReverb.PRESET_MEDIUMROOM;
@@ -706,7 +660,7 @@ public class AudioEffectTest extends AndroidTestCase {
status = mEffect.setParameter(param, preset);
assertEquals("setParameter failed", AudioEffect.SUCCESS, status);
status = mEffect.getParameter(param, value);
- assertFalse("getParameter 2 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 2 failed", AudioEffect.SUCCESS, status);
assertEquals("get/set Parameter failed", preset, value[0]);
} catch (IllegalArgumentException e) {
@@ -739,7 +693,7 @@ public class AudioEffectTest extends AndroidTestCase {
int param = EnvironmentalReverb.PARAM_DECAY_TIME;
byte[] value = new byte[4];
int status = mEffect.getParameter(param, value);
- assertFalse("getParameter 1 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 1 failed", AudioEffect.SUCCESS, status);
int time = 500;
if (mEffect.byteArrayToInt(value) == time) {
time = 1000;
@@ -748,7 +702,7 @@ public class AudioEffectTest extends AndroidTestCase {
status = mEffect.setParameter(param, value);
assertEquals("setParameter failed", AudioEffect.SUCCESS, status);
status = mEffect.getParameter(param, value);
- assertFalse("getParameter 2 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 2 failed", AudioEffect.SUCCESS, status);
int time2 = mEffect.byteArrayToInt(value);
assertTrue("got incorrect decay time",
((float)time2 > (float)(time / DELAY_TOLERANCE)) &&
@@ -785,7 +739,7 @@ public class AudioEffectTest extends AndroidTestCase {
int[] value = new int[1];
param[0] = EnvironmentalReverb.PARAM_DECAY_TIME;
int status = mEffect.getParameter(param, value);
- assertFalse("getParameter 1 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 1 failed", AudioEffect.SUCCESS, status);
int[] time = new int[1];
time[0] = 500;
if (value[0] == time[0]) {
@@ -794,7 +748,7 @@ public class AudioEffectTest extends AndroidTestCase {
status = mEffect.setParameter(param, time);
assertEquals("setParameter failed", AudioEffect.SUCCESS, status);
status = mEffect.getParameter(param, value);
- assertFalse("getParameter 2 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 2 failed", AudioEffect.SUCCESS, status);
assertTrue("got incorrect decay time",
((float)value[0] > (float)(time[0] / DELAY_TOLERANCE)) &&
((float)value[0] < (float)(time[0] * DELAY_TOLERANCE)));
@@ -831,7 +785,7 @@ public class AudioEffectTest extends AndroidTestCase {
param[0] = PresetReverb.PARAM_PRESET;
short[] value = new short[1];
int status = mEffect.getParameter(param, value);
- assertFalse("getParameter 1 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 1 failed", AudioEffect.SUCCESS, status);
short[] preset = new short[1];
preset[0] = PresetReverb.PRESET_SMALLROOM;
if (value[0] == preset[0]) {
@@ -840,7 +794,7 @@ public class AudioEffectTest extends AndroidTestCase {
status = mEffect.setParameter(param, preset);
assertEquals("setParameter failed", AudioEffect.SUCCESS, status);
status = mEffect.getParameter(param, value);
- assertFalse("getParameter 2 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 2 failed", AudioEffect.SUCCESS, status);
assertEquals("get/set Parameter failed", preset[0], value[0]);
} catch (IllegalArgumentException e) {
@@ -874,7 +828,7 @@ public class AudioEffectTest extends AndroidTestCase {
param[0] = EnvironmentalReverb.PARAM_DECAY_TIME;
byte[] value = new byte[4];
int status = mEffect.getParameter(param, value);
- assertFalse("getParameter 1 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 1 failed", AudioEffect.SUCCESS, status);
int time = 500;
if (mEffect.byteArrayToInt(value) == time) {
time = 1000;
@@ -883,7 +837,7 @@ public class AudioEffectTest extends AndroidTestCase {
status = mEffect.setParameter(param, mEffect.intToByteArray(time));
assertEquals("setParameter failed", AudioEffect.SUCCESS, status);
status = mEffect.getParameter(param, value);
- assertFalse("getParameter 2 failed", AudioEffect.isError(status));
+ assertEquals("getParameter 2 failed", AudioEffect.SUCCESS, status);
int time2 = mEffect.byteArrayToInt(value);
assertTrue("got incorrect decay time",
((float)time2 > (float)(time / DELAY_TOLERANCE)) &&
@@ -1064,8 +1018,8 @@ public class AudioEffectTest extends AndroidTestCase {
short[] value = new short[1];
status = effect2.getParameter(PresetReverb.PARAM_PRESET, value);
- assertFalse("Effect2 getParameter failed",
- AudioEffect.isError(status));
+ assertEquals("Effect2 getParameter failed",
+ AudioEffect.SUCCESS, status);
assertEquals("Effect1 changed parameter", PresetReverb.PRESET_SMALLROOM
, value[0]);
@@ -1232,7 +1186,7 @@ public class AudioEffectTest extends AndroidTestCase {
byte[] reply = new byte[4];
// command 3 is ENABLE
int status = mEffect.command(3, cmd, reply);
- assertFalse("command failed", AudioEffect.isError(status));
+ assertEquals("command failed", AudioEffect.SUCCESS, status);
assertTrue("effect not enabled", mEffect.getEnabled());
} catch (IllegalStateException e) {
diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
index f4d60c8..b4053cf 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -22,7 +22,6 @@ import static android.media.AudioManager.ADJUST_SAME;
import static android.media.AudioManager.FLAG_ALLOW_RINGER_MODES;
import static android.media.AudioManager.FLAG_SHOW_UI;
import static android.media.AudioManager.MODE_IN_CALL;
-import static android.media.AudioManager.MODE_IN_COMMUNICATION;
import static android.media.AudioManager.MODE_NORMAL;
import static android.media.AudioManager.MODE_RINGTONE;
import static android.media.AudioManager.RINGER_MODE_NORMAL;
@@ -45,21 +44,37 @@ import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
+import android.app.cts.CTSResult;
import android.content.Context;
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.provider.Settings;
-import android.telephony.TelephonyManager;
import android.test.AndroidTestCase;
import android.view.SoundEffectConstants;
-
@TestTargetClass(AudioManager.class)
-public class AudioManagerTest extends AndroidTestCase {
+public class AudioManagerTest extends AndroidTestCase implements CTSResult {
private final static int MP3_TO_PLAY = R.raw.testmp3;
private final static long TIME_TO_PLAY = 2000;
private AudioManager mAudioManager;
+ private int mResultCode;
+ private Sync mSync = new Sync();
+
+ private static class Sync {
+ private boolean notified;
+
+ synchronized void notifyResult() {
+ notified = true;
+ notify();
+ }
+
+ synchronized void waitForResult() throws Exception {
+ if (!notified) {
+ wait();
+ }
+ }
+ }
@Override
protected void setUp() throws Exception {
@@ -184,8 +199,6 @@ public class AudioManagerTest extends AndroidTestCase {
assertEquals(MODE_RINGTONE, mAudioManager.getMode());
mAudioManager.setMode(MODE_IN_CALL);
assertEquals(MODE_IN_CALL, mAudioManager.getMode());
- mAudioManager.setMode(MODE_IN_COMMUNICATION);
- assertEquals(MODE_IN_COMMUNICATION, mAudioManager.getMode());
mAudioManager.setMode(MODE_NORMAL);
assertEquals(MODE_NORMAL, mAudioManager.getMode());
}
@@ -247,30 +260,25 @@ public class AudioManagerTest extends AndroidTestCase {
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_RINGTONE));
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_NORMAL));
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_CALL));
- assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_COMMUNICATION));
mAudioManager.setBluetoothScoOn(true);
assertTrue(mAudioManager.isBluetoothScoOn());
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_RINGTONE));
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_NORMAL));
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_CALL));
- assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_COMMUNICATION));
mAudioManager.setBluetoothScoOn(false);
assertFalse(mAudioManager.isBluetoothScoOn());
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_RINGTONE));
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_NORMAL));
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_CALL));
- assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_COMMUNICATION));
mAudioManager.setSpeakerphoneOn(true);
assertTrue(mAudioManager.isSpeakerphoneOn());
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_CALL));
- assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_COMMUNICATION));
mAudioManager.setSpeakerphoneOn(false);
assertFalse(mAudioManager.isSpeakerphoneOn());
assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_CALL));
- assertEquals(AudioManager.MODE_CURRENT, mAudioManager.getRouting(MODE_IN_COMMUNICATION));
}
@TestTargets({
@@ -493,12 +501,7 @@ public class AudioManagerTest extends AndroidTestCase {
AudioManager.STREAM_VOICE_CALL,
AudioManager.STREAM_RING };
- TelephonyManager tm =
- (TelephonyManager)mContext.getSystemService(Context.TELEPHONY_SERVICE);
- //FIXME: use TelephonyManager.isVoiceCapable() when public
- boolean voiceCapable = tm.getPhoneType() != TelephonyManager.PHONE_TYPE_NONE;
-
- mAudioManager.adjustVolume(ADJUST_RAISE, 0);
+ mAudioManager.adjustVolume(ADJUST_RAISE, 100);
mAudioManager.adjustSuggestedStreamVolume(
ADJUST_LOWER, USE_DEFAULT_STREAM_TYPE, FLAG_SHOW_UI);
@@ -517,17 +520,49 @@ public class AudioManagerTest extends AndroidTestCase {
// volume lower
mAudioManager.setStreamVolume(streams[i], maxVolume, FLAG_SHOW_UI);
- for (int k = maxVolume; k > 1; k--) {
+ for (int k = maxVolume; k > 0; k--) {
mAudioManager.adjustStreamVolume(streams[i], ADJUST_LOWER, FLAG_SHOW_UI);
assertEquals(k - 1, mAudioManager.getStreamVolume(streams[i]));
}
- // on voice capable devices, ring and notification volumes cannot be set to 0
- // by continous press on volume minus key
- // simulate volume key release
- mAudioManager.adjustStreamVolume(streams[i], ADJUST_SAME,
- FLAG_SHOW_UI | FLAG_ALLOW_RINGER_MODES);
- mAudioManager.adjustStreamVolume(streams[i], ADJUST_LOWER, FLAG_SHOW_UI);
- assertEquals(0, mAudioManager.getStreamVolume(streams[i]));
+
+ mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+ assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+ mAudioManager.setStreamVolume(streams[i], 1, FLAG_SHOW_UI);
+ assertEquals(1, mAudioManager.getStreamVolume(streams[i]));
+ if (streams[i] == AudioManager.STREAM_RING) {
+ mAudioManager.adjustStreamVolume(streams[i], ADJUST_LOWER, FLAG_SHOW_UI);
+ assertEquals(0, mAudioManager.getStreamVolume(streams[i]));
+ // adjusting the volume to zero should result in either silent or vibrate mode
+ assertTrue(mAudioManager.getRingerMode() == RINGER_MODE_VIBRATE ||
+ mAudioManager.getRingerMode() == RINGER_MODE_SILENT);
+ mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+ assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+ assertEquals(1, mAudioManager.getStreamVolume(streams[i]));
+ } else {
+ mAudioManager.adjustStreamVolume(streams[i], ADJUST_LOWER, FLAG_SHOW_UI);
+ assertEquals(0, mAudioManager.getStreamVolume(streams[i]));
+ // lowering the volume should NOT have changed the ringer mode
+ assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+ // API quirk: volume must be decremented from 1 to get ringer mode change
+ mAudioManager.setStreamVolume(streams[i], 1, FLAG_SHOW_UI);
+ mAudioManager.adjustStreamVolume(streams[i], ADJUST_LOWER, FLAG_ALLOW_RINGER_MODES);
+ // lowering the volume should have changed the ringer mode
+ assertTrue(mAudioManager.getRingerMode() == RINGER_MODE_VIBRATE ||
+ mAudioManager.getRingerMode() == RINGER_MODE_SILENT);
+ mAudioManager.adjustStreamVolume(streams[i], ADJUST_LOWER, FLAG_ALLOW_RINGER_MODES);
+ // adjusting the volume to zero should result in either silent or vibrate mode
+ assertTrue(mAudioManager.getRingerMode() == RINGER_MODE_VIBRATE ||
+ mAudioManager.getRingerMode() == RINGER_MODE_SILENT);
+ mAudioManager.adjustStreamVolume(streams[i], ADJUST_RAISE, FLAG_ALLOW_RINGER_MODES);
+ // There are two possible ways the device may work. It may have a silent/vibrate
+ // mode or it may have distinct silent and vibrate modes.
+ assertTrue(mAudioManager.getRingerMode() == RINGER_MODE_NORMAL ||
+ mAudioManager.getRingerMode() == RINGER_MODE_VIBRATE);
+ // Increase the volume one more time to get out of the vibrate mode which may
+ // be separate from silent mode.
+ mAudioManager.adjustStreamVolume(streams[i], ADJUST_RAISE, FLAG_ALLOW_RINGER_MODES);
+ assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+ }
// volume raise
mAudioManager.setStreamVolume(streams[i], 0, FLAG_SHOW_UI);
@@ -548,7 +583,7 @@ public class AudioManagerTest extends AndroidTestCase {
// adjust volume
int maxVolume = mAudioManager.getStreamMaxVolume(STREAM_MUSIC);
- mAudioManager.adjustVolume(ADJUST_RAISE, 0);
+ mAudioManager.adjustVolume(ADJUST_RAISE, 100);
MediaPlayer mp = MediaPlayer.create(mContext, MP3_TO_PLAY);
mp.setAudioStreamType(STREAM_MUSIC);
@@ -582,12 +617,8 @@ public class AudioManagerTest extends AndroidTestCase {
assertFalse(mAudioManager.isMusicActive());
}
- public void testSetInvalidRingerMode() {
- int ringerMode = mAudioManager.getRingerMode();
- mAudioManager.setRingerMode(-1337);
- assertEquals(ringerMode, mAudioManager.getRingerMode());
-
- mAudioManager.setRingerMode(-3007);
- assertEquals(ringerMode, mAudioManager.getRingerMode());
+ public void setResult(int resultCode) {
+ mSync.notifyResult();
+ mResultCode = resultCode;
}
}
diff --git a/tests/tests/media/src/android/media/cts/AudioRecordTest.java b/tests/tests/media/src/android/media/cts/AudioRecordTest.java
index 1ddcdd5..5f6fc2c 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecordTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecordTest.java
@@ -18,7 +18,6 @@ package android.media.cts;
import java.nio.ByteBuffer;
-import android.content.pm.PackageManager;
import android.media.AudioFormat;
import android.media.AudioRecord;
import android.media.MediaRecorder;
@@ -41,7 +40,6 @@ public class AudioRecordTest extends AndroidTestCase {
private boolean mIsOnPeriodicNotificationCalled;
private boolean mIsHandleMessageCalled;
private Looper mLooper;
- private int MAX_RECORD_START_TIME_MS = 100;
@Override
protected void setUp() throws Exception {
@@ -139,9 +137,6 @@ public class AudioRecordTest extends AndroidTestCase {
)
})
public void testAudioRecordProperties() throws Exception {
- if (!hasMicrophone()) {
- return;
- }
assertEquals(AudioFormat.ENCODING_PCM_16BIT, mAudioRecord.getAudioFormat());
assertEquals(MediaRecorder.AudioSource.DEFAULT, mAudioRecord.getAudioSource());
assertEquals(1, mAudioRecord.getChannelCount());
@@ -229,16 +224,10 @@ public class AudioRecordTest extends AndroidTestCase {
)
})
public void testAudioRecordOP() throws Exception {
- if (!hasMicrophone()) {
- return;
- }
final int SLEEP_TIME = 10;
final int RECORD_TIME = 10000;
assertEquals(AudioRecord.STATE_INITIALIZED, mAudioRecord.getState());
- PackageManager pm = getContext().getPackageManager();
- boolean isLowLatency = pm.hasSystemFeature(PackageManager.FEATURE_AUDIO_LOW_LATENCY);
-
int markerInFrames = mAudioRecord.getSampleRate() / 2;
assertEquals(AudioRecord.SUCCESS,
mAudioRecord.setNotificationMarkerPosition(markerInFrames));
@@ -264,10 +253,6 @@ public class AudioRecordTest extends AndroidTestCase {
byte[] byteData = new byte[BUFFER_SIZE];
long time = System.currentTimeMillis();
mAudioRecord.startRecording();
- if (isLowLatency) {
- assertTrue("Record start time too long",
- (System.currentTimeMillis() - time) < MAX_RECORD_START_TIME_MS);
- }
assertEquals(AudioRecord.RECORDSTATE_RECORDING, mAudioRecord.getRecordingState());
while (System.currentTimeMillis() - time < RECORD_TIME) {
Thread.sleep(SLEEP_TIME);
@@ -336,8 +321,4 @@ public class AudioRecordTest extends AndroidTestCase {
mAudioRecord.release();
assertEquals(AudioRecord.STATE_UNINITIALIZED, mAudioRecord.getState());
}
-
- private boolean hasMicrophone() {
- return getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_MICROPHONE);
- }
}
diff --git a/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java b/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
deleted file mode 100644
index 504a304..0000000
--- a/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.media.cts;
-
-import android.content.pm.PackageManager;
-import android.media.AudioFormat;
-import android.media.AudioRecord;
-import android.media.MediaRecorder.AudioSource;
-import android.test.AndroidTestCase;
-import android.util.Log;
-import android.view.animation.cts.DelayedCheck;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class AudioRecord_BufferSizeTest extends AndroidTestCase {
-
- private static final String TAG = AudioRecord_BufferSizeTest.class.getSimpleName();
- private static final int CHANNEL_CONFIG = AudioFormat.CHANNEL_IN_MONO;
- private static final int AUDIO_FORMAT = AudioFormat.ENCODING_PCM_16BIT;
-
- private static final int[] SAMPLE_RATES_IN_HZ = new int[] {
- 8000,
- 11025,
- 16000,
- 44100,
- };
-
- private AudioRecord mAudioRecord;
-
- public void testGetMinBufferSize() throws Exception {
- if (!hasMicrophone()) {
- return;
- }
- List failedSampleRates = new ArrayList();
- for (int i = 0; i < SAMPLE_RATES_IN_HZ.length; i++) {
- try {
- record(SAMPLE_RATES_IN_HZ[i]);
- } catch (Throwable e) {
- Log.e(TAG, "Sample rate: " + SAMPLE_RATES_IN_HZ[i], e);
- failedSampleRates.add(SAMPLE_RATES_IN_HZ[i]);
- }
- }
- assertTrue("Failed sample rates: " + failedSampleRates + " See log for more details.",
- failedSampleRates.isEmpty());
- }
-
- private void record(int sampleRateInHz) {
- int bufferSize = AudioRecord.getMinBufferSize(sampleRateInHz, CHANNEL_CONFIG, AUDIO_FORMAT);
- byte[] buffer = new byte[bufferSize];
- assertTrue(bufferSize > 0);
-
- createAudioRecord(sampleRateInHz, bufferSize);
- checkRecordingState(AudioRecord.STATE_INITIALIZED);
-
- mAudioRecord.startRecording();
- checkRecordingState(AudioRecord.RECORDSTATE_RECORDING);
-
- assertTrue(mAudioRecord.read(buffer, 0, bufferSize) > 0);
-
- mAudioRecord.stop();
- checkRecordingState(AudioRecord.RECORDSTATE_STOPPED);
-
- mAudioRecord.release();
- }
-
- private void createAudioRecord(final int sampleRateInHz, final int bufferSize) {
- mAudioRecord = new AudioRecord(AudioSource.DEFAULT, sampleRateInHz,
- CHANNEL_CONFIG, AUDIO_FORMAT, bufferSize);
- assertNotNull(mAudioRecord);
- }
-
- private void checkRecordingState(final int state) {
- new DelayedCheck() {
- @Override
- protected boolean check() {
- return mAudioRecord.getRecordingState() == state;
- }
- }.run();
- }
-
- private boolean hasMicrophone() {
- return getContext().getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_MICROPHONE);
- }
-}
diff --git a/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java b/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java
index cbdf8b0..b94da11 100644
--- a/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java
+++ b/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java
@@ -22,8 +22,6 @@ import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import android.hardware.Camera;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.Size;
import android.media.CamcorderProfile;
import android.test.AndroidTestCase;
import android.util.Log;
@@ -35,16 +33,7 @@ public class CamcorderProfileTest extends AndroidTestCase {
private static final String TAG = "CamcorderProfileTest";
- // Uses get without id if cameraId == -1 and get with id otherwise.
- private CamcorderProfile getWithOptionalId(int quality, int cameraId) {
- if (cameraId == -1) {
- return CamcorderProfile.get(quality);
- } else {
- return CamcorderProfile.get(cameraId, quality);
- }
- }
-
- private void checkProfile(CamcorderProfile profile, List videoSizes) {
+ private void checkProfile(CamcorderProfile profile) {
Log.v(TAG, String.format("profile: duration=%d, quality=%d, " +
"fileFormat=%d, videoCodec=%d, videoBitRate=%d, videoFrameRate=%d, " +
"videoFrameWidth=%d, videoFrameHeight=%d, audioCodec=%d, " +
@@ -63,19 +52,7 @@ public class CamcorderProfileTest extends AndroidTestCase {
profile.audioChannels));
assertTrue(profile.duration > 0);
assertTrue(profile.quality == CamcorderProfile.QUALITY_LOW ||
- profile.quality == CamcorderProfile.QUALITY_HIGH ||
- profile.quality == CamcorderProfile.QUALITY_QCIF ||
- profile.quality == CamcorderProfile.QUALITY_CIF ||
- profile.quality == CamcorderProfile.QUALITY_480P ||
- profile.quality == CamcorderProfile.QUALITY_720P ||
- profile.quality == CamcorderProfile.QUALITY_1080P ||
- profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_LOW ||
- profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_HIGH ||
- profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_QCIF ||
- profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_CIF ||
- profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_480P ||
- profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_720P ||
- profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_1080P);
+ profile.quality == CamcorderProfile.QUALITY_HIGH);
assertTrue(profile.videoBitRate > 0);
assertTrue(profile.videoFrameRate > 0);
assertTrue(profile.videoFrameWidth > 0);
@@ -83,152 +60,6 @@ public class CamcorderProfileTest extends AndroidTestCase {
assertTrue(profile.audioBitRate > 0);
assertTrue(profile.audioSampleRate > 0);
assertTrue(profile.audioChannels > 0);
- assertTrue(isSizeSupported(profile.videoFrameWidth,
- profile.videoFrameHeight,
- videoSizes));
- }
-
- private void assertProfileEquals(CamcorderProfile expectedProfile,
- CamcorderProfile actualProfile) {
- assertEquals(expectedProfile.duration, actualProfile.duration);
- assertEquals(expectedProfile.fileFormat, actualProfile.fileFormat);
- assertEquals(expectedProfile.videoCodec, actualProfile.videoCodec);
- assertEquals(expectedProfile.videoBitRate, actualProfile.videoBitRate);
- assertEquals(expectedProfile.videoFrameRate, actualProfile.videoFrameRate);
- assertEquals(expectedProfile.videoFrameWidth, actualProfile.videoFrameWidth);
- assertEquals(expectedProfile.videoFrameHeight, actualProfile.videoFrameHeight);
- assertEquals(expectedProfile.audioCodec, actualProfile.audioCodec);
- assertEquals(expectedProfile.audioBitRate, actualProfile.audioBitRate);
- assertEquals(expectedProfile.audioSampleRate, actualProfile.audioSampleRate);
- assertEquals(expectedProfile.audioChannels, actualProfile.audioChannels);
- }
-
- private void checkSpecificProfileDimensions(CamcorderProfile profile, int quality) {
- Log.v(TAG, String.format("specific profile: quality=%d, width = %d, height = %d",
- profile.quality, profile.videoFrameWidth, profile.videoFrameHeight));
-
- switch (quality) {
- case CamcorderProfile.QUALITY_QCIF:
- case CamcorderProfile.QUALITY_TIME_LAPSE_QCIF:
- assertEquals(176, profile.videoFrameWidth);
- assertEquals(144, profile.videoFrameHeight);
- break;
-
- case CamcorderProfile.QUALITY_CIF:
- case CamcorderProfile.QUALITY_TIME_LAPSE_CIF:
- assertEquals(352, profile.videoFrameWidth);
- assertEquals(288, profile.videoFrameHeight);
- break;
-
- case CamcorderProfile.QUALITY_480P:
- case CamcorderProfile.QUALITY_TIME_LAPSE_480P:
- assertTrue(720 == profile.videoFrameWidth || // SMPTE 293M/ITU-R Rec. 601
- 640 == profile.videoFrameWidth || // ATSC/NTSC (square sampling)
- 704 == profile.videoFrameWidth); // ATSC/NTSC (non-square sampling)
- assertEquals(480, profile.videoFrameHeight);
- break;
-
- case CamcorderProfile.QUALITY_720P:
- case CamcorderProfile.QUALITY_TIME_LAPSE_720P:
- assertEquals(1280, profile.videoFrameWidth);
- assertEquals(720, profile.videoFrameHeight);
- break;
-
- case CamcorderProfile.QUALITY_1080P:
- case CamcorderProfile.QUALITY_TIME_LAPSE_1080P:
- // 1080p could be either 1920x1088 or 1920x1080.
- assertEquals(1920, profile.videoFrameWidth);
- assertTrue(1088 == profile.videoFrameHeight ||
- 1080 == profile.videoFrameHeight);
- break;
- }
- }
-
- // Checks if the existing specific profiles have the correct dimensions.
- // Also checks that the mimimum quality specific profile matches the low profile and
- // similarly that the maximum quality specific profile matches the high profile.
- private void checkSpecificProfiles(
- int cameraId,
- CamcorderProfile low,
- CamcorderProfile high,
- int[] specificQualities,
- List videoSizes) {
-
- CamcorderProfile minProfile = null;
- CamcorderProfile maxProfile = null;
-
- for (int i = 0; i < specificQualities.length; i++) {
- int quality = specificQualities[i];
- if ((cameraId != -1 && CamcorderProfile.hasProfile(cameraId, quality)) ||
- (cameraId == -1 && CamcorderProfile.hasProfile(quality))) {
- CamcorderProfile profile = getWithOptionalId(quality, cameraId);
- checkSpecificProfileDimensions(profile, quality);
-
- assertTrue(isSizeSupported(profile.videoFrameWidth,
- profile.videoFrameHeight,
- videoSizes));
-
- if (minProfile == null) {
- minProfile = profile;
- }
- maxProfile = profile;
- }
- }
-
- assertNotNull(minProfile);
- assertNotNull(maxProfile);
-
- Log.v(TAG, String.format("min profile: quality=%d, width = %d, height = %d",
- minProfile.quality, minProfile.videoFrameWidth, minProfile.videoFrameHeight));
- Log.v(TAG, String.format("max profile: quality=%d, width = %d, height = %d",
- maxProfile.quality, maxProfile.videoFrameWidth, maxProfile.videoFrameHeight));
-
- assertProfileEquals(low, minProfile);
- assertProfileEquals(high, maxProfile);
-
- }
-
- private void checkGet(int cameraId) {
- Log.v(TAG, (cameraId == -1)
- ? "Checking get without id"
- : "Checking get with id = " + cameraId);
-
- final List videoSizes = getSupportedVideoSizes(cameraId);
-
- CamcorderProfile lowProfile =
- getWithOptionalId(CamcorderProfile.QUALITY_LOW, cameraId);
- CamcorderProfile highProfile =
- getWithOptionalId(CamcorderProfile.QUALITY_HIGH, cameraId);
- checkProfile(lowProfile, videoSizes);
- checkProfile(highProfile, videoSizes);
-
- CamcorderProfile lowTimeLapseProfile =
- getWithOptionalId(CamcorderProfile.QUALITY_TIME_LAPSE_LOW, cameraId);
- CamcorderProfile highTimeLapseProfile =
- getWithOptionalId(CamcorderProfile.QUALITY_TIME_LAPSE_HIGH, cameraId);
- checkProfile(lowTimeLapseProfile, null);
- checkProfile(highTimeLapseProfile, null);
-
- int[] specificProfileQualities = {CamcorderProfile.QUALITY_QCIF,
- // replace this with CamcorderProfile.QUALITY_QVGA
- 7,
- CamcorderProfile.QUALITY_CIF,
- CamcorderProfile.QUALITY_480P,
- CamcorderProfile.QUALITY_720P,
- CamcorderProfile.QUALITY_1080P};
-
- int[] specificTimeLapseProfileQualities = {CamcorderProfile.QUALITY_TIME_LAPSE_QCIF,
- // replace this with CamcorderProfile.QUALITY_TIME_LAPSE_QVGA
- 1007,
- CamcorderProfile.QUALITY_TIME_LAPSE_CIF,
- CamcorderProfile.QUALITY_TIME_LAPSE_480P,
- CamcorderProfile.QUALITY_TIME_LAPSE_720P,
- CamcorderProfile.QUALITY_TIME_LAPSE_1080P};
-
- checkSpecificProfiles(cameraId, lowProfile, highProfile,
- specificProfileQualities, videoSizes);
- checkSpecificProfiles(cameraId, lowTimeLapseProfile, highTimeLapseProfile,
- specificTimeLapseProfileQualities, null);
}
@TestTargets({
@@ -239,7 +70,10 @@ public class CamcorderProfileTest extends AndroidTestCase {
)
})
public void testGet() {
- checkGet(-1);
+ CamcorderProfile lowProfile = CamcorderProfile.get(CamcorderProfile.QUALITY_LOW);
+ CamcorderProfile highProfile = CamcorderProfile.get(CamcorderProfile.QUALITY_HIGH);
+ checkProfile(lowProfile);
+ checkProfile(highProfile);
}
@TestTargets({
@@ -251,31 +85,13 @@ public class CamcorderProfileTest extends AndroidTestCase {
})
public void testGetWithId() {
int nCamera = Camera.getNumberOfCameras();
- for (int cameraId = 0; cameraId < nCamera; cameraId++) {
- checkGet(cameraId);
- }
- }
-
- private List getSupportedVideoSizes(int cameraId) {
- Camera camera = (cameraId == -1)? Camera.open(): Camera.open(cameraId);
- Parameters parameters = camera.getParameters();
- List videoSizes = parameters.getSupportedVideoSizes();
- if (videoSizes == null) {
- videoSizes = parameters.getSupportedPreviewSizes();
- assertNotNull(videoSizes);
- }
- camera.release();
- return videoSizes;
- }
-
- private boolean isSizeSupported(int width, int height, List sizes) {
- if (sizes == null) return true;
-
- for (Size size: sizes) {
- if (size.width == width && size.height == height) {
- return true;
- }
+ for (int id = 0; id < nCamera; id++) {
+ CamcorderProfile lowProfile = CamcorderProfile.get(id,
+ CamcorderProfile.QUALITY_LOW);
+ CamcorderProfile highProfile = CamcorderProfile.get(id,
+ CamcorderProfile.QUALITY_HIGH);
+ checkProfile(lowProfile);
+ checkProfile(highProfile);
}
- return false;
}
}
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerStreamingTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerStreamingTest.java
deleted file mode 100644
index 652c5bd..0000000
--- a/tests/tests/media/src/android/media/cts/MediaPlayerStreamingTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.media.cts;
-
-import android.media.MediaPlayer;
-import android.webkit.cts.CtsTestServer;
-
-
-/**
- * Tests of MediaPlayer streaming capabilities.
- */
-public class MediaPlayerStreamingTest extends MediaPlayerTestBase {
- private CtsTestServer mServer;
-
- // Streaming RTSP video from YouTube
- public void testRTSP_H263_AMR_Video1() throws Exception {
- playVideoTest("rtsp://v2.cache7.c.youtube.com/video.3gp?cid=0x271de9756065677e"
- + "&fmt=13&user=android-device-test", 176, 144);
- }
- public void testRTSP_H263_AMR_Video2() throws Exception {
- playVideoTest("rtsp://v2.cache7.c.youtube.com/video.3gp?cid=0xc80658495af60617"
- + "&fmt=13&user=android-device-test", 176, 144);
- }
-
- public void testRTSP_MPEG4SP_AAC_Video1() throws Exception {
- playVideoTest("rtsp://v2.cache7.c.youtube.com/video.3gp?cid=0x271de9756065677e"
- + "&fmt=17&user=android-device-test", 176, 144);
- }
- public void testRTSP_MPEG4SP_AAC_Video2() throws Exception {
- playVideoTest("rtsp://v2.cache7.c.youtube.com/video.3gp?cid=0xc80658495af60617"
- + "&fmt=17&user=android-device-test", 176, 144);
- }
-
- public void testRTSP_H264Base_AAC_Video1() throws Exception {
- playVideoTest("rtsp://v2.cache7.c.youtube.com/video.3gp?cid=0x271de9756065677e"
- + "&fmt=18&user=android-device-test", 480, 270);
- }
- public void testRTSP_H264Base_AAC_Video2() throws Exception {
- playVideoTest("rtsp://v2.cache7.c.youtube.com/video.3gp?cid=0xc80658495af60617"
- + "&fmt=18&user=android-device-test", 480, 270);
- }
-
- // Streaming HTTP video from YouTube
- public void testHTTP_H263_AMR_Video1() throws Exception {
- playVideoTest("http://v20.lscache8.c.youtube.com/videoplayback?id=271de9756065677e"
- + "&itag=13&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag"
- + "&signature=372FA4C532AA49D14EAF049BCDA66460EEE161E9"
- + ".6D8BF096B73B7A68A7032CA8685053CFB498D30A"
- + "&key=test_key1&user=android-device-test", 176, 144);
- }
- public void testHTTP_H263_AMR_Video2() throws Exception {
- playVideoTest("http://v20.lscache8.c.youtube.com/videoplayback?id=c80658495af60617"
- + "&itag=13&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag"
- + "&signature=191FCD5C4B7400065C20845D7AC2B437B1291F26"
- + ".66F8B8D7EFF7F144141AC67E8E35E078468CE6FB"
- + "&key=test_key1&user=android-device-test", 176, 144);
- }
-
- public void testHTTP_MPEG4SP_AAC_Video1() throws Exception {
- playVideoTest("http://v20.lscache8.c.youtube.com/videoplayback?id=271de9756065677e"
- + "&itag=17&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag"
- + "&signature=3DCD3F79E045F95B6AF661765F046FB0440FF016"
- + ".06A42661B3AF6BAF046F012549CC9BA34EBC80A9"
- + "&key=test_key1&user=android-device-test", 176, 144);
- }
- public void testHTTP_MPEG4SP_AAC_Video2() throws Exception {
- playVideoTest("http://v20.lscache8.c.youtube.com/videoplayback?id=c80658495af60617"
- + "&itag=17&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag"
- + "&signature=242B7AEF3AB38519F593203FDEF420E2A585DA6E"
- + ".4A57C03AF6859FE4694CD69C3225E386373A98B0"
- + "&key=test_key1&user=android-device-test", 176, 144);
- }
-
- public void testHTTP_H264Base_AAC_Video1() throws Exception {
- playVideoTest("http://v20.lscache8.c.youtube.com/videoplayback?id=271de9756065677e"
- + "&itag=18&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag"
- + "&signature=1219C2B07AF0638C27916307A6093C0E43CB894E"
- + ".126B6B916BD57157782738AA7C03E59F21DBC168"
- + "&key=test_key1&user=android-device-test", 480, 270);
- }
- public void testHTTP_H264Base_AAC_Video2() throws Exception {
- playVideoTest("http://v20.lscache8.c.youtube.com/videoplayback?id=c80658495af60617"
- + "&itag=18&ip=0.0.0.0&ipbits=0&expire=999999999999999999"
- + "&sparams=ip,ipbits,expire,ip,ipbits,expire,id,itag"
- + "&signature=61674BC069F2C812A18C390DE785CECD296228C7"
- + ".11F5FCE823FB8FA31269A06A483C2F9B2C22F357"
- + "&key=test_key1&user=android-device-test", 480, 270);
- }
-
- // Streaming HLS video from YouTube
- public void testHLS() throws Exception {
- // Play stream for 60 seconds
- playLiveVideoTest("http://www.youtube.com/api/manifest/hls/ns/yt-live/id/UeHRu5LFHaU"
- + "?ip=0.0.0.0&ipbits=0&expire=19000000000&sparams=ip,ipbits,expire&signature"
- + "=313BE90526F2D815EB207156E1460C7E8EEC2503.799EE7B8B7CE3F2957060DB27C216077"
- + "0303EBD2&key=test_key1&user=android-device-test&m3u8=1", 60 * 1000);
- }
-
- // Streaming audio from local HTTP server
- public void testPlayMp3Stream1() throws Throwable {
- localHttpAudioStreamTest("ringer.mp3", false, false);
- }
- public void testPlayMp3Stream2() throws Throwable {
- localHttpAudioStreamTest("ringer.mp3", false, false);
- }
- public void testPlayMp3StreamRedirect() throws Throwable {
- localHttpAudioStreamTest("ringer.mp3", true, false);
- }
- public void testPlayMp3StreamNoLength() throws Throwable {
- localHttpAudioStreamTest("noiseandchirps.mp3", false, true);
- }
- public void testPlayOggStream() throws Throwable {
- localHttpAudioStreamTest("noiseandchirps.ogg", false, false);
- }
- public void testPlayOggStreamRedirect() throws Throwable {
- localHttpAudioStreamTest("noiseandchirps.ogg", true, false);
- }
- public void testPlayOggStreamNoLength() throws Throwable {
- localHttpAudioStreamTest("noiseandchirps.ogg", false, true);
- }
-
- private void localHttpAudioStreamTest(final String name, boolean redirect, boolean nolength)
- throws Throwable {
- mServer = new CtsTestServer(mContext);
- try {
- String stream_url = null;
- if (redirect) {
- // Stagefright doesn't have a limit, but we can't test support of infinite redirects
- // Up to 4 redirects seems reasonable though.
- stream_url = mServer.getRedirectingAssetUrl(name, 4);
- } else {
- stream_url = mServer.getAssetUrl(name);
- }
- if (nolength) {
- stream_url = stream_url + "?" + CtsTestServer.NOLENGTH_POSTFIX;
- }
-
- mMediaPlayer.setDataSource(stream_url);
-
- mMediaPlayer.setDisplay(getActivity().getSurfaceHolder());
- mMediaPlayer.setScreenOnWhilePlaying(true);
-
- mOnBufferingUpdateCalled.reset();
- mMediaPlayer.setOnBufferingUpdateListener(new MediaPlayer.OnBufferingUpdateListener() {
- @Override
- public void onBufferingUpdate(MediaPlayer mp, int percent) {
- mOnBufferingUpdateCalled.signal();
- }
- });
- mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
- @Override
- public boolean onError(MediaPlayer mp, int what, int extra) {
- fail("Media player had error " + what + " playing " + name);
- return true;
- }
- });
-
- assertFalse(mOnBufferingUpdateCalled.isSignalled());
- mMediaPlayer.prepare();
-
- if (nolength) {
- mMediaPlayer.start();
- Thread.sleep(LONG_SLEEP_TIME);
- assertFalse(mMediaPlayer.isPlaying());
- } else {
- mOnBufferingUpdateCalled.waitForSignal();
- mMediaPlayer.start();
- Thread.sleep(SLEEP_TIME);
- }
- mMediaPlayer.stop();
- mMediaPlayer.reset();
- } finally {
- mServer.shutdown();
- }
- }
-}
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java
deleted file mode 100644
index 196382d..0000000
--- a/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.media.cts;
-
-import android.os.Bundle;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- */
-public class MediaPlayerSurfaceTest extends ActivityInstrumentationTestCase2 {
-
- public MediaPlayerSurfaceTest() {
- super("com.android.cts.stub", MediaPlayerSurfaceStubActivity.class);
- }
-
- public void testSetSurface() throws Exception {
- Bundle extras = new Bundle();
- MediaPlayerSurfaceStubActivity activity = launchActivity("com.android.cts.stub",
- MediaPlayerSurfaceStubActivity.class, extras);
- activity.playVideo();
- activity.finish();
- }
-}
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
index 9947592..d18d684 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
@@ -17,347 +17,567 @@ package android.media.cts;
import com.android.cts.stub.R;
-import android.content.pm.PackageManager;
+import dalvik.annotation.TestLevel;
+import dalvik.annotation.TestTargetClass;
+import dalvik.annotation.TestTargetNew;
+import dalvik.annotation.TestTargets;
+
+import android.content.Context;
import android.content.res.AssetFileDescriptor;
+import android.content.res.Resources;
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.media.MediaRecorder;
+import android.media.MediaPlayer.OnBufferingUpdateListener;
+import android.media.MediaPlayer.OnCompletionListener;
+import android.media.MediaPlayer.OnErrorListener;
+import android.media.MediaPlayer.OnPreparedListener;
+import android.media.MediaPlayer.OnSeekCompleteListener;
+import android.media.MediaPlayer.OnVideoSizeChangedListener;
import android.net.Uri;
import android.os.Environment;
+import android.os.Looper;
import android.os.PowerManager;
+import android.test.ActivityInstrumentationTestCase2;
+import android.view.SurfaceHolder;
+import android.webkit.cts.CtsTestServer;
+import android.util.Log;
import java.io.File;
+import java.io.FileDescriptor;
+
+@TestTargetClass(MediaPlayer.class)
+public class MediaPlayerTest extends ActivityInstrumentationTestCase2 {
+
+ private static String TAG = "CtsMediaPlayerTest";
+ private static final int SLEEP_TIME = 1000;
+ private static final int LONG_SLEEP_TIME = 6000;
+ private final String mSourceMediaOnSdcard;
+ private Monitor mOnVideoSizeChangedCalled = new Monitor();
+ private Monitor mOnBufferingUpdateCalled = new Monitor();
+ private Monitor mOnPrepareCalled = new Monitor();
+ private Monitor mOnSeekCompleteCalled = new Monitor();
+ private Monitor mOnCompletionCalled = new Monitor();
+ private Monitor mOnInfoCalled = new Monitor();
+ private Monitor mOnErrorCalled = new Monitor();
+ private Context mContext;
+ private Resources mResources;
+ private CtsTestServer mServer;
+ private static Object sVideoSizeChanged;
+ private static Object sLock;
+ private static Looper sLooper = null;
+ private static final int WAIT_FOR_COMMAND_TO_COMPLETE = 60000; //1 min max.
+
+ /*
+ * InstrumentationTestRunner.onStart() calls Looper.prepare(), which creates a looper
+ * for the current thread. However, since we don't actually call loop() in the test,
+ * any messages queued with that looper will never be consumed. We instantiate the player
+ * in the constructor, before setUp(), so that its constructor does not see the
+ * nonfunctional Looper.
+ */
+ private MediaPlayer mMediaPlayer = new MediaPlayer();
-/**
- * Tests for the MediaPlayer API and local video/audio playback.
- *
- * The files in res/raw used by testLocalVideo* are (c) copyright 2008,
- * Blender Foundation / www.bigbuckbunny.org, and are licensed under the Creative Commons
- * Attribution 3.0 License at http://creativecommons.org/licenses/by/3.0/us/.
- */
-public class MediaPlayerTest extends MediaPlayerTestBase {
- public void testPlayNullSource() throws Exception {
- try {
- mMediaPlayer.setDataSource((String) null);
- fail("Null URI was accepted");
- } catch (IllegalArgumentException e) {
- // expected
- }
- }
-
- public void testPlayAudio() throws Exception {
- final int mp3Duration = 34909;
- final int tolerance = 70;
- final int seekDuration = 100;
- final int resid = R.raw.testmp3_2;
-
- MediaPlayer mp = MediaPlayer.create(mContext, resid);
- try {
- mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
- mp.setWakeMode(mContext, PowerManager.PARTIAL_WAKE_LOCK);
-
- assertFalse(mp.isPlaying());
- mp.start();
- assertTrue(mp.isPlaying());
+ static MediaPlayer.OnVideoSizeChangedListener mOnVideoSizeChangedListener =
+ new MediaPlayer.OnVideoSizeChangedListener() {
+ public void onVideoSizeChanged(MediaPlayer mp, int width, int height) {
+ synchronized (sVideoSizeChanged) {
+ Log.v(TAG, "sizechanged notification received ...");
+ sVideoSizeChanged.notify();
+ }
+ }
+ };
- assertFalse(mp.isLooping());
- mp.setLooping(true);
- assertTrue(mp.isLooping());
+ private static class Monitor {
+ private boolean signalled;
- assertEquals(mp3Duration, mp.getDuration(), tolerance);
- int pos = mp.getCurrentPosition();
- assertTrue(pos >= 0);
- assertTrue(pos < mp3Duration - seekDuration);
+ public synchronized void reset() {
+ signalled = false;
+ }
- mp.seekTo(pos + seekDuration);
- assertEquals(pos + seekDuration, mp.getCurrentPosition(), tolerance);
+ public synchronized void signal() {
+ signalled = true;
+ notifyAll();
+ }
- // test pause and restart
- mp.pause();
- Thread.sleep(SLEEP_TIME);
- assertFalse(mp.isPlaying());
- mp.start();
- assertTrue(mp.isPlaying());
-
- // test stop and restart
- mp.stop();
- mp.reset();
- AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
- mp.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
- afd.close();
- mp.prepare();
- assertFalse(mp.isPlaying());
- mp.start();
- assertTrue(mp.isPlaying());
-
- // waiting to complete
- while(mp.isPlaying()) {
- Thread.sleep(SLEEP_TIME);
+ public synchronized void waitForSignal() throws InterruptedException {
+ while (!signalled) {
+ wait();
}
- } finally {
- mp.release();
}
}
- public void testPlayVideo() throws Exception {
- playVideoTest(R.raw.testvideo, 352, 288);
- }
-
- /**
- * Test for reseting a surface during video playback
- * After reseting, the video should continue playing
- * from the time setDisplay() was called
- */
- public void testVideoSurfaceResetting() throws Exception {
- final int tolerance = 150;
- final int seekPos = 1500;
-
- playVideoTest(R.raw.testvideo, 352, 288);
-
- mMediaPlayer.start();
- Thread.sleep(SLEEP_TIME);
-
- int posBefore = mMediaPlayer.getCurrentPosition();
- mMediaPlayer.setDisplay(getActivity().getSurfaceHolder2());
- int posAfter = mMediaPlayer.getCurrentPosition();
-
- assertEquals(posAfter, posBefore);
- assertTrue(mMediaPlayer.isPlaying());
-
- Thread.sleep(SLEEP_TIME);
-
- mMediaPlayer.seekTo(seekPos);
- Thread.sleep(SLEEP_TIME / 2);
-
- posBefore = mMediaPlayer.getCurrentPosition();
- mMediaPlayer.setDisplay(null);
- posAfter = mMediaPlayer.getCurrentPosition();
-
- assertEquals(posAfter, posBefore);
- assertEquals(seekPos + SLEEP_TIME / 2, posBefore, tolerance);
- assertTrue(mMediaPlayer.isPlaying());
-
- Thread.sleep(SLEEP_TIME);
-
- posBefore = mMediaPlayer.getCurrentPosition();
- mMediaPlayer.setDisplay(getActivity().generateSurfaceHolder());
- posAfter = mMediaPlayer.getCurrentPosition();
-
- assertEquals(posAfter, posBefore);
- assertTrue(mMediaPlayer.isPlaying());
-
- Thread.sleep(SLEEP_TIME);
- }
-
- public void testLocalVideo_MP4_H264_480x360_500kbps_25fps_AAC_Stereo_128kbps_44110Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz, 480, 360);
- }
-
- public void testLocalVideo_MP4_H264_480x360_500kbps_30fps_AAC_Stereo_128kbps_44110Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_500kbps_30fps_aac_stereo_128kbps_44100hz, 480, 360);
- }
-
- public void testLocalVideo_MP4_H264_480x360_1000kbps_25fps_AAC_Stereo_128kbps_44110Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz, 480, 360);
- }
-
- public void testLocalVideo_MP4_H264_480x360_1000kbps_30fps_AAC_Stereo_128kbps_44110Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz, 480, 360);
- }
-
- public void testLocalVideo_MP4_H264_480x360_1350kbps_25fps_AAC_Stereo_128kbps_44110Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1350kbps_25fps_aac_stereo_128kbps_44100hz, 480, 360);
- }
-
- public void testLocalVideo_MP4_H264_480x360_1350kbps_30fps_AAC_Stereo_128kbps_44110Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz, 480, 360);
- }
-
- public void testLocalVideo_MP4_H264_480x360_1350kbps_30fps_AAC_Stereo_192kbps_44110Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz, 480, 360);
+ public MediaPlayerTest() {
+ super("com.android.cts.stub", MediaStubActivity.class);
+ mSourceMediaOnSdcard = new File(Environment.getExternalStorageDirectory(),
+ "record_and_play.3gp").getAbsolutePath();
}
- public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Mono_24kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz, 176, 144);
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mContext = getInstrumentation().getTargetContext();
+ mResources = mContext.getResources();
}
- public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Mono_24kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_22050hz, 176, 144);
- }
-
- public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Stereo_24kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_11025hz, 176, 144);
- }
-
- public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Stereo_24kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_11025hz, 176, 144);
- }
-
- public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Stereo_128kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_11025hz, 176, 144);
- }
-
- public void testLocalVideo_3gp_H263_176x144_56kbps_12fps_AAC_Stereo_128kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_11025hz, 176, 144);
- }
+ @Override
+ protected void tearDown() throws Exception {
+ if (mMediaPlayer != null) {
+ mMediaPlayer.release();
+ }
+ File file = new File(mSourceMediaOnSdcard);
+ if (file.exists()) {
+ file.delete();
+ }
+ if (mServer != null) {
+ mServer.shutdown();
+ }
+ super.tearDown();
+ }
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "create",
+ args = {Context.class, int.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setAudioStreamType",
+ args = {int.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setWakeMode",
+ args = {Context.class, int.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isPlaying",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "start",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setLooping",
+ args = {boolean.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isLooping",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getCurrentPosition",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "seekTo",
+ args = {int.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "pause",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "stop",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "reset",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setDataSource",
+ args = {FileDescriptor.class, long.class, long.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "prepare",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getDuration",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "release",
+ args = {}
+ )
+ })
+ public void testPlayAudio() throws Exception {
+ final int mp3Duration = 34909;
+ final int tolerance = 70;
+ final int seekDuration = 100;
+ final int resid = R.raw.testmp3_2;
- public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Mono_24kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz, 176, 144);
- }
+ MediaPlayer mp = MediaPlayer.create(mContext, resid);
+ mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
+ mp.setWakeMode(mContext, PowerManager.PARTIAL_WAKE_LOCK);
- public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Mono_24kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_22050hz, 176, 144);
- }
+ assertFalse(mp.isPlaying());
+ mp.start();
+ assertTrue(mp.isPlaying());
- public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Stereo_24kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_11025hz, 176, 144);
- }
+ assertFalse(mp.isLooping());
+ mp.setLooping(true);
+ assertTrue(mp.isLooping());
- public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Stereo_24kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_11025hz, 176, 144);
- }
+ assertEquals(mp3Duration, mp.getDuration(), tolerance);
+ int pos = mp.getCurrentPosition();
+ assertTrue(pos >= 0);
+ assertTrue(pos < mp3Duration - seekDuration);
- public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Stereo_128kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_11025hz, 176, 144);
- }
+ mp.seekTo(pos + seekDuration);
+ assertEquals(pos + seekDuration, mp.getCurrentPosition(), tolerance);
- public void testLocalVideo_3gp_H263_176x144_56kbps_25fps_AAC_Stereo_128kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_11025hz, 176, 144);
- }
+ // test pause and restart
+ mp.pause();
+ Thread.sleep(SLEEP_TIME);
+ assertFalse(mp.isPlaying());
+ mp.start();
+ assertTrue(mp.isPlaying());
- public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Mono_24kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_11025hz, 176, 144);
- }
+ // test stop and restart
+ mp.stop();
+ mp.reset();
+ AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
+ mp.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+ afd.close();
+ mp.prepare();
+ assertFalse(mp.isPlaying());
+ mp.start();
+ assertTrue(mp.isPlaying());
- public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Mono_24kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_22050hz, 176, 144);
- }
+ // waiting to complete
+ while(mp.isPlaying()) {
+ Thread.sleep(SLEEP_TIME);
+ }
- public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Stereo_24kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_11025hz, 176, 144);
+ mp.release();
+ }
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "MediaPlayer",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setDisplay",
+ args = {SurfaceHolder.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setScreenOnWhilePlaying",
+ args = {boolean.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getVideoHeight",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getVideoWidth",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setVolume",
+ args = {float.class, float.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setDataSource",
+ args = {FileDescriptor.class}
+ )
+ })
+
+ /*
+ * Initializes the message looper so that the mediaPlayer object can
+ * receive the callback messages.
+ */
+ private static void initializeMessageLooper() {
+ new Thread() {
+ @Override
+ public void run() {
+ // Set up a looper to be used by camera.
+ Looper.prepare();
+ // Save the looper so that we can terminate this thread
+ // after we are done with it.
+ sLooper = Looper.myLooper();
+ synchronized (sLock) {
+ sLock.notify();
+ }
+ Looper.loop(); // Blocks forever until Looper.quit() is called.
+ Log.v(TAG, "initializeMessageLooper: quit.");
+ }
+ }.start();
}
- public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Stereo_24kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_11025hz, 176, 144);
+ /*
+ * Terminates the message looper thread.
+ */
+ private static void terminateMessageLooper() {
+ sLooper.quit();
}
- public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Stereo_128kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_11025hz, 176, 144);
- }
+ public void testPlayVideo() throws Exception {
+ final int expectedVideoWidth = 352; // width of R.raw.testvideo
+ final int expectedVideoHeight = 288; // height of R.raw.testvideo
+ final float leftVolume = 0.5f;
+ final float rightVolume = 0.5f;
+ final int resid = R.raw.testvideo;
+
+ sLock = new Object();
+ sVideoSizeChanged = new Object();
+ MediaPlayer mp = new MediaPlayer();
+ AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
+ mp.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+ afd.close();
+ mp.setDisplay(getActivity().getSurfaceHolder());
+ mp.setScreenOnWhilePlaying(true);
+ mp.prepare();
+
+ int videoWidth = 0;
+ int videoHeight = 0;
+ synchronized (sLock) {
+ initializeMessageLooper();
+ try {
+ sLock.wait(WAIT_FOR_COMMAND_TO_COMPLETE);
+ } catch(Exception e) {
+ Log.v(TAG, "looper was interrupted.");
+ return;
+ }
+ }
+ try {
+ mp.setOnVideoSizeChangedListener(mOnVideoSizeChangedListener);
+ synchronized (sVideoSizeChanged) {
+ try {
+ sVideoSizeChanged.wait(WAIT_FOR_COMMAND_TO_COMPLETE);
+ } catch (Exception e) {
+ Log.v(TAG, "wait was interrupted");
+ }
+ }
+ videoWidth = mp.getVideoWidth();
+ videoHeight = mp.getVideoHeight();
+ terminateMessageLooper();
+ } catch (Exception e) {
+ Log.e(TAG, e.getMessage());
+ }
+ assertEquals(expectedVideoWidth, videoWidth);
+ assertEquals(expectedVideoHeight, videoHeight);
- public void testLocalVideo_3gp_H263_176x144_300kbps_12fps_AAC_Stereo_128kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_11025hz, 176, 144);
- }
+ mp.start();
+ mp.setVolume(leftVolume, rightVolume);
- public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Mono_24kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_11025hz, 176, 144);
- }
+ // waiting to complete
+ while (mp.isPlaying()) {
+ Thread.sleep(SLEEP_TIME);
+ }
- public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Mono_24kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_22050hz, 176, 144);
- }
+ mp.release();
+ }
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnBufferingUpdateListener",
+ args = {OnBufferingUpdateListener.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setDataSource",
+ args = {String.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setDisplay",
+ args = {SurfaceHolder.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "start",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "stop",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "prepare",
+ args = {}
+ )
+ })
+
+ public void testPlayMp3Stream1() throws Throwable {
+ streamTest("ringer.mp3", false, false);
+ }
+ public void testPlayMp3Stream2() throws Throwable {
+ streamTest("ringer.mp3", false, false);
+ }
+ public void testPlayMp3StreamRedirect() throws Throwable {
+ streamTest("ringer.mp3", true, false);
+ }
+ public void testPlayMp3StreamNoLength() throws Throwable {
+ streamTest("noiseandchirps.mp3", false, true);
+ }
+ public void testPlayOggStream() throws Throwable {
+ streamTest("noiseandchirps.ogg", false, false);
+ }
+ public void testPlayOggStreamRedirect() throws Throwable {
+ streamTest("noiseandchirps.ogg", true, false);
+ }
+ public void testPlayOggStreamNoLength() throws Throwable {
+ streamTest("noiseandchirps.ogg", false, true);
+ }
+
+ private void streamTest(String name, boolean redirect, boolean nolength) throws Throwable {
+ mServer = new CtsTestServer(mContext);
+ String stream_url = null;
+ if (redirect) {
+ // Stagefright doesn't have a limit, but we can't test support of infinite redirects
+ // Up to 4 redirects seems reasonable though.
+ stream_url = mServer.getRedirectingAssetUrl(name, 4);
+ } else {
+ stream_url = mServer.getAssetUrl(name);
+ }
+ if (nolength) {
+ stream_url = stream_url + "?" + CtsTestServer.NOLENGTH_POSTFIX;
+ }
- public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Stereo_24kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_11025hz, 176, 144);
- }
+ mMediaPlayer.setDataSource(stream_url);
- public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Stereo_24kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_11025hz, 176, 144);
- }
+ mMediaPlayer.setDisplay(getActivity().getSurfaceHolder());
+ mMediaPlayer.setScreenOnWhilePlaying(true);
- public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Stereo_128kbps_11025Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz, 176, 144);
- }
+ mOnBufferingUpdateCalled.reset();
+ mMediaPlayer.setOnBufferingUpdateListener(new MediaPlayer.OnBufferingUpdateListener() {
+ public void onBufferingUpdate(MediaPlayer mp, int percent) {
+ mOnBufferingUpdateCalled.signal();
+ }
+ });
- public void testLocalVideo_3gp_H263_176x144_300kbps_25fps_AAC_Stereo_128kbps_22050Hz()
- throws Exception {
- playVideoTest(
- R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_22050hz, 176, 144);
- }
+ assertFalse(mOnBufferingUpdateCalled.signalled);
+ mMediaPlayer.prepare();
+ if (nolength) {
+ mMediaPlayer.start();
+ Thread.sleep(LONG_SLEEP_TIME);
+ assertFalse(mMediaPlayer.isPlaying());
+ } else {
+ mOnBufferingUpdateCalled.waitForSignal();
+ mMediaPlayer.start();
+ Thread.sleep(SLEEP_TIME);
+ }
+ mMediaPlayer.stop();
+ mMediaPlayer.reset();
+ }
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnCompletionListener",
+ args = {OnCompletionListener.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnErrorListener",
+ args = {OnErrorListener.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnPreparedListener",
+ args = {OnPreparedListener.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnSeekCompleteListener",
+ args = {OnSeekCompleteListener.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnVideoSizeChangedListener",
+ args = {OnVideoSizeChangedListener.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setOnInfoListener",
+ args = {MediaPlayer.OnInfoListener.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setDataSource",
+ args = {FileDescriptor.class, long.class, long.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "prepare",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "start",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "stop",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "isPlaying",
+ args = {}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "seekTo",
+ args = {int.class}
+ )
+ })
public void testCallback() throws Throwable {
final int mp4Duration = 8484;
- loadResource(R.raw.testvideo);
+ AssetFileDescriptor afd = mResources.openRawResourceFd(R.raw.testvideo);
+ try {
+ mMediaPlayer.setDataSource(
+ afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+ } finally {
+ afd.close();
+ }
+
mMediaPlayer.setDisplay(getActivity().getSurfaceHolder());
mMediaPlayer.setScreenOnWhilePlaying(true);
mMediaPlayer.setOnVideoSizeChangedListener(new MediaPlayer.OnVideoSizeChangedListener() {
- @Override
public void onVideoSizeChanged(MediaPlayer mp, int width, int height) {
mOnVideoSizeChangedCalled.signal();
}
});
mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
- @Override
public void onPrepared(MediaPlayer mp) {
mOnPrepareCalled.signal();
}
});
mMediaPlayer.setOnSeekCompleteListener(new MediaPlayer.OnSeekCompleteListener() {
- @Override
public void onSeekComplete(MediaPlayer mp) {
mOnSeekCompleteCalled.signal();
}
@@ -365,14 +585,12 @@ public class MediaPlayerTest extends MediaPlayerTestBase {
mOnCompletionCalled.reset();
mMediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
- @Override
public void onCompletion(MediaPlayer mp) {
mOnCompletionCalled.signal();
}
});
mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
- @Override
public boolean onError(MediaPlayer mp, int what, int extra) {
mOnErrorCalled.signal();
return false;
@@ -380,84 +598,83 @@ public class MediaPlayerTest extends MediaPlayerTestBase {
});
mMediaPlayer.setOnInfoListener(new MediaPlayer.OnInfoListener() {
- @Override
public boolean onInfo(MediaPlayer mp, int what, int extra) {
mOnInfoCalled.signal();
return false;
}
});
- assertFalse(mOnPrepareCalled.isSignalled());
- assertFalse(mOnVideoSizeChangedCalled.isSignalled());
+ assertFalse(mOnPrepareCalled.signalled);
+ assertFalse(mOnVideoSizeChangedCalled.signalled);
mMediaPlayer.prepare();
mOnPrepareCalled.waitForSignal();
mOnVideoSizeChangedCalled.waitForSignal();
- mOnSeekCompleteCalled.reset();
+ mOnSeekCompleteCalled.signalled = false;
mMediaPlayer.seekTo(mp4Duration >> 1);
mOnSeekCompleteCalled.waitForSignal();
- assertFalse(mOnCompletionCalled.isSignalled());
+ assertFalse(mOnCompletionCalled.signalled);
mMediaPlayer.start();
while(mMediaPlayer.isPlaying()) {
Thread.sleep(SLEEP_TIME);
}
assertFalse(mMediaPlayer.isPlaying());
mOnCompletionCalled.waitForSignal();
- assertFalse(mOnErrorCalled.isSignalled());
+ assertFalse(mOnErrorCalled.signalled);
mMediaPlayer.stop();
mMediaPlayer.start();
mOnErrorCalled.waitForSignal();
}
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setDataSource",
+ args = {Context.class, Uri.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setDataSource",
+ args = {String.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "create",
+ args = {Context.class, Uri.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "create",
+ args = {Context.class, Uri.class, SurfaceHolder.class}
+ ),
+ @TestTargetNew(
+ level = TestLevel.PARTIAL,
+ method = "prepareAsync",
+ args = {}
+ )
+ })
public void testRecordAndPlay() throws Exception {
- if (!hasMicrophone()) {
- return;
- }
- File outputFile = new File(Environment.getExternalStorageDirectory(),
- "record_and_play.3gp");
- String outputFileLocation = outputFile.getAbsolutePath();
- try {
- recordMedia(outputFileLocation);
- MediaPlayer mp = new MediaPlayer();
- try {
- mp.setDataSource(outputFileLocation);
- mp.prepareAsync();
- Thread.sleep(SLEEP_TIME);
- playAndStop(mp);
- } finally {
- mp.release();
- }
-
- Uri uri = Uri.parse(outputFileLocation);
- mp = new MediaPlayer();
- try {
- mp.setDataSource(mContext, uri);
- mp.prepareAsync();
- Thread.sleep(SLEEP_TIME);
- playAndStop(mp);
- } finally {
- mp.release();
- }
+ recordMedia();
+ MediaPlayer mp = new MediaPlayer();
+ mp.setDataSource(mSourceMediaOnSdcard);
+ mp.prepareAsync();
+ Thread.sleep(SLEEP_TIME);
+ playAndStop(mp);
+ mp.reset();
+ Uri uri = Uri.parse(mSourceMediaOnSdcard);
+ mp = new MediaPlayer();
+ mp.setDataSource(mContext, uri);
+ mp.prepareAsync();
+ Thread.sleep(SLEEP_TIME);
+ playAndStop(mp);
+ mp.release();
- try {
- mp = MediaPlayer.create(mContext, uri);
- playAndStop(mp);
- } finally {
- if (mp != null) {
- mp.release();
- }
- }
+ mp = MediaPlayer.create(mContext, uri);
+ playAndStop(mp);
+ mp.release();
- try {
- mp = MediaPlayer.create(mContext, uri, getActivity().getSurfaceHolder());
- playAndStop(mp);
- } finally {
- if (mp != null) {
- mp.release();
- }
- }
- } finally {
- outputFile.delete();
- }
+ mp = MediaPlayer.create(mContext, uri, getActivity().getSurfaceHolder());
+ playAndStop(mp);
+ mp.release();
}
private void playAndStop(MediaPlayer mp) throws Exception {
@@ -466,25 +683,18 @@ public class MediaPlayerTest extends MediaPlayerTestBase {
mp.stop();
}
- private void recordMedia(String outputFile) throws Exception {
+ private void recordMedia() throws Exception {
MediaRecorder mr = new MediaRecorder();
- try {
- mr.setAudioSource(MediaRecorder.AudioSource.MIC);
- mr.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
- mr.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
- mr.setOutputFile(outputFile);
+ mr.setAudioSource(MediaRecorder.AudioSource.MIC);
+ mr.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
+ mr.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+ mr.setOutputFile(mSourceMediaOnSdcard);
- mr.prepare();
- mr.start();
- Thread.sleep(SLEEP_TIME);
- mr.stop();
- } finally {
- mr.release();
- }
+ mr.prepare();
+ mr.start();
+ Thread.sleep(SLEEP_TIME);
+ mr.stop();
+ mr.release();
}
- private boolean hasMicrophone() {
- return getActivity().getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_MICROPHONE);
- }
}
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
deleted file mode 100644
index 6b6f3d7..0000000
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.media.cts;
-
-import android.content.Context;
-import android.content.res.AssetFileDescriptor;
-import android.content.res.Resources;
-import android.media.MediaPlayer;
-import android.test.ActivityInstrumentationTestCase2;
-
-import java.io.IOException;
-import java.util.logging.Logger;
-
-/**
- * Base class for tests which use MediaPlayer to play audio or video.
- */
-public class MediaPlayerTestBase extends ActivityInstrumentationTestCase2 {
- private static final Logger LOG = Logger.getLogger(MediaPlayerTestBase.class.getName());
-
- protected static final int SLEEP_TIME = 1000;
- protected static final int LONG_SLEEP_TIME = 6000;
- protected static final int STREAM_RETRIES = 5;
-
- public static class Monitor {
- private boolean signalled;
-
- public synchronized void reset() {
- signalled = false;
- }
-
- public synchronized void signal() {
- signalled = true;
- notifyAll();
- }
-
- public synchronized void waitForSignal() throws InterruptedException {
- while (!signalled) {
- wait();
- }
- }
-
- public synchronized boolean isSignalled() {
- return signalled;
- }
- }
-
- protected Monitor mOnVideoSizeChangedCalled = new Monitor();
- protected Monitor mOnBufferingUpdateCalled = new Monitor();
- protected Monitor mOnPrepareCalled = new Monitor();
- protected Monitor mOnSeekCompleteCalled = new Monitor();
- protected Monitor mOnCompletionCalled = new Monitor();
- protected Monitor mOnInfoCalled = new Monitor();
- protected Monitor mOnErrorCalled = new Monitor();
-
- protected Context mContext;
- protected Resources mResources;
-
- /*
- * InstrumentationTestRunner.onStart() calls Looper.prepare(), which creates a looper
- * for the current thread. However, since we don't actually call loop() in the test,
- * any messages queued with that looper will never be consumed. We instantiate the player
- * in the constructor, before setUp(), so that its constructor does not see the
- * nonfunctional Looper.
- */
- protected MediaPlayer mMediaPlayer = new MediaPlayer();
-
- public MediaPlayerTestBase() {
- super(MediaStubActivity.class);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mContext = getInstrumentation().getTargetContext();
- mResources = mContext.getResources();
- }
-
- @Override
- protected void tearDown() throws Exception {
- if (mMediaPlayer != null) {
- mMediaPlayer.release();
- }
- super.tearDown();
- }
-
- protected void loadResource(int resid) throws Exception {
- AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
- try {
- mMediaPlayer.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(),
- afd.getLength());
- } finally {
- afd.close();
- }
- }
-
- protected void playLiveVideoTest(String path, int playTime) throws Exception {
- playVideoWithRetries(path, null, null, playTime);
- }
-
- protected void playVideoTest(String path, int width, int height) throws Exception {
- playVideoWithRetries(path, width, height, 0);
- }
-
- protected void playVideoWithRetries(String path, Integer width, Integer height, int playTime)
- throws Exception {
- boolean playedSuccessfully = false;
- for (int i = 0; i < STREAM_RETRIES; i++) {
- try {
- mMediaPlayer.setDataSource(path);
- playLoadedVideo(width, height, playTime);
- playedSuccessfully = true;
- break;
- } catch (PrepareFailedException e) {
- // prepare() can fail because of network issues, so try again
- LOG.warning("prepare() failed on try " + i + ", trying playback again");
- }
- }
- assertTrue("Stream did not play successfully after all attempts", playedSuccessfully);
- }
-
- protected void playVideoTest(int resid, int width, int height) throws Exception {
- loadResource(resid);
- playLoadedVideo(width, height, 0);
- }
-
- /**
- * Play a video which has already been loaded with setDataSource().
- *
- * @param width width of the video to verify, or null to skip verification
- * @param height height of the video to verify, or null to skip verification
- * @param playTime length of time to play video, or 0 to play entire video
- */
- private void playLoadedVideo(final Integer width, final Integer height, int playTime)
- throws Exception {
- final float leftVolume = 0.5f;
- final float rightVolume = 0.5f;
-
- mMediaPlayer.setDisplay(getActivity().getSurfaceHolder());
- mMediaPlayer.setScreenOnWhilePlaying(true);
- mMediaPlayer.setOnVideoSizeChangedListener(new MediaPlayer.OnVideoSizeChangedListener() {
- @Override
- public void onVideoSizeChanged(MediaPlayer mp, int w, int h) {
- mOnVideoSizeChangedCalled.signal();
- if (width != null) {
- assertEquals(width.intValue(), w);
- }
- if (height != null) {
- assertEquals(height.intValue(), h);
- }
- }
- });
- mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
- @Override
- public boolean onError(MediaPlayer mp, int what, int extra) {
- fail("Media player had error " + what + " playing video");
- return true;
- }
- });
- try {
- mMediaPlayer.prepare();
- } catch (IOException e) {
- mMediaPlayer.reset();
- throw new PrepareFailedException();
- }
-
- mMediaPlayer.start();
- mOnVideoSizeChangedCalled.waitForSignal();
- mMediaPlayer.setVolume(leftVolume, rightVolume);
-
- // waiting to complete
- if (playTime == 0) {
- while (mMediaPlayer.isPlaying()) {
- Thread.sleep(SLEEP_TIME);
- }
- } else {
- Thread.sleep(playTime);
- }
- }
-
- private static class PrepareFailedException extends Exception {}
-}
diff --git a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
index db136f2..70b108e 100644
--- a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
@@ -20,7 +20,6 @@ import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-import android.content.pm.PackageManager;
import android.hardware.Camera;
import android.media.MediaRecorder;
import android.media.MediaRecorder.OnErrorListener;
@@ -151,9 +150,6 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase2 0);
}
-
- private boolean hasCamera() {
- return getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
- }
-
- private boolean hasMicrophone() {
- return getActivity().getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_MICROPHONE);
- }
}
diff --git a/tests/tests/media/src/android/media/cts/MediaScannerNotificationTest.java b/tests/tests/media/src/android/media/cts/MediaScannerNotificationTest.java
deleted file mode 100644
index 3c201ca..0000000
--- a/tests/tests/media/src/android/media/cts/MediaScannerNotificationTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2011 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 android.media.cts;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Uri;
-import android.os.Environment;
-import android.test.AndroidTestCase;
-
-
-public class MediaScannerNotificationTest extends AndroidTestCase {
- private static final int MEDIA_SCANNER_TIME_OUT = 2000;
-
- private ScannerNotificationReceiver mScannerStartedReceiver;
- private ScannerNotificationReceiver mScannerFinishedReceiver;
- private boolean mScannerStarted;
- private boolean mScannerFinished;
-
- public void testMediaScannerNotification() throws InterruptedException {
- mScannerStarted = false;
- mScannerFinished = false;
-
- IntentFilter scannerStartedIntentFilter = new IntentFilter(
- Intent.ACTION_MEDIA_SCANNER_STARTED);
- scannerStartedIntentFilter.addDataScheme("file");
- IntentFilter scannerFinshedIntentFilter = new IntentFilter(
- Intent.ACTION_MEDIA_SCANNER_FINISHED);
- scannerFinshedIntentFilter.addDataScheme("file");
-
- mScannerStartedReceiver = new ScannerNotificationReceiver(
- Intent.ACTION_MEDIA_SCANNER_STARTED);
- mScannerFinishedReceiver = new ScannerNotificationReceiver(
- Intent.ACTION_MEDIA_SCANNER_FINISHED);
-
- getContext().registerReceiver(mScannerStartedReceiver, scannerStartedIntentFilter);
- getContext().registerReceiver(mScannerFinishedReceiver, scannerFinshedIntentFilter);
-
- getContext().sendBroadcast(new Intent(Intent.ACTION_MEDIA_MOUNTED, Uri.parse("file://"
- + Environment.getExternalStorageDirectory())));
- mScannerStartedReceiver.waitForCalls(1, MEDIA_SCANNER_TIME_OUT);
- mScannerFinishedReceiver.waitForCalls(1, MEDIA_SCANNER_TIME_OUT);
-
- assertTrue(mScannerStarted);
- assertTrue(mScannerFinished);
- }
-
- class ScannerNotificationReceiver extends BroadcastReceiver {
- private int mCalls;
- private int mExpectedCalls;
- private String mAction;
- private Object mLock;
-
- ScannerNotificationReceiver(String action) {
- mAction = action;
- reset();
- mLock = new Object();
- }
-
- void reset() {
- mExpectedCalls = Integer.MAX_VALUE;
- mCalls = 0;
- }
-
- @Override
- public void onReceive(Context context, Intent intent) {
- if (intent.getAction().equals(mAction)) {
- if (mAction.equals(Intent.ACTION_MEDIA_SCANNER_STARTED)) {
- mScannerStarted = true;
- } else if (mAction.equals(Intent.ACTION_MEDIA_SCANNER_FINISHED)) {
- mScannerFinished = true;
- }
- synchronized (mLock) {
- mCalls += 1;
- if (mCalls >= mExpectedCalls) {
- mLock.notify();
- }
- }
- }
- }
-
- public void waitForCalls(int expectedCalls, long timeout) throws InterruptedException {
- synchronized(mLock) {
- mExpectedCalls = expectedCalls;
- if (mCalls < mExpectedCalls) {
- mLock.wait(timeout);
- }
- }
- }
- }
-}
diff --git a/tests/tests/nativemedia/Android.mk b/tests/tests/nativemedia/Android.mk
deleted file mode 100644
index 928ebcd..0000000
--- a/tests/tests/nativemedia/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Build the unit tests.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_C_INCLUDES:= \
- bionic \
- bionic/libstdc++/include \
- external/gtest/include \
- system/media/wilhelm/include \
- external/stlport/stlport \
- system/media/wilhelm/src/ut
-
-LOCAL_SRC_FILES:= \
- src/SLObjectCreationTest.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- libutils \
- libOpenSLES \
- libstlport
-
-LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT \
- libgtest
-
-LOCAL_CFLAGS += -DXP_UNIX
-
-LOCAL_MODULE:= NativeMediaTest
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
-
-include $(BUILD_EXECUTABLE)
\ No newline at end of file
diff --git a/tests/tests/nativemedia/src/SLObjectCreationTest.cpp b/tests/tests/nativemedia/src/SLObjectCreationTest.cpp
deleted file mode 100644
index e63e42f..0000000
--- a/tests/tests/nativemedia/src/SLObjectCreationTest.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-
-/**
- * Test for testing the creation of OpenSL ES objects under various configurations (determined
- * by their data source and sink types) that are expected to be supported.
- * The tests verify the creation and completion of the call to Realize() for the following objects:
- * - Engine
- * - OutputMix
- * - AudioPlayer:
- * * source is URI
- * * source is FD
- * * source is BufferQueue of PCM buffers
- * * source is AndroidBufferQueue of MP2TS buffers
- * * source is URI, sink is BufferQueue of PCM buffers
- * * source is FD, sink is BufferQueue of PCM buffers
- * * source is AndroidBufferQueue of AAC ADTS buffers, sink is BufferQueue of PCM buffers
- * - AudioRecorder
- * * source is IO device, sink is BufferQueue of PCM buffers
- */
-
-#define LOG_NDEBUG 0
-#define LOG_TAG "SLObjectCreationTest"
-
-#include