From 74de5414e3887073a97ee14bc60988d78d83772e Mon Sep 17 00:00:00 2001 From: htt1997 Date: Sat, 11 Mar 2023 09:29:38 +0800 Subject: [PATCH] update Signed-off-by: htt1997 --- .../kvdb/test/single_store_impl_test.cpp | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/kv_store/frameworks/innerkitsimpl/kvdb/test/single_store_impl_test.cpp b/kv_store/frameworks/innerkitsimpl/kvdb/test/single_store_impl_test.cpp index a7ffb5be..d71333e1 100644 --- a/kv_store/frameworks/innerkitsimpl/kvdb/test/single_store_impl_test.cpp +++ b/kv_store/frameworks/innerkitsimpl/kvdb/test/single_store_impl_test.cpp @@ -853,12 +853,7 @@ HWTEST_F(SingleStoreImplTest, MaxLogSizeTest, TestSize.Level0) EXPECT_EQ(kvStore_->Put(key, value), SUCCESS); key = "test1"; EXPECT_EQ(kvStore_->Put(key, value), SUCCESS); -<<<<<<< HEAD key = "test2"; -======= - key = Random(22); // for 24B random key - value = Random(4 * 1024 * 1024); // 4M value ->>>>>>> 918de8b672a076ba5b5ca1b859aac9617827ebb3 EXPECT_EQ(kvStore_->Put(key, value), SUCCESS); /** * @tc.steps:step2. Get the resultset. @@ -874,14 +869,8 @@ HWTEST_F(SingleStoreImplTest, MaxLogSizeTest, TestSize.Level0) * @tc.steps:step3. Put more data into the database. * @tc.expected: step3. Returns SUCCESS. */ -<<<<<<< HEAD for (int i = 0; i < 50; i++) { key = "test_" + std::to_string(i); -======= - value = Random(4 * 1024 * 1024); // 4M value - for (int i = 0; i < 49; i++) { - key = Random(16+i); // for 16B random key ->>>>>>> 918de8b672a076ba5b5ca1b859aac9617827ebb3 EXPECT_EQ(kvStore_->Put(key, value), SUCCESS); } /** @@ -922,12 +911,7 @@ HWTEST_F(SingleStoreImplTest, MaxLogSizeTest002, TestSize.Level0) EXPECT_EQ(kvStore_->Put(key, value), SUCCESS); key = "test1"; EXPECT_EQ(kvStore_->Put(key, value), SUCCESS); -<<<<<<< HEAD key = "test2"; -======= - key = Random(22); // for 24B random key - value = Random(4 * 1024 * 1024); // 4M value ->>>>>>> 918de8b672a076ba5b5ca1b859aac9617827ebb3 EXPECT_EQ(kvStore_->Put(key, value), SUCCESS); /** * @tc.steps:step2. Get the resultset. @@ -943,14 +927,8 @@ HWTEST_F(SingleStoreImplTest, MaxLogSizeTest002, TestSize.Level0) * @tc.steps:step3. Put more data into the database. * @tc.expected: step3. Returns SUCCESS. */ -<<<<<<< HEAD for (int i = 0; i < 50; i++) { key = "test_" + std::to_string(i); -======= - value = Random(4 * 1024 * 1024); // 4M value - for (int i = 0; i < 49; i++) { - key = Random(20 + i); ->>>>>>> 918de8b672a076ba5b5ca1b859aac9617827ebb3 EXPECT_EQ(kvStore_->Put(key, value), SUCCESS); } /** -- Gitee