fix tests

Author: maiko3tattun

OpenUtau.Core/Classic/ClassicSinger.cs

@@ -47,18 +47,24 @@ public ClassicSinger(Voicebank voicebank) {
         }
 
         public override void EnsureLoaded() {
+            EnsureLoaded(false);
+        }
+        public void EnsureLoaded(bool isTest) {
             if (Loaded) {
                 return;
             }
-            Reload();
+            Reload(isTest);
         }
 
         public override void Reload() {
+            Reload(false);
+        }
+        private void Reload(bool isTest) {
             if (!Found) {
                 return;
             }
             try {
-                voicebank.Reload();
+                voicebank.Reload(isTest);
                 Load();
                 loaded = true;
                 if (otoWatcher == null) {

OpenUtau.Core/Classic/VoiceBank.cs

@@ -25,6 +25,9 @@ public class Voicebank {
         public string Id;
 
         public void Reload() {
+            Reload(false);
+        }
+        public void Reload(bool isTest) {
             Name = null;
             Image = null;
             Portrait = null;
@@ -40,7 +43,7 @@ public void Reload() {
             OtoSets.Clear();
             Subbanks.Clear();
             Id = null;
-            VoicebankLoader.LoadVoicebank(this);
+            VoicebankLoader.LoadVoicebank(this, isTest);
         }
 
         public override string ToString() {

OpenUtau.Core/Classic/VoicebankErrorChecker.cs

@@ -60,7 +60,7 @@ public void Check() {
                 });
             }
             try {
-                VoicebankLoader.LoadVoicebank(voicebank);
+                VoicebankLoader.LoadVoicebank(voicebank, false);
             } catch (Exception e) {
                 Errors.Add(new VoicebankError() {
                     message = "Failed to load voicebank",

OpenUtau.Core/Classic/VoicebankLoader.cs

@@ -57,15 +57,15 @@ public IEnumerable<Voicebank> SearchAll() {
             return result;
         }
 
-        public static void LoadVoicebank(Voicebank voicebank) {
+        public static void LoadVoicebank(Voicebank voicebank, bool isTest) {
             LoadInfo(voicebank, voicebank.File, voicebank.BasePath);
-            LoadOtoSets(voicebank, Path.GetDirectoryName(voicebank.File));
+            LoadOtoSets(voicebank, Path.GetDirectoryName(voicebank.File), isTest);
         }
 
-        public static void LoadOtoSets(Voicebank voicebank, string dirPath) {
+        public static void LoadOtoSets(Voicebank voicebank, string dirPath, bool isTest) {
             var otoFile = Path.Combine(dirPath, kOtoIni);
             if (File.Exists(otoFile)) {
-                var otoSet = ParseOtoSet(otoFile, voicebank.TextFileEncoding);
+                var otoSet = ParseOtoSet(otoFile, voicebank.TextFileEncoding, isTest);
                 var voicebankDir = Path.GetDirectoryName(voicebank.File);
                 otoSet.Name = Path.GetRelativePath(voicebankDir, dirPath);
                 if (otoSet.Name == ".") {
@@ -75,7 +75,7 @@ public static void LoadOtoSets(Voicebank voicebank, string dirPath) {
             }
             var dirs = Directory.GetDirectories(dirPath);
             foreach (var dir in dirs) {
-                LoadOtoSets(voicebank, dir);
+                LoadOtoSets(voicebank, dir, isTest);
             }
         }
 
@@ -288,10 +288,10 @@ public static Dictionary<Tuple<string, string>, SortedSet<int>> ParsePrefixMap(S
             }
         }
 
-        public static OtoSet ParseOtoSet(string filePath, Encoding encoding) {
+        public static OtoSet ParseOtoSet(string filePath, Encoding encoding, bool isTest) {
             try {
                 using (var stream = File.OpenRead(filePath)) {
-                    var otoSet = ParseOtoSet(stream, filePath, encoding);
+                    var otoSet = ParseOtoSet(stream, filePath, encoding, isTest);
                     AddAliasForMissingFiles(otoSet);
                     return otoSet;
                 }
@@ -301,7 +301,7 @@ public static OtoSet ParseOtoSet(string filePath, Encoding encoding) {
             return null;
         }
 
-        public static OtoSet ParseOtoSet(Stream stream, string filePath, Encoding encoding) {
+        public static OtoSet ParseOtoSet(Stream stream, string filePath, Encoding encoding, bool isTest) {
             OtoSet otoSet;
             using (var reader = new StreamReader(stream, encoding)) {
                 var trace = new FileTrace { file = filePath, lineNumber = 0 };
@@ -312,7 +312,7 @@ public static OtoSet ParseOtoSet(Stream stream, string filePath, Encoding encodi
                     var line = reader.ReadLine().Trim();
                     trace.line = line;
                     try {
-                        Oto oto = ParseOto(line, trace);
+                        Oto oto = ParseOto(line, trace, isTest);
                         if (oto != null) {
                             otoSet.Otos.Add(oto);
                         }
@@ -346,7 +346,7 @@ static void AddAliasForMissingFiles(OtoSet otoSet) {
             }
         }
 
-        static Oto ParseOto(string line, FileTrace trace) {
+        static Oto ParseOto(string line, FileTrace trace, bool isTest) {
             const string format = "<wav>=<alias>,<offset>,<consonant>,<cutoff>,<preutter>,<overlap>";
             var oto = new Oto {
                 FileTrace = new FileTrace(trace),
@@ -386,13 +386,13 @@ static Oto ParseOto(string line, FileTrace trace) {
                 oto.Error = $"{trace}\nFailed to parse overlap. Format is {format}.";
                 return oto;
             }
-#if DEBUG == false
-            string path = Path.Combine(Path.GetDirectoryName(trace.file), oto.Wav);
-            if (!File.Exists(path)) {
-                oto.Error = $"{trace}\nSound file missing. {path}";
-                return oto;
+            if (!isTest) {
+                string path = Path.Combine(Path.GetDirectoryName(trace.file), oto.Wav);
+                if (!File.Exists(path)) {
+                    oto.Error = $"{trace}\nSound file missing. {path}";
+                    return oto;
+                }
             }
-#endif
             oto.IsValid = true;
             return oto;
         }

OpenUtau.Test/Classic/VoicebankLoaderTest.cs

@@ -39,7 +39,7 @@ public void OtoSetRoundTrip() {
 ".Replace("\r\n", "\n");
 
             using (MemoryStream stream = new MemoryStream(Encoding.ASCII.GetBytes(text))) {
-                var otoSet = VoicebankLoader.ParseOtoSet(stream, "oto.ini", Encoding.ASCII);
+                var otoSet = VoicebankLoader.ParseOtoSet(stream, "oto.ini", Encoding.ASCII, true);
                 using (MemoryStream stream2 = new MemoryStream()) {
                     VoicebankLoader.WriteOtoSet(otoSet, stream2, Encoding.ASCII);
                     string actual = Encoding.ASCII.GetString(stream2.ToArray());

OpenUtau.Test/Plugins/PhonemizerTestBase.cs

@@ -26,9 +26,9 @@ public void RunPhonemizeTest(string singerName, string[] lyrics, string[] alts,
             var file = Path.Join(basePath, singerName, "character.txt");
 
             var voicebank = new Voicebank() { File = file, BasePath = dir };
-            VoicebankLoader.LoadVoicebank(voicebank);
+            VoicebankLoader.LoadVoicebank(voicebank, true);
             var singer = new ClassicSinger(voicebank);
-            singer.EnsureLoaded();
+            singer.EnsureLoaded(true);
 
             var timeAxis = new Core.TimeAxis();
             timeAxis.BuildSegments(new Core.Ustx.UProject());