Fix image index iterator unit test.

This test was checking out-of-bounds. The bug only showed up in Linux. BUG=angle:741 Change-Id: I4cb45fc00dbb0bf9713f735a20fb6fd04bc95140 Reviewed-on: https://chromium-review.googlesource.com/221057Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org>

Fix image index iterator unit test.
1ea53509 · Jamie Madill · ba6bc95e · 1ea53509
Commit 1ea53509 authored Oct 06, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

ImageIndexIterator_unittest.cpp ...implementation_unit_tests/ImageIndexIterator_unittest.cpp +10 -7

No files found.
--- a/tests/angle_implementation_unit_tests/ImageIndexIterator_unittest.cpp
+++ b/tests/angle_implementation_unit_tests/ImageIndexIterator_unittest.cpp
@@ -23,6 +23,8 @@ TEST(ImageIndexTest, Iterator2D)
 {
    ImageIndexIterator iter = ImageIndexIterator::Make2D(minMip, maxMip);

+    ASSERT_GE(0, minMip);
+
    for (GLint mip = minMip; mip < maxMip; mip++)
    {
        EXPECT_TRUE(iter.hasNext());
@@ -42,10 +44,10 @@ TEST(ImageIndexTest, Iterator2D)

 TEST(ImageIndexTest, IteratorCube)
 {
-    testing::InSequence seq;
-
    ImageIndexIterator iter = ImageIndexIterator::MakeCube(0, 4);

+    ASSERT_GE(0, minMip);
+
    for (GLint mip = minMip; mip < maxMip; mip++)
    {
        for (GLint layer = 0; layer < 6; layer++)
@@ -65,10 +67,10 @@ TEST(ImageIndexTest, IteratorCube)

 TEST(ImageIndexTest, Iterator3D)
 {
-    testing::InSequence seq;
-
    ImageIndexIterator iter = ImageIndexIterator::Make3D(minMip, maxMip, minLayer, maxLayer);

+    ASSERT_GE(0, minMip);
+
    for (GLint mip = minMip; mip < maxMip; mip++)
    {
        for (GLint layer = minLayer; layer < maxLayer; layer++)
@@ -86,12 +88,13 @@ TEST(ImageIndexTest, Iterator3D)

 TEST(ImageIndexTest, Iterator2DArray)
 {
-    testing::InSequence seq;
-
-    GLsizei layerCounts[] = { 1, 3, 5 };
+    GLsizei layerCounts[] = { 1, 3, 5, 2 };

    ImageIndexIterator iter = ImageIndexIterator::Make2DArray(minMip, maxMip, layerCounts);

+    ASSERT_GE(0, minMip);
+    ASSERT_EQ(ArraySize(layerCounts), static_cast<size_t>(maxMip));
+
    for (GLint mip = minMip; mip < maxMip; mip++)
    {
        for (GLint layer = 0; layer < layerCounts[mip]; layer++)