commit e92a1ae4ac2dd1c232c925d541bc84e78541bd60
author David Neto <dneto@google.com> Fri May 21 19:40:23 2021 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri May 21 19:40:23 2021 +0000
tree 6a023827f21039c38caa0705c91338b409e6e7ad
parent 9d555d16217babdc93651a3f67c1c3a9cf3bb5c6

Remove duplicated tests on ast::TextureType

Those tests already exist under src/ast.

Add a test of sem::Texture::dim() instead

Change-Id: I4b77d46b9a4e3aca8292d64e2477bb002ab5c1cb
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/51805
Auto-Submit: David Neto <dneto@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

src/sem/texture_type_test.cc

diff --git a/src/sem/texture_type_test.cc b/src/sem/texture_type_test.cc
index 8763df2..28fabf7 100644
--- a/src/sem/texture_type_test.cc
+++ b/src/sem/texture_type_test.cc
@@ -14,33 +14,32 @@
 
 #include "src/sem/texture_type.h"
 
+#include "src/sem/sampled_texture_type.h"
 #include "src/sem/test_helper.h"
 
 namespace tint {
 namespace sem {
 namespace {
 
-using TextureTypeTest = TestHelper;
+using TextureTypeDimTest = TestParamHelper<ast::TextureDimension>;
 
-TEST_F(TextureTypeTest, IsTextureArray) {
-  EXPECT_EQ(false, IsTextureArray(ast::TextureDimension::kNone));
-  EXPECT_EQ(false, IsTextureArray(ast::TextureDimension::k1d));
-  EXPECT_EQ(false, IsTextureArray(ast::TextureDimension::k2d));
-  EXPECT_EQ(true, IsTextureArray(ast::TextureDimension::k2dArray));
-  EXPECT_EQ(false, IsTextureArray(ast::TextureDimension::k3d));
-  EXPECT_EQ(false, IsTextureArray(ast::TextureDimension::kCube));
-  EXPECT_EQ(true, IsTextureArray(ast::TextureDimension::kCubeArray));
+TEST_P(TextureTypeDimTest, DimMustMatch) {
+  // Check that the dim() query returns the right dimensionality.
+  F32 f32;
+  // TextureType is an abstract class, so use concrete class
+  // SampledTexture in its stead.
+  SampledTexture st(GetParam(), &f32);
+  EXPECT_EQ(st.dim(), GetParam());
 }
 
-TEST_F(TextureTypeTest, NumCoordinateAxes) {
-  EXPECT_EQ(0, NumCoordinateAxes(ast::TextureDimension::kNone));
-  EXPECT_EQ(1, NumCoordinateAxes(ast::TextureDimension::k1d));
-  EXPECT_EQ(2, NumCoordinateAxes(ast::TextureDimension::k2d));
-  EXPECT_EQ(2, NumCoordinateAxes(ast::TextureDimension::k2dArray));
-  EXPECT_EQ(3, NumCoordinateAxes(ast::TextureDimension::k3d));
-  EXPECT_EQ(3, NumCoordinateAxes(ast::TextureDimension::kCube));
-  EXPECT_EQ(3, NumCoordinateAxes(ast::TextureDimension::kCubeArray));
-}
+INSTANTIATE_TEST_SUITE_P(Dimensions,
+                         TextureTypeDimTest,
+                         ::testing::Values(ast::TextureDimension::k1d,
+                                           ast::TextureDimension::k2d,
+                                           ast::TextureDimension::k2dArray,
+                                           ast::TextureDimension::k3d,
+                                           ast::TextureDimension::kCube,
+                                           ast::TextureDimension::kCubeArray));
 
 }  // namespace
 }  // namespace sem