1 files changed, 8 insertions, 20 deletions
diff --git a/tests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java b/tests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
index c42f97dce..b1e6d5b20 100644
--- a/tests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
+++ b/tests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
@@ -19,10 +19,6 @@ package com.android.gallery3d.glrenderer;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
-import com.android.gallery3d.glrenderer.GLCanvas;
-import com.android.gallery3d.glrenderer.GLES11Canvas;
-import com.android.gallery3d.glrenderer.GLPaint;
-
 import junit.framework.TestCase;
 
 import java.util.Arrays;
@@ -43,8 +39,7 @@ public class GLCanvasTest extends TestCase {
     @SmallTest
     public void testSetSize() {
         GL11 glStub = new GLStub();
-        GLCanvas canvas = new GLES11Canvas();
-        canvas.initialize(glStub);
+        GLCanvas canvas = new GLES11Canvas(glStub);
         canvas.setSize(100, 200);
         canvas.setSize(1000, 100);
         try {
@@ -62,8 +57,7 @@ public class GLCanvasTest extends TestCase {
 
     private static class ClearBufferTest extends GLMock {
         void run() {
-            GLCanvas canvas = new GLES11Canvas();
-            canvas.initialize(this);
+            GLCanvas canvas = new GLES11Canvas(this);
             assertEquals(0, mGLClearCalled);
             canvas.clearBuffer();
             assertEquals(GL10.GL_COLOR_BUFFER_BIT, mGLClearMask);
@@ -85,8 +79,7 @@ public class GLCanvasTest extends TestCase {
                 0x7F010101, 0xFEFEFDFC, 0x017F8081, 0x027F8081, 0x2ADE4C4D
             };
 
-            GLCanvas canvas = new GLES11Canvas();
-            canvas.initialize(this);
+            GLCanvas canvas = new GLES11Canvas(this);
             canvas.setSize(400, 300);
             // Test one color to make sure blend function is set.
             assertEquals(0, mGLColorCalled);
@@ -114,8 +107,7 @@ public class GLCanvasTest extends TestCase {
     @SmallTest
     public void testSetGetMultiplyAlpha() {
         GL11 glStub = new GLStub();
-        GLCanvas canvas = new GLES11Canvas();
-        canvas.initialize(glStub);
+        GLCanvas canvas = new GLES11Canvas(glStub);
 
         canvas.setAlpha(1f);
         assertEquals(1f, canvas.getAlpha());
@@ -154,8 +146,7 @@ public class GLCanvasTest extends TestCase {
 
     private static class AlphaTest extends GLMock {
         void run() {
-            GLCanvas canvas = new GLES11Canvas();
-            canvas.initialize(this);
+            GLCanvas canvas = new GLES11Canvas(this);
             canvas.setSize(400, 300);
 
             assertEquals(0, mGLColorCalled);
@@ -197,8 +188,7 @@ public class GLCanvasTest extends TestCase {
         }
 
         void run() {
-            GLCanvas canvas = new GLES11Canvas();
-            canvas.initialize(this);
+            GLCanvas canvas = new GLES11Canvas(this);
             canvas.setSize(400, 300);
             canvas.drawLine(2, 7, 1, 8, newColorPaint(0) /* color */);
             assertTrue(mGLVertexArrayEnabled);
@@ -242,8 +232,7 @@ public class GLCanvasTest extends TestCase {
         }
 
         void run() {
-            GLCanvas canvas = new GLES11Canvas();
-            canvas.initialize(this);
+            GLCanvas canvas = new GLES11Canvas(this);
             canvas.setSize(400, 300);
             canvas.fillRect(2, 7, 1, 8, 0 /* color */);
             assertTrue(mGLVertexArrayEnabled);
@@ -305,8 +294,7 @@ public class GLCanvasTest extends TestCase {
         }
 
         void run() {
-            GLCanvas canvas = new GLES11Canvas();
-            canvas.initialize(this);
+            GLCanvas canvas = new GLES11Canvas(this);
             canvas.setSize(40, 50);
             int color = 0;