summaryrefslogtreecommitdiffstats
path: root/o3d/core/cross/effect_test.cc
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-17 06:29:23 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-17 06:29:23 +0000
commit5335a2097ca95ba95856ea9af73a5e1c6158689c (patch)
treea14f7c154461bcd0f130998e208f4797ff97727c /o3d/core/cross/effect_test.cc
parent1dc3ba84c3da4edfeaf22cedf65750533a20de00 (diff)
downloadchromium_src-5335a2097ca95ba95856ea9af73a5e1c6158689c.zip
chromium_src-5335a2097ca95ba95856ea9af73a5e1c6158689c.tar.gz
chromium_src-5335a2097ca95ba95856ea9af73a5e1c6158689c.tar.bz2
Undoing gcl bug damage AGAIN
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core/cross/effect_test.cc')
-rw-r--r--o3d/core/cross/effect_test.cc73
1 files changed, 2 insertions, 71 deletions
diff --git a/o3d/core/cross/effect_test.cc b/o3d/core/cross/effect_test.cc
index b26f632..af028e6 100644
--- a/o3d/core/cross/effect_test.cc
+++ b/o3d/core/cross/effect_test.cc
@@ -34,7 +34,6 @@
#include "core/cross/effect.h"
#include "core/cross/primitive.h"
#include "core/cross/standard_param.h"
-#include "core/cross/param_array.h"
#include "core/cross/stream.h"
#include "tests/common/win/testing_common.h"
@@ -162,7 +161,7 @@ uint32 kIndexBlock[4] = {
0, 1, 2, 3
};
-bool IsExpectedParamInfo(const EffectParameterInfo& info) {
+bool IsExpectedParam(const EffectParameterInfo& info) {
for (unsigned ii = 0; ii < arraysize(expected_params); ++ii) {
const ParamInfo& expected_info = expected_params[ii];
if (info.name().compare(expected_info.name) == 0) {
@@ -334,75 +333,7 @@ TEST_F(EffectTest, GetEffectParameters) {
EXPECT_EQ(arraysize(expected_params), info.size());
for (EffectParameterInfoArray::size_type ii = 0; ii < info.size(); ++ii) {
- EXPECT_TRUE(IsExpectedParamInfo(info[ii]));
- }
-
- // Clean up.
- object_manager()->DestroyPack(pack);
-}
-
-TEST_F(EffectTest, CreateUniformParameters) {
- Pack* pack = object_manager()->CreatePack();
- ASSERT_TRUE(pack != NULL);
-
- // load an effect
- Effect *fx = pack->Create<Effect>();
- ASSERT_TRUE(fx != NULL);
- EXPECT_TRUE(fx->LoadFromFXString(String(kLambertEffect)));
-
- ParamObject* param_object = pack->Create<ParamObject>();
- ASSERT_TRUE(param_object != NULL);
-
- // Check that we get the correct params
- fx->CreateUniformParameters(param_object);
-
- for (unsigned ii = 0; ii < arraysize(expected_params); ++ii) {
- const ParamInfo& expected_info = expected_params[ii];
- Param* param = param_object->GetUntypedParam(expected_info.name);
- if (expected_info.sas_type) {
- ASSERT_TRUE(param == NULL);
- } else {
- ASSERT_TRUE(param != NULL);
- if (expected_info.num_elements > 0) {
- ASSERT_TRUE(param->IsA(ParamParamArray::GetApparentClass()));
- } else {
- EXPECT_TRUE(param->IsA(expected_info.type));
- }
- }
- }
-
- // Clean up.
- object_manager()->DestroyPack(pack);
-}
-
-TEST_F(EffectTest, CreateSASParameters) {
- Pack* pack = object_manager()->CreatePack();
- ASSERT_TRUE(pack != NULL);
-
- // load an effect
- Effect *fx = pack->Create<Effect>();
- ASSERT_TRUE(fx != NULL);
- EXPECT_TRUE(fx->LoadFromFXString(String(kLambertEffect)));
-
- ParamObject* param_object = pack->Create<ParamObject>();
- ASSERT_TRUE(param_object != NULL);
-
- // Check that we get the correct params
- fx->CreateSASParameters(param_object);
-
- for (unsigned ii = 0; ii < arraysize(expected_params); ++ii) {
- const ParamInfo& expected_info = expected_params[ii];
- Param* param = param_object->GetUntypedParam(expected_info.name);
- if (expected_info.sas_type) {
- ASSERT_TRUE(param != NULL);
- if (expected_info.num_elements > 0) {
- ASSERT_TRUE(param->IsA(ParamParamArray::GetApparentClass()));
- } else {
- EXPECT_TRUE(param->IsA(expected_info.sas_type));
- }
- } else {
- ASSERT_TRUE(param == NULL);
- }
+ EXPECT_TRUE(IsExpectedParam(info[ii]));
}
// Clean up.