[jbosscache-commits] JBoss Cache SVN: r4777 - in pojo/tags: 2.1.0.CR2 and 1 other directories.

Author: jason.greene(a)jboss.com Date: 2007-11-26 13:19:25 -0500 (Mon, 26 Nov 2007) New Revision: 4777 Added: pojo/tags/2.1.0.CR2/ pojo/tags/2.1.0.CR2/pom.xml pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java Removed: pojo/tags/2.1.0.CR2/pom.xml pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java Log: Tag CR2 Copied: pojo/tags/2.1.0.CR2 (from rev 4765, pojo/branches/2.1) Deleted: pojo/tags/2.1.0.CR2/pom.xml =================================================================== --- pojo/branches/2.1/pom.xml 2007-11-15 18:07:41 UTC (rev 4765) +++ pojo/tags/2.1.0.CR2/pom.xml 2007-11-26 18:19:25 UTC (rev 4777) @@ -1,288 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <properties> - <jbosscache-pojo-version>2.1.0.CR1</jbosscache-pojo-version> - <jbosscache-core-version>2.1.0.CR1</jbosscache-core-version> - <jboss.aop.version>2.0.0.beta1</jboss.aop.version> - </properties> - <parent> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-common-parent</artifactId> - <version>1.1</version> - </parent> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-pojo</artifactId> - <version>${jbosscache-pojo-version}</version> - <name>JBoss Cache - POJO Edition</name> - <description>JBoss Cache - POJO Edition</description> - <packaging>jar</packaging> - <dependencies> - <dependency> - <groupId>org.jboss.aop</groupId> - <artifactId>jboss-aop</artifactId> - <version>${jboss.aop.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>${jbosscache-core-version}</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>${jbosscache-core-version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <!-- Hack AOP has broken deps --> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> - <version>2.0.0.Beta4</version> - <scope>runtime</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-1</version> - <executions> - <execution> - <id>assemble</id> - <phase>install</phase> - <goals> - <goal>attached</goal> - </goals> - <configuration> - <descriptors> - <descriptor>assembly/bin.xml</descriptor> - <descriptor>assembly/doc.xml</descriptor> - <descriptor>assembly/all.xml</descriptor> - </descriptors> - <finalName>${artifactId}-${jbosscache-pojo-version}</finalName> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> - <configuration> - <systemProperties> - <property> - <name>bind.address</name> - <value>127.0.0.1</value> - </property> - <property> - <name>java.net.preferIPv4Stack</name> - <value>true</value> - </property> - <property> - <name>jgroups.stack</name> - <value>udp</value> - </property> - </systemProperties> - <groups>functional</groups> - <forkMode>always</forkMode> - <argLine>-Djboss.aop.path=${basedir}/src/main/resources/META-INF/pojocache-aop.xml -javaagent:${settings.localRepository}/org/jboss/aop/jboss-aop/${jboss.aop.version}/jboss-aop-${jboss.aop.version}.jar</argLine> - <!-- Warning, this does not work right on 2.4-SNAPSHOT, (see SUREFIRE-349) --> - <!-- This seems to fail in some cases on 2.3 as well, disable for now --> - <useSystemClassLoader>true</useSystemClassLoader> - <redirectTestOutputToFile>false</redirectTestOutputToFile> - </configuration> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jbossaop-plugin</artifactId> - <version>2.0.0.beta1</version> - <!-- HACK: AOP project and plugin has broken deps --> - <dependencies> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> - <version>2.0.0.Beta4</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>${jbosscache-core-version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>aopc</id> - <phase>compile</phase> - <goals> - <goal>compile</goal> - </goals> - <configuration> - <verbose>false</verbose> - <aoppaths> - <aoppath>${basedir}/src/main/resources/META-INF/pojocache-aop.xml</aoppath> - </aoppaths> - </configuration> - </execution> - </executions> - </plugin> - <!-- the docbook generation plugin for the user guide --> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.0.0</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-doc-xslt-support</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - <executions> - - <!-- The User Guide--> - <execution> - <id>userguide_en</id> - <phase>package</phase> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - <configuration> - <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${basedir}/src/main/docbook/userguide/en</sourceDirectory> - <imageResource> - <directory>${basedir}/src/main/docbook/images</directory> - </imageResource> - <cssResource> - <directory>${basedir}/src/main/docbook/css</directory> - </cssResource> - <targetDirectory>${basedir}/target/docbook/userguide_en</targetDirectory> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> - <finalName>userguide_en.pdf</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>false</xincludeSupported> - </options> - </configuration> - </execution> - - <!-- The Tutorial --> - <execution> - <id>tutorial_en</id> - <phase>package</phase> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - <configuration> - <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${basedir}/src/main/docbook/tutorial/en</sourceDirectory> - <imageResource> - <directory>${basedir}/src/main/docbook/images</directory> - </imageResource> - <cssResource> - <directory>${basedir}/src/main/docbook/css</directory> - </cssResource> - <targetDirectory>${basedir}/target/docbook/tutorial_en</targetDirectory> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> - <finalName>tutorial_en.pdf</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>false</xincludeSupported> - </options> - </configuration> - </execution> - - <!-- the FAQs --> - <execution> - <id>faq_en</id> - <phase>package</phase> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - <configuration> - <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${basedir}/src/main/docbook/faq/en</sourceDirectory> - <imageResource> - <directory>${basedir}/src/main/docbook/images</directory> - </imageResource> - <cssResource> - <directory>${basedir}/src/main/docbook/css</directory> - </cssResource> - <targetDirectory>${basedir}/target/docbook/faq_en</targetDirectory> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> - <finalName>faq_en.pdf</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>false</xincludeSupported> - </options> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <!-- basic JBoss repository so that the common parent POM in jbosscache-support can be found --> - <repositories> - <repository> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> - </repositories> -</project> Copied: pojo/tags/2.1.0.CR2/pom.xml (from rev 4776, pojo/branches/2.1/pom.xml) =================================================================== --- pojo/tags/2.1.0.CR2/pom.xml (rev 0) +++ pojo/tags/2.1.0.CR2/pom.xml 2007-11-26 18:19:25 UTC (rev 4777) @@ -0,0 +1,288 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <properties> + <jbosscache-pojo-version>2.1.0.CR2</jbosscache-pojo-version> + <jbosscache-core-version>2.1.0.CR2</jbosscache-core-version> + <jboss.aop.version>2.0.0.beta1</jboss.aop.version> + </properties> + <parent> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-common-parent</artifactId> + <version>1.1</version> + </parent> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-pojo</artifactId> + <version>${jbosscache-pojo-version}</version> + <name>JBoss Cache - POJO Edition</name> + <description>JBoss Cache - POJO Edition</description> + <packaging>jar</packaging> + <dependencies> + <dependency> + <groupId>org.jboss.aop</groupId> + <artifactId>jboss-aop</artifactId> + <version>${jboss.aop.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>${jbosscache-core-version}</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>${jbosscache-core-version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <!-- Hack AOP has broken deps --> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-container</artifactId> + <version>2.0.0.Beta4</version> + <scope>runtime</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-1</version> + <executions> + <execution> + <id>assemble</id> + <phase>install</phase> + <goals> + <goal>attached</goal> + </goals> + <configuration> + <descriptors> + <descriptor>assembly/bin.xml</descriptor> + <descriptor>assembly/doc.xml</descriptor> + <descriptor>assembly/all.xml</descriptor> + </descriptors> + <finalName>${artifactId}-${jbosscache-pojo-version}</finalName> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3</version> + <configuration> + <systemProperties> + <property> + <name>bind.address</name> + <value>127.0.0.1</value> + </property> + <property> + <name>java.net.preferIPv4Stack</name> + <value>true</value> + </property> + <property> + <name>jgroups.stack</name> + <value>udp</value> + </property> + </systemProperties> + <groups>functional</groups> + <forkMode>always</forkMode> + <argLine>-Djboss.aop.path=${basedir}/src/main/resources/META-INF/pojocache-aop.xml -javaagent:${settings.localRepository}/org/jboss/aop/jboss-aop/${jboss.aop.version}/jboss-aop-${jboss.aop.version}.jar</argLine> + <!-- Warning, this does not work right on 2.4-SNAPSHOT, (see SUREFIRE-349) --> + <!-- This seems to fail in some cases on 2.3 as well, disable for now --> + <useSystemClassLoader>true</useSystemClassLoader> + <redirectTestOutputToFile>false</redirectTestOutputToFile> + </configuration> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jbossaop-plugin</artifactId> + <version>2.0.0.beta1</version> + <!-- HACK: AOP project and plugin has broken deps --> + <dependencies> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-container</artifactId> + <version>2.0.0.Beta4</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>${jbosscache-core-version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>aopc</id> + <phase>compile</phase> + <goals> + <goal>compile</goal> + </goals> + <configuration> + <verbose>false</verbose> + <aoppaths> + <aoppath>${basedir}/src/main/resources/META-INF/pojocache-aop.xml</aoppath> + </aoppaths> + </configuration> + </execution> + </executions> + </plugin> + <!-- the docbook generation plugin for the user guide --> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.0.0</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-doc-xslt-support</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + <executions> + + <!-- The User Guide--> + <execution> + <id>userguide_en</id> + <phase>package</phase> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${basedir}/src/main/docbook/userguide/en</sourceDirectory> + <imageResource> + <directory>${basedir}/src/main/docbook/images</directory> + </imageResource> + <cssResource> + <directory>${basedir}/src/main/docbook/css</directory> + </cssResource> + <targetDirectory>${basedir}/target/docbook/userguide_en</targetDirectory> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> + <finalName>userguide_en.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>false</xincludeSupported> + </options> + </configuration> + </execution> + + <!-- The Tutorial --> + <execution> + <id>tutorial_en</id> + <phase>package</phase> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${basedir}/src/main/docbook/tutorial/en</sourceDirectory> + <imageResource> + <directory>${basedir}/src/main/docbook/images</directory> + </imageResource> + <cssResource> + <directory>${basedir}/src/main/docbook/css</directory> + </cssResource> + <targetDirectory>${basedir}/target/docbook/tutorial_en</targetDirectory> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> + <finalName>tutorial_en.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>false</xincludeSupported> + </options> + </configuration> + </execution> + + <!-- the FAQs --> + <execution> + <id>faq_en</id> + <phase>package</phase> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${basedir}/src/main/docbook/faq/en</sourceDirectory> + <imageResource> + <directory>${basedir}/src/main/docbook/images</directory> + </imageResource> + <cssResource> + <directory>${basedir}/src/main/docbook/css</directory> + </cssResource> + <targetDirectory>${basedir}/target/docbook/faq_en</targetDirectory> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> + <finalName>faq_en.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>false</xincludeSupported> + </options> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <!-- basic JBoss repository so that the common parent POM in jbosscache-support can be found --> + <repositories> + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> +</project> Deleted: pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java =================================================================== --- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java 2007-11-15 18:07:41 UTC (rev 4765) +++ pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java 2007-11-26 18:19:25 UTC (rev 4777) @@ -1,125 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ - -package org.jboss.cache.pojo.rollback; - -import static org.testng.AssertJUnit.assertFalse; -import static org.testng.AssertJUnit.assertTrue; - -import java.util.ArrayList; - -import javax.transaction.TransactionManager; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.aop.proxy.ClassProxy; -import org.jboss.cache.pojo.PojoCache; -import org.jboss.cache.pojo.PojoCacheFactory; -import org.jboss.cache.pojo.interceptors.PojoFailedTxMockupInterceptor; -import org.jboss.cache.pojo.test.Person; -import org.jboss.cache.transaction.DummyTransactionManager; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -/** - * Additional basic tests - * - * @author Ben Wang - */ - -@Test(groups = {"functional"}) -public class ListUndoTest -{ - Log log_ = LogFactory.getLog(ListUndoTest.class); - PojoCache cache_; - TransactionManager tx_mgr; - - - @BeforeMethod(alwaysRun = true) - protected void setUp() throws Exception - { - log_.info("setUp() ...."); - String configFile = "META-INF/local-service.xml"; - boolean toStart = false; - cache_ = PojoCacheFactory.createCache(configFile, toStart); - cache_.start(); - tx_mgr = DummyTransactionManager.getInstance(); - - } - - @AfterMethod(alwaysRun = true) - protected void tearDown() throws Exception - { - cache_.stop(); - } - -// public void testDummy() {} - - private void setTxRollback(boolean isTrue) - { - PojoFailedTxMockupInterceptor.TX_ROLLBACK = isTrue; - } - - public void testSimple() throws Exception - { - ArrayList<String> list = new ArrayList<String>(); - list.add("test1"); - - setTxRollback(true); - cache_.attach("/a", list); - assertFalse("Should not have cache interceptor ", isProxy(list)); - - cache_.attach("/a", list); - } - - public void testSimpleTxWithRollback1() throws Exception - { - log_.info("testSimpleTxWithRollback1() ...."); - Person test = new Person(); - test.setName("Ben"); - test.setAge(10); - ArrayList<String> list = new ArrayList<String>(); - list.add("English"); - test.setLanguages(list); - - setTxRollback(true); - cache_.attach("/a", test); - assertFalse("Should not have cache interceptor ", isProxy(test.getLanguages())); - - cache_.attach("/a", test); - } - - private boolean isProxy(Object pojo) - { - if (pojo instanceof ClassProxy) return true; - return false; - } - - public void testSimpleTxWithRollback2() throws Exception - { - log_.info("testSimpleTxWithRollback1() ...."); - Person test = new Person(); - test.setName("Ben"); - test.setAge(10); - ArrayList<String> list = new ArrayList<String>(); - list.add("English"); - test.setLanguages(list); - - cache_.attach("/a", test); - - setTxRollback(true); - cache_.detach("/a"); - - assertTrue("Should still have cache interceptor ", isProxy(test.getLanguages())); - cache_.detach("/a"); - } - - - - -} Copied: pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java (from rev 4774, pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java) =================================================================== --- pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java (rev 0) +++ pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/ListUndoTest.java 2007-11-26 18:19:25 UTC (rev 4777) @@ -0,0 +1,139 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ + +package org.jboss.cache.pojo.rollback; + +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; + +import java.util.ArrayList; + +import javax.transaction.TransactionManager; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.aop.proxy.ClassProxy; +import org.jboss.cache.pojo.PojoCache; +import org.jboss.cache.pojo.PojoCacheFactory; +import org.jboss.cache.pojo.interceptors.PojoFailedTxMockupInterceptor; +import org.jboss.cache.pojo.test.Person; +import org.jboss.cache.transaction.DummyTransactionManager; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Additional basic tests + * + * @author Ben Wang + */ + +@Test(groups = {"functional"}) +public class ListUndoTest +{ + Log log_ = LogFactory.getLog(ListUndoTest.class); + PojoCache cache_; + TransactionManager tx_mgr; + + + @BeforeMethod(alwaysRun = true) + protected void setUp() throws Exception + { + log_.info("setUp() ...."); + String configFile = "META-INF/local-service.xml"; + boolean toStart = false; + cache_ = PojoCacheFactory.createCache(configFile, toStart); + cache_.start(); + tx_mgr = DummyTransactionManager.getInstance(); + + } + + @AfterMethod(alwaysRun = true) + protected void tearDown() throws Exception + { + cache_.stop(); + } + +// public void testDummy() {} + + private void setTxRollback(boolean isTrue) + { + PojoFailedTxMockupInterceptor.TX_ROLLBACK = isTrue; + } + + public void testSimple() throws Exception + { + ArrayList<String> list = new ArrayList<String>(); + list.add("test1"); + + setTxRollback(true); + try + { + cache_.attach("/a", list); + } + catch (Exception e) + { + } + assertFalse("Should not have cache interceptor ", isProxy(list)); + + cache_.attach("/a", list); + } + + public void testSimpleTxWithRollback1() throws Exception + { + log_.info("testSimpleTxWithRollback1() ...."); + Person test = new Person(); + test.setName("Ben"); + test.setAge(10); + ArrayList<String> list = new ArrayList<String>(); + list.add("English"); + test.setLanguages(list); + + setTxRollback(true); + try + { + cache_.attach("/a", test); + } + catch (Exception e) + { + } + assertFalse("Should not have cache interceptor ", isProxy(test.getLanguages())); + + cache_.attach("/a", test); + } + + private boolean isProxy(Object pojo) + { + if (pojo instanceof ClassProxy) return true; + return false; + } + + public void testSimpleTxWithRollback2() throws Exception + { + log_.info("testSimpleTxWithRollback1() ...."); + Person test = new Person(); + test.setName("Ben"); + test.setAge(10); + ArrayList<String> list = new ArrayList<String>(); + list.add("English"); + test.setLanguages(list); + + cache_.attach("/a", test); + + setTxRollback(true); + try + { + cache_.detach("/a"); + } + catch (Exception e) + { + } + + assertTrue("Should still have cache interceptor ", isProxy(test.getLanguages())); + cache_.detach("/a"); + } +} Deleted: pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java =================================================================== --- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java 2007-11-15 18:07:41 UTC (rev 4765) +++ pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java 2007-11-26 18:19:25 UTC (rev 4777) @@ -1,108 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ - -package org.jboss.cache.pojo.rollback; - -import static org.testng.AssertJUnit.assertFalse; -import static org.testng.AssertJUnit.assertTrue; - -import javax.transaction.TransactionManager; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.aop.Advised; -import org.jboss.aop.advice.Interceptor; -import org.jboss.cache.pojo.PojoCache; -import org.jboss.cache.pojo.PojoCacheFactory; -import org.jboss.cache.pojo.interceptors.PojoFailedTxMockupInterceptor; -import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor; -import org.jboss.cache.pojo.test.Person; -import org.jboss.cache.transaction.DummyTransactionManager; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -/** - * Additional basic tests - * - * @author Ben Wang - */ - -@Test(groups = {"functional"}) -public class LocalUndoTest -{ - Log log_ = LogFactory.getLog(LocalUndoTest.class); - PojoCache cache_; - TransactionManager tx_mgr; - - - @BeforeMethod(alwaysRun = true) - protected void setUp() throws Exception - { - log_.info("setUp() ...."); - String configFile = "META-INF/local-service.xml"; - boolean toStart = false; - cache_ = PojoCacheFactory.createCache(configFile, toStart); - cache_.start(); - tx_mgr = DummyTransactionManager.getInstance(); - - } - - @AfterMethod(alwaysRun = true) - protected void tearDown() throws Exception - { - cache_.stop(); - } - -// public void testDummy() {} - - private void setTxRollback(boolean isTrue) - { - PojoFailedTxMockupInterceptor.TX_ROLLBACK = isTrue; - } - - public void testSimpleTxWithRollback1() throws Exception - { - log_.info("testSimpleTxWithRollback1() ...."); - Person test = new Person(); - test.setName("Ben"); - test.setAge(10); - - setTxRollback(true); - cache_.attach("/a", test); - assertFalse("Should not have cache interceptor ", hasCacheInterceptor(test)); - } - - private boolean hasCacheInterceptor(Object pojo) - { - Interceptor[] interceptors = ((Advised) pojo)._getInstanceAdvisor().getInterceptors(); - for (int i = 0; i < interceptors.length; i++) - { - if (interceptors[i] instanceof CacheFieldInterceptor) - return true; - } - return false; - } - - public void testSimpleTxWithRollback2() throws Exception - { - log_.info("testSimpleTxWithRollback1() ...."); - Person test = new Person(); - test.setName("Ben"); - test.setAge(10); - cache_.attach("/a", test); - - setTxRollback(true); - cache_.detach("/a"); - - assertTrue("Should still have cache interceptor ", hasCacheInterceptor(test)); - } - - - - -} Copied: pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java (from rev 4774, pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java) =================================================================== --- pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java (rev 0) +++ pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/LocalUndoTest.java 2007-11-26 18:19:25 UTC (rev 4777) @@ -0,0 +1,120 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ + +package org.jboss.cache.pojo.rollback; + +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; + +import javax.transaction.TransactionManager; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.aop.Advised; +import org.jboss.aop.advice.Interceptor; +import org.jboss.cache.pojo.PojoCache; +import org.jboss.cache.pojo.PojoCacheFactory; +import org.jboss.cache.pojo.interceptors.PojoFailedTxMockupInterceptor; +import org.jboss.cache.pojo.interceptors.dynamic.CacheFieldInterceptor; +import org.jboss.cache.pojo.test.Person; +import org.jboss.cache.transaction.DummyTransactionManager; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Additional basic tests + * + * @author Ben Wang + */ + +@Test(groups = {"functional"}) +public class LocalUndoTest +{ + Log log_ = LogFactory.getLog(LocalUndoTest.class); + PojoCache cache_; + TransactionManager tx_mgr; + + + @BeforeMethod(alwaysRun = true) + protected void setUp() throws Exception + { + log_.info("setUp() ...."); + String configFile = "META-INF/local-service.xml"; + boolean toStart = false; + cache_ = PojoCacheFactory.createCache(configFile, toStart); + cache_.start(); + tx_mgr = DummyTransactionManager.getInstance(); + + } + + @AfterMethod(alwaysRun = true) + protected void tearDown() throws Exception + { + cache_.stop(); + } + +// public void testDummy() {} + + private void setTxRollback(boolean isTrue) + { + PojoFailedTxMockupInterceptor.TX_ROLLBACK = isTrue; + } + + public void testSimpleTxWithRollback1() throws Exception + { + log_.info("testSimpleTxWithRollback1() ...."); + Person test = new Person(); + test.setName("Ben"); + test.setAge(10); + + setTxRollback(true); + try + { + cache_.attach("/a", test); + } + catch (Exception e) + { + } + assertFalse("Should not have cache interceptor ", hasCacheInterceptor(test)); + } + + private boolean hasCacheInterceptor(Object pojo) + { + Interceptor[] interceptors = ((Advised) pojo)._getInstanceAdvisor().getInterceptors(); + for (int i = 0; i < interceptors.length; i++) + { + if (interceptors[i] instanceof CacheFieldInterceptor) + return true; + } + return false; + } + + public void testSimpleTxWithRollback2() throws Exception + { + log_.info("testSimpleTxWithRollback1() ...."); + Person test = new Person(); + test.setName("Ben"); + test.setAge(10); + cache_.attach("/a", test); + + setTxRollback(true); + try + { + cache_.detach("/a"); + } + catch (Exception e) + { + } + + assertTrue("Should still have cache interceptor ", hasCacheInterceptor(test)); + } + + + + +} Deleted: pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java =================================================================== --- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java 2007-11-15 18:07:41 UTC (rev 4765) +++ pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java 2007-11-26 18:19:25 UTC (rev 4777) @@ -1,125 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ - -package org.jboss.cache.pojo.rollback; - -import static org.testng.AssertJUnit.assertFalse; -import static org.testng.AssertJUnit.assertTrue; - -import java.util.HashMap; - -import javax.transaction.TransactionManager; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.aop.proxy.ClassProxy; -import org.jboss.cache.pojo.PojoCache; -import org.jboss.cache.pojo.PojoCacheFactory; -import org.jboss.cache.pojo.interceptors.PojoFailedTxMockupInterceptor; -import org.jboss.cache.pojo.test.Person; -import org.jboss.cache.transaction.DummyTransactionManager; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -/** - * Additional basic tests - * - * @author Ben Wang - */ - -@Test(groups = {"functional"}) -public class MapUndoTest -{ - Log log_ = LogFactory.getLog(MapUndoTest.class); - PojoCache cache_; - TransactionManager tx_mgr; - - - @BeforeMethod(alwaysRun = true) - protected void setUp() throws Exception - { - log_.info("setUp() ...."); - String configFile = "META-INF/local-service.xml"; - boolean toStart = false; - cache_ = PojoCacheFactory.createCache(configFile, toStart); - cache_.start(); - tx_mgr = DummyTransactionManager.getInstance(); - - } - - @AfterMethod(alwaysRun = true) - protected void tearDown() throws Exception - { - cache_.stop(); - } - -// public void testDummy() {} - - private void setTxRollback(boolean isTrue) - { - PojoFailedTxMockupInterceptor.TX_ROLLBACK = isTrue; - } - - public void testSimple() throws Exception - { - HashMap<String, String> map = new HashMap<String, String>(); - map.put("1", "test1"); - - setTxRollback(true); - cache_.attach("/a", map); - assertFalse("Should not have cache interceptor ", isProxy(map)); - - cache_.attach("/a", map); - } - - public void testSimpleTxWithRollback1() throws Exception - { - log_.info("testSimpleTxWithRollback1() ...."); - Person test = new Person(); - test.setName("Ben"); - test.setAge(10); - HashMap<String, String> map = new HashMap<String, String>(); - map.put("1", "English"); - test.setHobbies(map); - - setTxRollback(true); - cache_.attach("/a", test); - assertFalse("Should not have cache interceptor ", isProxy(test.getHobbies())); - - cache_.attach("/a", test); - } - - private boolean isProxy(Object pojo) - { - if (pojo instanceof ClassProxy) return true; - return false; - } - - public void testSimpleTxWithRollback2() throws Exception - { - log_.info("testSimpleTxWithRollback1() ...."); - Person test = new Person(); - test.setName("Ben"); - test.setAge(10); - HashMap<String, String> map = new HashMap<String, String>(); - map.put("1", "English"); - test.setHobbies(map); - - cache_.attach("/a", test); - - setTxRollback(true); - cache_.detach("/a"); - - assertTrue("Should still have cache interceptor ", isProxy(test.getHobbies())); - cache_.detach("/a"); - } - - - - -} Copied: pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java (from rev 4774, pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java) =================================================================== --- pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java (rev 0) +++ pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/MapUndoTest.java 2007-11-26 18:19:25 UTC (rev 4777) @@ -0,0 +1,143 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ + +package org.jboss.cache.pojo.rollback; + +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; + +import java.util.HashMap; + +import javax.transaction.TransactionManager; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.aop.proxy.ClassProxy; +import org.jboss.cache.pojo.PojoCache; +import org.jboss.cache.pojo.PojoCacheFactory; +import org.jboss.cache.pojo.interceptors.PojoFailedTxMockupInterceptor; +import org.jboss.cache.pojo.test.Person; +import org.jboss.cache.transaction.DummyTransactionManager; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Additional basic tests + * + * @author Ben Wang + */ + +@Test(groups = {"functional"}) +public class MapUndoTest +{ + Log log_ = LogFactory.getLog(MapUndoTest.class); + PojoCache cache_; + TransactionManager tx_mgr; + + + @BeforeMethod(alwaysRun = true) + protected void setUp() throws Exception + { + log_.info("setUp() ...."); + String configFile = "META-INF/local-service.xml"; + boolean toStart = false; + cache_ = PojoCacheFactory.createCache(configFile, toStart); + cache_.start(); + tx_mgr = DummyTransactionManager.getInstance(); + + } + + @AfterMethod(alwaysRun = true) + protected void tearDown() throws Exception + { + cache_.stop(); + } + +// public void testDummy() {} + + private void setTxRollback(boolean isTrue) + { + PojoFailedTxMockupInterceptor.TX_ROLLBACK = isTrue; + } + + public void testSimple() throws Exception + { + HashMap<String, String> map = new HashMap<String, String>(); + map.put("1", "test1"); + + setTxRollback(true); + try + { + cache_.attach("/a", map); + } + catch (Exception e) + { + } + assertFalse("Should not have cache interceptor ", isProxy(map)); + + cache_.attach("/a", map); + } + + public void testSimpleTxWithRollback1() throws Exception + { + log_.info("testSimpleTxWithRollback1() ...."); + Person test = new Person(); + test.setName("Ben"); + test.setAge(10); + HashMap<String, String> map = new HashMap<String, String>(); + map.put("1", "English"); + test.setHobbies(map); + + setTxRollback(true); + try + { + cache_.attach("/a", test); + } + catch (Exception e) + { + } + assertFalse("Should not have cache interceptor ", isProxy(test.getHobbies())); + + cache_.attach("/a", test); + } + + private boolean isProxy(Object pojo) + { + if (pojo instanceof ClassProxy) return true; + return false; + } + + public void testSimpleTxWithRollback2() throws Exception + { + log_.info("testSimpleTxWithRollback1() ...."); + Person test = new Person(); + test.setName("Ben"); + test.setAge(10); + HashMap<String, String> map = new HashMap<String, String>(); + map.put("1", "English"); + test.setHobbies(map); + + cache_.attach("/a", test); + + setTxRollback(true); + try + { + cache_.detach("/a"); + } + catch (Exception e) + { + } + + assertTrue("Should still have cache interceptor ", isProxy(test.getHobbies())); + cache_.detach("/a"); + } + + + + +} Deleted: pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java =================================================================== --- pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java 2007-11-15 18:07:41 UTC (rev 4765) +++ pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java 2007-11-26 18:19:25 UTC (rev 4777) @@ -1,125 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ - -package org.jboss.cache.pojo.rollback; - -import static org.testng.AssertJUnit.assertFalse; -import static org.testng.AssertJUnit.assertTrue; - -import java.util.HashSet; - -import javax.transaction.TransactionManager; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.aop.proxy.ClassProxy; -import org.jboss.cache.pojo.PojoCache; -import org.jboss.cache.pojo.PojoCacheFactory; -import org.jboss.cache.pojo.interceptors.PojoFailedTxMockupInterceptor; -import org.jboss.cache.pojo.test.Person; -import org.jboss.cache.transaction.DummyTransactionManager; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -/** - * Additional basic tests - * - * @author Ben Wang - */ - -@Test(groups = {"functional"}) -public class SetUndoTest -{ - Log log_ = LogFactory.getLog(SetUndoTest.class); - PojoCache cache_; - TransactionManager tx_mgr; - - - @BeforeMethod(alwaysRun = true) - protected void setUp() throws Exception - { - log_.info("setUp() ...."); - String configFile = "META-INF/local-service.xml"; - boolean toStart = false; - cache_ = PojoCacheFactory.createCache(configFile, toStart); - cache_.start(); - tx_mgr = DummyTransactionManager.getInstance(); - - } - - @AfterMethod(alwaysRun = true) - protected void tearDown() throws Exception - { - cache_.stop(); - } - -// public void testDummy() {} - - private void setTxRollback(boolean isTrue) - { - PojoFailedTxMockupInterceptor.TX_ROLLBACK = isTrue; - } - - public void testSimple() throws Exception - { - HashSet<String> set = new HashSet<String>(); - set.add("test1"); - - setTxRollback(true); - cache_.attach("/a", set); - assertFalse("Should not have cache interceptor ", isProxy(set)); - - cache_.attach("/a", set); - } - - public void testSimpleTxWithRollback1() throws Exception - { - log_.info("testSimpleTxWithRollback1() ...."); - Person test = new Person(); - test.setName("Ben"); - test.setAge(10); - HashSet<String> set = new HashSet<String>(); - set.add("English"); - test.setSkills(set); - - setTxRollback(true); - cache_.attach("/a", test); - assertFalse("Should not have cache interceptor ", isProxy(test.getSkills())); - - cache_.attach("/a", test); - } - - private boolean isProxy(Object pojo) - { - if (pojo instanceof ClassProxy) return true; - return false; - } - - public void testSimpleTxWithRollback2() throws Exception - { - log_.info("testSimpleTxWithRollback1() ...."); - Person test = new Person(); - test.setName("Ben"); - test.setAge(10); - HashSet<String> set = new HashSet<String>(); - set.add("English"); - test.setSkills(set); - - cache_.attach("/a", test); - - setTxRollback(true); - cache_.detach("/a"); - - assertTrue("Should still have cache interceptor ", isProxy(test.getSkills())); - cache_.detach("/a"); - } - - - - -} Copied: pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java (from rev 4774, pojo/branches/2.1/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java) =================================================================== --- pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java (rev 0) +++ pojo/tags/2.1.0.CR2/src/test/java/org/jboss/cache/pojo/rollback/SetUndoTest.java 2007-11-26 18:19:25 UTC (rev 4777) @@ -0,0 +1,137 @@ +/* + * JBoss, Home of Professional Open Source + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ + +package org.jboss.cache.pojo.rollback; + +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertTrue; + +import java.util.HashSet; + +import javax.transaction.TransactionManager; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.aop.proxy.ClassProxy; +import org.jboss.cache.pojo.PojoCache; +import org.jboss.cache.pojo.PojoCacheFactory; +import org.jboss.cache.pojo.interceptors.PojoFailedTxMockupInterceptor; +import org.jboss.cache.pojo.test.Person; +import org.jboss.cache.transaction.DummyTransactionManager; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Additional basic tests + * + * @author Ben Wang + */ + +@Test(groups = {"functional"}) +public class SetUndoTest +{ + Log log_ = LogFactory.getLog(SetUndoTest.class); + PojoCache cache_; + TransactionManager tx_mgr; + + + @BeforeMethod(alwaysRun = true) + protected void setUp() throws Exception + { + log_.info("setUp() ...."); + String configFile = "META-INF/local-service.xml"; + boolean toStart = false; + cache_ = PojoCacheFactory.createCache(configFile, toStart); + cache_.start(); + tx_mgr = DummyTransactionManager.getInstance(); + + } + + @AfterMethod(alwaysRun = true) + protected void tearDown() throws Exception + { + cache_.stop(); + } + +// public void testDummy() {} + + private void setTxRollback(boolean isTrue) + { + PojoFailedTxMockupInterceptor.TX_ROLLBACK = isTrue; + } + + public void testSimple() throws Exception + { + HashSet<String> set = new HashSet<String>(); + set.add("test1"); + + setTxRollback(true); + try + { + cache_.attach("/a", set); + } + catch (Exception e) + { + } + assertFalse("Should not have cache interceptor ", isProxy(set)); + + cache_.attach("/a", set); + } + + public void testSimpleTxWithRollback1() throws Exception + { + log_.info("testSimpleTxWithRollback1() ...."); + Person test = new Person(); + test.setName("Ben"); + test.setAge(10); + HashSet<String> set = new HashSet<String>(); + set.add("English"); + test.setSkills(set); + + setTxRollback(true); + try + { + cache_.attach("/a", test); + } catch (Exception e) + { + } + assertFalse("Should not have cache interceptor ", isProxy(test.getSkills())); + + cache_.attach("/a", test); + } + + private boolean isProxy(Object pojo) + { + if (pojo instanceof ClassProxy) return true; + return false; + } + + public void testSimpleTxWithRollback2() throws Exception + { + log_.info("testSimpleTxWithRollback1() ...."); + Person test = new Person(); + test.setName("Ben"); + test.setAge(10); + HashSet<String> set = new HashSet<String>(); + set.add("English"); + test.setSkills(set); + + cache_.attach("/a", test); + + setTxRollback(true); + try + { + cache_.detach("/a"); + } catch (Exception e) + { + } + + assertTrue("Should still have cache interceptor ", isProxy(test.getSkills())); + cache_.detach("/a"); + } +}