You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2012/11/06 16:45:57 UTC
svn commit: r1406190 -
/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
Author: lukaszlenart
Date: Tue Nov 6 15:45:57 2012
New Revision: 1406190
URL: http://svn.apache.org/viewvc?rev=1406190&view=rev
Log:
WW-3918 removes FileManager#isReloadConfigs() method and use @Inject("struts.configuration.xml.reload")
Modified:
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java?rev=1406190&r1=1406189&r2=1406190&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java (original)
+++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java Tue Nov 6 15:45:57 2012
@@ -4,10 +4,8 @@ import com.opensymphony.xwork2.FileManag
import com.opensymphony.xwork2.FileManagerFactory;
import com.opensymphony.xwork2.XWorkTestCase;
-import java.io.File;
import java.io.InputStream;
import java.net.URL;
-import java.util.Date;
/**
* FileManager Tester.
@@ -51,32 +49,14 @@ public class DefaultFileManagerTest exte
container.getInstance(FileManagerFactory.class).setReloadingConfigs("false");
FileManager fm = container.getInstance(FileManagerFactory.class).getFileManager();
String resourceName = "xwork-sample.xml";
- URL url = ClassLoaderUtil.getResource(resourceName, DefaultFileManagerTest.class);
- assertFalse(fm.fileNeedsReloading(url));
+ assertFalse(fm.fileNeedsReloading(resourceName));
// when
container.getInstance(FileManagerFactory.class).setReloadingConfigs("true");
- changeLastModified(resourceName);
// then
- url = ClassLoaderUtil.getResource(resourceName, DefaultFileManagerTest.class);
fm = container.getInstance(FileManagerFactory.class).getFileManager();
- assertTrue(fm.fileNeedsReloading(url));
- restoreLastModified(resourceName);
- }
-
- private void changeLastModified(String resourceName) throws Exception {
- URL url = ClassLoaderUtil.getResource(resourceName, DefaultFileManagerTest.class);
- File file = new File(url.toURI());
- lastModified = file.lastModified();
- file.setLastModified(new Date().getTime() - 1000 * 20);
- Thread.sleep(1100);
- }
-
- private void restoreLastModified(String resourceName) throws Exception {
- URL url = ClassLoaderUtil.getResource(resourceName, DefaultFileManagerTest.class);
- new File(url.toURI()).setLastModified(lastModified);
- Thread.sleep(1100);
+ assertTrue(fm.fileNeedsReloading(resourceName));
}
}