Author: markt
Date: Fri Sep 14 09:20:37 2012
New Revision: 1384694
URL: http://svn.apache.org/viewvc?rev=1384694&view=rev
Log:
Move resources used for tests to make space for additional resources for new
tests
Added:
tomcat/sandbox/trunk-resources/test/webresources/dir1/
tomcat/sandbox/trunk-resources/test/webresources/dir1/d1/
- copied from r1384449,
tomcat/sandbox/trunk-resources/test/webresources/d1/
tomcat/sandbox/trunk-resources/test/webresources/dir1/d2/
- copied from r1384449,
tomcat/sandbox/trunk-resources/test/webresources/d2/
tomcat/sandbox/trunk-resources/test/webresources/dir1/f1.txt
- copied unchanged from r1384449,
tomcat/sandbox/trunk-resources/test/webresources/f1.txt
tomcat/sandbox/trunk-resources/test/webresources/dir1/f2.txt
- copied unchanged from r1384449,
tomcat/sandbox/trunk-resources/test/webresources/f2.txt
Removed:
tomcat/sandbox/trunk-resources/test/webresources/d1/
tomcat/sandbox/trunk-resources/test/webresources/d2/
tomcat/sandbox/trunk-resources/test/webresources/f1.txt
tomcat/sandbox/trunk-resources/test/webresources/f2.txt
Modified:
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSet.java
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
Modified:
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSet.java?rev=1384694&r1=1384693&r2=1384694&view=diff
==============================================================================
---
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSet.java
(original)
+++
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSet.java
Fri Sep 14 09:20:37 2012
@@ -34,7 +34,7 @@ public class TestDirResourceSet {
@Before
public void setup() {
- File f = new File("test/webresources");
+ File f = new File("test/webresources/dir1");
dirResourceSet = new DirResourceSet(
new TesterWebResourceRoot(), f, "", "");
}
@@ -214,7 +214,7 @@ public class TestDirResourceSet {
public void testMkdirNew() {
Assert.assertTrue(dirResourceSet.mkdir("/new-test"));
- File file = new File("test/webresources/new-test");
+ File file = new File("test/webresources/dir1/new-test");
Assert.assertTrue(file.isDirectory());
Assert.assertTrue(file.delete());
}
@@ -259,7 +259,7 @@ public class TestDirResourceSet {
InputStream is = new ByteArrayInputStream("test".getBytes());
Assert.assertTrue(dirResourceSet.write("/new-test", is));
- File file = new File("test/webresources/new-test");
+ File file = new File("test/webresources/dir1/new-test");
Assert.assertTrue(file.exists());
Assert.assertTrue(file.delete());
}
Modified:
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java?rev=1384694&r1=1384693&r2=1384694&view=diff
==============================================================================
---
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
(original)
+++
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
Fri Sep 14 09:20:37 2012
@@ -24,7 +24,7 @@ public class TestDirResourceSetInternal
public void setup() {
File f = new File("test");
dirResourceSet = new DirResourceSet(
- new TesterWebResourceRoot(), f, "", "webresources");
+ new TesterWebResourceRoot(), f, "", "webresources/dir1");
}
}
Modified:
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSetMount.java?rev=1384694&r1=1384693&r2=1384694&view=diff
==============================================================================
---
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
(original)
+++
tomcat/sandbox/trunk-resources/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
Fri Sep 14 09:20:37 2012
@@ -34,7 +34,7 @@ public class TestDirResourceSetMount {
@Before
public void setup() {
- File f = new File("test/webresources");
+ File f = new File("test/webresources/dir1");
dirResourceSet = new DirResourceSet(
new TesterWebResourceRoot(), f, "/mount", "");
}
@@ -242,7 +242,7 @@ public class TestDirResourceSetMount {
public void testMkdirNew() {
Assert.assertTrue(dirResourceSet.mkdir("/mount/new-test"));
- File file = new File("test/webresources/new-test");
+ File file = new File("test/webresources/dir1/new-test");
Assert.assertTrue(file.isDirectory());
Assert.assertTrue(file.delete());
}
@@ -293,7 +293,7 @@ public class TestDirResourceSetMount {
InputStream is = new ByteArrayInputStream("test".getBytes());
Assert.assertTrue(dirResourceSet.write("/mount/new-test", is));
- File file = new File("test/webresources/new-test");
+ File file = new File("test/webresources/dir1/new-test");
Assert.assertTrue(file.exists());
Assert.assertTrue(file.delete());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
