Bläddra i källkod

Fixing unit test issues

Ray Krueger 19 år sedan
förälder
incheckning
73cea493c6

+ 8 - 2
sandbox/pom.xml

@@ -49,6 +49,12 @@
       <version>1.2.6</version>
       <type>jar</type>
     </dependency>
+      <dependency>
+        <groupId>hsqldb</groupId>
+        <artifactId>hsqldb</artifactId>
+        <version>1.8.0.4</version>
+          <scope>test</scope>
+      </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -56,8 +62,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.4</source>
+          <target>1.4</target>
         </configuration>
       </plugin>
     </plugins>

+ 1 - 1
sandbox/src/main/java/org/acegisecurity/acls/domain/AclImpl.java

@@ -456,7 +456,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
         }
 
         sb.append("inheriting: ").append(this.entriesInheriting).append("; ");
-        sb.append("parent: ").append((this.parentAcl == null) ? "Null" : this.parentAcl.getObjectIdentity());
+        sb.append("parent: ").append((this.parentAcl == null) ? "Null" : this.parentAcl.getObjectIdentity().toString());
         sb.append("]");
 
         return sb.toString();

+ 6 - 6
sandbox/src/test/java/org/acegisecurity/acls/jdbc/JdbcAclServiceTests.java

@@ -47,12 +47,12 @@ public class JdbcAclServiceTests extends AbstractDependencyInjectionSpringContex
     }
 
     public void testStub() {
-        ObjectIdentity id1 = new ObjectIdentityImpl("sample.contact.Contact", new Long(1));
-        ObjectIdentity id2 = new ObjectIdentityImpl("sample.contact.Contact", new Long(2));
-        ObjectIdentity id3 = new ObjectIdentityImpl("sample.contact.Contact", new Long(3));
-        ObjectIdentity id4 = new ObjectIdentityImpl("sample.contact.Contact", new Long(4));
-        ObjectIdentity id5 = new ObjectIdentityImpl("sample.contact.Contact", new Long(5));
-        ObjectIdentity id6 = new ObjectIdentityImpl("sample.contact.Contact", new Long(6));
+        ObjectIdentity id1 = new ObjectIdentityImpl("java.lang.Object", new Long(1));
+        ObjectIdentity id2 = new ObjectIdentityImpl("java.lang.Object", new Long(2));
+        ObjectIdentity id3 = new ObjectIdentityImpl("java.lang.Object", new Long(3));
+        ObjectIdentity id4 = new ObjectIdentityImpl("java.lang.Object", new Long(4));
+        ObjectIdentity id5 = new ObjectIdentityImpl("java.lang.Object", new Long(5));
+        ObjectIdentity id6 = new ObjectIdentityImpl("java.lang.Object", new Long(6));
         Map map = jdbcAclService.readAclsById(new ObjectIdentity[] {id1, id2, id3, id4, id5, id6});
         Iterator iterator = map.keySet().iterator();