1.1 --- a/mdr/test/unit/src/org/netbeans/mdr/test/AdditionalIndexTest.java Mon Nov 18 12:07:57 2002 +0000
1.2 +++ b/mdr/test/unit/src/org/netbeans/mdr/test/AdditionalIndexTest.java Mon Nov 18 15:51:26 2002 +0000
1.3 @@ -131,6 +131,8 @@
1.4 } // for
1.5 } // for
1.6
1.7 + pkg.refDelete ();
1.8 + modelPackage.refDelete ();
1.9 }
1.10
1.11 public void test_2 () {
1.12 @@ -188,6 +190,8 @@
1.13 } // if
1.14 } // for
1.15
1.16 + pkg.refDelete ();
1.17 + modelPackage.refDelete ();
1.18 }
1.19
1.20 public void test_3 () {
1.21 @@ -224,6 +228,9 @@
1.22 size = storage.getObjectsFromAdditionalIndex(((BaseObjectHandler)pkg)._getDelegate().getMofId(), "Indexik3", null).size();
1.23 if (size != 1)
1.24 fail ("found: " + size);
1.25 +
1.26 + pkg.refDelete ();
1.27 + modelPackage.refDelete ();
1.28 }
1.29
1.30 public void test_4 () {
1.31 @@ -301,6 +308,9 @@
1.32 size = storage.queryAdditionalIndex(((BaseObjectHandler)pkg)._getDelegate().getMofId(), "Index", map).size();
1.33 if (size != 2)
1.34 fail ("found: " + size);
1.35 +
1.36 + pkg.refDelete ();
1.37 + modelPackage.refDelete ();
1.38 }
1.39
1.40 }
2.1 --- a/mdr/test/unit/src/org/netbeans/mdr/test/AdvancedXMITest.java Mon Nov 18 12:07:57 2002 +0000
2.2 +++ b/mdr/test/unit/src/org/netbeans/mdr/test/AdvancedXMITest.java Mon Nov 18 15:51:26 2002 +0000
2.3 @@ -79,14 +79,14 @@
2.4 // **************************************************************************
2.5
2.6 public void testEncoding () {
2.7 - RefPackage pkg = instantiateModel ("Text.xml", "Text");
2.8 + RefPackage pkg = instantiateModel ("Text.xml", "Text", "EncodingPkg_1");
2.9 new RandomDataGenerator ().generate (pkg, 0, 6);
2.10
2.11 Lookup lookup = Lookup.getDefault ();
2.12
2.13 XMIWriter writer = XMIWriterFactory.getDefault ().createXMIWriter ();
2.14 XMIReader reader = XMIReaderFactory.getDefault ().createXMIReader ();
2.15 - ((OutputConfig) writer.getConfiguration()).setEncoding("UTF-8");
2.16 + writer.getConfiguration().setEncoding("UTF-8");
2.17
2.18 final String name = "test_encod.xml";
2.19 try {
2.20 @@ -102,7 +102,7 @@
2.21 repository.endTrans ();
2.22 }
2.23
2.24 - RefPackage pkg_2 = instantiateModel ("Text.xml", "Text");
2.25 + RefPackage pkg_2 = instantiateModel ("Text.xml", "Text", "EncodingPkg_2");
2.26 try {
2.27 repository.beginTrans (true);
2.28 reader.read (new File (name).toURL ().toExternalForm (), pkg_2);
2.29 @@ -113,15 +113,16 @@
2.30 }
2.31
2.32 compareData (pkg, pkg_2, new HashSet ());
2.33 + deleteModel (pkg);
2.34
2.35 }
2.36
2.37 // **************************************************************************
2.38
2.39 public void testConsumerProducer () {
2.40 - RefPackage pkg = instantiateModel ("Java.xml", "Core");
2.41 + RefPackage pkg = instantiateModel ("Java.xml", "Core", "ConsumerPkg_1");
2.42 new RandomDataGenerator ().generate (pkg, 122, 8);
2.43 - RefPackage pkg_2 = instantiateModel ("Java.xml", "Core");
2.44 + RefPackage pkg_2 = instantiateModel ("Java.xml", "Core", "ConsumerPkg_2");
2.45
2.46 Lookup lookup = Lookup.getDefault ();
2.47
2.48 @@ -140,12 +141,14 @@
2.49
2.50 compareData (pkg, pkg_2, new HashSet ());
2.51
2.52 + deleteModel (pkg);
2.53 + deleteModel (pkg_2);
2.54 }
2.55
2.56 // **************************************************************************
2.57
2.58 public void testReferenceProvider () {
2.59 - RefPackage pkg = instantiateModel ("Java.xml", "Core");
2.60 + RefPackage pkg = instantiateModel ("Java.xml", "Core", "Provider_1");
2.61 new RandomDataGenerator ().generate (pkg, 0, 7);
2.62
2.63 Lookup lookup = Lookup.getDefault ();
2.64 @@ -169,7 +172,7 @@
2.65 }
2.66 }
2.67
2.68 - RefPackage pkg_2 = instantiateModel ("Java.xml", "Core");
2.69 + RefPackage pkg_2 = instantiateModel ("Java.xml", "Core", "Provider_2");
2.70 try {
2.71 repository.beginTrans (true);
2.72 reader.read (file[0].toURL ().toExternalForm (), pkg_2);
2.73 @@ -180,13 +183,15 @@
2.74 }
2.75
2.76 compareData (pkg, pkg_2, new HashSet ());
2.77 -
2.78 +
2.79 + deleteModel (pkg);
2.80 + deleteModel (pkg_2);
2.81 }
2.82
2.83 // **************************************************************************
2.84
2.85 public void testReferenceResolver () {
2.86 - RefPackage pkg = instantiateModel ("Text.xml", "Text");
2.87 + RefPackage pkg = instantiateModel ("Text.xml", "Text", "Resolver_1");
2.88 new RandomDataGenerator ().generate (pkg, 0, 3);
2.89
2.90 Lookup lookup = Lookup.getDefault ();
2.91 @@ -223,7 +228,7 @@
2.92 }
2.93
2.94 File file = new File ("textExp.xml");
2.95 - RefPackage pkg_2 = instantiateModel ("Text.xml", "Text");
2.96 + RefPackage pkg_2 = instantiateModel ("Text.xml", "Text", "Resolver_2");
2.97 try {
2.98 repository.beginTrans (true);
2.99 reader.read (file.toURL ().toExternalForm (), pkg_2);
2.100 @@ -234,13 +239,14 @@
2.101 }
2.102
2.103 // compareData (pkg, pkg_2, new HashSet ());
2.104 -
2.105 + deleteModel (pkg);
2.106 + deleteModel (pkg_2);
2.107 }
2.108
2.109 // **************************************************************************
2.110
2.111 public void testHeaderProvider () {
2.112 - RefPackage pkg = instantiateModel ("Java.xml", "Core");
2.113 + RefPackage pkg = instantiateModel ("Java.xml", "Core", "HeaderProvider_1");
2.114 new RandomDataGenerator ().generate (pkg, 0, 3);
2.115
2.116 Lookup lookup = Lookup.getDefault ();
2.117 @@ -264,7 +270,7 @@
2.118 }
2.119
2.120 File file = new File ("headerTest.xml");
2.121 - RefPackage pkg_2 = instantiateModel ("Java.xml", "Core");
2.122 + RefPackage pkg_2 = instantiateModel ("Java.xml", "Core", "HeaderProvider_2");
2.123 try {
2.124 repository.beginTrans (true);
2.125 reader.read (file.toURL ().toExternalForm (), pkg_2);
2.126 @@ -275,6 +281,8 @@
2.127 }
2.128
2.129 compareData (pkg, pkg_2, new HashSet ());
2.130 + deleteModel (pkg);
2.131 + deleteModel (pkg_2);
2.132
2.133 }
2.134
2.135 @@ -288,15 +296,21 @@
2.136 *
2.137 * @return created extent
2.138 */
2.139 - private RefPackage instantiateModel (String docName, String mainPackageName) {
2.140 - ModelPackage pkg = loadMOFModel (docName, "PureMOF_test");
2.141 + private RefPackage instantiateModel (String docName, String mainPackageName, String metaPkgName) {
2.142 + ModelPackage pkg = loadMOFModel (docName, metaPkgName);
2.143 RefPackage result = createExtent (
2.144 findMofPackage (pkg, mainPackageName),
2.145 - mainPackageName
2.146 - );
2.147 + metaPkgName + "_"
2.148 + );
2.149 return result;
2.150 }
2.151
2.152 + private void deleteModel (RefPackage pkg) {
2.153 + RefPackage meta = pkg.refMetaObject ().refOutermostPackage ();
2.154 + pkg.refDelete ();
2.155 + meta.refDelete ();
2.156 + }
2.157 +
2.158 /**
2.159 * Compares instances counts in packages, fails if there is a proxy with different number
2.160 * of instantiated objects in each package.
3.1 --- a/mdr/test/unit/src/org/netbeans/mdr/test/DTDProducerTest.java Mon Nov 18 12:07:57 2002 +0000
3.2 +++ b/mdr/test/unit/src/org/netbeans/mdr/test/DTDProducerTest.java Mon Nov 18 15:51:26 2002 +0000
3.3 @@ -72,9 +72,9 @@
3.4 }
3.5
3.6 public void doTest (String xmlName, String packageName, String fileName) {
3.7 - RefPackage pkg = instantiateModel (xmlName, packageName);
3.8 + RefPackage pkg = instantiateModel (xmlName, packageName, packageName + "_1");
3.9 new RandomDataGenerator ().generate (pkg, 0, 12);
3.10 - RefPackage pkg2 = instantiateModel (xmlName, packageName);
3.11 + RefPackage pkg2 = instantiateModel (xmlName, packageName, packageName + "_2");
3.12
3.13 Lookup lookup = Lookup.getDefault ();
3.14 DTDProducer producer = DTDProducer.getDefault ();
3.15 @@ -123,17 +123,25 @@
3.16
3.17 Validator validator = new Validator ();
3.18 validator.validate (file);
3.19 -
3.20 +
3.21 + deleteModel (pkg);
3.22 + deleteModel (pkg2);
3.23 }
3.24
3.25 - private RefPackage instantiateModel (String docName, String mainPackageName) {
3.26 - ModelPackage pkg = loadMOFModel (docName, "PureMOF_test");
3.27 + private RefPackage instantiateModel (String docName, String mainPackageName, String extentName) {
3.28 + ModelPackage pkg = loadMOFModel (docName, extentName + "_meta");
3.29 RefPackage result = createExtent (
3.30 findMofPackage (pkg, mainPackageName),
3.31 - mainPackageName
3.32 + extentName
3.33 );
3.34 return result;
3.35 }
3.36 +
3.37 + private void deleteModel (RefPackage pkg) {
3.38 + RefPackage meta = pkg.refMetaObject ().refOutermostPackage ();
3.39 + pkg.refDelete ();
3.40 + meta.refDelete ();
3.41 + }
3.42
3.43 private void addDTDTag (File src, File dest, String dtdFileName) {
3.44 try {
4.1 --- a/mdr/test/unit/src/org/netbeans/mdr/test/MDRExportImportTest.java Mon Nov 18 12:07:57 2002 +0000
4.2 +++ b/mdr/test/unit/src/org/netbeans/mdr/test/MDRExportImportTest.java Mon Nov 18 15:51:26 2002 +0000
4.3 @@ -62,7 +62,7 @@
4.4 // **************************************************************************
4.5
4.6 public void test () {
4.7 - RefPackage pkg = instantiateModel ("Java.xml", "Core");
4.8 + RefPackage pkg = instantiateModel ("Java.xml", "Core", "Core");
4.9 new RandomDataGenerator ().generate (pkg, 0, 5);
4.10
4.11 Lookup lookup = Lookup.getDefault ();
4.12 @@ -89,10 +89,7 @@
4.13 } finally {
4.14 repository.endTrans ();
4.15 }
4.16 - try {
4.17 - pkg.refDelete ();
4.18 - } catch (Exception e) { // [PENDING]
4.19 - }
4.20 + deleteModel (pkg);
4.21 }
4.22
4.23 /**
4.24 @@ -155,6 +152,10 @@
4.25
4.26 // compare number of instances and links in both extents
4.27 compareData (pkg_1, pkg_2, new HashSet ());
4.28 +
4.29 + pkg_1.refDelete ();
4.30 + pkg_2.refDelete ();
4.31 + model.refDelete ();
4.32 }
4.33
4.34 /**
4.35 @@ -174,8 +175,8 @@
4.36 }
4.37
4.38 public void testCollectionWritting () {
4.39 - RefPackage pkg = instantiateModel ("Text.xml", "Text");
4.40 - RefPackage pkg2 = instantiateModel ("Text.xml", "Text");
4.41 + RefPackage pkg = instantiateModel ("Text.xml", "Text", "text_1");
4.42 + RefPackage pkg2 = instantiateModel ("Text.xml", "Text", "text_2");
4.43 new RandomDataGenerator ().generate (pkg, 0, 10);
4.44
4.45 Lookup lookup = Lookup.getDefault ();
4.46 @@ -231,6 +232,9 @@
4.47 fail ("Number of deserialized Classes does not match.");
4.48 if (pkg2.refClass ("Word").refAllOfType().size() != wordCount)
4.49 fail ("Number of deserialized Methods does not match.");
4.50 +
4.51 + deleteModel (pkg);
4.52 + deleteModel (pkg2);
4.53 }
4.54
4.55 // **************************************************************************
4.56 @@ -325,21 +329,18 @@
4.57 }
4.58 }
4.59
4.60 - /**
4.61 - * Creates extent for a metamodel specified by an XMI document.
4.62 - *
4.63 - * @param docName XMI document name
4.64 - * @param mainPackageName name of a MofPackage (included in XMI document) to instantiate
4.65 - *
4.66 - * @return created extent
4.67 - */
4.68 - private RefPackage instantiateModel (String docName, String mainPackageName) {
4.69 - ModelPackage pkg = loadMOFModel (docName, "PureMOF_test");
4.70 + private RefPackage instantiateModel (String docName, String mainPackageName, String extentName) {
4.71 + ModelPackage pkg = loadMOFModel (docName, extentName + "_meta");
4.72 RefPackage result = createExtent (
4.73 findMofPackage (pkg, mainPackageName),
4.74 - mainPackageName
4.75 + extentName
4.76 );
4.77 return result;
4.78 }
4.79
4.80 + private void deleteModel (RefPackage pkg) {
4.81 + RefPackage meta = pkg.refMetaObject ().refOutermostPackage ();
4.82 + pkg.refDelete ();
4.83 + meta.refDelete ();
4.84 + }
4.85 }
5.1 --- a/mdr/test/unit/src/org/netbeans/mdr/test/MDRTestCase.java Mon Nov 18 12:07:57 2002 +0000
5.2 +++ b/mdr/test/unit/src/org/netbeans/mdr/test/MDRTestCase.java Mon Nov 18 15:51:26 2002 +0000
5.3 @@ -105,6 +105,7 @@
5.4 try {
5.5 return repository.createExtent (name, pkg);
5.6 } catch (CreationFailedException e) {
5.7 + e.printStackTrace ();
5.8 }
5.9 fail ("Package instantiation failed: " + name);
5.10 return null;
6.1 --- a/mdr/test/unit/src/org/netbeans/mdr/test/StaticFeaturesTest.java Mon Nov 18 12:07:57 2002 +0000
6.2 +++ b/mdr/test/unit/src/org/netbeans/mdr/test/StaticFeaturesTest.java Mon Nov 18 15:51:26 2002 +0000
6.3 @@ -97,7 +97,10 @@
6.4
6.5 proxyD.setStaticFieldC (22);
6.6 if (!proxyB.getStaticFieldA().equals("abcdef"))
6.7 - fail();
6.8 + fail();
6.9 +
6.10 + pkg.refDelete ();
6.11 + modelPackage.refDelete ();
6.12 }
6.13
6.14 // static operator test
6.15 @@ -138,6 +141,9 @@
6.16
6.17 if (proxyD.compute(objD) != 333) // proxyD.compute always returns 333
6.18 fail();
6.19 +
6.20 + pkg.refDelete ();
6.21 + modelPackage.refDelete ();
6.22 }
6.23
6.24 // derived classifier-level attribute test
6.25 @@ -149,6 +155,9 @@
6.26
6.27 if (proxyD.getStaticDerivedField() != 123)
6.28 fail();
6.29 +
6.30 + pkg.refDelete ();
6.31 + modelPackage.refDelete ();
6.32 }
6.33
6.34 // classifier-level attribute test using reflective methods
6.35 @@ -190,5 +199,8 @@
6.36 proxyD.refSetValue("staticFieldC", new Integer(22));
6.37 if (!proxyB.refGetValue("staticFieldA").equals("abcdef"))
6.38 fail();
6.39 +
6.40 + pkg.refDelete ();
6.41 + modelPackage.refDelete ();
6.42 }
6.43 }