diff options
author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 04:24:21 +0000 |
---|---|---|
committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 04:24:21 +0000 |
commit | 34f464fb752432829a22a30767b66eb5c24a2242 (patch) | |
tree | 93545e6e6f56e7151ae8bc5100accf0998c262ad /o3d/tests | |
parent | e8b80d819b7d1888e10f5cfef75bfeff0f5d3b03 (diff) | |
download | chromium_src-34f464fb752432829a22a30767b66eb5c24a2242.zip chromium_src-34f464fb752432829a22a30767b66eb5c24a2242.tar.gz chromium_src-34f464fb752432829a22a30767b66eb5c24a2242.tar.bz2 |
Add o3djs.DestinationBuffer to converter.
I named it o3djs.DestinationBuffer because it has nothing to do
with O3D. It's purely part of our sample serialization example.
Review URL: http://codereview.chromium.org/149236
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests')
-rw-r--r-- | o3d/tests/build.scons | 11 | ||||
-rw-r--r-- | o3d/tests/selenium/tests/serialization-test.html | 38 |
2 files changed, 44 insertions, 5 deletions
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons index 218fbda..58b897c 100644 --- a/o3d/tests/build.scons +++ b/o3d/tests/build.scons @@ -217,6 +217,7 @@ tests = [ 'core/cross/vertex_source_test.cc', 'core/cross/visitor_base_test.cc', 'core/cross/weak_ptr_test.cc', + 'import/cross/destination_buffer_test.cc', 'import/cross/gz_compressor_test.cc', 'import/cross/gz_decompressor_test.cc', 'import/cross/memory_buffer_test.cc', @@ -458,10 +459,10 @@ if ARGUMENTS.get('SYSTEM_TESTS_ENABLED', False): # Also require gl related libraries based on variant. system_tests_req += gl_requirements - + # Require SwiftShader (only if it is available). system_tests_req += swiftshader_install - + # Add requirements for system_tests. env.Requires(system_tests_install, system_tests_req) @@ -542,7 +543,7 @@ selenium_good_to_go = True if run_env.Bit('mac'): plugin_path = '$ARTIFACTS_DIR/O3D.plugin' - + if run_env['MAC_HERMETIC_FIREFOX_DIR']: # if we have a hermetic version of Firefox, then run it if os.path.exists(run_env.subst('$MAC_HERMETIC_FIREFOX_DIR')): @@ -579,7 +580,7 @@ if run_env.Bit('mac'): cleanup_steps = [ 'rm -rf "$MAC_FIREFOX_DIR"', ] - + def DeferSelenium(env): if not selenium_good_to_go: @@ -604,7 +605,7 @@ def DeferSelenium(env): '--screenshotsdir=$ARTIFACTS_DIR/selenium/screenshots_firefox'])] + cleanup_steps, ) - + # Require SwiftShader (only if it is available). run_env.Requires(run_selenium_firefox, swiftshader_install) diff --git a/o3d/tests/selenium/tests/serialization-test.html b/o3d/tests/selenium/tests/serialization-test.html index dcb5ddc..a59b0cb 100644 --- a/o3d/tests/selenium/tests/serialization-test.html +++ b/o3d/tests/selenium/tests/serialization-test.html @@ -929,6 +929,44 @@ g_suite.testShouldSetVertexBufferData = function() { g_test.assertEquals(12, field.size); }; +g_suite.testShouldSetDestinationBufferData = function() { + var json = { + version: o3djs.serialization.supportedVersion, + objects: { + 'o3djs.DestinationBuffer': [ + { + 'custom':{ + 'numElements':1398, + 'fields':[ + { + 'id':197809, + 'type':'o3d.FloatField', + 'numComponents':3}, + { + 'id':197813, + 'type':'o3d.FloatField', + 'numComponents':3}] + } + } + ] + } + }; + + var pack = g_client.createPack(); + var deserializer = o3djs.serialization.createDeserializer(pack, json); + deserializer.archiveInfo = g_archiveInfo; + deserializer.run(); + + g_test.assertEquals(1, pack.objects.length); + var buffer = pack.objects[0]; + g_test.assertEquals(1398, buffer.numElements); + g_test.assertEquals(2, buffer.fields.length); + var field = buffer.fields[0]; + g_test.assertEquals('o3d.FloatField', field.className); + g_test.assertEquals(3, field.numComponents); + g_test.assertEquals(12, field.size); +}; + g_suite.testShouldSetSourceBufferData = function() { var json = { version: o3djs.serialization.supportedVersion, |