[Springframework-cvs] spring/test/org/springframework/transaction/interceptor AbstractTransactionAspectTests.java, 1.13, 1.14

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/test/org/springframework/transaction/interceptor
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28043/test/org/springframework/transaction/interceptor

Modified Files:
	AbstractTransactionAspectTests.java 
Log Message:
polishing

Index: AbstractTransactionAspectTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/test/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AbstractTransactionAspectTests.java	6 Mar 2006 15:59:38 -0000	1.13
--- AbstractTransactionAspectTests.java	19 Sep 2006 15:53:57 -0000	1.14
***************
*** 1,11 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
!  * Copyright 2002-2006 the original author or authors.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 68,76 ****
  
  	public void testNoTransaction() throws Exception {
! 		MockControl ptxControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptxControl.getMock();
  
  		// expect no calls
! 		ptxControl.replay();
  
  		TestBean tb = new TestBean();
--- 68,76 ----
  
  	public void testNoTransaction() throws Exception {
! 		MockControl ptmControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptmControl.getMock();
  
  		// expect no calls
! 		ptmControl.replay();
  
  		TestBean tb = new TestBean();
***************
*** 86,90 ****
  		checkTransactionStatus(false);
  
! 		ptxControl.verify();
  	}
  
--- 86,90 ----
  		checkTransactionStatus(false);
  
! 		ptmControl.verify();
  	}
  
***************
*** 99,110 ****
  
  		TransactionStatus status = transactionStatusForNewTransaction();
! 		MockControl ptxControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptxControl.getMock();
  		// expect a transaction
  		ptm.getTransaction(txatt);
! 		ptxControl.setReturnValue(status, 1);
  		ptm.commit(status);
! 		ptxControl.setVoidCallable(1);
! 		ptxControl.replay();
  
  		TestBean tb = new TestBean();
--- 99,110 ----
  
  		TransactionStatus status = transactionStatusForNewTransaction();
! 		MockControl ptmControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptmControl.getMock();
  		// expect a transaction
  		ptm.getTransaction(txatt);
! 		ptmControl.setReturnValue(status, 1);
  		ptm.commit(status);
! 		ptmControl.setVoidCallable(1);
! 		ptmControl.replay();
  
  		TestBean tb = new TestBean();
***************
*** 115,119 ****
  		checkTransactionStatus(false);
  
! 		ptxControl.verify();
  	}
  
--- 115,119 ----
  		checkTransactionStatus(false);
  
! 		ptmControl.verify();
  	}
  
***************
*** 130,141 ****
  
  		TransactionStatus status = transactionStatusForNewTransaction();
! 		MockControl ptxControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptxControl.getMock();
  		// expect a transaction
  		ptm.getTransaction(txatt);
! 		ptxControl.setReturnValue(status, 2);
  		ptm.commit(status);
! 		ptxControl.setVoidCallable(2);
! 		ptxControl.replay();
  
  		TestBean tb = new TestBean();
--- 130,141 ----
  
  		TransactionStatus status = transactionStatusForNewTransaction();
! 		MockControl ptmControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptmControl.getMock();
  		// expect a transaction
  		ptm.getTransaction(txatt);
! 		ptmControl.setReturnValue(status, 2);
  		ptm.commit(status);
! 		ptmControl.setVoidCallable(2);
! 		ptmControl.replay();
  
  		TestBean tb = new TestBean();
***************
*** 148,152 ****
  		checkTransactionStatus(false);
  
! 		ptxControl.verify();
  	}
  
--- 148,152 ----
  		checkTransactionStatus(false);
  
! 		ptmControl.verify();
  	}
  
***************
*** 162,173 ****
  		MockControl statusControl = MockControl.createControl(TransactionStatus.class);
  		TransactionStatus status = (TransactionStatus) statusControl.getMock();
! 		MockControl ptxControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptxControl.getMock();
  		// expect a transaction
  		ptm.getTransaction(txatt);
! 		ptxControl.setReturnValue(status, 1);
  		ptm.commit(status);
! 		ptxControl.setVoidCallable(1);
! 		ptxControl.replay();
  
  		TestBean tb = new TestBean();
--- 162,173 ----
  		MockControl statusControl = MockControl.createControl(TransactionStatus.class);
  		TransactionStatus status = (TransactionStatus) statusControl.getMock();
! 		MockControl ptmControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptmControl.getMock();
  		// expect a transaction
  		ptm.getTransaction(txatt);
! 		ptmControl.setReturnValue(status, 1);
  		ptm.commit(status);
! 		ptmControl.setVoidCallable(1);
! 		ptmControl.replay();
  
  		TestBean tb = new TestBean();
***************
*** 179,183 ****
  		checkTransactionStatus(false);
  
! 		ptxControl.verify();
  	}
  
--- 179,183 ----
  		checkTransactionStatus(false);
  
! 		ptmControl.verify();
  	}
  
***************
*** 189,200 ****
  
  		TransactionStatus status = transactionStatusForNewTransaction();
! 		MockControl ptxControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptxControl.getMock();
  		// Expect a transaction
  		ptm.getTransaction(txatt);
! 		ptxControl.setReturnValue(status, 1);
  		ptm.commit(status);
! 		ptxControl.setVoidCallable(1);
! 		ptxControl.replay();
  		
  		final String spouseName = "innerName";
--- 189,200 ----
  
  		TransactionStatus status = transactionStatusForNewTransaction();
! 		MockControl ptmControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptmControl.getMock();
  		// Expect a transaction
  		ptm.getTransaction(txatt);
! 		ptmControl.setReturnValue(status, 1);
  		ptm.commit(status);
! 		ptmControl.setVoidCallable(1);
! 		ptmControl.replay();
  		
  		final String spouseName = "innerName";
***************
*** 227,231 ****
  		checkTransactionStatus(false);
  
! 		ptxControl.verify();
  	}
  	
--- 227,231 ----
  		checkTransactionStatus(false);
  
! 		ptmControl.verify();
  	}
  	
***************
*** 243,261 ****
  		TransactionStatus innerStatus = transactionStatusForNewTransaction();
  		
! 		MockControl ptxControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptxControl.getMock();
  		// Expect a transaction
  		ptm.getTransaction(outerTxatt);
! 		ptxControl.setReturnValue(outerStatus, 1);
  		
  		ptm.getTransaction(innerTxatt);
! 		ptxControl.setReturnValue(innerStatus, 1);
  		
  		ptm.commit(innerStatus);
! 		ptxControl.setVoidCallable(1);
  		
  		ptm.commit(outerStatus);
! 		ptxControl.setVoidCallable(1);
! 		ptxControl.replay();
  		
  		final String spouseName = "innerName";
--- 243,261 ----
  		TransactionStatus innerStatus = transactionStatusForNewTransaction();
  		
! 		MockControl ptmControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptmControl.getMock();
  		// Expect a transaction
  		ptm.getTransaction(outerTxatt);
! 		ptmControl.setReturnValue(outerStatus, 1);
  		
  		ptm.getTransaction(innerTxatt);
! 		ptmControl.setReturnValue(innerStatus, 1);
  		
  		ptm.commit(innerStatus);
! 		ptmControl.setVoidCallable(1);
  		
  		ptm.commit(outerStatus);
! 		ptmControl.setVoidCallable(1);
! 		ptmControl.replay();
  		
  		final String spouseName = "innerName";
***************
*** 291,295 ****
  		checkTransactionStatus(false);
  
! 		ptxControl.verify();
  	}
  	
--- 291,295 ----
  		checkTransactionStatus(false);
  
! 		ptmControl.verify();
  	}
  	
***************
*** 400,411 ****
  
  		TransactionStatus status = transactionStatusForNewTransaction();
! 		MockControl ptxControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptxControl.getMock();
  
  		ptm.getTransaction(txatt);
! 		ptxControl.setReturnValue(status, 1);
  		ptm.commit(status);
! 		ptxControl.setVoidCallable(1);
! 		ptxControl.replay();
  
  		final String name = "jenny";
--- 400,411 ----
  
  		TransactionStatus status = transactionStatusForNewTransaction();
! 		MockControl ptmControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptmControl.getMock();
  
  		ptm.getTransaction(txatt);
! 		ptmControl.setReturnValue(status, 1);
  		ptm.commit(status);
! 		ptmControl.setVoidCallable(1);
! 		ptmControl.replay();
  
  		final String name = "jenny";
***************
*** 423,427 ****
  		assertTrue(name.equals(itb.getName()));
  
! 		ptxControl.verify();
  	}
  	
--- 423,427 ----
  		assertTrue(name.equals(itb.getName()));
  
! 		ptmControl.verify();
  	}
  	
***************
*** 445,455 ****
  		tas.register(m, txatt);
  
! 		MockControl ptxControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptxControl.getMock();
  		// Expect a transaction
  		ptm.getTransaction(txatt);
  		CannotCreateTransactionException ex = new CannotCreateTransactionException("foobar", null);
! 		ptxControl.setThrowable(ex);
! 		ptxControl.replay();
  
  		TestBean tb = new TestBean() {
--- 445,455 ----
  		tas.register(m, txatt);
  
! 		MockControl ptmControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptmControl.getMock();
  		// Expect a transaction
  		ptm.getTransaction(txatt);
  		CannotCreateTransactionException ex = new CannotCreateTransactionException("foobar", null);
! 		ptmControl.setThrowable(ex);
! 		ptmControl.replay();
  
  		TestBean tb = new TestBean() {
***************
*** 468,472 ****
  			assertTrue(thrown == ex);
  		}
! 		ptxControl.verify();
  	}
  
--- 468,472 ----
  			assertTrue(thrown == ex);
  		}
! 		ptmControl.verify();
  	}
  
***************
*** 485,498 ****
  		// No attributes for m2
  
! 		MockControl ptxControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptxControl.getMock();
  
  		TransactionStatus status = transactionStatusForNewTransaction();
  		ptm.getTransaction(txatt);
! 		ptxControl.setReturnValue(status);
  		UnexpectedRollbackException ex = new UnexpectedRollbackException("foobar", null);
  		ptm.commit(status);
! 		ptxControl.setThrowable(ex);
! 		ptxControl.replay();
  
  		TestBean tb = new TestBean();		
--- 485,498 ----
  		// No attributes for m2
  
! 		MockControl ptmControl = MockControl.createControl(PlatformTransactionManager.class);
! 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptmControl.getMock();
  
  		TransactionStatus status = transactionStatusForNewTransaction();
  		ptm.getTransaction(txatt);
! 		ptmControl.setReturnValue(status);
  		UnexpectedRollbackException ex = new UnexpectedRollbackException("foobar", null);
  		ptm.commit(status);
! 		ptmControl.setThrowable(ex);
! 		ptmControl.replay();
  
  		TestBean tb = new TestBean();		
***************
*** 510,514 ****
  		// Should have invoked target and changed name
  		assertTrue(itb.getName() == name);
! 		ptxControl.verify();
  	}
  
--- 510,514 ----
  		// Should have invoked target and changed name
  		assertTrue(itb.getName() == name);
! 		ptmControl.verify();
  	}