[jbpm-commits] JBoss JBPM SVN: r2501 - in jbpm3/trunk/modules/core/src: test/java/org/jbpm/jpdl/par and 1 other directory.

[do-not-reply at jboss.org]

Author: camunda
Date: 2008-10-07 11:00:18 -0400 (Tue, 07 Oct 2008)
New Revision: 2501

Modified:
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveDeploymentDbTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ResourceAction.java
Log:
JBPM-1404
added verification of package information in classes from par to test case 
(see https://jira.jboss.org/jira/browse/JBPM-1404)

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java	2008-10-07 14:20:14 UTC (rev 2500)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/instantiation/ProcessClassLoader.java	2008-10-07 15:00:18 UTC (rev 2501)
@@ -112,6 +112,18 @@
       } catch (JbpmException e) {
         clazz = null;
       }
+      
+      // Add the package information
+      // see https://jira.jboss.org/jira/browse/JBPM-1404
+      // not necessary! Test passes without it?
+//      final int packageIndex = name.lastIndexOf('.');
+//      if (packageIndex != -1) {
+//        final String packageName = name.substring(0, packageIndex);
+//        final Package classPackage = getPackage(packageName);
+//        if (classPackage == null) {
+//          definePackage(packageName, null, null, null, null, null, null, null);
+//        }
+//      }
     }
 
     if (clazz==null) {

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveDeploymentDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveDeploymentDbTest.java	2008-10-07 14:20:14 UTC (rev 2500)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveDeploymentDbTest.java	2008-10-07 15:00:18 UTC (rev 2501)
@@ -158,6 +158,8 @@
   public static InputStream unexistingArchiveResourceStream = null;
   public static InputStream unexistingArchiveLoaderResourceStream = null;
 
+  public static Object resourceActionInstance = null;
+
   public void testExecuteResourceUsingProcess() throws Exception
   {
     // create a process archive file and save it to disk
@@ -205,6 +207,8 @@
         unexistingClassLoaderResourceStream = null;
         unexistingArchiveResourceStream = null;
         unexistingArchiveLoaderResourceStream = null;
+        
+        resourceActionInstance = null;
 
         processInstance.signal();
       }
@@ -234,6 +238,11 @@
     assertNull(unexistingClassLoaderResourceStream);
     assertNull(unexistingArchiveResourceStream);
     assertNull(unexistingArchiveLoaderResourceStream);
+    
+    // test if package information are set correctly
+    // see https://jira.jboss.org/jira/browse/JBPM-1404
+    assertEquals("org.jbpm.jpdl.par", resourceActionInstance.getClass().getPackage().getName());
+    resourceActionInstance = null;
   }
 
   private static void addEntry(ZipOutputStream zipOutputStream, String entryName, String resource) throws IOException

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ResourceAction.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ResourceAction.java	2008-10-07 14:20:14 UTC (rev 2500)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ResourceAction.java	2008-10-07 15:00:18 UTC (rev 2501)
@@ -15,6 +15,9 @@
 
   public void execute(ExecutionContext executionContext) throws Exception
   {
+    // remember action class instance
+    ProcessArchiveDeploymentDbTest.resourceActionInstance = this;
+    
     // class resources
 
     URL resource = getClass().getResource("classresource.txt");