mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-07 07:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

TextToSpeechTest: always test getLanguage.

Browse Source 
This changes the getLanguage helper to return the result from
getLanguage on all platform versions, disabling the deprecated
message on API 21 and above.
This commit is contained in:
Reece H. Dunn
2014-10-29 16:32:25 +00:00
parent 7846e91089
commit 702f8be24f
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/eSpeakTests/src/com/reecedunn/espeak/test/TextToSpeechTest.java
+4 -7
View File
@@ -33,13 +33,10 @@ public class TextToSpeechTest extends TextToSpeechTestCase
Locale initialLocale = getLanguage(getEngine());
assertThat(getEngine().isLanguageAvailable(new Locale("cel")), isTtsLangCode(TextToSpeech.LANG_NOT_SUPPORTED));
Locale language = getLanguage(getEngine());
if (language != null) {
assertThat(getLanguage(getEngine()).getLanguage(), is(initialLocale.getLanguage()));
assertThat(getLanguage(getEngine()).getCountry(), is(initialLocale.getCountry()));
assertThat(getLanguage(getEngine()).getVariant(), is(initialLocale.getVariant()));
} else {
assertThat(initialLocale, is(nullValue()));
}
assertThat(getLanguage(getEngine()).getLanguage(), is(initialLocale.getLanguage()));
assertThat(getLanguage(getEngine()).getCountry(), is(initialLocale.getCountry()));
assertThat(getLanguage(getEngine()).getVariant(), is(initialLocale.getVariant()));
}
public void testLanguages()
android/eSpeakTests/src/com/reecedunn/espeak/test/TextToSpeechTestCase.java
+1 -8
View File
@@ -98,14 +98,7 @@ public class TextToSpeechTestCase extends AndroidTestCase
@SuppressWarnings("deprecation")
public static Locale getLanguage(TextToSpeech engine) {
if (engine != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
android.speech.tts.Voice voice = engine.getVoice();
if (voice != null) {
return voice.getLocale();
}
} else {
return engine.getLanguage();
}
return engine.getLanguage();
}
return null;
}