[jbpm-commits] JBoss JBPM SVN: r2540 - in jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src: main/java/org/jbpm/util and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Oct 14 19:45:02 EDT 2008


Author: alex.guizar at jboss.com
Date: 2008-10-14 19:45:01 -0400 (Tue, 14 Oct 2008)
New Revision: 2540

Removed:
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/context/package.html
Modified:
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteArray.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteBlockChopper.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ArrayUtil.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ByteUtil.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ClassLoaderUtil.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/EqualsUtil.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/IoUtil.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/JndiUtil.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StaticUtil.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StringUtil.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/XmlUtil.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AbstractJbpmTestCase.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/SerializabilityTest.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayTest.java
   jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java
Log:
[JBPM-1177] merged r2439:2440 https://svn.jboss.org/repos/jbpm/jbpm3/trunk

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteArray.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteArray.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteArray.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -48,7 +48,7 @@
   protected String name = null;
   protected List byteBlocks = null;
   
-  private static Log log = LogFactory.getLog(ByteArray.class);
+  private static final Log log = LogFactory.getLog(ByteArray.class);
   
   public ByteArray() {
   }

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteBlockChopper.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteBlockChopper.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteBlockChopper.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -22,55 +22,93 @@
 package org.jbpm.bytes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.jbpm.JbpmConfiguration;
 
 /**
  * is used by {@link org.jbpm.bytes.ByteArray} to chop a 
  * byte arrays into a list of chunks and glue them back together. 
  */
-public abstract class ByteBlockChopper {
+public class ByteBlockChopper {
 
+  private static final Log log = LogFactory.getLog(ByteBlockChopper.class);
+
+  private ByteBlockChopper() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static List chopItUp(byte[] byteArray) {
-    int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
     List bytes = null;
-    if ( (byteArray!=null)
-         && (byteArray.length>0) ){
-      bytes = new ArrayList();
-      int index = 0;
-      while ( (byteArray.length-index) > blockSize ) {
-        byte[] byteBlock = new byte[blockSize];
-        System.arraycopy(byteArray, index, byteBlock, 0, blockSize);
-        bytes.add(byteBlock);
-        index+=blockSize;
+    if (byteArray != null) {
+      int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
+      int byteCount = byteArray.length;
+      if (byteCount > blockSize) {
+        log.debug("chopping " + byteCount + " bytes");
+        bytes = new ArrayList();
+        int offset;
+        for (offset = 0; byteCount - offset > blockSize; offset += blockSize) {
+          bytes.add(subArray(byteArray, offset, blockSize));
+        }
+        bytes.add(subArray(byteArray, offset, byteCount - offset));
       }
-      byte[] byteBlock = new byte[byteArray.length-index];
-      System.arraycopy(byteArray, index, byteBlock, 0, byteArray.length-index);
-      bytes.add(byteBlock);
+      else if (byteCount > 0) {
+        log.debug("no need to chop " + byteCount + " bytes");
+        bytes = Collections.singletonList(byteArray);
+      }
     }
     return bytes;
   }
 
-  public static byte[] glueChopsBackTogether(List bytes) {
-    byte[] value = null;
+  private static byte[] subArray(byte[] array, int offset, int length) {
+    byte[] subArray = new byte[length];
+    System.arraycopy(array, offset, subArray, 0, length);
+    log.debug("chopped " + length + " bytes beggining at " + offset);
+    return subArray;
+  }
+
+  public static byte[] glueChopsBackTogether(List byteBlocks) {
+    byte[] byteArray = null;
     
-    if (bytes!=null) {
-      Iterator iter = bytes.iterator();
-      while (iter.hasNext()) {
-        byte[] byteBlock = (byte[]) iter.next();
-        if (value==null) {
-          value = byteBlock;
-        } else {
-          byte[] oldValue = value;
-          value = new byte[value.length+byteBlock.length];
-          System.arraycopy(oldValue, 0, value, 0, oldValue.length);
-          System.arraycopy(byteBlock, 0, value, oldValue.length, byteBlock.length);
+    if (byteBlocks != null) {
+      int blockCount = byteBlocks.size();
+      switch (blockCount) {
+      case 0:
+        break;
+      case 1:
+        byteArray = (byte[]) byteBlocks.get(0);
+        log.debug("no need to glue " + byteArray.length + " bytes");
+        break;
+      default:
+        int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
+        byte[] lastBlock = (byte[]) byteBlocks.get(blockCount - 1);
+        int byteCount = blockSize * (blockCount - 1) + lastBlock.length;
+        log.debug("gluing " + byteCount + " bytes");
+
+        byteArray = new byte[byteCount];
+        int offset = 0;
+        for (int i = 0, n = blockCount; i < n; i++) {
+          byte[] block = (byte[]) byteBlocks.get(i);
+          int length = block.length;
+          System.arraycopy(block, 0, byteArray, offset, length);
+          log.debug("glued " + length + " bytes beggining at " + offset);
+          // JBPM-702 sybase truncates trailing zeros
+          if (length < blockSize && i < n-1) {
+            Arrays.fill(byteArray, offset + length, offset + blockSize, (byte) 0);
+            log.debug("zero filled " + (blockSize - length) + " trailing bytes");
+            offset += blockSize;
+          }
+          else {
+            offset += length;            
+          }
         }
       }
     }
-
-    return value;
+    return byteArray;
   }
 }

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ArrayUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ArrayUtil.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ArrayUtil.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -21,8 +21,12 @@
  */
 package org.jbpm.util;
 
-public abstract class ArrayUtil {
+public class ArrayUtil {
 
+  private ArrayUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static String toString(Object[] array) {
     if (array==null) {
       return "null";

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ByteUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ByteUtil.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ByteUtil.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -1,7 +1,10 @@
 package org.jbpm.util;
 
+public class ByteUtil {
 
-public abstract class ByteUtil {
+  private ByteUtil() {
+    // hide default constructor to prevent instantiation
+  }
 
   public static String toString(byte[] bytes) {
     if (bytes == null) return "null";

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ClassLoaderUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ClassLoaderUtil.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ClassLoaderUtil.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -34,6 +34,10 @@
  */
 public class ClassLoaderUtil {
 
+  private ClassLoaderUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static Class loadClass(String className) {
     try {
       return getClassLoader().loadClass(className);

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/EqualsUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/EqualsUtil.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/EqualsUtil.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -21,8 +21,12 @@
  */
 package org.jbpm.util;
 
-public abstract class EqualsUtil {
+public class EqualsUtil {
 
+  private EqualsUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static boolean equals(Object thisObject, Object otherObject) {
     if ( (thisObject==null) || (otherObject==null) ) return false;
     

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/IoUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/IoUtil.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/IoUtil.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -28,10 +28,14 @@
 
 import org.jbpm.JbpmException;
 
-public abstract class IoUtil {
+public class IoUtil {
 
-  public static final int BUFFERSIZE = 4096;
+  private IoUtil() {
+    // hide default constructor to prevent instantiation
+  }
 
+  private static final int BUFFERSIZE = 4096;
+
   public static byte[] readBytes(InputStream inputStream) throws IOException {
     byte[] bytes = null;
     if (inputStream==null) {

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/JndiUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/JndiUtil.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/JndiUtil.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -27,8 +27,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public abstract class JndiUtil {
-  
+public class JndiUtil {
+
+  private JndiUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static Object lookup(String jndiName, Class type) {
     Object object = null;
     try {

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StaticUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StaticUtil.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StaticUtil.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -26,7 +26,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-public abstract class StaticUtil {
+public class StaticUtil {
 
   /*
   public class MyClass ... {
@@ -45,7 +45,7 @@
     ...
   }
   */
-  
+
   static Map initializers = Collections.synchronizedMap(new HashMap());
 
   public abstract static class Initializer {
@@ -56,6 +56,28 @@
     public abstract void init();
   }
 
+  /*
+  public class MyClass ... {
+    static AType aStaticInMyClass = null;
+    static AnotherType anotherStaticInMyClass = null;
+    
+    static {
+      new StaticUtil.Initializer(MyClass.class) {
+        public void init() {
+          // initialize static members here
+          aStaticInMyClass = ...;
+          anotherStaticInMyClass = ...;
+        }
+      };
+    }
+    ...
+  }
+  */
+
+  private StaticUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static void add(Class clazz, Initializer initializer) {
     initializers.put(clazz, initializer);
   }

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StringUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StringUtil.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StringUtil.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -10,6 +10,10 @@
   static final byte[] HEX_CHAR_TABLE = { (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8',
       (byte) '9', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f' };
 
+  private StringUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static String toHexString(byte[] bytes) {
     try {
       byte[] hex = new byte[2 * bytes.length];

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/XmlUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/XmlUtil.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/XmlUtil.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -47,8 +47,12 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
-public abstract class XmlUtil {
-  
+public class XmlUtil {
+
+  private XmlUtil() {
+    // hide default constructor to prevent instantiation
+  }
+
   public static Document parseXmlText(String xml) {
     ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
     return parseXmlInputSource(new InputSource(bais));

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AbstractJbpmTestCase.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AbstractJbpmTestCase.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AbstractJbpmTestCase.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -21,18 +21,14 @@
  */
 package org.jbpm;
 
-import java.io.Serializable;
-
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public class AbstractJbpmTestCase extends TestCase implements Serializable {
+public abstract class AbstractJbpmTestCase extends TestCase {
 
-  private static final long serialVersionUID = 1L;
-  
   private static Log log = LogFactory.getLog(AbstractJbpmTestCase.class);
 
   public void setUp() throws Exception {

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/SerializabilityTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/SerializabilityTest.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/SerializabilityTest.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -100,7 +100,6 @@
     "org.jbpm.security.authorizer.JbpmIdentityAuthorizer",
     "org.jbpm.security.authorizer.RolesAuthorizer",
     "org.jbpm.security.filter.JbpmAuthenticationFilter",
-    "org.jbpm.util.ClassLoaderUtil",
     "org.jbpm.command.service.CommandServiceImpl",
     "org.jbpm.msg.jms.JmsCommandFactory",
     "org.jbpm.msg.jms.JmsMessageConstants",
@@ -145,9 +144,10 @@
   private void assertSerializabilityOfClass(String className) {
     Class clazz = ClassLoaderUtil.loadClass(className);
     
-    if ( ! ( (Serializable.class.isAssignableFrom(clazz))
-             || (Modifier.isAbstract(clazz.getModifiers()))
-             || (isExcused(className))
+    if ( ! ( Serializable.class.isAssignableFrom(clazz)
+             || Modifier.isAbstract(clazz.getModifiers())
+             || isExcused(className)
+             || clazz.getConstructors().length == 0
            )
        ) {
       fail(className+" is NOT Serializable");
@@ -166,5 +166,4 @@
     return isExcused;
   }
 
-  // private static final Log log = LogFactory.getLog(SerializabilityTest.class);
 }

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -75,7 +75,7 @@
     assertNull(retrievedByteArray.getBytes());
   }
 
-  private byte[] getMultipleBlockBytes() {
+  private static byte[] getMultipleBlockBytes() {
     String text = "muchos bytes"; // (10 bytes)
     for (int i=0; i<8; i++) text+=text;
     // now text should be 2560 bytes

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayTest.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayTest.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -21,30 +21,36 @@
  */
 package org.jbpm.bytes;
 
-import junit.framework.TestCase;
+import java.util.List;
 
-public class ByteArrayTest extends TestCase {
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.JbpmConfiguration;
 
-  public void testByteChopping2Blocks() {
-    ByteArray byteArray = new ByteArray(new byte[2048]);
-    assertEquals(2, byteArray.byteBlocks.size());
-  }
+public class ByteArrayTest extends AbstractJbpmTestCase {
 
-  public void testByteChopping3Blocks() {
-    ByteArray byteArray = new ByteArray(new byte[2049]);
-    assertEquals(3, byteArray.byteBlocks.size());
+  public void testByteChoppingBlockCount() {
+    int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
+    for (int arrayLength = 125; arrayLength <= 1000; arrayLength *= 2) {
+      ByteArray byteArray = new ByteArray(new byte[arrayLength]);
+      int blockCount = arrayLength / blockSize;
+      if (arrayLength % blockSize > 0) blockCount++;
+      List byteBlocks = byteArray.byteBlocks;
+      assertEquals(blockCount, byteBlocks.size());
+    }
   }
-
+  
   public void testReassembling() {
-    ByteArray byteArray = new ByteArray(new byte[2049]);
-    assertEquals(2049, byteArray.getBytes().length);
+    for (int arrayLength = 125; arrayLength <= 1000; arrayLength *= 2) {
+      ByteArray byteArray = new ByteArray(new byte[arrayLength]);      
+      assertEquals(arrayLength, byteArray.getBytes().length);
+    }
   }
-  
+
   public void testEquals() {
     ByteArray left =  new ByteArray("the same bytes".getBytes());
     ByteArray right = new ByteArray("the same bytes".getBytes());
-    assertTrue(left.equals(right));
-    assertTrue(right.equals(left));
+    assertEquals(left, right);
+    assertEquals(right, left);
   }
 
   public void testNotEquals() {

Deleted: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/context/package.html
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/context/package.html	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/context/package.html	2008-10-14 23:45:01 UTC (rev 2540)
@@ -1,4 +0,0 @@
-<body>
-is the package that contains the context module, adding 
-process variables to the graph execution.
-</body>
\ No newline at end of file

Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java	2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java	2008-10-14 23:45:01 UTC (rev 2540)
@@ -38,10 +38,8 @@
 import org.jbpm.logging.log.ProcessLog;
 import org.jbpm.taskmgmt.exe.TaskInstance;
 
-public class AbstractDbTestCase extends AbstractJbpmTestCase {
+public abstract class AbstractDbTestCase extends AbstractJbpmTestCase {
 
-	private static final long serialVersionUID = 1L;
-
 	protected static JbpmConfiguration jbpmConfiguration = getDbTestJbpmConfiguration();
 
 	protected JbpmContext jbpmContext = null;




More information about the jbpm-commits mailing list