From 3fda97e5362d9ca7103a9efc9ff7877bc5420e91 Mon Sep 17 00:00:00 2001
From: Norbert Podhorszki <pnorbert@ornl.gov>
Date: Tue, 2 May 2017 13:41:57 -0400
Subject: [PATCH] fix test for changed DefineVariable syntax
---
.../interface/TestADIOSInterfaceWrite.cpp | 140 +++++++++---------
1 file changed, 70 insertions(+), 70 deletions(-)
diff --git a/testing/adios2/interface/TestADIOSInterfaceWrite.cpp b/testing/adios2/interface/TestADIOSInterfaceWrite.cpp
index a5446b70d..ece198e12 100644
--- a/testing/adios2/interface/TestADIOSInterfaceWrite.cpp
+++ b/testing/adios2/interface/TestADIOSInterfaceWrite.cpp
@@ -33,9 +33,9 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarChar1x10)
std::invalid_argument);
// Verify the dimensions, name, and type are correct
- ASSERT_EQ(var_i8.m_Count.size(), 1);
- EXPECT_EQ(var_i8.m_Count[0], 10);
- EXPECT_EQ(var_i8.m_Shape.size(), 0);
+ ASSERT_EQ(var_i8.m_Shape.size(), 1);
+ EXPECT_EQ(var_i8.m_Shape[0], 10);
+ EXPECT_EQ(var_i8.m_Count.size(), 0);
EXPECT_EQ(var_i8.m_Start.size(), 0);
EXPECT_EQ(var_i8.m_Name, "i8");
EXPECT_EQ(var_i8.m_Type, "char");
@@ -50,9 +50,9 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarShort1x10)
EXPECT_THROW(auto &foo =
adios.DefineVariable<short>("i16", adios::Dims{10}),
std::invalid_argument);
- ASSERT_EQ(var_i16.m_Count.size(), 1);
- EXPECT_EQ(var_i16.m_Count[0], 10);
- EXPECT_EQ(var_i16.m_Shape.size(), 0);
+ ASSERT_EQ(var_i16.m_Shape.size(), 1);
+ EXPECT_EQ(var_i16.m_Shape[0], 10);
+ EXPECT_EQ(var_i16.m_Count.size(), 0);
EXPECT_EQ(var_i16.m_Start.size(), 0);
EXPECT_EQ(var_i16.m_Name, "i16");
EXPECT_EQ(var_i16.m_Type, "short");
@@ -64,9 +64,9 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarInt1x10)
::testing::StaticAssertTypeEq<decltype(var_i32), adios::Variable<int> &>();
EXPECT_THROW(auto &foo = adios.DefineVariable<int>("i32", adios::Dims{10}),
std::invalid_argument);
- ASSERT_EQ(var_i32.m_Count.size(), 1);
- EXPECT_EQ(var_i32.m_Count[0], 10);
- EXPECT_EQ(var_i32.m_Shape.size(), 0);
+ ASSERT_EQ(var_i32.m_Shape.size(), 1);
+ EXPECT_EQ(var_i32.m_Shape[0], 10);
+ EXPECT_EQ(var_i32.m_Count.size(), 0);
EXPECT_EQ(var_i32.m_Start.size(), 0);
EXPECT_EQ(var_i32.m_Name, "i32");
EXPECT_EQ(var_i32.m_Type, "int");
@@ -78,9 +78,9 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarLong1x10)
::testing::StaticAssertTypeEq<decltype(var_i64), adios::Variable<long> &>();
EXPECT_THROW(auto &foo = adios.DefineVariable<long>("i64", adios::Dims{10}),
std::invalid_argument);
- ASSERT_EQ(var_i64.m_Count.size(), 1);
- EXPECT_EQ(var_i64.m_Count[0], 10);
- EXPECT_EQ(var_i64.m_Shape.size(), 0);
+ ASSERT_EQ(var_i64.m_Shape.size(), 1);
+ EXPECT_EQ(var_i64.m_Shape[0], 10);
+ EXPECT_EQ(var_i64.m_Count.size(), 0);
EXPECT_EQ(var_i64.m_Start.size(), 0);
EXPECT_EQ(var_i64.m_Name, "i64");
EXPECT_EQ(var_i64.m_Type, "long int");
@@ -94,9 +94,9 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarUChar1x10)
EXPECT_THROW(auto &foo =
adios.DefineVariable<unsigned char>("u8", adios::Dims{10}),
std::invalid_argument);
- ASSERT_EQ(var_u8.m_Count.size(), 1);
- EXPECT_EQ(var_u8.m_Count[0], 10);
- EXPECT_EQ(var_u8.m_Shape.size(), 0);
+ ASSERT_EQ(var_u8.m_Shape.size(), 1);
+ EXPECT_EQ(var_u8.m_Shape[0], 10);
+ EXPECT_EQ(var_u8.m_Count.size(), 0);
EXPECT_EQ(var_u8.m_Start.size(), 0);
EXPECT_EQ(var_u8.m_Name, "u8");
EXPECT_EQ(var_u8.m_Type, "unsigned char");
@@ -111,9 +111,9 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarUShort1x10)
EXPECT_THROW(auto &foo = adios.DefineVariable<unsigned short>(
"u16", adios::Dims{10}),
std::invalid_argument);
- ASSERT_EQ(var_u16.m_Count.size(), 1);
- EXPECT_EQ(var_u16.m_Count[0], 10);
- EXPECT_EQ(var_u16.m_Shape.size(), 0);
+ ASSERT_EQ(var_u16.m_Shape.size(), 1);
+ EXPECT_EQ(var_u16.m_Shape[0], 10);
+ EXPECT_EQ(var_u16.m_Count.size(), 0);
EXPECT_EQ(var_u16.m_Start.size(), 0);
EXPECT_EQ(var_u16.m_Name, "u16");
EXPECT_EQ(var_u16.m_Type, "unsigned short");
@@ -127,9 +127,9 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarUInt1x10)
EXPECT_THROW(auto &foo =
adios.DefineVariable<unsigned int>("u32", adios::Dims{10}),
std::invalid_argument);
- ASSERT_EQ(var_u32.m_Count.size(), 1);
- EXPECT_EQ(var_u32.m_Count[0], 10);
- EXPECT_EQ(var_u32.m_Shape.size(), 0);
+ ASSERT_EQ(var_u32.m_Shape.size(), 1);
+ EXPECT_EQ(var_u32.m_Shape[0], 10);
+ EXPECT_EQ(var_u32.m_Count.size(), 0);
EXPECT_EQ(var_u32.m_Start.size(), 0);
EXPECT_EQ(var_u32.m_Name, "u32");
EXPECT_EQ(var_u32.m_Type, "unsigned int");
@@ -143,9 +143,9 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarULong1x10)
EXPECT_THROW(
auto &foo = adios.DefineVariable<unsigned long>("u64", adios::Dims{10}),
std::invalid_argument);
- ASSERT_EQ(var_u64.m_Count.size(), 1);
- EXPECT_EQ(var_u64.m_Count[0], 10);
- EXPECT_EQ(var_u64.m_Shape.size(), 0);
+ ASSERT_EQ(var_u64.m_Shape.size(), 1);
+ EXPECT_EQ(var_u64.m_Shape[0], 10);
+ EXPECT_EQ(var_u64.m_Count.size(), 0);
EXPECT_EQ(var_u64.m_Start.size(), 0);
EXPECT_EQ(var_u64.m_Name, "u64");
EXPECT_EQ(var_u64.m_Type, "unsigned long int");
@@ -159,9 +159,9 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarFloat1x10)
EXPECT_THROW(auto &foo =
adios.DefineVariable<float>("r32", adios::Dims{10}),
std::invalid_argument);
- ASSERT_EQ(var_r32.m_Count.size(), 1);
- EXPECT_EQ(var_r32.m_Count[0], 10);
- EXPECT_EQ(var_r32.m_Shape.size(), 0);
+ ASSERT_EQ(var_r32.m_Shape.size(), 1);
+ EXPECT_EQ(var_r32.m_Shape[0], 10);
+ EXPECT_EQ(var_r32.m_Count.size(), 0);
EXPECT_EQ(var_r32.m_Start.size(), 0);
EXPECT_EQ(var_r32.m_Name, "r32");
EXPECT_EQ(var_r32.m_Type, "float");
@@ -175,9 +175,9 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarDouble1x10)
EXPECT_THROW(auto &foo =
adios.DefineVariable<double>("r64", adios::Dims{10}),
std::invalid_argument);
- ASSERT_EQ(var_r64.m_Count.size(), 1);
- EXPECT_EQ(var_r64.m_Count[0], 10);
- EXPECT_EQ(var_r64.m_Shape.size(), 0);
+ ASSERT_EQ(var_r64.m_Shape.size(), 1);
+ EXPECT_EQ(var_r64.m_Shape[0], 10);
+ EXPECT_EQ(var_r64.m_Count.size(), 0);
EXPECT_EQ(var_r64.m_Start.size(), 0);
EXPECT_EQ(var_r64.m_Name, "r64");
EXPECT_EQ(var_r64.m_Type, "double");
@@ -190,10 +190,10 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarChar2x5)
EXPECT_THROW(auto &foo =
adios.DefineVariable<char>("i8", adios::Dims{2, 5}),
std::invalid_argument);
- ASSERT_EQ(var_i8.m_Count.size(), 2);
- EXPECT_EQ(var_i8.m_Count[0], 2);
- EXPECT_EQ(var_i8.m_Count[1], 5);
- EXPECT_EQ(var_i8.m_Shape.size(), 0);
+ ASSERT_EQ(var_i8.m_Shape.size(), 2);
+ EXPECT_EQ(var_i8.m_Shape[0], 2);
+ EXPECT_EQ(var_i8.m_Shape[1], 5);
+ EXPECT_EQ(var_i8.m_Count.size(), 0);
EXPECT_EQ(var_i8.m_Start.size(), 0);
EXPECT_EQ(var_i8.m_Name, "i8");
EXPECT_EQ(var_i8.m_Type, "char");
@@ -207,10 +207,10 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarShort2x5)
EXPECT_THROW(auto &foo =
adios.DefineVariable<short>("i16", adios::Dims{2, 5}),
std::invalid_argument);
- ASSERT_EQ(var_i16.m_Count.size(), 2);
- EXPECT_EQ(var_i16.m_Count[0], 2);
- EXPECT_EQ(var_i16.m_Count[1], 5);
- EXPECT_EQ(var_i16.m_Shape.size(), 0);
+ ASSERT_EQ(var_i16.m_Shape.size(), 2);
+ EXPECT_EQ(var_i16.m_Shape[0], 2);
+ EXPECT_EQ(var_i16.m_Shape[1], 5);
+ EXPECT_EQ(var_i16.m_Count.size(), 0);
EXPECT_EQ(var_i16.m_Start.size(), 0);
EXPECT_EQ(var_i16.m_Name, "i16");
EXPECT_EQ(var_i16.m_Type, "short");
@@ -223,10 +223,10 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarInt2x5)
EXPECT_THROW(auto &foo =
adios.DefineVariable<int>("i32", adios::Dims{2, 5}),
std::invalid_argument);
- ASSERT_EQ(var_i32.m_Count.size(), 2);
- EXPECT_EQ(var_i32.m_Count[0], 2);
- EXPECT_EQ(var_i32.m_Count[1], 5);
- EXPECT_EQ(var_i32.m_Shape.size(), 0);
+ ASSERT_EQ(var_i32.m_Shape.size(), 2);
+ EXPECT_EQ(var_i32.m_Shape[0], 2);
+ EXPECT_EQ(var_i32.m_Shape[1], 5);
+ EXPECT_EQ(var_i32.m_Count.size(), 0);
EXPECT_EQ(var_i32.m_Start.size(), 0);
EXPECT_EQ(var_i32.m_Name, "i32");
EXPECT_EQ(var_i32.m_Type, "int");
@@ -239,10 +239,10 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarLong2x5)
EXPECT_THROW(auto &foo =
adios.DefineVariable<long>("i64", adios::Dims{2, 5}),
std::invalid_argument);
- ASSERT_EQ(var_i64.m_Count.size(), 2);
- EXPECT_EQ(var_i64.m_Count[0], 2);
- EXPECT_EQ(var_i64.m_Count[1], 5);
- EXPECT_EQ(var_i64.m_Shape.size(), 0);
+ ASSERT_EQ(var_i64.m_Shape.size(), 2);
+ EXPECT_EQ(var_i64.m_Shape[0], 2);
+ EXPECT_EQ(var_i64.m_Shape[1], 5);
+ EXPECT_EQ(var_i64.m_Count.size(), 0);
EXPECT_EQ(var_i64.m_Start.size(), 0);
EXPECT_EQ(var_i64.m_Name, "i64");
EXPECT_EQ(var_i64.m_Type, "long int");
@@ -256,10 +256,10 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarUChar2x5)
EXPECT_THROW(auto &foo = adios.DefineVariable<unsigned char>(
"u8", adios::Dims{2, 5}),
std::invalid_argument);
- ASSERT_EQ(var_u8.m_Count.size(), 2);
- EXPECT_EQ(var_u8.m_Count[0], 2);
- EXPECT_EQ(var_u8.m_Count[1], 5);
- EXPECT_EQ(var_u8.m_Shape.size(), 0);
+ ASSERT_EQ(var_u8.m_Shape.size(), 2);
+ EXPECT_EQ(var_u8.m_Shape[0], 2);
+ EXPECT_EQ(var_u8.m_Shape[1], 5);
+ EXPECT_EQ(var_u8.m_Count.size(), 0);
EXPECT_EQ(var_u8.m_Start.size(), 0);
EXPECT_EQ(var_u8.m_Name, "u8");
EXPECT_EQ(var_u8.m_Type, "unsigned char");
@@ -274,10 +274,10 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarUShort2x5)
EXPECT_THROW(auto &foo = adios.DefineVariable<unsigned short>(
"u16", adios::Dims{2, 5}),
std::invalid_argument);
- ASSERT_EQ(var_u16.m_Count.size(), 2);
- EXPECT_EQ(var_u16.m_Count[0], 2);
- EXPECT_EQ(var_u16.m_Count[1], 5);
- EXPECT_EQ(var_u16.m_Shape.size(), 0);
+ ASSERT_EQ(var_u16.m_Shape.size(), 2);
+ EXPECT_EQ(var_u16.m_Shape[0], 2);
+ EXPECT_EQ(var_u16.m_Shape[1], 5);
+ EXPECT_EQ(var_u16.m_Count.size(), 0);
EXPECT_EQ(var_u16.m_Start.size(), 0);
EXPECT_EQ(var_u16.m_Name, "u16");
EXPECT_EQ(var_u16.m_Type, "unsigned short");
@@ -292,10 +292,10 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarUInt2x5)
EXPECT_THROW(auto &foo = adios.DefineVariable<unsigned int>(
"u32", adios::Dims{2, 5}),
std::invalid_argument);
- ASSERT_EQ(var_u32.m_Count.size(), 2);
- EXPECT_EQ(var_u32.m_Count[0], 2);
- EXPECT_EQ(var_u32.m_Count[1], 5);
- EXPECT_EQ(var_u32.m_Shape.size(), 0);
+ ASSERT_EQ(var_u32.m_Shape.size(), 2);
+ EXPECT_EQ(var_u32.m_Shape[0], 2);
+ EXPECT_EQ(var_u32.m_Shape[1], 5);
+ EXPECT_EQ(var_u32.m_Count.size(), 0);
EXPECT_EQ(var_u32.m_Start.size(), 0);
EXPECT_EQ(var_u32.m_Name, "u32");
EXPECT_EQ(var_u32.m_Type, "unsigned int");
@@ -310,10 +310,10 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarULong2x5)
EXPECT_THROW(auto &foo = adios.DefineVariable<unsigned long>(
"u64", adios::Dims{2, 5}),
std::invalid_argument);
- ASSERT_EQ(var_u64.m_Count.size(), 2);
- EXPECT_EQ(var_u64.m_Count[0], 2);
- EXPECT_EQ(var_u64.m_Count[1], 5);
- EXPECT_EQ(var_u64.m_Shape.size(), 0);
+ ASSERT_EQ(var_u64.m_Shape.size(), 2);
+ EXPECT_EQ(var_u64.m_Shape[0], 2);
+ EXPECT_EQ(var_u64.m_Shape[1], 5);
+ EXPECT_EQ(var_u64.m_Count.size(), 0);
EXPECT_EQ(var_u64.m_Start.size(), 0);
EXPECT_EQ(var_u64.m_Name, "u64");
EXPECT_EQ(var_u64.m_Type, "unsigned long int");
@@ -327,10 +327,10 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarFloat2x5)
EXPECT_THROW(auto &foo =
adios.DefineVariable<float>("r32", adios::Dims{2, 5}),
std::invalid_argument);
- ASSERT_EQ(var_r32.m_Count.size(), 2);
- EXPECT_EQ(var_r32.m_Count[0], 2);
- EXPECT_EQ(var_r32.m_Count[1], 5);
- EXPECT_EQ(var_r32.m_Shape.size(), 0);
+ ASSERT_EQ(var_r32.m_Shape.size(), 2);
+ EXPECT_EQ(var_r32.m_Shape[0], 2);
+ EXPECT_EQ(var_r32.m_Shape[1], 5);
+ EXPECT_EQ(var_r32.m_Count.size(), 0);
EXPECT_EQ(var_r32.m_Start.size(), 0);
EXPECT_EQ(var_r32.m_Name, "r32");
EXPECT_EQ(var_r32.m_Type, "float");
@@ -344,10 +344,10 @@ TEST_F(ADIOSInterfaceWriteTest, DefineVarDouble2x5)
EXPECT_THROW(auto &foo =
adios.DefineVariable<double>("r64", adios::Dims{2, 5}),
std::invalid_argument);
- ASSERT_EQ(var_r64.m_Count.size(), 2);
- EXPECT_EQ(var_r64.m_Count[0], 2);
- EXPECT_EQ(var_r64.m_Count[1], 5);
- EXPECT_EQ(var_r64.m_Shape.size(), 0);
+ ASSERT_EQ(var_r64.m_Shape.size(), 2);
+ EXPECT_EQ(var_r64.m_Shape[0], 2);
+ EXPECT_EQ(var_r64.m_Shape[1], 5);
+ EXPECT_EQ(var_r64.m_Count.size(), 0);
EXPECT_EQ(var_r64.m_Start.size(), 0);
EXPECT_EQ(var_r64.m_Name, "r64");
EXPECT_EQ(var_r64.m_Type, "double");
--
GitLab