@@ -88,96 +88,60 @@ public void setUp() throws Exception {
8888 }
8989
9090 @ Test
91- public void testShowProgress () {
91+ public void testShowProgress () throws InterruptedException {
9292 ss .showProgress (15 , 45 );
93- try {
94- final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
95- assertEquals (event .getProgressValue (), 15 );
96- assertEquals (event .getProgressMaximum (), 45 );
97- assertFalse (event .isWarning ());
98- }
99- catch (final InterruptedException e ) {
100- e .printStackTrace ();
101- fail ();
102- }
93+ final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
94+ assertEquals (event .getProgressValue (), 15 );
95+ assertEquals (event .getProgressMaximum (), 45 );
96+ assertFalse (event .isWarning ());
10397 }
10498
10599 @ Test
106- public void testShowStatusString () {
100+ public void testShowStatusString () throws InterruptedException {
107101 final String text = "Hello, world" ;
108102 ss .showStatus (text );
109- try {
110- final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
111- assertEquals (event .getStatusMessage (), text );
112- assertFalse (event .isWarning ());
113- }
114- catch (final InterruptedException e ) {
115- e .printStackTrace ();
116- fail ();
117- }
103+ final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
104+ assertEquals (event .getStatusMessage (), text );
105+ assertFalse (event .isWarning ());
118106 }
119107
120108 @ Test
121- public void testShowStatusIntIntString () {
109+ public void testShowStatusIntIntString () throws InterruptedException {
122110 final String text = "Working..." ;
123111 ss .showStatus (25 , 55 , text );
124- try {
125- final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
126- assertEquals (event .getProgressValue (), 25 );
127- assertEquals (event .getProgressMaximum (), 55 );
128- assertEquals (event .getStatusMessage (), text );
129- assertFalse (event .isWarning ());
130- }
131- catch (final InterruptedException e ) {
132- e .printStackTrace ();
133- fail ();
134- }
112+ final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
113+ assertEquals (event .getProgressValue (), 25 );
114+ assertEquals (event .getProgressMaximum (), 55 );
115+ assertEquals (event .getStatusMessage (), text );
116+ assertFalse (event .isWarning ());
135117 }
136118
137119 @ Test
138- public void testWarn () {
120+ public void testWarn () throws InterruptedException {
139121 final String text = "Totally hosed" ;
140122 ss .warn (text );
141- try {
142- final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
143- assertEquals (event .getStatusMessage (), text );
144- assertTrue (event .isWarning ());
145- }
146- catch (final InterruptedException e ) {
147- e .printStackTrace ();
148- fail ();
149- }
123+ final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
124+ assertEquals (event .getStatusMessage (), text );
125+ assertTrue (event .isWarning ());
150126 }
151127
152128 @ Test
153- public void testShowStatusIntIntStringBoolean () {
129+ public void testShowStatusIntIntStringBoolean () throws InterruptedException {
154130 final String text = "Working and hosed..." ;
155131 ss .showStatus (33 , 44 , text , true );
156- try {
157- final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
158- assertEquals (event .getStatusMessage (), text );
159- assertEquals (event .getProgressValue (), 33 );
160- assertEquals (event .getProgressMaximum (), 44 );
161- assertTrue (event .isWarning ());
162- }
163- catch (final InterruptedException e ) {
164- e .printStackTrace ();
165- fail ();
166- }
132+ final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
133+ assertEquals (event .getStatusMessage (), text );
134+ assertEquals (event .getProgressValue (), 33 );
135+ assertEquals (event .getProgressMaximum (), 44 );
136+ assertTrue (event .isWarning ());
167137 }
168138
169139 @ Test
170- public void testClearStatus () {
140+ public void testClearStatus () throws InterruptedException {
171141 ss .clearStatus ();
172- try {
173- final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
174- assertEquals (event .getStatusMessage (), "" );
175- assertFalse (event .isWarning ());
176- }
177- catch (final InterruptedException e ) {
178- e .printStackTrace ();
179- fail ();
180- }
142+ final StatusEvent event = queue .poll (10 , TimeUnit .SECONDS );
143+ assertEquals (event .getStatusMessage (), "" );
144+ assertFalse (event .isWarning ());
181145 }
182146
183147}
0 commit comments