Merge pull request #143 from marytts/sorted-basenames-lst

Sorted basenames.lst
marytts · Jul 13, 2021 · 51453ba · 51453ba
2 parents 082ad42 + c68a1d7
commit 51453ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/groovy/de/dfki/mary/voicebuilding/tasks/GenerateBasenamesList.groovy b/src/main/groovy/de/dfki/mary/voicebuilding/tasks/GenerateBasenamesList.groovy
@@ -42,7 +42,7 @@ class GenerateBasenamesList extends DefaultTask {
             project.fileTree(wavDir).matching {
                 include this.includes.getOrElse('*').collect { it + '.wav' }
                 exclude this.excludes.getOrElse([]).collect { it + '.wav' }
-            }.each { wavFile ->
+            }.toSorted().each { wavFile ->
                 def basename = wavFile.name - '.wav'
                 def textFile = textDir.file("${basename}.txt").get().asFile
                 if (!textFile.canRead()) {

diff --git a/src/test/resources/de/dfki/mary/voicebuilding/dataPluginFunctionalTestBuildScript.gradle b/src/test/resources/de/dfki/mary/voicebuilding/dataPluginFunctionalTestBuildScript.gradle
@@ -113,10 +113,10 @@ task testBasenames(group: 'Verification') {
     doLast {
         def basenamesFile = file("$buildDir/basenames.lst")
         assert basenamesFile.exists()
-        def actual = basenamesFile.readLines() as Set
+        def actual = basenamesFile.readLines()
         def expected = fileTree("$buildDir/wav").include('*.wav').exclude('time0023.wav', 'unused.wav').collect {
             it.name - '.wav'
-        } as Set
+        }.unique().toSorted()
         assert actual == expected
     }
 }