From 32efff8500e13954b29bad45024efeb0dec38f5d Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Mon, 17 Dec 2012 14:13:09 +0000 Subject: [PATCH] VoiceData.Exception: use AssertionError instead of Exception to get the language in the JUnit results. --- .../src/com/reecedunn/espeak/test/SpeechSynthesisTest.java | 2 +- .../src/com/reecedunn/espeak/test/TextToSpeechTest.java | 2 +- .../eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/eSpeakTests/src/com/reecedunn/espeak/test/SpeechSynthesisTest.java b/android/eSpeakTests/src/com/reecedunn/espeak/test/SpeechSynthesisTest.java index 8eae8b60..c83acb95 100644 --- a/android/eSpeakTests/src/com/reecedunn/espeak/test/SpeechSynthesisTest.java +++ b/android/eSpeakTests/src/com/reecedunn/espeak/test/SpeechSynthesisTest.java @@ -154,7 +154,7 @@ public class SpeechSynthesisTest extends AndroidTestCase assertThat(voice.locale.getVariant(), is(data.variant)); assertThat(voice.toString(), is(data.name)); } - catch (Exception e) + catch (AssertionError e) { throw new VoiceData.Exception(data, e); } diff --git a/android/eSpeakTests/src/com/reecedunn/espeak/test/TextToSpeechTest.java b/android/eSpeakTests/src/com/reecedunn/espeak/test/TextToSpeechTest.java index 00620217..72bf441c 100644 --- a/android/eSpeakTests/src/com/reecedunn/espeak/test/TextToSpeechTest.java +++ b/android/eSpeakTests/src/com/reecedunn/espeak/test/TextToSpeechTest.java @@ -137,7 +137,7 @@ public class TextToSpeechTest extends AndroidTestCase assertThat(mEngine.getLanguage().getCountry(), is("")); assertThat(mEngine.getLanguage().getVariant(), is("")); } - catch (Exception e) + catch (AssertionError e) { throw new VoiceData.Exception(data, e); } diff --git a/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java b/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java index e8524f69..6d52af06 100644 --- a/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java +++ b/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java @@ -58,7 +58,7 @@ public class VoiceData { private static final long serialVersionUID = 1L; - public Exception(Voice voice, java.lang.Exception context) + public Exception(Voice voice, AssertionError context) { super("Voice \"" + voice.name + "\" -- " + context); }