Skip to content

Commit 23e2955

Browse files
Add test to verify third party service directory
1 parent 1568099 commit 23e2955

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ class LicensesTask extends DefaultTask {
107107
}
108108
}
109109

110-
for (filename in thirdPartyLicenses.sort{it.getName().toLowerCase()}) {
111-
addLicensesFromFile(filename)
112-
}
110+
addThirdPartyLicenses();
113111

114112
writeMetadata()
115113
}
@@ -302,6 +300,12 @@ class LicensesTask extends DefaultTask {
302300
start += content.length
303301
}
304302

303+
protected void addThirdPartyLicenses() {
304+
for (filename in thirdPartyLicenses.sort{it.getName().toLowerCase()}) {
305+
addLicensesFromFile(filename)
306+
}
307+
}
308+
305309
protected void writeMetadata() {
306310
for (entry in licensesMap) {
307311
licensesMetadata.append(entry.value, UTF_8)

oss-licenses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/LicensesTaskTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,4 +321,20 @@ public void testDependenciesWithNameDuplicatedNames() throws IOException {
321321
assertTrue(licensesTask.licensesMap.containsKey("groupF:deps6"));
322322
assertTrue(licensesTask.licensesMap.containsKey("groupF:deps7"));
323323
}
324+
325+
@Test
326+
public void testThirdPartyLicenses() throws IOException {
327+
File thirdPartyLicensesDir = new File(BASE_DIR + "/thirdPartyLicenses");
328+
File[] thirdPartyLicenses = thirdPartyLicensesDir.listFiles();
329+
assert thirdPartyLicenses != null;
330+
licensesTask.setThirdPartyLicenses(thirdPartyLicenses);
331+
licensesTask.addThirdPartyLicenses();
332+
333+
String expected = "test" + LINE_BREAK;
334+
String content = new String(Files.readAllBytes(thirdPartyLicenses[0].toPath()), UTF_8);
335+
336+
assertThat(licensesTask.licensesMap.size(), is(1));
337+
assertTrue(licensesTask.licensesMap.containsKey("license1"));
338+
assertEquals(expected, content);
339+
}
324340
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test

0 commit comments

Comments
 (0)