Skip to content

Commit 5bd97a6

Browse files
mannodermausmannodermaus
committed
Use unified quotation marks throughout the plugin's sources
1 parent f57356c commit 5bd97a6

File tree

6 files changed

+66
-70
lines changed

6 files changed

+66
-70
lines changed

‎android-junit5/src/main/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnit5Test.groovy‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -115,24 +115,24 @@ class AndroidJUnit5Test extends JavaExec {
115115

116116
private void configureTaskInputs(AndroidJUnit5Test task, AndroidJUnitPlatformExtension junitExtension) {
117117
// Setup JUnit 5 properties
118-
task.inputs.property('enableStandardTestTask', junitExtension.enableStandardTestTask)
119-
task.inputs.property('selectors.uris', junitExtension.selectors.uris)
120-
task.inputs.property('selectors.files', junitExtension.selectors.files)
121-
task.inputs.property('selectors.directories', junitExtension.selectors.directories)
122-
task.inputs.property('selectors.packages', junitExtension.selectors.packages)
123-
task.inputs.property('selectors.classes', junitExtension.selectors.classes)
124-
task.inputs.property('selectors.methods', junitExtension.selectors.methods)
125-
task.inputs.property('selectors.resources', junitExtension.selectors.resources)
126-
task.inputs.property('filters.engines.include', junitExtension.filters.engines.include)
127-
task.inputs.property('filters.engines.exclude', junitExtension.filters.engines.exclude)
128-
task.inputs.property('filters.tags.include', junitExtension.filters.tags.include)
129-
task.inputs.property('filters.tags.exclude', junitExtension.filters.tags.exclude)
130-
task.inputs.property('filters.includeClassNamePatterns', junitExtension.filters.includeClassNamePatterns)
131-
task.inputs.property('filters.packages.include', junitExtension.filters.packages.include)
132-
task.inputs.property('filters.packages.exclude', junitExtension.filters.packages.exclude)
118+
task.inputs.property("enableStandardTestTask", junitExtension.enableStandardTestTask)
119+
task.inputs.property("selectors.uris", junitExtension.selectors.uris)
120+
task.inputs.property("selectors.files", junitExtension.selectors.files)
121+
task.inputs.property("selectors.directories", junitExtension.selectors.directories)
122+
task.inputs.property("selectors.packages", junitExtension.selectors.packages)
123+
task.inputs.property("selectors.classes", junitExtension.selectors.classes)
124+
task.inputs.property("selectors.methods", junitExtension.selectors.methods)
125+
task.inputs.property("selectors.resources", junitExtension.selectors.resources)
126+
task.inputs.property("filters.engines.include", junitExtension.filters.engines.include)
127+
task.inputs.property("filters.engines.exclude", junitExtension.filters.engines.exclude)
128+
task.inputs.property("filters.tags.include", junitExtension.filters.tags.include)
129+
task.inputs.property("filters.tags.exclude", junitExtension.filters.tags.exclude)
130+
task.inputs.property("filters.includeClassNamePatterns", junitExtension.filters.includeClassNamePatterns)
131+
task.inputs.property("filters.packages.include", junitExtension.filters.packages.include)
132+
task.inputs.property("filters.packages.exclude", junitExtension.filters.packages.exclude)
133133

134134
if (junitExtension.logManager) {
135-
systemProperty 'java.util.logging.manager', junitExtension.logManager
135+
systemProperty "java.util.logging.manager", junitExtension.logManager
136136
}
137137
}
138138

@@ -176,64 +176,64 @@ class AndroidJUnit5Test extends JavaExec {
176176
private List<String> buildArgs(project, junitExtension, reportsDir, testRootDirs) {
177177
def args = []
178178

179-
args.addAll(['--details', junitExtension.details.toString()])
179+
args.addAll(["--details", junitExtension.details.toString()])
180180

181181
addSelectors(project, junitExtension.selectors, testRootDirs, args)
182182
addFilters(junitExtension.filters, args)
183183

184-
args.addAll(['--reports-dir', reportsDir.getAbsolutePath()])
184+
args.addAll(["--reports-dir", reportsDir.getAbsolutePath()])
185185

186186
return args
187187
}
188188

189189
private void addFilters(filters, args) {
190190
filters.includeClassNamePatterns.each { pattern ->
191-
args.addAll(['-n', pattern])
191+
args.addAll(["-n", pattern])
192192
}
193193
filters.packages.include.each { includedPackage ->
194-
args.addAll(['--include-package', includedPackage])
194+
args.addAll(["--include-package", includedPackage])
195195
}
196196
filters.packages.exclude.each { excludedPackage ->
197-
args.addAll(['--exclude-package', excludedPackage])
197+
args.addAll(["--exclude-package", excludedPackage])
198198
}
199199
filters.tags.include.each { tag ->
200-
args.addAll(['-t', tag])
200+
args.addAll(["-t", tag])
201201
}
202202
filters.tags.exclude.each { tag ->
203-
args.addAll(['-T', tag])
203+
args.addAll(["-T", tag])
204204
}
205205
filters.engines.include.each { engineId ->
206-
args.addAll(['-e', engineId])
206+
args.addAll(["-e", engineId])
207207
}
208208
filters.engines.exclude.each { engineId ->
209-
args.addAll(['-E', engineId])
209+
args.addAll(["-E", engineId])
210210
}
211211
}
212212

213213
private void addSelectors(project, selectors, testRootDirs, args) {
214214
if (selectors.empty) {
215-
args.addAll(['--scan-class-path', testRootDirs.join(File.pathSeparator)])
215+
args.addAll(["--scan-class-path", testRootDirs.join(File.pathSeparator)])
216216
} else {
217217
selectors.uris.each { uri ->
218-
args.addAll(['-u', uri])
218+
args.addAll(["-u", uri])
219219
}
220220
selectors.files.each { file ->
221-
args.addAll(['-f', file])
221+
args.addAll(["-f", file])
222222
}
223223
selectors.directories.each { directory ->
224-
args.addAll(['-d', directory])
224+
args.addAll(["-d", directory])
225225
}
226226
selectors.packages.each { aPackage ->
227-
args.addAll(['-p', aPackage])
227+
args.addAll(["-p", aPackage])
228228
}
229229
selectors.classes.each { aClass ->
230-
args.addAll(['-c', aClass])
230+
args.addAll(["-c", aClass])
231231
}
232232
selectors.methods.each { method ->
233-
args.addAll(['-m', method])
233+
args.addAll(["-m", method])
234234
}
235235
selectors.resources.each { resource ->
236-
args.addAll(['-r', resource])
236+
args.addAll(["-r", resource])
237237
}
238238
}
239239
}

‎android-junit5/src/main/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformExtension.groovy‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@ class AndroidJUnitPlatformExtension extends JUnitPlatformExtension {
1818

1919
/**
2020
* The version of JUnit Jupiter to use.
21-
*
22-
* Defaults to {@code '5.0.0-RC2'}.
2321
*/
24-
String jupiterVersion = '5.0.0-RC2'
22+
String jupiterVersion = "5.0.0-RC2"
2523

2624
/**
2725
* The version of JUnit Vintage Engine to use.
28-
*
29-
* Defaults to {@code '4.12.0-RC2'}.
3026
*/
31-
String vintageVersion = '4.12.0-RC2'
27+
String vintageVersion = "4.12.0-RC2"
3228
}

‎android-junit5/src/main/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformPlugin.groovy‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
2020

2121
static final String LOG_TAG = "[android-junit5]"
2222

23-
static final String EXTENSION_NAME = 'junitPlatform'
23+
static final String EXTENSION_NAME = "junitPlatform"
2424

2525
/**
2626
* This method doesn't call through to super.apply().
@@ -36,21 +36,21 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
3636

3737
// Construct the platform extension (use our Android variant of the Extension class though)
3838
def junitExtension = project.extensions.create(EXTENSION_NAME, AndroidJUnitPlatformExtension, project)
39-
junitExtension.extensions.create('selectors', SelectorsExtension)
40-
junitExtension.extensions.create('filters', FiltersExtension)
41-
junitExtension.filters.extensions.create('packages', PackagesExtension)
42-
junitExtension.filters.extensions.create('tags', TagsExtension)
43-
junitExtension.filters.extensions.create('engines', EnginesExtension)
39+
junitExtension.extensions.create("selectors", SelectorsExtension)
40+
junitExtension.extensions.create("filters", FiltersExtension)
41+
junitExtension.filters.extensions.create("packages", PackagesExtension)
42+
junitExtension.filters.extensions.create("tags", TagsExtension)
43+
junitExtension.filters.extensions.create("engines", EnginesExtension)
4444

4545
// configuration.defaultDependencies used below was introduced in Gradle 2.5
46-
if (GradleVersion.current() < GradleVersion.version('2.5')) {
47-
throw new GradleException('android-junit5 plugin requires Gradle version 2.5 or higher')
46+
if (GradleVersion.current() < GradleVersion.version("2.5")) {
47+
throw new GradleException("android-junit5 plugin requires Gradle version 2.5 or higher")
4848
}
4949

5050
// Add required JUnit Platform dependencies to a custom configuration that
5151
// will later be used to create the classpath for the custom task created
5252
// by this plugin.
53-
def configuration = project.configurations.maybeCreate('junitPlatform')
53+
def configuration = project.configurations.maybeCreate("junitPlatform")
5454
configuration.defaultDependencies { deps ->
5555
// By default, include both TestEngines
5656
// and the Launcher-related dependencies

‎android-junit5/src/test/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformSpec.groovy‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
6666

6767
/* Abstract */
6868

69-
protected abstract String testCompileDependency()
69+
protected abstract String testCompileDependencyName()
7070

71-
protected abstract String testRuntimeDependency()
71+
protected abstract String testRuntimeDependencyName()
7272

7373
/* Test Cases */
7474

@@ -77,7 +77,7 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
7777
Project p = ProjectBuilder.builder().withParent(testRoot).build()
7878
p.file(".").mkdir()
7979

80-
p.apply plugin: 'de.mannodermaus.android-junit5'
80+
p.apply plugin: "de.mannodermaus.android-junit5"
8181

8282
then:
8383
def e = thrown(PluginApplicationException)
@@ -91,8 +91,8 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
9191
p.file("src/main").mkdirs()
9292
p.file("src/main/AndroidManifest.xml").withWriter { it.write(ANDROID_MANIFEST) }
9393

94-
p.apply plugin: 'com.android.application'
95-
p.apply plugin: 'de.mannodermaus.android-junit5'
94+
p.apply plugin: "com.android.application"
95+
p.apply plugin: "de.mannodermaus.android-junit5"
9696
p.android {
9797
compileSdkVersion COMPILE_SDK
9898
buildToolsVersion BUILD_TOOLS
@@ -119,8 +119,8 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
119119
p.file("src/main").mkdirs()
120120
p.file("src/main/AndroidManifest.xml").withWriter { it.write(ANDROID_MANIFEST) }
121121

122-
p.apply plugin: 'com.android.library'
123-
p.apply plugin: 'de.mannodermaus.android-junit5'
122+
p.apply plugin: "com.android.library"
123+
p.apply plugin: "de.mannodermaus.android-junit5"
124124
p.android {
125125
compileSdkVersion COMPILE_SDK
126126
buildToolsVersion BUILD_TOOLS
@@ -143,7 +143,7 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
143143
testApkProject.file("src/main").mkdirs()
144144
testApkProject.file("src/main/AndroidManifest.xml").withWriter { it.write(ANDROID_MANIFEST) }
145145

146-
testApkProject.apply plugin: 'com.android.library'
146+
testApkProject.apply plugin: "com.android.library"
147147
testApkProject.android {
148148
compileSdkVersion COMPILE_SDK
149149
buildToolsVersion BUILD_TOOLS
@@ -154,8 +154,8 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
154154
p.file("src/main").mkdirs()
155155
p.file("src/main/AndroidManifest.xml").withWriter { it.write(ANDROID_MANIFEST) }
156156

157-
p.apply plugin: 'com.android.application'
158-
p.apply plugin: 'de.mannodermaus.android-junit5'
157+
p.apply plugin: "com.android.application"
158+
p.apply plugin: "de.mannodermaus.android-junit5"
159159
p.repositories {
160160
jcenter()
161161
}
@@ -173,7 +173,7 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
173173
}
174174
p.dependencies {
175175
// "testApk" or "testRuntimeOnly"
176-
add(testRuntimeDependency(), testApkProject)
176+
add(testRuntimeDependencyName(), testApkProject)
177177
}
178178
p.evaluate()
179179

@@ -208,8 +208,8 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
208208
p.file("src/main").mkdirs()
209209
p.file("src/main/AndroidManifest.xml").withWriter { it.write(ANDROID_MANIFEST) }
210210

211-
p.apply plugin: 'com.android.application'
212-
p.apply plugin: 'de.mannodermaus.android-junit5'
211+
p.apply plugin: "com.android.application"
212+
p.apply plugin: "de.mannodermaus.android-junit5"
213213
p.android {
214214
compileSdkVersion COMPILE_SDK
215215
buildToolsVersion BUILD_TOOLS
@@ -243,7 +243,7 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
243243
p.tasks.getByName("junitPlatformTestPaidRelease")
244244
}
245245

246-
@IgnoreIf({ AndroidJUnitPlatformSpec.isAgp3x() })
246+
@IgnoreIf({ isAgp3x() })
247247
def "custom junit jupiter version"() {
248248
when:
249249
def nonExistentVersion = "0.0.0"
@@ -253,8 +253,8 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
253253
p.file("src/main").mkdirs()
254254
p.file("src/main/AndroidManifest.xml").withWriter { it.write(ANDROID_MANIFEST) }
255255

256-
p.apply plugin: 'com.android.application'
257-
p.apply plugin: 'de.mannodermaus.android-junit5'
256+
p.apply plugin: "com.android.application"
257+
p.apply plugin: "de.mannodermaus.android-junit5"
258258
p.android {
259259
compileSdkVersion COMPILE_SDK
260260
buildToolsVersion BUILD_TOOLS
@@ -276,7 +276,7 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
276276
}
277277
p.dependencies {
278278
// "testCompile" or "testApi"
279-
invokeMethod(testCompileDependency(), junitJupiter())
279+
invokeMethod(testCompileDependencyName(), junitJupiter())
280280
}
281281

282282
then:

‎android-junit5/src/testAgp2x/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformAgp2xSpec.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ package de.mannodermaus.gradle.plugins.android_junit5
77
class AndroidJUnitPlatformAgp2xSpec extends AndroidJUnitPlatformSpec {
88

99
@Override
10-
protected String testCompileDependency() {
10+
protected String testCompileDependencyName() {
1111
return "testCompile"
1212
}
1313

1414
@Override
15-
protected String testRuntimeDependency() {
15+
protected String testRuntimeDependencyName() {
1616
return "testApk"
1717
}
1818
}

‎android-junit5/src/testAgp3x/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformAgp3xSpec.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package de.mannodermaus.gradle.plugins.android_junit5
33
class AndroidJUnitPlatformAgp3xSpec extends AndroidJUnitPlatformSpec {
44

55
@Override
6-
protected String testCompileDependency() {
7-
return "testApi"
6+
protected String testCompileDependencyName() {
7+
return "testImplementation"
88
}
99

1010
@Override
11-
protected String testRuntimeDependency() {
11+
protected String testRuntimeDependencyName() {
1212
return "testRuntimeOnly"
1313
}
1414
}

0 commit comments

Comments
 (0)