From af33d42e88fce0a002c15fc8937817246ec7e3c8 Mon Sep 17 00:00:00 2001
From: "Jablonski, Mateusz" <mateusz.jablonski@intel.com>
Date: Mon, 16 Mar 2020 13:08:31 +0100
Subject: [PATCH] Correct StackVec test

Change-Id: Iadd7f1ef075b975beeddc503482b33e67fa2875b
Signed-off-by: Jablonski, Mateusz <mateusz.jablonski@intel.com>
---
 .../unit_test/utilities/containers_tests.cpp  | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/shared/test/unit_test/utilities/containers_tests.cpp b/shared/test/unit_test/utilities/containers_tests.cpp
index 11bad7ca76..47e4baa98f 100644
--- a/shared/test/unit_test/utilities/containers_tests.cpp
+++ b/shared/test/unit_test/utilities/containers_tests.cpp
@@ -1203,26 +1203,21 @@ TEST(StackVec, MoveAsignment) {
 }
 
 TEST(StackVec, Alignment) {
-    struct alignas(16) S16 {
-        int a;
-    };
-    struct alignas(32) S32 {
-        int a;
-    };
-    struct alignas(64) S64 {
-        int a;
-    };
+    StackVec<uint16_t, 4> s16;
+    StackVec<uint32_t, 4> s32;
+    StackVec<uint64_t, 4> s64;
 
-    StackVec<S32, 4> s32;
-    StackVec<S16, 4> s16;
-    StackVec<S64, 4> s64;
-    s16.push_back(S16{});
-    s32.push_back(S32{});
-    s64.push_back(S64{});
+    static_assert(sizeof(s16) <= 24u, "");
+    static_assert(sizeof(s32) <= 32u, "");
+    static_assert(sizeof(s64) <= 48u, "");
 
-    EXPECT_EQ(0U, reinterpret_cast<uintptr_t>(&*s16.begin()) % 16);
-    EXPECT_EQ(0U, reinterpret_cast<uintptr_t>(&*s32.begin()) % 32);
-    EXPECT_EQ(0U, reinterpret_cast<uintptr_t>(&*s64.begin()) % 64);
+    s16.push_back(0);
+    s32.push_back(0);
+    s64.push_back(0);
+
+    EXPECT_EQ(0U, reinterpret_cast<uintptr_t>(s16.begin()) % 2);
+    EXPECT_EQ(0U, reinterpret_cast<uintptr_t>(s32.begin()) % 4);
+    EXPECT_EQ(0U, reinterpret_cast<uintptr_t>(s64.begin()) % 8);
 }
 
 TEST(StackVec, PushBack) {