[jboss-cvs] javassist SVN: r652 - in branches/rel_3_12_0_sp: src/test/test/javassist/proxy and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2012-09-14 07:46:23 -0400 (Fri, 14 Sep 2012)
New Revision: 652

Modified:
   branches/rel_3_12_0_sp/pom.xml
   branches/rel_3_12_0_sp/src/test/test/javassist/proxy/ProxySerializationTest.java
Log:
Fix compiling and testing with Maven


Modified: branches/rel_3_12_0_sp/pom.xml
===================================================================
--- branches/rel_3_12_0_sp/pom.xml	2012-09-14 11:42:39 UTC (rev 651)
+++ branches/rel_3_12_0_sp/pom.xml	2012-09-14 11:46:23 UTC (rev 652)
@@ -40,8 +40,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <source>1.5</source>
+          <target>1.5</target>
         </configuration>
       </plugin>
       <plugin>
@@ -66,6 +66,12 @@
         </executions>
         <inherited>true</inherited>
       </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>always</forkMode>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <profiles>

Modified: branches/rel_3_12_0_sp/src/test/test/javassist/proxy/ProxySerializationTest.java
===================================================================
--- branches/rel_3_12_0_sp/src/test/test/javassist/proxy/ProxySerializationTest.java	2012-09-14 11:42:39 UTC (rev 651)
+++ branches/rel_3_12_0_sp/src/test/test/javassist/proxy/ProxySerializationTest.java	2012-09-14 11:46:23 UTC (rev 652)
@@ -69,7 +69,8 @@
             ProxyObjectInputStream in = new ProxyObjectInputStream(bis);
             TestClass newProxy = (TestClass)in.readObject();
             // inherited fields should have been deserialized
-            assert(proxy.getName() == newProxy.getName());
+            // do not assume the string is interned and use equals
+            assert(proxy.getName().equals(newProxy.getName()));
             // since we are reading into the same JVM the new proxy should have the same class as the old proxy
             assert(newProxy.getClass() == proxy.getClass());
         } catch (Exception e) {