[jbpm-commits] JBoss JBPM SVN: r6404 - in jbpm4/trunk: modules/test-db/src/test/java/org/jbpm/test/process and 3 other directories.

Author: alex.guizar(a)jboss.com Date: 2010-06-11 09:11:04 -0400 (Fri, 11 Jun 2010) New Revision: 6404 Added: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.xml Removed: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.examples.xml Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskDueDateTest.java jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml jbpm4/trunk/qa/jdbc/mysql.properties Log: JBPM-2872: fix hudson db job - mysql chapter Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml 2010-06-10 19:17:23 UTC (rev 6403) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml 2010-06-11 13:11:04 UTC (rev 6404) @@ -9,4 +9,6 @@ <import resource="jbpm.identity.cfg.xml" /> <import resource="jbpm.businesscalendar.cfg.xml" /> + <import resource="jbpm.mail.templates.xml" /> + </jbpm-configuration> Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java 2010-06-10 19:17:23 UTC (rev 6403) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/process/RepositoryServiceTest.java 2010-06-11 13:11:04 UTC (rev 6404) @@ -21,13 +21,19 @@ */ package org.jbpm.test.process; +import java.sql.ResultSet; import java.util.List; +import org.hibernate.Session; + import org.jbpm.api.Execution; import org.jbpm.api.JbpmException; import org.jbpm.api.ProcessDefinition; import org.jbpm.api.ProcessDefinitionQuery; import org.jbpm.api.ProcessInstance; +import org.jbpm.api.cmd.Command; +import org.jbpm.api.cmd.Environment; +import org.jbpm.pvm.internal.cmd.CommandService; import org.jbpm.test.JbpmTestCase; /** @@ -379,6 +385,24 @@ * @see <a href="https://jira.jboss.org/browse/JBPM-2746">JBPM-2746<... */ public void testNonLatinProcessName() { + processEngine.execute(new Command<Void>() { + + public Void execute(Environment environment) throws Exception { + ResultSet resultSet = environment.get(Session.class) + .connection() + .createStatement() + .executeQuery("select @@character_set_client, @@character_set_connection, @@character_set_results, @@collation_connection"); + if (resultSet.next()) { + log.info("character set client: " + resultSet.getString(1)); + log.info("character set connection: " + resultSet.getString(2)); + log.info("character set results: " + resultSet.getString(3)); + log.info("collation connection: " + resultSet.getString(4)); + } + resultSet.close(); + return null; + } + }); + // "Lev Trotskij" deployJpdlXmlString("<process name='\u041B\u0435\u0412 \u0422\u0440\u043E\u0446\u043A\u0438\u0439'>" + " <start/>" + Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskDueDateTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskDueDateTest.java 2010-06-10 19:17:23 UTC (rev 6403) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskDueDateTest.java 2010-06-11 13:11:04 UTC (rev 6404) @@ -47,6 +47,7 @@ Calendar tomorrow = Calendar.getInstance(); tomorrow.add(Calendar.DATE, 1); + tomorrow.set(Calendar.MILLISECOND, 0); // mysql does not capture subsecond times Map<String, ? > variables = Collections.singletonMap("tomorrow", tomorrow); String processInstanceId = executionService.startProcessInstanceByKey("BaseDate", variables) .getId(); @@ -69,6 +70,7 @@ Calendar tomorrow = Calendar.getInstance(); tomorrow.add(Calendar.DATE, 1); + tomorrow.set(Calendar.MILLISECOND, 0); // mysql does not capture subsecond times Map<String, ? > variables = Collections.singletonMap("tomorrow", tomorrow); String processInstanceId = executionService.startProcessInstanceByKey( "BaseDatePlusDuration", variables).getId(); @@ -92,6 +94,7 @@ Calendar tomorrow = Calendar.getInstance(); tomorrow.add(Calendar.DATE, 1); + tomorrow.set(Calendar.MILLISECOND, 0); // mysql does not capture subsecond times Map<String, ? > variables = Collections.singletonMap("tomorrow", tomorrow); String processInstanceId = executionService.startProcessInstanceByKey( "BaseDateMinusDuration", variables).getId(); Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2010-06-10 19:17:23 UTC (rev 6403) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2010-06-11 13:11:04 UTC (rev 6404) @@ -9,6 +9,6 @@ <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> - <import resource="jbpm.mail.templates.examples.xml" /> + <import resource="jbpm.mail.templates.xml" /> </jbpm-configuration> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.examples.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.examples.xml 2010-06-10 19:17:23 UTC (rev 6403) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.examples.xml 2010-06-11 13:11:04 UTC (rev 6404) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jbpm-configuration> - - <process-engine-context> - - <mail-template name="rectify-template"> - <to addresses="${addressee}" /> - <cc users="bb" groups="innerparty" /> - <subject>rectify ${newspaper}</subject> - <text>${newspaper} ${date} ${details}</text> - </mail-template> - - </process-engine-context> - -</jbpm-configuration> Copied: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.xml (from rev 6386, jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.examples.xml) =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.xml (rev 0) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.templates.xml 2010-06-11 13:11:04 UTC (rev 6404) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <process-engine-context> + + <mail-template name="rectify-template"> + <to addresses="${addressee}" /> + <cc users="bb" groups="innerparty" /> + <subject>rectify ${newspaper}</subject> + <text>${newspaper} ${date} ${details}</text> + </mail-template> + + </process-engine-context> + +</jbpm-configuration> Modified: jbpm4/trunk/qa/jdbc/mysql.properties =================================================================== --- jbpm4/trunk/qa/jdbc/mysql.properties 2010-06-10 19:17:23 UTC (rev 6403) +++ jbpm4/trunk/qa/jdbc/mysql.properties 2010-06-11 13:11:04 UTC (rev 6404) @@ -1,4 +1,4 @@ jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com:3306/pvm1 +jdbc.url=jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com:3306/pvm1?characterEncoding=utf8 jdbc.username=pvm1 jdbc.password=pvm1