You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2009/12/30 15:50:11 UTC
svn commit: r894630 -
/incubator/aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java
Author: mnuttall
Date: Wed Dec 30 14:50:11 2009
New Revision: 894630
URL: http://svn.apache.org/viewvc?rev=894630&view=rev
Log:
ARIES-89: Implement application support: Watch out for .svn files!
Modified:
incubator/aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java
Modified: incubator/aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java?rev=894630&r1=894629&r2=894630&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java (original)
+++ incubator/aries/trunk/application/application-utils/src/test/java/org/apache/aries/application/utils/filesystem/FileSystemTest.java Wed Dec 30 14:50:11 2009
@@ -38,8 +38,8 @@
import org.apache.aries.application.filesystem.IDirectory;
import org.apache.aries.application.filesystem.IFile;
import org.apache.aries.application.utils.AppConstants;
-import org.junit.AfterClass;
import org.apache.aries.unittest.junit.Assert;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -237,6 +237,11 @@
assertTrue(file.isFile());
List<IFile> files = dir.listFiles();
+ for (IFile f: files) {
+ if (f.getName().equalsIgnoreCase(".svn")) {
+ files.remove(f);
+ }
+ }
assertEquals(1, files.size());
@@ -247,9 +252,11 @@
assertNotNull(metaInf.convert());
for (IFile aFile : dir) {
- assertTrue(aFile.isDirectory());
- assertEquals("META-INF", aFile.getName());
- assertNotNull(aFile.convert());
+ if (!aFile.getName().equalsIgnoreCase(".svn")) {
+ assertTrue(aFile.isDirectory());
+ assertEquals("META-INF", aFile.getName());
+ assertNotNull(aFile.convert());
+ }
}
InputStream is = file.open();