Browse Source

test: avoid short names

Michele Caini 1 year ago
parent
commit
26000fa019
1 changed files with 30 additions and 30 deletions
  1. 30 30
      test/entt/signal/sigh.cpp

+ 30 - 30
test/entt/signal/sigh.cpp

@@ -5,8 +5,8 @@
 #include "../../common/linter.hpp"
 
 struct sigh_listener {
-    static void f(int &v) {
-        ++v;
+    static void f(int &iv) {
+        ++iv;
     }
 
     [[nodiscard]] bool g(int) {
@@ -142,49 +142,49 @@ TEST(SigH, Swap) {
 TEST(SigH, Functions) {
     entt::sigh<void(int &)> sigh;
     entt::sink sink{sigh};
-    int v = 0;
+    int value = 0;
 
     sink.connect<&sigh_listener::f>();
-    sigh.publish(v);
+    sigh.publish(value);
 
     ASSERT_FALSE(sigh.empty());
     ASSERT_EQ(sigh.size(), 1u);
-    ASSERT_EQ(v, 1);
+    ASSERT_EQ(value, 1);
 
-    v = 0;
+    value = 0;
     sink.disconnect<&sigh_listener::f>();
-    sigh.publish(v);
+    sigh.publish(value);
 
     ASSERT_TRUE(sigh.empty());
     ASSERT_EQ(sigh.size(), 0u);
-    ASSERT_EQ(v, 0);
+    ASSERT_EQ(value, 0);
 }
 
 TEST(SigH, FunctionsWithPayload) {
     entt::sigh<void()> sigh;
     entt::sink sink{sigh};
-    int v = 0;
+    int value = 0;
 
-    sink.connect<&sigh_listener::f>(v);
+    sink.connect<&sigh_listener::f>(value);
     sigh.publish();
 
     ASSERT_FALSE(sigh.empty());
     ASSERT_EQ(sigh.size(), 1u);
-    ASSERT_EQ(v, 1);
+    ASSERT_EQ(value, 1);
 
-    v = 0;
-    sink.disconnect<&sigh_listener::f>(v);
+    value = 0;
+    sink.disconnect<&sigh_listener::f>(value);
     sigh.publish();
 
     ASSERT_TRUE(sigh.empty());
     ASSERT_EQ(sigh.size(), 0u);
-    ASSERT_EQ(v, 0);
+    ASSERT_EQ(value, 0);
 
-    sink.connect<&sigh_listener::f>(v);
-    sink.disconnect(&v);
+    sink.connect<&sigh_listener::f>(value);
+    sink.disconnect(&value);
     sigh.publish();
 
-    ASSERT_EQ(v, 0);
+    ASSERT_EQ(value, 0);
 }
 
 TEST(SigH, Members) {
@@ -241,7 +241,7 @@ TEST(SigH, Collector) {
 
     auto bool_return = [&cnt](bool value) {
         // gtest and its macro hell are sometimes really annoying...
-        [](auto v) { ASSERT_TRUE(v); }(value);
+        [](auto curr) { ASSERT_TRUE(curr); }(value);
         ++cnt;
         return true;
     };
@@ -274,22 +274,22 @@ TEST(SigH, CollectorVoid) {
 TEST(SigH, Connection) {
     entt::sigh<void(int &)> sigh;
     entt::sink sink{sigh};
-    int v = 0;
+    int value = 0;
 
     auto conn = sink.connect<&sigh_listener::f>();
-    sigh.publish(v);
+    sigh.publish(value);
 
     ASSERT_FALSE(sigh.empty());
     ASSERT_TRUE(conn);
-    ASSERT_EQ(v, 1);
+    ASSERT_EQ(value, 1);
 
-    v = 0;
+    value = 0;
     conn.release();
-    sigh.publish(v);
+    sigh.publish(value);
 
     ASSERT_TRUE(sigh.empty());
     ASSERT_FALSE(conn);
-    ASSERT_EQ(0, v);
+    ASSERT_EQ(0, value);
 }
 
 TEST(SigH, ScopedConnection) {
@@ -460,26 +460,26 @@ TEST(SigH, ConnectAndAutoDisconnect) {
     sigh_listener listener;
     entt::sigh<void(int &)> sigh;
     entt::sink sink{sigh};
-    int v = 0;
+    int value = 0;
 
     sink.connect<&sigh_listener::g>(listener);
     sink.connect<&connect_and_auto_disconnect>(sigh);
 
     ASSERT_FALSE(listener.val);
     ASSERT_EQ(sigh.size(), 2u);
-    ASSERT_EQ(v, 0);
+    ASSERT_EQ(value, 0);
 
-    sigh.publish(v);
+    sigh.publish(value);
 
     ASSERT_TRUE(listener.val);
     ASSERT_EQ(sigh.size(), 2u);
-    ASSERT_EQ(v, 0);
+    ASSERT_EQ(value, 0);
 
-    sigh.publish(v);
+    sigh.publish(value);
 
     ASSERT_FALSE(listener.val);
     ASSERT_EQ(sigh.size(), 2u);
-    ASSERT_EQ(v, 1);
+    ASSERT_EQ(value, 1);
 }
 
 TEST(SigH, CustomAllocator) {