egl: test: Check that eglGetConfigs checks for NULL parameter

[android-x86/frameworks-native.git] / opengl / tests / EGLTest / EGL_test.cpp

diff --git a/opengl/tests/EGLTest/EGL_test.cpp b/opengl/tests/EGLTest/EGL_test.cpp
index ec433fb..c79fb5b 100644 (file)
--- a/opengl/tests/EGLTest/EGL_test.cpp
+++ b/opengl/tests/EGLTest/EGL_test.cpp
@@ -19,8 +19,7 @@
 #include <utils/String8.h>
 
 #include <EGL/egl.h>
-#include <gui/SurfaceTextureClient.h>
-#include <gui/DummyConsumer.h>
+#include <gui/Surface.h>
 
 
 namespace android {
@@ -54,6 +53,13 @@ protected:
     }
 };
 
+TEST_F(EGLTest, EGLGetConfigsWithNullNumConfigs) {
+    EGLBoolean success;
+    success = eglGetConfigs(mEglDisplay, NULL, 0, NULL);
+    ASSERT_EQ(EGL_FALSE, success);
+    ASSERT_EQ(EGL_BAD_PARAMETER, eglGetError());
+}
+
 TEST_F(EGLTest, DISABLED_EGLConfigEightBitFirst) {
 
     EGLint numConfigs;
@@ -101,10 +107,15 @@ TEST_F(EGLTest, EGLTerminateSucceedsWithRemainingObjects) {
     };
     EXPECT_TRUE(eglChooseConfig(mEglDisplay, attrs, &config, 1, &numConfigs));
 
+    struct DummyConsumer : public BnConsumerListener {
+        virtual void onFrameAvailable() {}
+        virtual void onBuffersReleased() {}
+    };
+
     // Create a EGLSurface
     sp<BufferQueue> bq = new BufferQueue();
-    bq->consumerConnect(new DummyConsumer());
-    sp<SurfaceTextureClient> mSTC = new SurfaceTextureClient(static_cast<sp<IGraphicBufferProducer> >( bq));
+    bq->consumerConnect(new DummyConsumer, false);
+    sp<Surface> mSTC = new Surface(static_cast<sp<IGraphicBufferProducer> >( bq));
     sp<ANativeWindow> mANW = mSTC;
 
     EGLSurface eglSurface = eglCreateWindowSurface(mEglDisplay, config,