1.1 --- a/mdr/test/unit/src/org/netbeans/mdr/test/MDRExportImportTest.java	Mon Aug 04 10:59:29 2003 +0000
     1.2 +++ b/mdr/test/unit/src/org/netbeans/mdr/test/MDRExportImportTest.java	Mon Aug 04 12:06:48 2003 +0000
     1.3 @@ -139,7 +139,7 @@
     1.4          }
     1.5          
     1.6          // create second extent of UML metamodel
     1.7 -        RefPackage pkg_2 = createExtent (findMofPackage(model, "UML"), "UML");
     1.8 +        RefPackage pkg_2 = createExtent (findMofPackage(model, "UML"), "UML_2");
     1.9          // read back exported data
    1.10          try {
    1.11              repository.beginTrans (true);
    1.12 @@ -153,9 +153,9 @@
    1.13          // compare number of instances and links in both extents
    1.14          compareData (pkg_1, pkg_2, new HashSet ());
    1.15          
    1.16 -        pkg_1.refDelete ();
    1.17 -        pkg_2.refDelete ();
    1.18 -        model.refDelete ();
    1.19 +        deleteModel (pkg_1);
    1.20 +        deleteModel (pkg_2);
    1.21 +        deleteModel (model);        
    1.22      }
    1.23      
    1.24      /**
    1.25 @@ -337,7 +337,7 @@
    1.26          if (url == null)
    1.27              fail ("Resource not found.");
    1.28          RefPackage pkg = createExtent (
    1.29 -            findMofPackage (modelPackage, "Model"), "PureMOF_test"
    1.30 +            findMofPackage (modelPackage, "Model"), "PureMOF_test" + docName
    1.31          );
    1.32          try {
    1.33              repository.beginTrans (true);
    1.34 @@ -388,8 +388,20 @@
    1.35      }
    1.36      
    1.37      private void deleteModel (RefPackage pkg) {
    1.38 -        RefPackage meta = pkg.refMetaObject ().refOutermostPackage ();
    1.39 -        pkg.refDelete ();
    1.40 -        meta.refDelete ();
    1.41 +        RefPackage meta = null;
    1.42 +        try {
    1.43 +            if (pkg.refMetaObject () != null)
    1.44 +                meta = pkg.refMetaObject ().refOutermostPackage ();
    1.45 +        } catch (javax.jmi.reflect.InvalidObjectException e) {
    1.46 +        }
    1.47 +        try {
    1.48 +            pkg.refDelete ();
    1.49 +        } catch (Exception e) {
    1.50 +        }
    1.51 +        try {
    1.52 +            if (meta != null)
    1.53 +                meta.refDelete ();
    1.54 +        } catch (Exception e) {
    1.55 +        }
    1.56      }
    1.57  }