From 894fa88ed5daf4a1cbfcfb955eddca410dc9f043 Mon Sep 17 00:00:00 2001
From: James Yang <jamesyang916@gmail.com>
Date: Tue, 21 Apr 2020 18:18:39 -0400
Subject: [PATCH] Assert correct concept in all unittests

---
 test/expression/distribution/bernoulli_unittest.cpp   | 2 +-
 test/expression/distribution/normal_unittest.cpp      | 2 +-
 test/expression/distribution/uniform_unittest.cpp     | 2 +-
 test/expression/model/model_unittest.cpp              | 6 +++---
 test/expression/variable/constant_unittest.cpp        | 2 +-
 test/expression/variable/variable_viewer_unittest.cpp | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/expression/distribution/bernoulli_unittest.cpp b/test/expression/distribution/bernoulli_unittest.cpp
index 6500fedb..6e4a32e3 100644
--- a/test/expression/distribution/bernoulli_unittest.cpp
+++ b/test/expression/distribution/bernoulli_unittest.cpp
@@ -21,7 +21,7 @@ struct bernoulli_fixture : ::testing::Test
 
 TEST_F(bernoulli_fixture, ctor)
 {
-    static_assert(util::is_dist_expr_v<Bernoulli<MockVarExpr>>);
+    static_assert(util::assert_is_dist_expr_v<Bernoulli<MockVarExpr>>);
 }
 
 TEST_F(bernoulli_fixture, bernoulli_check_params) {
diff --git a/test/expression/distribution/normal_unittest.cpp b/test/expression/distribution/normal_unittest.cpp
index b86ce9d8..13efaa26 100644
--- a/test/expression/distribution/normal_unittest.cpp
+++ b/test/expression/distribution/normal_unittest.cpp
@@ -24,7 +24,7 @@ struct normal_fixture : ::testing::Test {
 
 TEST_F(normal_fixture, ctor)
 {
-    static_assert(util::is_dist_expr_v<norm_t>);
+    static_assert(util::assert_is_dist_expr_v<norm_t>);
 }
 
 TEST_F(normal_fixture, normal_check_params) {
diff --git a/test/expression/distribution/uniform_unittest.cpp b/test/expression/distribution/uniform_unittest.cpp
index 3428a63a..2d80615f 100644
--- a/test/expression/distribution/uniform_unittest.cpp
+++ b/test/expression/distribution/uniform_unittest.cpp
@@ -23,7 +23,7 @@ struct uniform_fixture : ::testing::Test {
 
 TEST_F(uniform_fixture, ctor)
 {
-    static_assert(util::is_dist_expr_v<unif_t>);
+    static_assert(util::assert_is_dist_expr_v<unif_t>);
 }
 
 TEST_F(uniform_fixture, uniform_check_params) {
diff --git a/test/expression/model/model_unittest.cpp b/test/expression/model/model_unittest.cpp
index ab864561..fb900a80 100644
--- a/test/expression/model/model_unittest.cpp
+++ b/test/expression/model/model_unittest.cpp
@@ -29,7 +29,7 @@ struct var_dist_fixture : ::testing::Test
 
 TEST_F(var_dist_fixture, ctor)
 {
-    static_assert(util::is_model_expr_v<model_t>);
+    static_assert(util::assert_is_model_expr_v<model_t>);
 }
 
 TEST_F(var_dist_fixture, pdf_valid)
@@ -107,8 +107,8 @@ struct many_var_dist_fixture : ::testing::Test
 
 TEST_F(many_var_dist_fixture, ctor)
 {
-    static_assert(util::is_model_expr_v<model_two_t>);
-    static_assert(util::is_model_expr_v<model_four_t>);
+    static_assert(util::assert_is_model_expr_v<model_two_t>);
+    static_assert(util::assert_is_model_expr_v<model_four_t>);
 }
 
 TEST_F(many_var_dist_fixture, two_vars_pdf)
diff --git a/test/expression/variable/constant_unittest.cpp b/test/expression/variable/constant_unittest.cpp
index 6efdc71e..e40d4b15 100644
--- a/test/expression/variable/constant_unittest.cpp
+++ b/test/expression/variable/constant_unittest.cpp
@@ -16,7 +16,7 @@ struct constant_fixture : ::testing::Test
 
 TEST_F(constant_fixture, ctor)
 {
-    static_assert(util::is_var_expr_v<Constant<value_t>>);
+    static_assert(util::assert_is_var_expr_v<Constant<value_t>>);
 }
 
 TEST_F(constant_fixture, convertible_value)
diff --git a/test/expression/variable/variable_viewer_unittest.cpp b/test/expression/variable/variable_viewer_unittest.cpp
index 1324efed..9281ecd9 100644
--- a/test/expression/variable/variable_viewer_unittest.cpp
+++ b/test/expression/variable/variable_viewer_unittest.cpp
@@ -15,7 +15,7 @@ struct variable_viewer_fixture : ::testing::Test
 
 TEST_F(variable_viewer_fixture, ctor)
 {
-    static_assert(util::is_var_expr_v<VariableViewer<MockVar>>);
+    static_assert(util::assert_is_var_expr_v<VariableViewer<MockVar>>);
 }
 
 TEST_F(variable_viewer_fixture, convertible_value)