[utilities COMMIT] /spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTe...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Feb 11 06:54:06 2015
New Revision: 750

URL: http://svn.shibboleth.net/view/utilities?rev=750&view=rev
Log:
Revert all yesterday's changes

Modified:
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java

Modified: spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java?rev=750&r1=749&r2=750&view=diff
==============================================================================
--- spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java (original)
+++ spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java Wed Feb 11 06:54:06 2015
@@ -26,7 +26,6 @@
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
-import org.joda.time.DateTime;
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -111,7 +110,6 @@
                 new ReloadableSpringService<>(TestServiceableComponent.class);
 
         createPopulatedFile("net/shibboleth/ext/spring/service/ServiceableBean1.xml");
-        Thread.sleep(RELOAD_DELAY); // sleep to let the file arrive.
 
         service.setFailFast(true);
         service.setId("deferedReload");
@@ -123,12 +121,8 @@
         ServiceableComponent<TestServiceableComponent> serviceableComponent = service.getServiceableComponent();
         TestServiceableComponent component = serviceableComponent.getComponent();
 
-        final DateTime x = service.getLastReloadAttemptInstant();
-        Assert.assertEquals(x,  service.getLastSuccessfulReloadInstant());
-        
         Assert.assertEquals(component.getTheValue(), "One");
         Assert.assertFalse(component.isDestroyed());
-        Thread.sleep(RELOAD_DELAY*3);
 
         overwriteFileWith("net/shibboleth/ext/spring/service/ServiceableBean2.xml");