Skip to content
This repository was archived by the owner on Aug 7, 2024. It is now read-only.

Commit 26e6fb9

Browse files
author
Nick Rout
committed
Fix tests
1 parent 76ad59d commit 26e6fb9

File tree

14 files changed

+21
-17
lines changed

14 files changed

+21
-17
lines changed

‎material3Lib/src/androidTest/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
-->
1616

1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
package="com.google.android.material.composethemeadapter3">
18+
package="com.google.android.material.composethemeadapter3.test">
1919

2020
<uses-sdk android:targetSdkVersion="29" />
2121

‎material3Lib/src/androidTest/java/com/google/android/material/composethemeadapter3/Mdc3Activity.kt renamed to ‎material3Lib/src/androidTest/java/com/google/android/material/composethemeadapter3/test/Mdc3Activity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter3
17+
package com.google.android.material.composethemeadapter3.test
1818

1919
import androidx.appcompat.app.AppCompatActivity
2020

‎material3Lib/src/androidTest/java/com/google/android/material/composethemeadapter3/Mdc3ThemeTest.kt renamed to ‎material3Lib/src/androidTest/java/com/google/android/material/composethemeadapter3/test/Mdc3ThemeTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter3
17+
package com.google.android.material.composethemeadapter3.test
1818

1919
import androidx.compose.material3.LocalContentColor
2020
import androidx.compose.material3.MaterialTheme
@@ -30,7 +30,8 @@ import androidx.compose.ui.unit.TextUnit
3030
import androidx.compose.ui.unit.em
3131
import androidx.compose.ui.unit.sp
3232
import androidx.test.filters.MediumTest
33-
import com.google.android.material.composethemeadapter3.test.R
33+
import com.google.android.material.composethemeadapter3.FontFamilyWithWeight
34+
import com.google.android.material.composethemeadapter3.Mdc3Theme
3435
import org.junit.Assert
3536
import org.junit.Rule
3637
import org.junit.Test

‎material3Lib/src/androidTest/java/com/google/android/material/composethemeadapter3/NotMdc3Activity.kt renamed to ‎material3Lib/src/androidTest/java/com/google/android/material/composethemeadapter3/test/NotMdc3Activity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter3
17+
package com.google.android.material.composethemeadapter3.test
1818

1919
import androidx.appcompat.app.AppCompatActivity
2020

‎material3Lib/src/androidTest/java/com/google/android/material/composethemeadapter3/NotMdc3ThemeTest.kt renamed to ‎material3Lib/src/androidTest/java/com/google/android/material/composethemeadapter3/test/NotMdc3ThemeTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter3
17+
package com.google.android.material.composethemeadapter3.test
1818

1919
import androidx.compose.ui.test.junit4.createAndroidComposeRule
2020
import androidx.test.filters.MediumTest
21+
import com.google.android.material.composethemeadapter3.Mdc3Theme
2122
import org.junit.Rule
2223
import org.junit.Test
2324
import org.junit.runner.RunWith

‎materialLib/src/androidTest/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
-->
1616

1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
package="com.google.android.material.composethemeadapter">
18+
package="com.google.android.material.composethemeadapter.test">
1919

2020
<uses-sdk android:targetSdkVersion="29" />
2121

‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/DarkMdcActivity.kt renamed to ‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/test/DarkMdcActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter
17+
package com.google.android.material.composethemeadapter.test
1818

1919
import android.content.Context
2020
import androidx.appcompat.app.AppCompatActivity

‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/DarkTheme.kt renamed to ‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/test/DarkTheme.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter
17+
package com.google.android.material.composethemeadapter.test
1818

1919
import android.content.Context
2020
import android.content.res.Configuration

‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/DefaultFontFamilyMdcActivity.kt renamed to ‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/test/DefaultFontFamilyMdcActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter
17+
package com.google.android.material.composethemeadapter.test
1818

1919
import androidx.appcompat.app.AppCompatActivity
2020

‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/DefaultFontFamilyMdcThemeTest.kt renamed to ‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/test/DefaultFontFamilyMdcThemeTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter
17+
package com.google.android.material.composethemeadapter.test
1818

1919
import android.view.ContextThemeWrapper
2020
import androidx.annotation.StyleRes
@@ -30,7 +30,7 @@ import androidx.compose.ui.text.font.FontWeight
3030
import androidx.compose.ui.text.font.toFontFamily
3131
import androidx.test.filters.MediumTest
3232
import androidx.test.filters.SdkSuppress
33-
import com.google.android.material.composethemeadapter.test.R
33+
import com.google.android.material.composethemeadapter.MdcTheme
3434
import org.junit.Assert.assertEquals
3535
import org.junit.Assert.assertNotEquals
3636
import org.junit.Rule

‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/LightMdcActivity.kt renamed to ‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/test/LightMdcActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter
17+
package com.google.android.material.composethemeadapter.test
1818

1919
import android.content.Context
2020
import androidx.appcompat.app.AppCompatActivity

‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/MdcThemeTest.kt renamed to ‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/test/MdcThemeTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter
17+
package com.google.android.material.composethemeadapter.test
1818

1919
import androidx.appcompat.app.AppCompatActivity
2020
import androidx.compose.foundation.shape.CornerSize
@@ -37,7 +37,8 @@ import androidx.compose.ui.unit.dp
3737
import androidx.compose.ui.unit.em
3838
import androidx.compose.ui.unit.sp
3939
import androidx.test.filters.MediumTest
40-
import com.google.android.material.composethemeadapter.test.R
40+
import com.google.android.material.composethemeadapter.FontFamilyWithWeight
41+
import com.google.android.material.composethemeadapter.MdcTheme
4142
import org.junit.Assert.assertEquals
4243
import org.junit.Assert.assertNotNull
4344
import org.junit.Assert.assertNull

‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/NotMdcActivity.kt renamed to ‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/test/NotMdcActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter
17+
package com.google.android.material.composethemeadapter.test
1818

1919
import androidx.appcompat.app.AppCompatActivity
2020

‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/NotMdcThemeTest.kt renamed to ‎materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/test/NotMdcThemeTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.android.material.composethemeadapter
17+
package com.google.android.material.composethemeadapter.test
1818

1919
import androidx.compose.ui.test.junit4.createAndroidComposeRule
2020
import androidx.test.filters.MediumTest
21+
import com.google.android.material.composethemeadapter.MdcTheme
2122
import org.junit.Rule
2223
import org.junit.Test
2324
import org.junit.runner.RunWith

0 commit comments

Comments
 (0)