@@ -33,34 +33,29 @@ class PsiUtilTest : TestCase() {
3333
3434 // --- Attribute group tests ---
3535
36- fun testGetAttributeGroup_testInTestDataGroup () {
37- val group = PsiUtil .getAttributeGroup(TestoClasses .TEST )
38- assertSame(TestoClasses .TEST_DATA_ATTRIBUTES , group)
39- }
40-
41- fun testGetAttributeGroup_dataProviderInTestDataGroup () {
36+ fun testGetAttributeGroup_dataProviderInDataGroup () {
4237 val group = PsiUtil .getAttributeGroup(TestoClasses .DATA_PROVIDER )
43- assertSame(TestoClasses .TEST_DATA_ATTRIBUTES , group)
38+ assertSame(TestoClasses .DATA_ATTRIBUTES , group)
4439 }
4540
46- fun testGetAttributeGroup_dataSetInTestDataGroup () {
41+ fun testGetAttributeGroup_dataSetInDataGroup () {
4742 val group = PsiUtil .getAttributeGroup(TestoClasses .DATA_SET )
48- assertSame(TestoClasses .TEST_DATA_ATTRIBUTES , group)
43+ assertSame(TestoClasses .DATA_ATTRIBUTES , group)
4944 }
5045
51- fun testGetAttributeGroup_dataUnionInTestDataGroup () {
46+ fun testGetAttributeGroup_dataUnionInDataGroup () {
5247 val group = PsiUtil .getAttributeGroup(TestoClasses .DATA_UNION )
53- assertSame(TestoClasses .TEST_DATA_ATTRIBUTES , group)
48+ assertSame(TestoClasses .DATA_ATTRIBUTES , group)
5449 }
5550
56- fun testGetAttributeGroup_dataCrossInTestDataGroup () {
51+ fun testGetAttributeGroup_dataCrossInDataGroup () {
5752 val group = PsiUtil .getAttributeGroup(TestoClasses .DATA_CROSS )
58- assertSame(TestoClasses .TEST_DATA_ATTRIBUTES , group)
53+ assertSame(TestoClasses .DATA_ATTRIBUTES , group)
5954 }
6055
61- fun testGetAttributeGroup_dataZipInTestDataGroup () {
56+ fun testGetAttributeGroup_dataZipInDataGroup () {
6257 val group = PsiUtil .getAttributeGroup(TestoClasses .DATA_ZIP )
63- assertSame(TestoClasses .TEST_DATA_ATTRIBUTES , group)
58+ assertSame(TestoClasses .DATA_ATTRIBUTES , group)
6459 }
6560
6661 fun testGetAttributeGroup_testInlineInInlineGroup () {
@@ -73,6 +68,11 @@ class PsiUtilTest : TestCase() {
7368 assertSame(TestoClasses .BENCH_ATTRIBUTES , group)
7469 }
7570
71+ fun testGetAttributeGroup_testHasNoGroup () {
72+ val group = PsiUtil .getAttributeGroup(TestoClasses .TEST )
73+ assertNull(" Test attribute is not numbered, just runnable" , group)
74+ }
75+
7676 fun testGetAttributeGroup_nullReturnsNull () {
7777 assertNull(PsiUtil .getAttributeGroup(null ))
7878 }
@@ -102,18 +102,9 @@ class PsiUtilTest : TestCase() {
102102
103103 fun testAttributeGroups_totalCount () {
104104 val totalGrouped = PsiUtil .ATTRIBUTE_GROUPS .sumOf { it.size }
105- val expectedGrouped = TestoClasses .TEST_DATA_ATTRIBUTES .size +
105+ val expectedGrouped = TestoClasses .DATA_ATTRIBUTES .size +
106106 TestoClasses .TEST_INLINE_ATTRIBUTES .size +
107107 TestoClasses .BENCH_ATTRIBUTES .size
108108 assertEquals(expectedGrouped, totalGrouped)
109109 }
110-
111- fun testTestDataAttributes_containsTestAndAllData () {
112- val testData = TestoClasses .TEST_DATA_ATTRIBUTES .toSet()
113- assertTrue(testData.contains(TestoClasses .TEST ))
114- for (attr in TestoClasses .DATA_ATTRIBUTES ) {
115- assertTrue(" Missing: $attr " , testData.contains(attr))
116- }
117- assertEquals(1 + TestoClasses .DATA_ATTRIBUTES .size, TestoClasses .TEST_DATA_ATTRIBUTES .size)
118- }
119110}
0 commit comments