[Wicket-stuff-autocvs] wicket-phonebook/src/test/wicket/contrib/phonebook/web/page DeleteContactPageTest.java,1.1,1.2

[Igor V. <iva...@us...>]

Update of /cvsroot/wicket-stuff/wicket-phonebook/src/test/wicket/contrib/phonebook/web/page
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31487/src/test/wicket/contrib/phonebook/web/page

Modified Files:
	DeleteContactPageTest.java 
Log Message:
cleaned up

Index: DeleteContactPageTest.java
===================================================================
RCS file: /cvsroot/wicket-stuff/wicket-phonebook/src/test/wicket/contrib/phonebook/web/page/DeleteContactPageTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DeleteContactPageTest.java	11 Dec 2005 09:06:10 -0000	1.1
--- DeleteContactPageTest.java	12 Dec 2005 07:33:51 -0000	1.2
***************
*** 21,37 ****
  import javax.servlet.ServletException;
  
  import org.easymock.MockControl;
- import org.springframework.context.ApplicationContext;
- import org.springframework.context.support.StaticApplicationContext;
  
- import junit.framework.TestCase;
  import wicket.Page;
  import wicket.contrib.phonebook.Contact;
  import wicket.contrib.phonebook.ContactDao;
! import wicket.contrib.spring.SpringInjector;
! import wicket.contrib.spring.SpringInjectorLocator;
  import wicket.contrib.spring.test.ApplicationContextMock;
  import wicket.contrib.spring.test.SpringContextLocatorMock;
- import wicket.markup.html.WebPage;
  import wicket.markup.html.form.Button;
  import wicket.markup.html.form.Form;
--- 21,35 ----
  import javax.servlet.ServletException;
  
+ import junit.framework.TestCase;
+ 
  import org.easymock.MockControl;
  
  import wicket.Page;
+ import wicket.contrib.injection.web.InjectorHolder;
  import wicket.contrib.phonebook.Contact;
  import wicket.contrib.phonebook.ContactDao;
! import wicket.contrib.spring.injection.annot.AnnotSpringInjector;
  import wicket.contrib.spring.test.ApplicationContextMock;
  import wicket.contrib.spring.test.SpringContextLocatorMock;
  import wicket.markup.html.form.Button;
  import wicket.markup.html.form.Form;
***************
*** 60,68 ****
  		SpringContextLocatorMock ctxLocator=new SpringContextLocatorMock(appctx);
  		
! 		SpringInjector injector=new SpringInjector(ctxLocator);
! 		
! 		SpringInjectorLocator.setInjector(injector);
! 		
  		
  
  		WicketTester app=new WicketTester();
--- 58,64 ----
  		SpringContextLocatorMock ctxLocator=new SpringContextLocatorMock(appctx);
  		
! 		AnnotSpringInjector injector=new AnnotSpringInjector(ctxLocator);
  		
+ 		InjectorHolder.setInjector(injector);
  
  		WicketTester app=new WicketTester();