code improvement

2020-10-01 18:10:40 +03:00
parent d4eab0546f
commit 87417cdb68
3 changed files with 571 additions and 323 deletions
--- a/tests/core/piStringListTest.cpp
+++ b/tests/core/piStringListTest.cpp
@@ -8,55 +8,123 @@ TEST(PIStringList_Tests, construct_empty){
    ASSERT_TRUE(lis.isEmpty());
 }

-TEST(PIStringList_Tests, construct_one_str){
+TEST(PIStringList_Tests, construct_one_str_size){
    PIString str1 = "first string";
    PIStringList lis {str1};
-    ASSERT_TRUE(str1 == lis[0] && lis.length() == 1);
+    ASSERT_EQ(lis.length(),1);
 }

-TEST(PIStringList_Tests, construct_one_str_rvalue){
+TEST(PIStringList_Tests, construct_one_str_data){
+    PIString str1 = "first string";
+    PIStringList lis {str1};
+    ASSERT_EQ(str1, lis[0]);
+}
+
+TEST(PIStringList_Tests, construct_one_str_rvalue_size){
    PIString str1 = "first string";
    PIStringList lis {"first string"};
-    ASSERT_TRUE(str1 == lis[0] && lis.length() == 1);
+    ASSERT_EQ(lis.length(), 1);
 }

-TEST(PIStringList_Tests, construct_two_str){
+TEST(PIStringList_Tests, construct_one_str_rvalue_data){
+    PIString str1 = "first string";
+    PIStringList lis {"first string"};
+    ASSERT_EQ(str1, lis[0]);
+}
+TEST(PIStringList_Tests, construct_two_str_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIStringList lis {str1, str2};
-    ASSERT_TRUE(str1 == lis[0] && lis[1] == str2 && lis.length() == 2);
+    ASSERT_EQ(lis.length(), 2);
 }

-TEST(PIStringList_Tests, construct_two_str_rvalue){
+TEST(PIStringList_Tests, construct_two_str_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIStringList lis {str1, str2};
+    ASSERT_EQ(str1, lis[0]);
+    ASSERT_EQ(str2, lis[1]);
+}
+
+TEST(PIStringList_Tests, construct_two_str_rvalue_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIStringList lis {"first string", "second string"};
-    ASSERT_TRUE(str1 == lis[0] && lis[1] == str2 && lis.length() == 2);
+    ASSERT_EQ(lis.length(), 2);
 }

-TEST(PIStringList_Tests, construct_three_str){
+TEST(PIStringList_Tests, construct_two_str_rvalue_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIStringList lis {"first string", "second string"};
+    ASSERT_EQ(str1, lis[0]);
+    ASSERT_EQ(lis[1], str2);
+}
+
+TEST(PIStringList_Tests, construct_three_str_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "third string";
    PIStringList lis {str1, str2, str3};
-    ASSERT_TRUE(str1 == lis[0] && lis[1] == str2 && lis[2] == str3 && lis.length() == 3);
+    ASSERT_EQ(lis.length(),3);
 }

-TEST(PIStringList_Tests, construct_three_str_rvalue){
+TEST(PIStringList_Tests, construct_three_str_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "third string";
+    PIStringList lis {str1, str2, str3};
+    ASSERT_EQ(lis[0], str1);
+    ASSERT_EQ(lis[1], str2);
+    ASSERT_EQ(lis[2], str3);
+}
+
+TEST(PIStringList_Tests, construct_three_str_rvalue_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "third string";
    PIStringList lis {"first string", "second string", "third string"};
-    ASSERT_TRUE(str1 == lis[0] && lis[1] == str2 && lis[2] == str3 && lis.length() == 3);
+    ASSERT_EQ(lis.length(), 3);
 }

-TEST(PIStringList_Tests, construct_four_str){
+TEST(PIStringList_Tests, construct_three_str_rvalue_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "third string";
+    PIStringList lis {"first string", "second string", "third string"};
+    ASSERT_EQ(lis[0], str1);
+    ASSERT_EQ(lis[1], str2);
+    ASSERT_EQ(lis[2], str3);
+}
+
+TEST(PIStringList_Tests, construct_four_str_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "third string";
    PIString str4 = "fourth string";
    PIStringList lis {str1, str2, str3, str4};
-    ASSERT_TRUE(str1 == lis[0] && lis[1] == str2 && lis[2] == str3 && lis[3] == str4 && lis.length() == 4);
+    ASSERT_EQ(lis.length(), 4);
+}
+
+TEST(PIStringList_Tests, construct_four_str_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "third string";
+    PIString str4 = "fourth string";
+    PIStringList lis {str1, str2, str3, str4};
+    ASSERT_EQ(lis[0], str1);
+    ASSERT_EQ(lis[1], str2);
+    ASSERT_EQ(lis[2], str3);
+    ASSERT_EQ(lis[3], str4);
+}
+
+TEST(PIStringList_Tests, construct_four_str_rvalue_size){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "third string";
+    PIString str4 = "fourth string";
+    PIStringList lis {"first string", "second string", "third string", "fourth string"};
+    ASSERT_EQ(lis.length(), 4);
 }

 TEST(PIStringList_Tests, construct_four_str_rvalue){
@@ -65,30 +133,59 @@ TEST(PIStringList_Tests, construct_four_str_rvalue){
    PIString str3 = "third string";
    PIString str4 = "fourth string";
    PIStringList lis {"first string", "second string", "third string", "fourth string"};
-    ASSERT_TRUE(str1 == lis[0] && lis[1] == str2 && lis[2] == str3 && lis[3] == str4 && lis.length() == 4);
+    ASSERT_EQ(lis[0], str1);
+    ASSERT_EQ(lis[1], str2);
+    ASSERT_EQ(lis[2], str3);
+    ASSERT_EQ(lis[3], str4);
 }

-TEST(PIStringList_Tests, construct_list){
+TEST(PIStringList_Tests, construct_list_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "third string";
    PIString str4 = "fourth string";
    PIStringList lis {str1, str2, str3, str4};
    PIStringList list {lis};
-    ASSERT_TRUE(str1 == list[0] && list[1] == str2 && list[2] == str3 && list[3] == str4 && list.length() == 4);
+    ASSERT_EQ(list.length(), 4);
 }

-TEST(PIStringList_Tests, construct_list_rvalue){
+TEST(PIStringList_Tests, construct_list_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "third string";
+    PIString str4 = "fourth string";
+    PIStringList lis {str1, str2, str3, str4};
+    PIStringList list {lis};
+    ASSERT_EQ(list[0], str1);
+    ASSERT_EQ(list[1], str2);
+    ASSERT_EQ(list[2], str3);
+    ASSERT_EQ(list[3], str4);
+}
+
+TEST(PIStringList_Tests, construct_list_rvalue_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "third string";
    PIString str4 = "fourth string";
    PIStringList lis {"first string", "second string", "third string", "fourth string"};
    PIStringList list {move(lis)};
-    ASSERT_TRUE(str1 == list[0] && list[1] == str2 && list[2] == str3 && list[3] == str4 && list.length() == 4);
+    ASSERT_EQ(list.length(), 4);
 }

-TEST(PIStringList_Tests, construct_pivect){
+TEST(PIStringList_Tests, construct_list_rvalue_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "third string";
+    PIString str4 = "fourth string";
+    PIStringList lis {"first string", "second string", "third string", "fourth string"};
+    PIStringList list {move(lis)};
+    ASSERT_EQ(list[0], str1);
+    ASSERT_EQ(list[1], str2);
+    ASSERT_EQ(list[2], str3);
+    ASSERT_EQ(list[3], str4);
+}
+
+TEST(PIStringList_Tests, construct_pivect_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "third string";
@@ -99,10 +196,27 @@ TEST(PIStringList_Tests, construct_pivect){
    vect.append(str3);
    vect.append(str4);
    PIStringList list {vect};
-    ASSERT_TRUE(str1 == list[0] && list[1] == str2 && list[2] == str3 && list[3] == str4 && list.length() == 4);
+    ASSERT_EQ(list.length(), 4);
 }

-TEST(PIStringList_Tests, construct_list_pideq){
+TEST(PIStringList_Tests, construct_pivect_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "third string";
+    PIString str4 = "fourth string";
+    PIVector<PIString> vect;
+    vect.append(str1);
+    vect.append(str2);
+    vect.append(str3);
+    vect.append(str4);
+    PIStringList list {vect};
+    ASSERT_EQ(list[0], str1);
+    ASSERT_EQ(list[1], str2);
+    ASSERT_EQ(list[2], str3);
+    ASSERT_EQ(list[3], str4);
+}
+
+TEST(PIStringList_Tests, construct_list_pideq_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "third string";
@@ -113,7 +227,24 @@ TEST(PIStringList_Tests, construct_list_pideq){
    deq.append(str3);
    deq.append(str4);
    PIStringList list {deq};
-    ASSERT_TRUE(str1 == list[0] && list[1] == str2 && list[2] == str3 && list[3] == str4 && list.length() == 4);
+    ASSERT_EQ(list.length(), 4);
+}
+
+TEST(PIStringList_Tests, construct_list_pideq_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "third string";
+    PIString str4 = "fourth string";
+    PIDeque<PIString> deq;
+    deq.append(str1);
+    deq.append(str2);
+    deq.append(str3);
+    deq.append(str4);
+    PIStringList list {deq};
+    ASSERT_EQ(list[0], str1);
+    ASSERT_EQ(list[1], str2);
+    ASSERT_EQ(list[2], str3);
+    ASSERT_EQ(list[3], str4);
 }

 TEST(PIStringList_Tests, join){
@@ -123,10 +254,10 @@ TEST(PIStringList_Tests, join){
    PIString str4 = "fourth string";
    PIString del = ", ";
    PIStringList lis {str1, str2, str3, str4};
-    ASSERT_TRUE(lis.join(del) == "first string, second string, third string, fourth string");
+    ASSERT_EQ(lis.join(del), "first string, second string, third string, fourth string");
 }

-TEST(PIStringList_Tests, remove_strings){
+TEST(PIStringList_Tests, remove_strings_size){
    PIString str1 = "first string";
    PIString str2 = "string";
    PIString str3 = "third string";
@@ -134,56 +265,114 @@ TEST(PIStringList_Tests, remove_strings){
    PIString val = "string";
    PIStringList lis {str1, str2, str3, str4};
    lis.removeStrings(val);
-    ASSERT_TRUE(lis[0] == "first string" && lis[1] == "third string" && lis.length() == 2);
+    ASSERT_EQ(lis.length(), 2);
 }

-TEST(PIStringList_Tests, remove){
+TEST(PIStringList_Tests, remove_strings_data){
+    PIString str1 = "first string";
+    PIString str2 = "string";
+    PIString str3 = "third string";
+    PIString str4 = "string";
+    PIString val = "string";
+    PIStringList lis {str1, str2, str3, str4};
+    lis.removeStrings(val);
+    ASSERT_EQ(lis[0], "first string");
+    ASSERT_EQ(lis[1], "third string");
+}
+
+TEST(PIStringList_Tests, remove_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "third string";
    PIString str4 = "fourth string";
    PIStringList lis {str1, str2, str3, str4};
    lis.remove(2);
-    ASSERT_TRUE(lis[0] == "first string" && lis[1] == "second string" && lis[2] == "fourth string" && lis.length() == 3);
+    ASSERT_EQ(lis.length(), 3);
 }

-TEST(PIStringList_Tests, remove_count){
+TEST(PIStringList_Tests, remove_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "third string";
+    PIString str4 = "fourth string";
+    PIStringList lis {str1, str2, str3, str4};
+    lis.remove(2);
+    ASSERT_EQ(lis[0], "first string");
+    ASSERT_EQ(lis[1], "second string");
+    ASSERT_EQ(lis[2], "fourth string");
+}
+
+TEST(PIStringList_Tests, remove_count_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "third string";
    PIString str4 = "fourth string";
    PIStringList lis {str1, str2, str3, str4};
    lis.remove(2,2);
-    ASSERT_TRUE(lis[0] == "first string" && lis[1] == "second string" && lis.length() == 2);
+    ASSERT_EQ(lis.length(), 2);
 }

-TEST(PIStringList_Tests, remove_Duplicates){
+TEST(PIStringList_Tests, remove_count_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "third string";
+    PIString str4 = "fourth string";
+    PIStringList lis {str1, str2, str3, str4};
+    lis.remove(2,2);
+    ASSERT_EQ(lis[0], "first string");
+    ASSERT_EQ(lis[1], "second string");
+}
+
+TEST(PIStringList_Tests, remove_Duplicates_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "first string";
    PIString str4 = "second string";
    PIStringList lis {str1, str2, str3, str4};
    lis.removeDuplicates();
-    ASSERT_TRUE(lis[0] == "first string" && lis[1] == "second string" && lis.length() == 2);
+    ASSERT_EQ(lis.length(), 2);
 }

-TEST(PIStringList_Tests, trim){
+TEST(PIStringList_Tests, remove_Duplicates_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "first string";
+    PIString str4 = "second string";
+    PIStringList lis {str1, str2, str3, str4};
+    lis.removeDuplicates();
+    ASSERT_EQ(lis[0], "first string");
+    ASSERT_EQ(lis[1], "second string");
+}
+
+TEST(PIStringList_Tests, trim_size){
    PIString str1 = " first string ";
    PIString str2 = "second string ";
    PIString str3 = " third string";
    PIString str4 = "fourth string";
    PIStringList lis {str1, str2, str3, str4};
    lis.trim();
-    ASSERT_TRUE(lis[0] == "first string" && lis[1] == "second string" && lis[2] == "third string" && lis[3] == "fourth string" && lis.length() == 4);
+    ASSERT_EQ(lis.length(), 4);
 }

+TEST(PIStringList_Tests, trim_data){
+    PIString str1 = " first string ";
+    PIString str2 = "second string ";
+    PIString str3 = " third string";
+    PIString str4 = "fourth string";
+    PIStringList lis {str1, str2, str3, str4};
+    lis.trim();
+    ASSERT_EQ(lis[0], "first string");
+    ASSERT_EQ(lis[1], "second string");
+    ASSERT_EQ(lis[2], "third string");
+    ASSERT_EQ(lis[3], "fourth string");
+}
 TEST(PIStringList_Tests, content_size){
    PIString str1 = " first string ";
    PIString str2 = "second string ";
    PIString str3 = " third string";
    PIString str4 = "fourth string";
    PIStringList lis {str1, str2, str3, str4};
-    ASSERT_TRUE(lis.contentSize() == 54);
+    ASSERT_EQ(lis.contentSize(), 54);
 }

 TEST(PIStringList_Tests, operator_compare){
@@ -248,37 +437,76 @@ TEST(PIStringList_Tests, operator_compare_unequal_size){
    ASSERT_TRUE(lis != lis1);
 }

-TEST(PIStringList_Tests, operator_assignment){
+TEST(PIStringList_Tests, operator_assignment_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "thord string";
    PIString str4 = "fourth string";
    PIStringList lis {str1, str2, str3, str4};
    PIStringList lis1 = lis;
-    ASSERT_TRUE(str1 == lis1[0] && lis1[1] == str2 && lis1[2] == str3 && lis1[3] == str4 && lis1.length() == 4);
+    ASSERT_EQ(lis1.length(), 4);
 }

-TEST(PIStringList_Tests, operator_shift){
+TEST(PIStringList_Tests, operator_assignment_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "thord string";
+    PIString str4 = "fourth string";
+    PIStringList lis {str1, str2, str3, str4};
+    PIStringList lis1 = lis;
+    ASSERT_EQ(lis1[0], str1);
+    ASSERT_EQ(lis1[1], str2);
+    ASSERT_EQ(lis1[2], str3);
+    ASSERT_EQ(lis1[3], str4);
+}
+
+TEST(PIStringList_Tests, operator_shift_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "thord string";
    PIString str4 = "fourth string";
    PIStringList lis {str1, str2, str3};
    lis << str4;
-    ASSERT_TRUE(str1 == lis[0] && lis[1] == str2 && lis[2] == str3 && lis[3] == str4 && lis.length() == 4);
+    ASSERT_EQ(lis.length(), 4);
 }

-TEST(PIStringList_Tests, operator_shift_rvalue){
+TEST(PIStringList_Tests, operator_shift_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "thord string";
+    PIString str4 = "fourth string";
+    PIStringList lis {str1, str2, str3};
+    lis << str4;
+    ASSERT_EQ(lis[0], str1);
+    ASSERT_EQ(lis[1], str2);
+    ASSERT_EQ(lis[2], str3);
+    ASSERT_EQ(lis[3], str4);
+}
+
+TEST(PIStringList_Tests, operator_shift_rvalue_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "thord string";
    PIString str4 = "fourth string";
    PIStringList lis {str1, str2, str3};
    lis << "fourth string";
-    ASSERT_TRUE(str1 == lis[0] && lis[1] == str2 && lis[2] == str3 && lis[3] == str4 && lis.length() == 4);
+    ASSERT_EQ(lis.length(), 4);
 }

-TEST(PIStringList_Tests, operator_shift_pistringlist){
+TEST(PIStringList_Tests, operator_shift_rvalue_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "thord string";
+    PIString str4 = "fourth string";
+    PIStringList lis {str1, str2, str3};
+    lis << "fourth string";
+    ASSERT_EQ(lis[0], str1);
+    ASSERT_EQ(lis[1], str2);
+    ASSERT_EQ(lis[2], str3);
+    ASSERT_EQ(lis[3], str4);
+}
+
+TEST(PIStringList_Tests, operator_shift_pistringlist_size){
    PIString str1 = "first string";
    PIString str2 = "second string";
    PIString str3 = "thord string";
@@ -286,7 +514,21 @@ TEST(PIStringList_Tests, operator_shift_pistringlist){
    PIStringList lis {str1, str2};
    PIStringList lis1 {str3, str4};
    lis << lis1;
-    ASSERT_TRUE(str1 == lis[0] && lis[1] == str2 && lis[2] == str3 && lis[3] == str4 && lis.length() == 4);
+    ASSERT_EQ(lis.length(), 4);
+}
+
+TEST(PIStringList_Tests, operator_shift_pistringlist_data){
+    PIString str1 = "first string";
+    PIString str2 = "second string";
+    PIString str3 = "thord string";
+    PIString str4 = "fourth string";
+    PIStringList lis {str1, str2};
+    PIStringList lis1 {str3, str4};
+    lis << lis1;
+    ASSERT_EQ(lis[0], str1);
+    ASSERT_EQ(lis[1], str2);
+    ASSERT_EQ(lis[2], str3);
+    ASSERT_EQ(lis[3], str4);
 }

 TEST(PIStringList_Tests, operator_shift_pibytearray){
@@ -312,5 +554,5 @@ TEST(PIStringList_Tests, operator_shift_right_pibytearray){
    arr << res;
    PIStringList list;
    arr >> list;
-    ASSERT_TRUE(res == list);
+    ASSERT_EQ(res, list);
 }