From bfd413ff8a1f8a64b5618d48d87ba84ab3f1d14d Mon Sep 17 00:00:00 2001 From: Jaewoong Cheon Date: Sat, 29 Jul 2023 12:52:08 +0900 Subject: [PATCH] Refactor hard coded test tag --- .../woong/compose/grid/GridArrangementTest.kt | 82 ++++++++++--------- .../kotlin/io/woong/compose/grid/GridTest.kt | 66 +++++++-------- 2 files changed, 76 insertions(+), 72 deletions(-) diff --git a/grid/src/androidAndroidTest/kotlin/io/woong/compose/grid/GridArrangementTest.kt b/grid/src/androidAndroidTest/kotlin/io/woong/compose/grid/GridArrangementTest.kt index d3a1f8f..30aad55 100644 --- a/grid/src/androidAndroidTest/kotlin/io/woong/compose/grid/GridArrangementTest.kt +++ b/grid/src/androidAndroidTest/kotlin/io/woong/compose/grid/GridArrangementTest.kt @@ -43,6 +43,8 @@ class GridArrangementTest { @get:Rule val composeRule: ComposeContentTestRule = createComposeRule() + private val gridTag: String = "grid" + @Test fun testHorizontalGrid_withHorizontalArrangementStart_whenLtr() { val testTags = arrayOf("1", "2", "3", "4", "5", "6", "7", "8") @@ -54,7 +56,7 @@ class GridArrangementTest { CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) { HorizontalGrid( rowCount = rowCount, - modifier = Modifier.testTag("grid"), + modifier = Modifier.testTag(gridTag), horizontalArrangement = Arrangement.Start, ) { for (tag in testTags) { @@ -95,7 +97,7 @@ class GridArrangementTest { CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) { VerticalGrid( columnCount = columnCount, - modifier = Modifier.testTag("grid"), + modifier = Modifier.testTag(gridTag), horizontalArrangement = Arrangement.Start, ) { for (tag in testTags) { @@ -139,7 +141,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.Start, ) { for (tag in testTags) { @@ -183,7 +185,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.Start, ) { for (tag in testTags) { @@ -227,7 +229,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.End, ) { for (tag in testTags) { @@ -271,7 +273,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.End, ) { for (tag in testTags) { @@ -315,7 +317,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.End, ) { for (tag in testTags) { @@ -359,7 +361,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.End, ) { for (tag in testTags) { @@ -403,7 +405,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.Center, ) { for (tag in testTags) { @@ -448,7 +450,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.Center, ) { for (tag in testTags) { @@ -493,7 +495,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.Center, ) { for (tag in testTags) { @@ -538,7 +540,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.Center, ) { for (tag in testTags) { @@ -582,7 +584,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.Top, ) { for (tag in testTags) { @@ -624,7 +626,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.Top, ) { for (tag in testTags) { @@ -666,7 +668,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.Bottom, ) { for (tag in testTags) { @@ -708,7 +710,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.Bottom, ) { for (tag in testTags) { @@ -750,7 +752,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.Center, ) { for (tag in testTags) { @@ -793,7 +795,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.Center, ) { for (tag in testTags) { @@ -837,7 +839,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceEvenly, ) { for (tag in testTags) { @@ -883,7 +885,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceEvenly, ) { for (tag in testTags) { @@ -929,7 +931,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceEvenly, ) { for (tag in testTags) { @@ -975,7 +977,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceEvenly, ) { for (tag in testTags) { @@ -1020,7 +1022,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.SpaceEvenly, ) { for (tag in testTags) { @@ -1064,7 +1066,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.SpaceEvenly, ) { for (tag in testTags) { @@ -1109,7 +1111,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceBetween, ) { for (tag in testTags) { @@ -1155,7 +1157,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceBetween, ) { for (tag in testTags) { @@ -1201,7 +1203,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceBetween, ) { for (tag in testTags) { @@ -1247,7 +1249,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceBetween, ) { for (tag in testTags) { @@ -1292,7 +1294,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.SpaceBetween, ) { for (tag in testTags) { @@ -1336,7 +1338,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.SpaceBetween, ) { for (tag in testTags) { @@ -1381,7 +1383,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceAround, ) { for (tag in testTags) { @@ -1429,7 +1431,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceAround, ) { for (tag in testTags) { @@ -1477,7 +1479,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceAround, ) { for (tag in testTags) { @@ -1525,7 +1527,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid"), + .testTag(gridTag), horizontalArrangement = Arrangement.SpaceAround, ) { for (tag in testTags) { @@ -1572,7 +1574,7 @@ class GridArrangementTest { rowCount = rowCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.SpaceAround, ) { for (tag in testTags) { @@ -1618,7 +1620,7 @@ class GridArrangementTest { columnCount = columnCount, modifier = Modifier .height(gridHeight) - .testTag("grid"), + .testTag(gridTag), verticalArrangement = Arrangement.SpaceAround, ) { for (tag in testTags) { @@ -1663,7 +1665,7 @@ class GridArrangementTest { composeRule.setContent { HorizontalGrid( rowCount = rowCount, - modifier = Modifier.testTag("grid"), + modifier = Modifier.testTag(gridTag), horizontalArrangement = Arrangement.spacedBy(horizontalSpacing), verticalArrangement = Arrangement.spacedBy(verticalSpacing) ) { @@ -1692,7 +1694,7 @@ class GridArrangementTest { } } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo((childSize * columnCount) + (horizontalSpacing * (columnCount - 1))) .assertHeightIsEqualTo((childSize * rowCount) + (verticalSpacing * (rowCount - 1))) } @@ -1709,7 +1711,7 @@ class GridArrangementTest { composeRule.setContent { VerticalGrid( columnCount = columnCount, - modifier = Modifier.testTag("grid"), + modifier = Modifier.testTag(gridTag), horizontalArrangement = Arrangement.spacedBy(horizontalSpacing), verticalArrangement = Arrangement.spacedBy(verticalSpacing) ) { @@ -1738,7 +1740,7 @@ class GridArrangementTest { } } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo((childSize * columnCount) + (horizontalSpacing * (columnCount - 1))) .assertHeightIsEqualTo((childSize * rowCount) + (verticalSpacing * (rowCount - 1))) } diff --git a/grid/src/androidAndroidTest/kotlin/io/woong/compose/grid/GridTest.kt b/grid/src/androidAndroidTest/kotlin/io/woong/compose/grid/GridTest.kt index c7801a7..b29c088 100644 --- a/grid/src/androidAndroidTest/kotlin/io/woong/compose/grid/GridTest.kt +++ b/grid/src/androidAndroidTest/kotlin/io/woong/compose/grid/GridTest.kt @@ -41,18 +41,20 @@ class GridTest { @get:Rule val composeRule: ComposeContentTestRule = createComposeRule() + private val gridTag: String = "grid" + @Test fun testHorizontalGrid_noChild() { composeRule.setContent { HorizontalGrid( rowCount = 3, - modifier = Modifier.testTag("grid"), + modifier = Modifier.testTag(gridTag), content = {} ) } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(0.dp) .assertHeightIsEqualTo(0.dp) } @@ -62,13 +64,13 @@ class GridTest { composeRule.setContent { VerticalGrid( columnCount = 3, - modifier = Modifier.testTag("grid"), + modifier = Modifier.testTag(gridTag), content = {} ) } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(0.dp) .assertHeightIsEqualTo(0.dp) } @@ -82,7 +84,7 @@ class GridTest { composeRule.setContent { HorizontalGrid( rowCount = rowCount, - modifier = Modifier.testTag("grid") + modifier = Modifier.testTag(gridTag) ) { for (tag in testTags) { Box( @@ -104,7 +106,7 @@ class GridTest { } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(childSize) .assertHeightIsEqualTo(childSize * rowCount) } @@ -118,7 +120,7 @@ class GridTest { composeRule.setContent { VerticalGrid( columnCount = columnCount, - modifier = Modifier.testTag("grid") + modifier = Modifier.testTag(gridTag) ) { for (tag in testTags) { Box( @@ -140,7 +142,7 @@ class GridTest { } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(childSize * columnCount) .assertHeightIsEqualTo(childSize) } @@ -154,7 +156,7 @@ class GridTest { composeRule.setContent { HorizontalGrid( rowCount = rowCount, - modifier = Modifier.testTag("grid") + modifier = Modifier.testTag(gridTag) ) { for (tag in testTags) { Box( @@ -187,7 +189,7 @@ class GridTest { } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(childSize * 2) .assertHeightIsEqualTo(childSize * rowCount) } @@ -201,7 +203,7 @@ class GridTest { composeRule.setContent { VerticalGrid( columnCount = columnCount, - modifier = Modifier.testTag("grid") + modifier = Modifier.testTag(gridTag) ) { for (tag in testTags) { Box( @@ -234,7 +236,7 @@ class GridTest { } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(childSize * columnCount) .assertHeightIsEqualTo(childSize * 2) } @@ -248,7 +250,7 @@ class GridTest { composeRule.setContent { HorizontalGrid( rowCount = rowCount, - modifier = Modifier.testTag("grid") + modifier = Modifier.testTag(gridTag) ) { for (tag in testTags) { Box( @@ -289,7 +291,7 @@ class GridTest { } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(childSize * 3) .assertHeightIsEqualTo(childSize * rowCount) } @@ -303,7 +305,7 @@ class GridTest { composeRule.setContent { VerticalGrid( columnCount = columnCount, - modifier = Modifier.testTag("grid") + modifier = Modifier.testTag(gridTag) ) { for (tag in testTags) { Box( @@ -344,7 +346,7 @@ class GridTest { } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(childSize * columnCount) .assertHeightIsEqualTo(childSize * 3) } @@ -359,7 +361,7 @@ class GridTest { composeRule.setContent { HorizontalGrid( rowCount = rowCount, - modifier = Modifier.testTag("grid") + modifier = Modifier.testTag(gridTag) ) { for (tag in testTags) { Box( @@ -386,7 +388,7 @@ class GridTest { } } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(childSize * columnCount) .assertHeightIsEqualTo(childSize * rowCount) } @@ -401,7 +403,7 @@ class GridTest { composeRule.setContent { VerticalGrid( columnCount = columnCount, - modifier = Modifier.testTag("grid") + modifier = Modifier.testTag(gridTag) ) { for (tag in testTags) { Box( @@ -428,7 +430,7 @@ class GridTest { } } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(childSize * columnCount) .assertHeightIsEqualTo(childSize * rowCount) } @@ -447,7 +449,7 @@ class GridTest { composeRule.setContent { HorizontalGrid( rowCount = rowCount, - modifier = Modifier.testTag("grid") + modifier = Modifier.testTag(gridTag) ) { for (index in testTags.indices) { Box( @@ -476,7 +478,7 @@ class GridTest { } } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(150.dp) .assertHeightIsEqualTo(150.dp) } @@ -495,7 +497,7 @@ class GridTest { composeRule.setContent { VerticalGrid( columnCount = columnCount, - modifier = Modifier.testTag("grid") + modifier = Modifier.testTag(gridTag) ) { for (index in testTags.indices) { Box( @@ -525,7 +527,7 @@ class GridTest { } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(150.dp) .assertHeightIsEqualTo(150.dp) } @@ -543,7 +545,7 @@ class GridTest { rowCount = rowCount, modifier = Modifier .height(gridHeight) - .testTag("grid") + .testTag(gridTag) ) { for (tag in testTags) { Box( @@ -570,7 +572,7 @@ class GridTest { } } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(childSize * columnCount) .assertHeightIsEqualTo(gridHeight) } @@ -588,7 +590,7 @@ class GridTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid") + .testTag(gridTag) ) { for (tag in testTags) { Box( @@ -615,7 +617,7 @@ class GridTest { } } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(gridWidth) .assertHeightIsEqualTo(childSize * rowCount) } @@ -633,7 +635,7 @@ class GridTest { rowCount = rowCount, modifier = Modifier .height(gridHeight) - .testTag("grid") + .testTag(gridTag) ) { for (tag in testTags) { Box( @@ -685,7 +687,7 @@ class GridTest { } } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(childSize * columnCount) .assertHeightIsEqualTo(gridHeight) } @@ -703,7 +705,7 @@ class GridTest { columnCount = columnCount, modifier = Modifier .width(gridWidth) - .testTag("grid") + .testTag(gridTag) ) { for (tag in testTags) { Box( @@ -755,7 +757,7 @@ class GridTest { } } composeRule - .onNode(hasTestTag("grid")) + .onNode(hasTestTag(gridTag)) .assertWidthIsEqualTo(gridWidth) .assertHeightIsEqualTo(childSize * rowCount) }