code improvement

This commit is contained in:
2020-10-01 18:10:40 +03:00
parent d4eab0546f
commit 87417cdb68
3 changed files with 571 additions and 323 deletions

View File

@@ -118,12 +118,8 @@ TEST(PIByteArray_Tests, convert_from_base64_empty){
TEST(PIByteArray_Tests, to_base64){
PIByteArray arr((void*)"PIP is great", 12);
PIByteArray old((void*)"PIP is great", 12);
PIByteArray arr2 = arr.toBase64();
ASSERT_EQ(arr, old);
ASSERT_NE(arr2, old);
PIByteArray arr1(16);
arr1[0] = 85;
arr1[1] = 69;
@@ -145,6 +141,13 @@ TEST(PIByteArray_Tests, to_base64){
ASSERT_EQ(arr2, arr1);
}
TEST(PIByteArray_Tests, to_base64_immutability){
PIByteArray arr((void*)"PIP is great", 12);
PIByteArray old((void*)"PIP is great", 12);
PIByteArray arr2 = arr.toBase64();
ASSERT_EQ(arr, old);
}
TEST(PIByteArray_Tests, to_base64_empty){
PIByteArray arr;
arr.toBase64();
@@ -179,7 +182,6 @@ TEST(PIByteArray_Tests, decompress_rle){
TEST(PIByteArray_Tests, compress_rle_point){
PIByteArray arr((void*)"nnnnew", 6);
PIByteArray arr2((void*)"nnnnew", 6);
PIByteArray arr1 = arr.compressedRLE(15);
PIByteArray res(6);
res[0] = 19;
@@ -189,10 +191,28 @@ TEST(PIByteArray_Tests, compress_rle_point){
res[4] = 16;
res[5] = 119;
ASSERT_EQ(arr1, res);
}
TEST(PIByteArray_Tests, compress_rle_point_immutability){
PIByteArray arr((void*)"nnnnew", 6);
PIByteArray arr2((void*)"nnnnew", 6);
PIByteArray arr1 = arr.compressedRLE(15);
ASSERT_EQ(arr, arr2);
}
TEST(PIByteArray_Tests, decompress_rle_point){
PIByteArray arr(4);
arr[0] = 17;
arr[1] = 110;
arr[2] = 16;
arr[3] = 101;
PIByteArray arr1 = arr.decompressedRLE(15);
PIByteArray res((void*)"nne", 3);
ASSERT_EQ(arr1, res);
}
TEST(PIByteArray_Tests, decompress_rle_point_immutability){
PIByteArray arr(4);
arr[0] = 17;
arr[1] = 110;
@@ -204,8 +224,6 @@ TEST(PIByteArray_Tests, decompress_rle_point){
arr2[2] = 16;
arr2[3] = 101;
PIByteArray arr1 = arr.decompressedRLE(15);
PIByteArray res((void*)"nne", 3);
ASSERT_EQ(arr1, res);
ASSERT_EQ(arr, arr2);
}
@@ -213,7 +231,7 @@ TEST(PIByteArray_Tests, to_string){
PIByteArray arr((void*)"new", 3);
PIString str = arr.toString();
PIString res = "0x6E 0x65 0x77";
ASSERT_TRUE(res == str);
ASSERT_EQ(res, str);
}
@@ -221,21 +239,21 @@ TEST(PIByteArray_Tests, to_string_10){
PIByteArray arr((void*)"new", 3);
PIString str = arr.toString(10);
PIString res = "110 101 119";
ASSERT_TRUE(res == str);
ASSERT_EQ(res, str);
}
TEST(PIByteArray_Tests, to_string_2){
PIByteArray arr((void*)"new", 3);
PIString str = arr.toString(2);
PIString res = "b1101110 b1100101 b1110111";
ASSERT_TRUE(res == str);
ASSERT_EQ(res, str);
}
TEST(PIByteArray_Tests, to_string_8){
PIByteArray arr((void*)"new", 3);
PIString str = arr.toString(8);
PIString res = "0156 0145 0167";
ASSERT_TRUE(res == str);
ASSERT_EQ(res, str);
}
TEST(PIByteArray_Tests, to_hex){
@@ -243,7 +261,7 @@ TEST(PIByteArray_Tests, to_hex){
arr[0] = 15;
PIString str = arr.toHex();
PIString res = "0f";
ASSERT_TRUE(res == str);
ASSERT_EQ(res, str);
}
TEST(PIByteArray_Tests, append){
@@ -735,7 +753,7 @@ TEST(PIByteArray_Tests, operator_shift_right_RawData){
PIByteArray::RawData res((void*)"new", 3);
PIByteArray res_arr;
res_arr << res;
ASSERT_TRUE(res_arr == arr);
ASSERT_EQ(res_arr, arr);
}
TEST(PIByteArray_Tests, operator_shift_PIPair){
@@ -1027,13 +1045,12 @@ TEST(PIByteArray_Tests, operator_shift_right_PIVector2D){
res.element(1, 0) = 'o';
res.element(1, 1) = 'l';
res.element(1, 2) = 'd';
ASSERT_TRUE(vec2.element(0,0) == res.element(0,0) &&
vec2.element(0,1) == res.element(0,1) &&
vec2.element(0,2) == res.element(0,2) &&
vec2.element(1,0) == res.element(1,0) &&
vec2.element(1,1) == res.element(1,1) &&
vec2.element(1,2) == res.element(1,2));
ASSERT_EQ(vec2.element(0,0), res.element(0,0));
ASSERT_EQ(vec2.element(0,1), res.element(0,1));
ASSERT_EQ(vec2.element(0,2), res.element(0,2));
ASSERT_EQ(vec2.element(1,0), res.element(1,0));
ASSERT_EQ(vec2.element(1,1), res.element(1,1));
ASSERT_EQ(vec2.element(1,2), res.element(1,2));
}
TEST(PIByteArray_Tests, operator_shift_template){