Split statistics tests (#7122)

azevaykin · web-flow · commit b1a2b730191e · 2024-07-26T12:01:15.000+03:00
diff --git a/ydb/core/statistics/aggregator/ut/ut_aggregator.cpp b/ydb/core/statistics/aggregator/ut/ut_aggregator.cpp
@@ -1,4 +1,4 @@
-#include "ut_common.h"
+#include <ydb/core/statistics/ut_common/ut_common.h>
 
 #include <ydb/library/actors/testlib/test_runtime.h>
 
diff --git a/ydb/core/statistics/aggregator/ut/ya.make b/ydb/core/statistics/aggregator/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(ydb/core/statistics)
+UNITTEST_FOR(ydb/core/statistics/aggregator)
 
 FORK_SUBTESTS()
 
@@ -17,15 +17,11 @@ PEERDIR(
     library/cpp/testing/unittest
     ydb/core/protos
     ydb/core/testlib/default
+    ydb/core/statistics/ut_common
 )
 
 SRCS(
-    ut_common.h
-    ut_common.cpp
     ut_aggregator.cpp
-    ut_statistics.cpp
-    ut_database.cpp
-    #ut_service.cpp
 )
 
 END()
diff --git a/ydb/core/statistics/aggregator/ya.make b/ydb/core/statistics/aggregator/ya.make
@@ -36,3 +36,7 @@ PEERDIR(
 YQL_LAST_ABI_VERSION()
 
 END()
+
+RECURSE_FOR_TESTS(
+    ut
+)
diff --git a/ydb/core/statistics/database/ut/ut_database.cpp b/ydb/core/statistics/database/ut/ut_database.cpp
@@ -1,4 +1,4 @@
-#include "ut_common.h"
+#include <ydb/core/statistics/ut_common/ut_common.h>
 
 #include <ydb/core/statistics/events.h>
 #include <ydb/core/statistics/database/database.h>
diff --git a/ydb/core/statistics/database/ut/ya.make b/ydb/core/statistics/database/ut/ya.make
@@ -0,0 +1,27 @@
+UNITTEST_FOR(ydb/core/statistics/database)
+
+FORK_SUBTESTS()
+
+IF (WITH_VALGRIND)
+    TIMEOUT(3600)
+    SIZE(LARGE)
+    TAG(ya:fat)
+ELSE()
+    TIMEOUT(600)
+    SIZE(MEDIUM)
+ENDIF()
+
+YQL_LAST_ABI_VERSION()
+
+PEERDIR(
+    library/cpp/testing/unittest
+    ydb/core/protos
+    ydb/core/testlib/default
+    ydb/core/statistics/ut_common
+)
+
+SRCS(
+    ut_database.cpp
+)
+
+END()
diff --git a/ydb/core/statistics/database/ya.make b/ydb/core/statistics/database/ya.make
@@ -17,3 +17,7 @@ PEERDIR(
 YQL_LAST_ABI_VERSION()
 
 END()
+
+RECURSE_FOR_TESTS(
+    ut
+)
diff --git a/ydb/core/statistics/service/ut/ut_basic_statistics.cpp b/ydb/core/statistics/service/ut/ut_basic_statistics.cpp
@@ -1,4 +1,4 @@
-#include "ut_common.h"
+#include <ydb/core/statistics/ut_common/ut_common.h>
 
 #include <ydb/library/actors/testlib/test_runtime.h>
 
@@ -82,7 +82,7 @@ void ValidateRowCount(TTestActorRuntime& runtime, ui32 nodeIndex, TPathId pathId
 
 } // namespace
 
-Y_UNIT_TEST_SUITE(Statistics) {
+Y_UNIT_TEST_SUITE(BasicStatistics) {
 
     Y_UNIT_TEST(Simple) {
         TTestEnv env(1, 1);
diff --git a/ydb/core/statistics/service/ut/ut_service.cpp b/ydb/core/statistics/service/ut/ut_service.cpp
diff --git a/ydb/core/statistics/service/ut/ya.make b/ydb/core/statistics/service/ut/ya.make
@@ -0,0 +1,29 @@
+UNITTEST_FOR(ydb/core/statistics/service)
+
+FORK_SUBTESTS()
+
+IF (WITH_VALGRIND)
+    TIMEOUT(3600)
+    SIZE(LARGE)
+    TAG(ya:fat)
+ELSE()
+    TIMEOUT(600)
+    SIZE(MEDIUM)
+ENDIF()
+
+YQL_LAST_ABI_VERSION()
+
+PEERDIR(
+    library/cpp/testing/unittest
+    ydb/core/protos
+    ydb/core/testlib/default
+    ydb/core/statistics/ut_common
+)
+
+SRCS(
+    ut_basic_statistics.cpp
+    ut_service.cpp
+)
+
+END()
+
diff --git a/ydb/core/statistics/service/ya.make b/ydb/core/statistics/service/ya.make
@@ -21,3 +21,8 @@ PEERDIR(
 YQL_LAST_ABI_VERSION()
 
 END()
+
+RECURSE_FOR_TESTS(
+    ut
+)
+
diff --git a/ydb/core/statistics/ut_common/ut_common.cpp b/ydb/core/statistics/ut_common/ut_common.cpp
diff --git a/ydb/core/statistics/ut_common/ut_common.h b/ydb/core/statistics/ut_common/ut_common.h
diff --git a/ydb/core/statistics/ut_common/ya.make b/ydb/core/statistics/ut_common/ya.make
@@ -0,0 +1,15 @@
+LIBRARY()
+
+SRCS(
+    ut_common.cpp
+    ut_common.h
+)
+
+PEERDIR(
+    ydb/core/testlib
+)
+
+YQL_LAST_ABI_VERSION()
+
+END()
+
diff --git a/ydb/core/statistics/ya.make b/ydb/core/statistics/ya.make
@@ -20,8 +20,11 @@ RECURSE(
     aggregator
     database
     service
+    ut_common
 )
 
 RECURSE_FOR_TESTS(
-    ut
+    aggregator/ut
+    database/ut
+    service/ut
 )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "ut_common.h"`
	`1`	`+#include <ydb/core/statistics/ut_common/ut_common.h>`
`2`	`2`
`3`	`3`	`#include <ydb/library/actors/testlib/test_runtime.h>`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,11 @@ RECURSE(`
`20`	`20`	`aggregator`
`21`	`21`	`database`
`22`	`22`	`service`
	`23`	`+ ut_common`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`RECURSE_FOR_TESTS(`
`26`		`- ut`
	`27`	`+ aggregator/ut`
	`28`	`+ database/ut`
	`29`	`+ service/ut`
`27`	`30`	`)`