1.1 --- a/openide.util/test/unit/src/org/openide/ErrorManagerDelegatesToLoggingTest.java	Mon Jul 02 15:01:07 2007 +0000
     1.2 +++ b/openide.util/test/unit/src/org/openide/ErrorManagerDelegatesToLoggingTest.java	Tue Jul 24 21:23:15 2007 +0000
     1.3 @@ -19,16 +19,16 @@
     1.4  
     1.5  package org.openide;
     1.6  
     1.7 +import java.io.ByteArrayInputStream;
     1.8  import java.io.IOException;
     1.9  import java.io.PrintWriter;
    1.10 -import java.io.StringBufferInputStream;
    1.11  import java.io.StringWriter;
    1.12  import java.util.logging.Handler;
    1.13  import java.util.logging.Level;
    1.14  import java.util.logging.LogManager;
    1.15  import java.util.logging.LogRecord;
    1.16 -import junit.framework.*;
    1.17 -import org.netbeans.junit.*;
    1.18 +import org.netbeans.junit.NbTestCase;
    1.19 +import org.openide.util.Lookup;
    1.20  
    1.21  /** Test for general ErrorManager functionality.
    1.22   *
    1.23 @@ -36,18 +36,18 @@
    1.24   */
    1.25  public class ErrorManagerDelegatesToLoggingTest extends NbTestCase {
    1.26  
    1.27 -    public ErrorManagerDelegatesToLoggingTest(java.lang.String testName) {
    1.28 +    public ErrorManagerDelegatesToLoggingTest(String testName) {
    1.29          super(testName);
    1.30      }
    1.31      
    1.32      protected void setUp () throws IOException {
    1.33 -        assertNull ("No ErrorManager in lookup", org.openide.util.Lookup.getDefault ().lookup (ErrorManager.class));
    1.34 +        assertNull("No ErrorManager in lookup", Lookup.getDefault().lookup(ErrorManager.class));
    1.35          
    1.36          
    1.37          String config = 
    1.38              "handlers=" + MyHandler.class.getName() + "\n" +
    1.39              ".level=50\n";
    1.40 -        LogManager.getLogManager().readConfiguration(new StringBufferInputStream(config));
    1.41 +        LogManager.getLogManager().readConfiguration(new ByteArrayInputStream(config.getBytes()));
    1.42  
    1.43          MyHandler.messages.setLength(0);
    1.44      }
    1.45 @@ -87,8 +87,8 @@
    1.46          Throwable value = ErrorManager.getDefault ().annotate(t, ErrorManager.INFORMATIONAL, null, null, null, null);
    1.47          assertEquals ("Annotate must return the same exception", t, value);
    1.48          
    1.49 -        value = ErrorManager.getDefault ().copyAnnotation (t, new Throwable ());
    1.50 -        assertEquals ("copyAnnotation must return the same exception", t, value);
    1.51 +        @SuppressWarnings("deprecation") Throwable _value = ErrorManager.getDefault().copyAnnotation(t, new Throwable());
    1.52 +        assertEquals ("copyAnnotation must return the same exception", t, _value);
    1.53          
    1.54          value = ErrorManager.getDefault ().attachAnnotations(t, new ErrorManager.Annotation[0]);
    1.55          assertEquals ("attachAnnotations must return the same exception", t, value);