Author: dgeraskov
Date: 2008-01-15 09:38:24 -0500 (Tue, 15 Jan 2008)
New Revision: 5694
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/Customization.java
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1622
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/Customization.java
===================================================================
---
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/Customization.java
(rev 0)
+++
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/Customization.java 2008-01-15
14:38:24 UTC (rev 5694)
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.console.test.mappingproject;
+
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class Customization {
+
+ /**
+ * is use TEST_PACKS_PATTERN to packages
+ */
+ public static final boolean U_TEST_PACKS_PATTERN = false;
+
+ /**
+ * packages name pattern
+ */
+ public static final String TEST_PACKS_PATTERN = ".*\\.optlock.*";
+
+ /**
+ * is stop after missing package or run further
+ */
+ public static final boolean STOP_AFTER_MISSING_PACK = false;
+
+ /**
+ * Shows each test run as individual
+ */
+ public static final boolean SHOW_EACH_TEST = true;
+
+ /**
+ * Delay in milliseconds after each package
+ */
+ public static final int EACTH_PACK_TEST_DELAY = 0;
+
+ /**
+ * Delay in milliseconds before closing workspace
+ */
+ public static final long AFTER_ALL_PACKS_DELAY = 20000;
+
+ /**
+ * Use time profiler
+ */
+ public static final boolean USE_CONSOLE_OUTPUT = true;
+
+
+}
Property changes on:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/Customization.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java
===================================================================
---
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java 2008-01-15
14:36:00 UTC (rev 5693)
+++
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java 2008-01-15
14:38:24 UTC (rev 5694)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
+import java.util.regex.Pattern;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestResult;
@@ -72,10 +74,6 @@
for (int i = 0; i < suite.testCount(); i++) {
Test test = suite.testAt(i);
test.run(result);
- /*if (result.failureCount() > 0 || result.errorCount() > 0){
- // we have failed tests after setup
- fail(((Throwable)result.failures().nextElement()).getMessage());
- }*/
}
}
@@ -88,12 +86,13 @@
super.run(result);
}
- public void tearDown() throws Exception {
+ public void tearDown() throws Exception {
waitForJobs();
- runTestsBeforeTearDown();
+ runTestsBeforeTearDown();
waitForJobs();
- this.project.deleteIProject();
- waitForJobs();
+ delay(1000);
+ //this.project.deleteIProject();
+ //waitForJobs();
super.tearDown();
}
@@ -112,6 +111,7 @@
* the number of milliseconds
*/
protected void delay(long waitTimeMillis) {
+ if (waitTimeMillis <= 0) return;
Display display = Display.getCurrent();
// If this is the UI thread,
@@ -148,11 +148,9 @@
}
public void testEachPackWithTestSet() throws JavaModelException {
- /*
- * (1) All test runs show as one
- * Comment this and uncomment (2) if you want to see each test run independent
- */
+ long start_time = System.currentTimeMillis();
TestSuite suite = TestSet.getTests();
+ int pack_count = 0;
IPackageFragmentRoot[] roots =
project.getIJavaProject().getAllPackageFragmentRoots();
for (int i = 0; i < roots.length; i++) {
if (roots[i].getClass() != PackageFragmentRoot.class) continue;
@@ -164,13 +162,17 @@
IPackageFragment pack = (IPackageFragment) javaElement;
// use packages only with compilation units
if (pack.getCompilationUnits().length == 0) continue;
+ if (Customization.U_TEST_PACKS_PATTERN &&
+ !Pattern.matches(Customization.TEST_PACKS_PATTERN, javaElement.getElementName())){
+ continue;
+ }
- /*
- * (2) Each test run shows independent
- * Comment this and uncomment (1) if you want to see all test runs as one
- * TestSuite suite = TestSet.getTests();
- */
-
+ long st_pack_time = System.currentTimeMillis();
+ int prev_failCount = result.failureCount();
+ int prev_errCount = result.errorCount();
+
+ if (Customization.SHOW_EACH_TEST) suite = TestSet.getTests();
+
activePackage = pack;
//==============================
//run all tests for package
@@ -180,14 +182,35 @@
waitForJobs();
}
//==============================
- }
- waitForJobs();
- //delay(15000);
- }
-
+ pack_count++;
+ if (Customization.USE_CONSOLE_OUTPUT){
+ System.out.print( result.errorCount() - prev_errCount + " errors. \t");
+ System.out.print( result.failureCount() - prev_failCount + "
fails.\t");
+ long period = System.currentTimeMillis() - st_pack_time;
+ String time = period / 1000 + "." + (period % 1000) / 100;
+ System.out.println( time +" sec. " +
javaElement.getElementName());
+ }
+ waitForJobs();
+ delay(Customization.EACTH_PACK_TEST_DELAY);
+
+ if (Customization.STOP_AFTER_MISSING_PACK){
+ if (result.failureCount() > prev_failCount) break;
+ }
+ prev_failCount = result.failureCount();
+ prev_errCount = result.errorCount();
+ }
+ }
}
- waitForJobs();
- //delay(10000);
+ if (Customization.USE_CONSOLE_OUTPUT){
+ System.out.println(
"=====================================================");
+ System.out.print( result.errorCount() + " errors. \t");
+ System.out.print( result.failureCount() + " fails.\t");
+ System.out.print(( System.currentTimeMillis() - start_time ) / 1000 + "
seconds.\t" );
+ System.out.println( pack_count + " packages tested." );
+ }
+ waitForJobs();
+
+ delay(Customization.AFTER_ALL_PACKS_DELAY);
}
/**