Skip to content

Commit 9cd794c

Browse files
committed
[Gradle] Remove unit test resources from main library source set and refactor the way test resources are configured/accessed
Resolves #1709 PiperOrigin-RevId: 449026115
1 parent 1e7bd27 commit 9cd794c

File tree

53 files changed

+53
-61
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+53
-61
lines changed

lib/build.gradle

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ android {
9797
srcDirs.forEach {
9898
main.res.srcDirs += 'java/' + it + '/res'
9999
main.res.srcDirs += 'java/' + it + '/res-public'
100+
test.res.srcDirs += 'javatests/' + it + '/res'
100101
}
101102

102103
test.java.srcDir 'javatests'
@@ -113,15 +114,6 @@ android {
113114
}
114115
}
115116

116-
// Add the resource directories to the main sourceSet for all test tasks
117-
gradle.projectsEvaluated {
118-
tasks.withType(Test) { task ->
119-
srcDirs.forEach {
120-
android.sourceSets.main.res.srcDirs += 'javatests/' + it + '/res'
121-
}
122-
}
123-
}
124-
125117
task generateJavadocs(type: Javadoc) {
126118
if (project.hasProperty("online")) {
127119
options.addStringOption("toroot", "/")

lib/javatests/com/google/android/material/appbar/MaterialToolbarTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.google.android.material.appbar;
1717

18-
import com.google.android.material.R;
18+
import com.google.android.material.test.R;
1919

2020
import static com.google.common.truth.Truth.assertThat;
2121

lib/javatests/com/google/android/material/badge/BadgeDrawableTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.google.android.material.badge;
1717

18-
import com.google.android.material.R;
18+
import com.google.android.material.test.R;
1919

2020
import static com.google.common.truth.Truth.assertThat;
2121

lib/javatests/com/google/android/material/badge/BadgeUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.google.android.material.badge;
1717

18-
import com.google.android.material.R;
18+
import com.google.android.material.test.R;
1919

2020
import static com.google.common.truth.Truth.assertThat;
2121

lib/javatests/com/google/android/material/bottomnavigation/BottomNavigationViewTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.google.android.material.bottomnavigation;
1717

18-
import com.google.android.material.R;
18+
import com.google.android.material.test.R;
1919

2020
import static com.google.common.truth.Truth.assertThat;
2121

lib/javatests/com/google/android/material/bottomsheet/BottomSheetBehaviorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.google.android.material.bottomsheet;
1717

18-
import com.google.android.material.R;
18+
import com.google.android.material.test.R;
1919

2020
import static com.google.common.truth.Truth.assertThat;
2121

lib/javatests/com/google/android/material/button/MaterialButtonTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.google.android.material.button;
1717

18-
import com.google.android.material.R;
18+
import com.google.android.material.test.R;
1919

2020
import static com.google.common.truth.Truth.assertThat;
2121

lib/javatests/com/google/android/material/button/MaterialButtonToggleGroupTest.java

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

1717
package com.google.android.material.button;
1818

19-
import com.google.android.material.R;
19+
import com.google.android.material.test.R;
2020

2121
import static android.view.View.GONE;
2222
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;

lib/javatests/com/google/android/material/checkbox/MaterialCheckBoxTest.java

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

1717
package com.google.android.material.checkbox;
1818

19-
import com.google.android.material.R;
19+
import com.google.android.material.test.R;
2020

2121
import static com.google.common.truth.Truth.assertThat;
2222

lib/javatests/com/google/android/material/chip/ChipGroupTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.google.android.material.chip;
1717

18-
import com.google.android.material.R;
18+
import com.google.android.material.test.R;
1919

2020
import static com.google.common.truth.Truth.assertThat;
2121
import static org.junit.Assert.assertEquals;

0 commit comments

Comments
 (0)