diff options
| author | Siva Velusamy <vsiva@google.com> | 2013-07-25 17:04:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-25 17:04:23 -0700 |
| commit | 4edeeeaaa3cfc621fb67b827df052576853208a1 (patch) | |
| tree | 630c4fd03756e0227ea5c7fcdbf96d5b91089479 | |
| parent | 8ea1a932418b14d7f0d13859f7918841a945d52a (diff) | |
| parent | 5a0e0eddb2fb3857ce6bcdbca30c9c0c4e5c12fa (diff) | |
| download | platform_sdk-4edeeeaaa3cfc621fb67b827df052576853208a1.tar.gz platform_sdk-4edeeeaaa3cfc621fb67b827df052576853208a1.tar.bz2 platform_sdk-4edeeeaaa3cfc621fb67b827df052576853208a1.zip | |
am 5a0e0edd: Merge "Fix gldebugger formatter test"
* commit '5a0e0eddb2fb3857ce6bcdbca30c9c0c4e5c12fa':
Fix gldebugger formatter test
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gltrace/format/GLMessageFormatterTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gltrace/format/GLMessageFormatterTest.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gltrace/format/GLMessageFormatterTest.java index afbc09a4a..5d1804102 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gltrace/format/GLMessageFormatterTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gltrace/format/GLMessageFormatterTest.java @@ -60,7 +60,7 @@ public class GLMessageFormatterTest { int arg2 = 10; GLMessage msg = constructGLMessage(null, Function.glBindBuffer, - createEnumDataType(arg1.value), + createEnumDataType((int)arg1.value), createIntegerDataType(arg2)); String expected = String.format("glBindBuffer(target = %s, buffer = %s)", @@ -79,7 +79,7 @@ public class GLMessageFormatterTest { GLMessage msg = constructGLMessage( createStringDataType(retValue), Function.glGetString, - createEnumDataType(arg1.value)); + createEnumDataType((int)arg1.value)); String expected = String.format("%s(name = %s) = (const GLchar*) %s", Function.glGetString, arg1.toString(), retValue); String actual = sGLMessageFormatter.formatGLMessage(msg); @@ -132,7 +132,7 @@ public class GLMessageFormatterTest { //void, glGetActiveAttrib, GLenum* type GLMessage msg = constructGLMessage(null, Function.glGetActiveAttrib, - createIntegerPointerDataType(GLEnum.GL_FLOAT_MAT4.value)); + createIntegerPointerDataType((int)GLEnum.GL_FLOAT_MAT4.value)); String expected = "glGetActiveAttrib(type = [GL_FLOAT_MAT4])"; String actual = sGLMessageFormatter.formatGLMessage(msg); |