1.1 --- a/mdr/test/cfg-perf.xml Mon Jul 15 14:34:23 2002 +0000
1.2 +++ b/mdr/test/cfg-perf.xml Mon Jul 15 15:09:03 2002 +0000
1.3 @@ -14,10 +14,18 @@
1.4 -->
1.5
1.6 <mconfig name="MDR performance test config">
1.7 - <testbag testattribs="stable" executor="code" name="MDR Performance">
1.8 + <testbag testattribs="stable" executor="code" name="MDR Performance (first start)" prio ="1">
1.9 <testset dir="perf/src">
1.10 <patternset>
1.11 <include name="org/netbeans/mdr/test/MDRPerformanceTests.class/testMDRFirstStart"/>
1.12 + </patternset>
1.13 + </testset>
1.14 + </testbag>
1.15 +
1.16 + <testbag testattribs="stable" executor="code" name="MDR Performance" prio = "2">
1.17 + <testset dir="perf/src">
1.18 + <patternset>
1.19 + <include name="org/netbeans/mdr/test/MDRPerformanceTests.class/testMDRStart"/>
1.20 <include name="org/netbeans/mdr/test/MDRPerformanceTests.class/testObjectCreation"/>
1.21 <include name="org/netbeans/mdr/test/MDRPerformanceTests.class/testAssociationCreation"/>
1.22 <include name="org/netbeans/mdr/test/MDRPerformanceTests.class/testAllOfClass"/>
2.1 --- a/mdr/test/perf/src/org/netbeans/mdr/test/MDRPerformanceTests.java Mon Jul 15 14:34:23 2002 +0000
2.2 +++ b/mdr/test/perf/src/org/netbeans/mdr/test/MDRPerformanceTests.java Mon Jul 15 15:09:03 2002 +0000
2.3 @@ -110,6 +110,31 @@
2.4 System.setProperty("org.openide.util.Lookup", "org.netbeans.mdr.test.MDRTestLookup");
2.5 System.setProperty("org.netbeans.mdr.SaveStorageOnExit", "true");
2.6 }
2.7 +
2.8 + if (repository == null) {
2.9 + MDRManager mdrManager = MDRManager.getDefault();
2.10 + if (mdrManager == null)
2.11 + fail("Unable to lookup MDRManager");
2.12 + repository = mdrManager.getDefaultRepository();
2.13 + if (repository == null)
2.14 + fail ("Repository not found.");
2.15 + }
2.16 +
2.17 + String timestamp = null;
2.18 + File timestampFile = new File(workDir + File.separator + "timestamp");
2.19 + if (timestampFile.exists()) {
2.20 + try {
2.21 + timestamp = new DataInputStream(new FileInputStream(timestampFile)).readUTF();
2.22 + } catch (Exception e) {}
2.23 + }
2.24 + else {
2.25 + timestamp = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date());
2.26 + try {
2.27 + DataOutputStream dos = new DataOutputStream(new FileOutputStream(timestampFile));
2.28 + dos.writeUTF(timestamp);
2.29 + dos.close();
2.30 + } catch (Exception e) {}
2.31 + }
2.32
2.33 if (!enabled && "true".equals(System.getProperty("netbeans.performance.enabled"))) {
2.34 enabled = true;
2.35 @@ -118,22 +143,13 @@
2.36 System.setProperty("netbeans.performance.serverURL","jdbc:mysql://beetle.czech.sun.com:3306/performance");
2.37 System.setProperty("netbeans.performance.testSuite","MDRPerformanceTests");
2.38 System.setProperty("netbeans.performance.totalTestCases","12");
2.39 - System.setProperty("org.openide.version",new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date()));
2.40 + System.setProperty("org.openide.version",timestamp);
2.41 System.setProperty("netbeans.build.branch","");
2.42 }
2.43
2.44 }
2.45
2.46 public void testMDRFirstStart () {
2.47 - XMIReader reader = XMIReader.getDefault();
2.48 - if (reader == null)
2.49 - fail("Unable to lookup XMIReader");
2.50 - MDRManager mdrManager = MDRManager.getDefault();
2.51 - if (mdrManager == null)
2.52 - fail("Unable to lookup MDRManager");
2.53 - repository = mdrManager.getDefaultRepository();
2.54 - if (repository == null)
2.55 - fail ("Repository not found.");
2.56 long start = System.currentTimeMillis();
2.57 repository.getExtent(MOFMODEL);
2.58 long result = System.currentTimeMillis() - start;
2.59 @@ -144,6 +160,35 @@
2.60 conn.logTestCase("MDR - booting MOF (first start)", result);
2.61 }
2.62 PrintStream log = getLog();
2.63 + log.println("MDR first startup performace results:");
2.64 + log.println("------------------------------------");
2.65 + log.println("Booting MOF: " + (float)result/(float)1000 + " s");
2.66 +
2.67 + ModelPackage mmExtent = null;
2.68 + try {
2.69 + start = System.currentTimeMillis();
2.70 + mmExtent = (ModelPackage) repository.createExtent(METAMODEL);
2.71 + result = System.currentTimeMillis() - start;
2.72 + } catch (CreationFailedException e) {
2.73 + fail ("Package instantiation failed: " + METAMODEL);
2.74 + }
2.75 +
2.76 + if (enabled)
2.77 + conn.logTestCase("MDR - instantiating MOF (first start)", result);
2.78 + log.println("Creating MOF instance: " + (float)result/(float)1000 + " s");
2.79 + }
2.80 +
2.81 + public void testMDRStart () {
2.82 + long start = System.currentTimeMillis();
2.83 + repository.getExtent(MOFMODEL);
2.84 + long result = System.currentTimeMillis() - start;
2.85 +
2.86 + PerformanceServerConnection conn = null;
2.87 + if (enabled) {
2.88 + conn = new PerformanceServerConnection();
2.89 + conn.logTestCase("MDR - booting MOF", result);
2.90 + }
2.91 + PrintStream log = getLog();
2.92 log.println("MDR startup performace results:");
2.93 log.println("------------------------------------");
2.94 log.println("Booting MOF: " + (float)result/(float)1000 + " s");
2.95 @@ -158,9 +203,13 @@
2.96 }
2.97
2.98 if (enabled)
2.99 - conn.logTestCase("MDR - instantiating MOF (first start)", result);
2.100 + conn.logTestCase("MDR - instantiating MOF", result);
2.101 log.println("Creating MOF instance: " + (float)result/(float)1000 + " s");
2.102
2.103 + XMIReader reader = XMIReader.getDefault();
2.104 + if (reader == null)
2.105 + fail("Unable to lookup XMIReader");
2.106 +
2.107 try {
2.108 repository.beginTrans (true);
2.109 reader.read (MODEL_XMI_URL.toString(), new RefPackage[] {mmExtent});
2.110 @@ -180,7 +229,7 @@
2.111 fail ("Package instantiation failed: " + MODEL);
2.112 }
2.113 }
2.114 -
2.115 +
2.116 public void testObjectCreation () {
2.117 initSupport();
2.118 long[] results = new long[MAX_ITERATIONS];