1.1 --- a/mdr/test/unit/src/org/netbeans/mdr/test/AdvancedXMITest.java	Sun Oct 27 19:39:58 2002 +0000
     1.2 +++ b/mdr/test/unit/src/org/netbeans/mdr/test/AdvancedXMITest.java	Tue Oct 29 15:57:43 2002 +0000
     1.3 @@ -76,40 +76,36 @@
     1.4          return setup;
     1.5      }
     1.6  
     1.7 -    /*
     1.8 -    public void testUML () {
     1.9 -        // load UML metamodel
    1.10 -        ModelPackage model = loadMOFModel("01-02-15_Diff.xml", "model");                
    1.11 -        // instantiate UML metamodels
    1.12 -        RefPackage pkg = createExtent (findMofPackage(model, "UML"), "UML");
    1.13 -        RefPackage pkg_2 = createExtent (findMofPackage(model, "UML"), "UML");
    1.14 -        // generate random instances and links
    1.15 -        new RandomDataGenerator ().generate (pkg, 0, 12);
    1.16 +    // **************************************************************************
    1.17 +
    1.18 +    public void testEncoding () {
    1.19 +        RefPackage pkg = instantiateModel ("Text.xml", "Text");
    1.20 +        new RandomDataGenerator ().generate (pkg, 0, 6);
    1.21          
    1.22          Lookup lookup = Lookup.getDefault ();
    1.23          
    1.24          XMIWriter writer = XMIWriterFactory.getDefault ().createXMIWriter ();
    1.25          XMIReader reader = XMIReaderFactory.getDefault ().createXMIReader ();
    1.26 -        writer.getConfiguration().setReferenceProvider(new Provider ());
    1.27 +        ((OutputConfig) writer.getConfiguration()).setEncoding("UTF-8");
    1.28 +
    1.29 +        final String name = "test_encod.xml";
    1.30 +        try {
    1.31 +            OutputStream os = new FileOutputStream (name);
    1.32 +            repository.beginTrans (true);
    1.33 +            writer.write (os, name, pkg, null);
    1.34 +            os.flush ();
    1.35 +            os.close ();
    1.36 +        } catch (Exception e) {
    1.37 +            e.printStackTrace();
    1.38 +            fail (e.getMessage ());
    1.39 +        } finally {
    1.40 +            repository.endTrans ();
    1.41 +        }
    1.42          
    1.43 -        for (int x = 0; x < N; x++) {
    1.44 -            try {
    1.45 -                OutputStream os = new FileOutputStream (file [x]);
    1.46 -                repository.beginTrans (true);
    1.47 -                writer.write (os, name [x], pkg, null);
    1.48 -                os.flush ();
    1.49 -                os.close ();
    1.50 -            } catch (Exception e) {
    1.51 -                e.printStackTrace();
    1.52 -                fail (e.getMessage ());
    1.53 -            } finally {
    1.54 -                repository.endTrans ();
    1.55 -            }
    1.56 -        }                    
    1.57 -                
    1.58 +        RefPackage pkg_2 = instantiateModel ("Text.xml", "Text");
    1.59          try {
    1.60              repository.beginTrans (true);
    1.61 -            reader.read (file[0].toURL ().toExternalForm (), pkg_2);
    1.62 +            reader.read (new File (name).toURL ().toExternalForm (), pkg_2);
    1.63          } catch (Exception e) {            
    1.64              fail (e.getMessage ());
    1.65          } finally {
    1.66 @@ -118,8 +114,7 @@
    1.67          
    1.68          compareData (pkg, pkg_2, new HashSet ());
    1.69          
    1.70 -    } 
    1.71 -     */           
    1.72 +    }
    1.73      
    1.74      // **************************************************************************
    1.75      
    1.76 @@ -186,7 +181,7 @@
    1.77          
    1.78          compareData (pkg, pkg_2, new HashSet ());
    1.79          
    1.80 -    }        
    1.81 +    }
    1.82      
    1.83      // **************************************************************************
    1.84      
    1.85 @@ -380,11 +375,16 @@
    1.86      
    1.87      public static class HeaderProvider implements XMIHeaderProvider {
    1.88          
    1.89 -        public void writeHeader (PrintStream stream) {
    1.90 -            stream.println("<XMI.documentation>");
    1.91 -            stream.println("    <XMI.exporter>Netbeans XMI Writer</XMI.exporter>");
    1.92 -            stream.println("    <XMI.exporterVersion>1.0</XMI.exporterVersion>");
    1.93 -            stream.println("</XMI.documentation>");
    1.94 +        public void writeHeader (Writer writer) {
    1.95 +            try {
    1.96 +                writer.write("<XMI.documentation>\n\r");
    1.97 +                writer.write("    <XMI.exporter>Netbeans XMI Writer</XMI.exporter>\n\r");
    1.98 +                writer.write("    <XMI.exporterVersion>1.0</XMI.exporterVersion>\n\r");
    1.99 +                writer.write("</XMI.documentation>\n\r");
   1.100 +            } catch (IOException e) {
   1.101 +                e.printStackTrace ();
   1.102 +                fail (e.getMessage ());
   1.103 +            }
   1.104          }
   1.105          
   1.106      }