diff options
Diffstat (limited to 'tests/src/com/android/gallery3d/ui/GLCanvasTest.java')
-rw-r--r-- | tests/src/com/android/gallery3d/ui/GLCanvasTest.java | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/tests/src/com/android/gallery3d/ui/GLCanvasTest.java b/tests/src/com/android/gallery3d/ui/GLCanvasTest.java index 8df7a3dfb..ddbddad17 100644 --- a/tests/src/com/android/gallery3d/ui/GLCanvasTest.java +++ b/tests/src/com/android/gallery3d/ui/GLCanvasTest.java @@ -39,7 +39,8 @@ public class GLCanvasTest extends TestCase { @SmallTest public void testSetSize() { GL11 glStub = new GLStub(); - GLCanvas canvas = new GLCanvasImpl(glStub); + GLCanvas canvas = new GLCanvasImpl(); + canvas.initialize(glStub); canvas.setSize(100, 200); canvas.setSize(1000, 100); try { @@ -57,7 +58,8 @@ public class GLCanvasTest extends TestCase { private static class ClearBufferTest extends GLMock { void run() { - GLCanvas canvas = new GLCanvasImpl(this); + GLCanvas canvas = new GLCanvasImpl(); + canvas.initialize(this); assertEquals(0, mGLClearCalled); canvas.clearBuffer(); assertEquals(GL10.GL_COLOR_BUFFER_BIT, mGLClearMask); @@ -79,7 +81,8 @@ public class GLCanvasTest extends TestCase { 0x7F010101, 0xFEFEFDFC, 0x017F8081, 0x027F8081, 0x2ADE4C4D }; - GLCanvas canvas = new GLCanvasImpl(this); + GLCanvas canvas = new GLCanvasImpl(); + canvas.initialize(this); canvas.setSize(400, 300); // Test one color to make sure blend function is set. assertEquals(0, mGLColorCalled); @@ -107,7 +110,8 @@ public class GLCanvasTest extends TestCase { @SmallTest public void testSetGetMultiplyAlpha() { GL11 glStub = new GLStub(); - GLCanvas canvas = new GLCanvasImpl(glStub); + GLCanvas canvas = new GLCanvasImpl(); + canvas.initialize(glStub); canvas.setAlpha(1f); assertEquals(1f, canvas.getAlpha()); @@ -146,7 +150,8 @@ public class GLCanvasTest extends TestCase { private static class AlphaTest extends GLMock { void run() { - GLCanvas canvas = new GLCanvasImpl(this); + GLCanvas canvas = new GLCanvasImpl(); + canvas.initialize(this); canvas.setSize(400, 300); assertEquals(0, mGLColorCalled); @@ -188,7 +193,8 @@ public class GLCanvasTest extends TestCase { } void run() { - GLCanvas canvas = new GLCanvasImpl(this); + GLCanvas canvas = new GLCanvasImpl(); + canvas.initialize(this); canvas.setSize(400, 300); canvas.drawLine(2, 7, 1, 8, newColorPaint(0) /* color */); assertTrue(mGLVertexArrayEnabled); @@ -232,7 +238,8 @@ public class GLCanvasTest extends TestCase { } void run() { - GLCanvas canvas = new GLCanvasImpl(this); + GLCanvas canvas = new GLCanvasImpl(); + canvas.initialize(this); canvas.setSize(400, 300); canvas.fillRect(2, 7, 1, 8, 0 /* color */); assertTrue(mGLVertexArrayEnabled); @@ -294,7 +301,8 @@ public class GLCanvasTest extends TestCase { } void run() { - GLCanvas canvas = new GLCanvasImpl(this); + GLCanvas canvas = new GLCanvasImpl(); + canvas.initialize(this); canvas.setSize(40, 50); int color = 0; |