Fix the gtest-tree-ntuple-v7-test-ntuple-cluster test on Windows

hageboeck · Jul 2, 2020 · fca6716 · fca6716
1 parent 02921ab
commit fca6716
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/tree/ntuple/v7/test/ntuple_cluster.cxx b/tree/ntuple/v7/test/ntuple_cluster.cxx
@@ -241,7 +241,7 @@ TEST(ClusterPool, GetClusterBasics)
    c1.GetCluster(3, {0});
    ASSERT_EQ(1U, p1.fReqsClusterIds.size());
    EXPECT_EQ(3U, p1.fReqsClusterIds[0]);
-   EXPECT_EQ(RPageSource::ColumnSet_t({0U}), p1.fReqsColumns[0]);
+   EXPECT_EQ(RPageSource::ColumnSet_t({0}), p1.fReqsColumns[0]);
 
    RPageSourceMock p2;
    {
@@ -251,8 +251,8 @@ TEST(ClusterPool, GetClusterBasics)
    ASSERT_EQ(2U, p2.fReqsClusterIds.size());
    EXPECT_EQ(0U, p2.fReqsClusterIds[0]);
    EXPECT_EQ(1U, p2.fReqsClusterIds[1]);
-   EXPECT_EQ(RPageSource::ColumnSet_t({0U}), p2.fReqsColumns[0]);
-   EXPECT_EQ(RPageSource::ColumnSet_t({0U}), p2.fReqsColumns[1]);
+   EXPECT_EQ(RPageSource::ColumnSet_t({0}), p2.fReqsColumns[0]);
+   EXPECT_EQ(RPageSource::ColumnSet_t({0}), p2.fReqsColumns[1]);
 
    RPageSourceMock p3;
    {
@@ -263,9 +263,9 @@ TEST(ClusterPool, GetClusterBasics)
    EXPECT_EQ(2U, p3.fReqsClusterIds[0]);
    EXPECT_EQ(3U, p3.fReqsClusterIds[1]);
    EXPECT_EQ(4U, p3.fReqsClusterIds[2]);
-   EXPECT_EQ(RPageSource::ColumnSet_t({0U}), p3.fReqsColumns[0]);
-   EXPECT_EQ(RPageSource::ColumnSet_t({0U}), p3.fReqsColumns[1]);
-   EXPECT_EQ(RPageSource::ColumnSet_t({0U}), p3.fReqsColumns[2]);
+   EXPECT_EQ(RPageSource::ColumnSet_t({0}), p3.fReqsColumns[0]);
+   EXPECT_EQ(RPageSource::ColumnSet_t({0}), p3.fReqsColumns[1]);
+   EXPECT_EQ(RPageSource::ColumnSet_t({0}), p3.fReqsColumns[2]);
 }
 
 
@@ -276,12 +276,12 @@ TEST(ClusterPool, GetClusterIncrementally)
    c1.GetCluster(3, {0});
    ASSERT_EQ(1U, p1.fReqsClusterIds.size());
    EXPECT_EQ(3U, p1.fReqsClusterIds[0]);
-   EXPECT_EQ(RPageSource::ColumnSet_t({0U}), p1.fReqsColumns[0]);
+   EXPECT_EQ(RPageSource::ColumnSet_t({0}), p1.fReqsColumns[0]);
 
    c1.GetCluster(3, {1});
    ASSERT_EQ(2U, p1.fReqsClusterIds.size());
    EXPECT_EQ(3U, p1.fReqsClusterIds[1]);
-   EXPECT_EQ(RPageSource::ColumnSet_t({1U}), p1.fReqsColumns[1]);
+   EXPECT_EQ(RPageSource::ColumnSet_t({1}), p1.fReqsColumns[1]);
 }