Author: markt
Date: Wed Sep 23 07:18:36 2015
New Revision: 1704765
URL: http://svn.apache.org/viewvc?rev=1704765&view=rev
Log:
Port fixes from trunk for running web resources tests in parallel
Removed:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestDirResourceSet.java
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 23 07:18:36 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1
666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,1703160,1703164,170
3167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657
682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1
666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,168581
6,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,1703160,170
3164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Wed Sep 23 07:18:36 2015
@@ -20,11 +20,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.nio.file.FileVisitResult;
-import java.nio.file.FileVisitor;
import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
import org.junit.Assert;
import org.junit.Test;
@@ -1755,44 +1751,6 @@ public class TestHostConfigAutomaticDepl
return xml;
}
- private static void recurrsiveCopy(final Path src, final Path dest)
- throws IOException {
-
- Files.walkFileTree(src, new FileVisitor<Path>() {
- @Override
- public FileVisitResult preVisitDirectory(Path dir,
- BasicFileAttributes attrs) throws IOException {
- Files.copy(dir, dest.resolve(src.relativize(dir)));
- return FileVisitResult.CONTINUE;
- }
-
- @Override
- public FileVisitResult visitFile(Path file,
- BasicFileAttributes attrs) throws IOException {
- Path destPath = dest.resolve(src.relativize(file));
- Files.copy(file, destPath);
- // Make sure that HostConfig thinks all newly copied files have
- // been modified.
- destPath.toFile().setLastModified(
- System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
- return FileVisitResult.CONTINUE;
- }
-
- @Override
- public FileVisitResult visitFileFailed(Path file, IOException ioe)
- throws IOException {
- throw ioe;
- }
-
- @Override
- public FileVisitResult postVisitDirectory(Path dir, IOException
ioe)
- throws IOException {
- // NO-OP
- return FileVisitResult.CONTINUE;
- }});
- }
-
-
private static class StateTracker implements LifecycleListener {
private StringBuilder stateHistory = new StringBuilder();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Wed Sep 23 07:18:36 2015
@@ -25,6 +25,11 @@ import java.io.PrintWriter;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.URL;
+import java.nio.file.FileVisitResult;
+import java.nio.file.FileVisitor;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
@@ -822,4 +827,42 @@ public abstract class TomcatBaseTest ext
super.start();
}
}
+
+
+ public static void recurrsiveCopy(final Path src, final Path dest)
+ throws IOException {
+
+ Files.walkFileTree(src, new FileVisitor<Path>() {
+ @Override
+ public FileVisitResult preVisitDirectory(Path dir,
+ BasicFileAttributes attrs) throws IOException {
+ Files.copy(dir, dest.resolve(src.relativize(dir)));
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult visitFile(Path file,
+ BasicFileAttributes attrs) throws IOException {
+ Path destPath = dest.resolve(src.relativize(file));
+ Files.copy(file, destPath);
+ // Make sure that HostConfig thinks all newly copied files have
+ // been modified.
+ destPath.toFile().setLastModified(
+ System.currentTimeMillis() - 2 *
HostConfig.FILE_MODIFICATION_RESOLUTION_MS);
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult visitFileFailed(Path file, IOException ioe)
+ throws IOException {
+ throw ioe;
+ }
+
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir, IOException
ioe)
+ throws IOException {
+ // NO-OP
+ return FileVisitResult.CONTINUE;
+ }});
+ }
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
Wed Sep 23 07:18:36 2015
@@ -31,31 +31,32 @@ public abstract class AbstractTestFileRe
this.readOnly = readOnly;
}
+ protected abstract String getDir1();
+
@Override
public WebResourceRoot getWebResourceRoot() {
- File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
- WebResourceSet webResourceSet = new DirResourceSet(root, "/",
f.getAbsolutePath(), "/");
+ WebResourceSet webResourceSet = new DirResourceSet(root, "/",
getBaseDir().getAbsolutePath(), "/");
webResourceSet.setReadOnly(readOnly);
root.setMainResources(webResourceSet);
WebResourceSet f1 = new FileResourceSet(root, "/f1.txt",
- "test/webresources/dir1/f1.txt", "/");
+ getDir1() + "/f1.txt", "/");
f1.setReadOnly(readOnly);
root.addPreResources(f1);
WebResourceSet f2 = new FileResourceSet(root, "/f2.txt",
- "test/webresources/dir1/f2.txt", "/");
+ getDir1() + "/f2.txt", "/");
f2.setReadOnly(readOnly);
root.addPreResources(f2);
WebResourceSet d1f1 = new FileResourceSet(root, "/d1/d1-f1.txt",
- "test/webresources/dir1/d1/d1-f1.txt", "/");
+ getDir1() + "/d1/d1-f1.txt", "/");
d1f1.setReadOnly(readOnly);
root.addPreResources(d1f1);
WebResourceSet d2f1 = new FileResourceSet(root, "/d2/d2-f1.txt",
- "test/webresources/dir1/d2/d2-f1.txt", "/");
+ getDir1() + "/d2/d2-f1.txt", "/");
d2f1.setReadOnly(readOnly);
root.addPreResources(d2f1);
@@ -68,8 +69,8 @@ public abstract class AbstractTestFileRe
}
@Override
- public String getBaseDir() {
- return "test/webresources/dir2";
+ public File getBaseDir() {
+ return new File("test/webresources/dir2");
}
@Override
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
Wed Sep 23 07:18:36 2015
@@ -44,7 +44,7 @@ public abstract class AbstractTestResour
return "";
}
- public abstract String getBaseDir();
+ public abstract File getBaseDir();
@Before
public final void setup() throws LifecycleException {
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
Wed Sep 23 07:18:36 2015
@@ -16,9 +16,63 @@
*/
package org.apache.catalina.webresources;
-public class TestDirResourceSet extends AbstractTestDirResourceSet {
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttribute;
- public TestDirResourceSet() {
- super(false);
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import org.apache.catalina.WebResourceRoot;
+import org.apache.catalina.WebResourceSet;
+import org.apache.catalina.startup.ExpandWar;
+import org.apache.catalina.startup.TomcatBaseTest;
+
+public class TestDirResourceSet extends AbstractTestResourceSet {
+
+ private static Path tempDir;
+ private static File dir1;
+
+ @BeforeClass
+ public static void before() throws IOException {
+ tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
+ dir1 = new File(tempDir.toFile(), "dir1");
+ TomcatBaseTest.recurrsiveCopy(new
File("test/webresources/dir1").toPath(), dir1.toPath());
+ }
+
+ @AfterClass
+ public static void after() {
+ ExpandWar.delete(tempDir.toFile());
+ }
+
+
+ @Override
+ public WebResourceRoot getWebResourceRoot() {
+ TesterWebResourceRoot root = new TesterWebResourceRoot();
+ WebResourceSet webResourceSet =
+ new DirResourceSet(root, "/", getBaseDir().getAbsolutePath(),
"/");
+ webResourceSet.setReadOnly(false);
+ root.setMainResources(webResourceSet);
+ return root;
+ }
+
+ @Override
+ protected boolean isWriteable() {
+ return true;
+ }
+
+ @Override
+ public File getBaseDir() {
+ return dir1;
+ }
+
+ @Override
+ @Test
+ public void testNoArgConstructor() {
+ @SuppressWarnings("unused")
+ Object obj = new DirResourceSet();
}
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java
Wed Sep 23 07:18:36 2015
@@ -17,20 +17,58 @@
package org.apache.catalina.webresources;
import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttribute;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.WebResourceSet;
+import org.apache.catalina.startup.ExpandWar;
+import org.apache.catalina.startup.TomcatBaseTest;
+
+public class TestDirResourceSetInternal extends AbstractTestResourceSet {
+
+ private static Path tempDir;
+ private static File dir1;
+
+ @BeforeClass
+ public static void before() throws IOException {
+ tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
+ dir1 = new File(tempDir.toFile(), "dir1");
+ TomcatBaseTest.recurrsiveCopy(new
File("test/webresources/dir1").toPath(), dir1.toPath());
+ }
+
+ @AfterClass
+ public static void after() {
+ ExpandWar.delete(tempDir.toFile());
+ }
-public class TestDirResourceSetInternal extends TestDirResourceSet {
@Override
public WebResourceRoot getWebResourceRoot() {
- File f = new File("test/");
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
- new DirResourceSet(new TesterWebResourceRoot(), "/",
- f.getAbsolutePath(), "/webresources/dir1");
+ new DirResourceSet(root, "/",
tempDir.toAbsolutePath().toString(), "/dir1");
root.setMainResources(webResourceSet);
return root;
}
+
+ @Override
+ protected boolean isWriteable() {
+ return true;
+ }
+
+ @Override
+ public File getBaseDir() {
+ return dir1;
+ }
+
+ @Override
+ public void testNoArgConstructor() {
+ // NO-OP. Tested in TestDirResource
+ }
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java
Wed Sep 23 07:18:36 2015
@@ -17,19 +17,43 @@
package org.apache.catalina.webresources;
import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttribute;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.WebResourceSet;
+import org.apache.catalina.startup.ExpandWar;
+import org.apache.catalina.startup.TomcatBaseTest;
public class TestDirResourceSetMount extends AbstractTestResourceSetMount {
+ private static Path tempDir;
+ private static File dir1;
+
+ @BeforeClass
+ public static void before() throws IOException {
+ tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
+ dir1 = new File(tempDir.toFile(), "dir1");
+ TomcatBaseTest.recurrsiveCopy(new
File("test/webresources/dir1").toPath(), dir1.toPath());
+ }
+
+ @AfterClass
+ public static void after() {
+ ExpandWar.delete(tempDir.toFile());
+ }
+
+
@Override
public WebResourceRoot getWebResourceRoot() {
- File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
new DirResourceSet(new TesterWebResourceRoot(), getMount(),
- f.getAbsolutePath(), "/");
+ getBaseDir().getAbsolutePath(), "/");
root.setMainResources(webResourceSet);
return root;
}
@@ -40,7 +64,7 @@ public class TestDirResourceSetMount ext
}
@Override
- public String getBaseDir() {
- return "test/webresources/dir1";
+ public File getBaseDir() {
+ return dir1;
}
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java
Wed Sep 23 07:18:36 2015
@@ -16,9 +16,35 @@
*/
package org.apache.catalina.webresources;
-public class TestDirResourceSetReadOnly extends AbstractTestDirResourceSet {
+import java.io.File;
- public TestDirResourceSetReadOnly() {
- super(true);
+import org.apache.catalina.WebResourceRoot;
+import org.apache.catalina.WebResourceSet;
+
+public class TestDirResourceSetReadOnly extends AbstractTestResourceSet {
+
+ @Override
+ public WebResourceRoot getWebResourceRoot() {
+ TesterWebResourceRoot root = new TesterWebResourceRoot();
+ WebResourceSet webResourceSet =
+ new DirResourceSet(root, "/", getBaseDir().getAbsolutePath(),
"/");
+ webResourceSet.setReadOnly(true);
+ root.setMainResources(webResourceSet);
+ return root;
+ }
+
+ @Override
+ protected boolean isWriteable() {
+ return false;
+ }
+
+ @Override
+ public File getBaseDir() {
+ return new File("test/webresources/dir1");
+ }
+
+ @Override
+ public void testNoArgConstructor() {
+ // NO-OP. Tested in TestDirResource
}
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
Wed Sep 23 07:18:36 2015
@@ -17,35 +17,59 @@
package org.apache.catalina.webresources;
import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttribute;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.WebResourceSet;
+import org.apache.catalina.startup.ExpandWar;
+import org.apache.catalina.startup.TomcatBaseTest;
+
+public class TestDirResourceSetVirtual extends AbstractTestResourceSet {
+
+ private static Path tempDir;
+ private static File dir1;
+
+ @BeforeClass
+ public static void before() throws IOException {
+ tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
+ dir1 = new File(tempDir.toFile(), "dir1");
+ TomcatBaseTest.recurrsiveCopy(new
File("test/webresources/dir1").toPath(), dir1.toPath());
+ }
+
+ @AfterClass
+ public static void after() {
+ ExpandWar.delete(tempDir.toFile());
+ }
-public class TestDirResourceSetVirtual extends TestDirResourceSet {
@Override
public WebResourceRoot getWebResourceRoot() {
- File f = new File(getBaseDir());
TesterWebResourceRoot root = new TesterWebResourceRoot();
WebResourceSet webResourceSet =
new DirResourceSet(new TesterWebResourceRoot(), "/",
- f.getAbsolutePath(), "/");
+ getBaseDir().getAbsolutePath(), "/");
root.setMainResources(webResourceSet);
WebResourceSet f1 = new FileResourceSet(root, "/f1.txt",
- "test/webresources/dir1/f1.txt", "/");
+ dir1.getAbsolutePath() + "/f1.txt", "/");
root.addPreResources(f1);
WebResourceSet f2 = new FileResourceSet(root, "/f2.txt",
- "test/webresources/dir1/f2.txt", "/");
+ dir1.getAbsolutePath() + "/f2.txt", "/");
root.addPreResources(f2);
WebResourceSet d1 = new DirResourceSet(root, "/d1",
- "test/webresources/dir1/d1", "/");
+ dir1.getAbsolutePath() + "/d1", "/");
root.addPreResources(d1);
WebResourceSet d2 = new DirResourceSet(root, "/d2",
- "test/webresources/dir1/d2", "/");
+ dir1.getAbsolutePath() + "/d2", "/");
root.addPreResources(d2);
return root;
@@ -57,7 +81,12 @@ public class TestDirResourceSetVirtual e
}
@Override
- public String getBaseDir() {
- return "test/webresources/dir3";
+ public File getBaseDir() {
+ return new File("test/webresources/dir3");
+ }
+
+ @Override
+ public void testNoArgConstructor() {
+ // NO-OP. Tested in TestDirResource
}
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
Wed Sep 23 07:18:36 2015
@@ -16,9 +16,42 @@
*/
package org.apache.catalina.webresources;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttribute;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+import org.apache.catalina.startup.ExpandWar;
+import org.apache.catalina.startup.TomcatBaseTest;
+
public class TestFileResourceSet extends AbstractTestFileResourceSet {
+ private static Path tempDir;
+ private static File dir1;
+
+ @BeforeClass
+ public static void before() throws IOException {
+ tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
+ dir1 = new File(tempDir.toFile(), "dir1");
+ TomcatBaseTest.recurrsiveCopy(new
File("test/webresources/dir1").toPath(), dir1.toPath());
+ }
+
+ @AfterClass
+ public static void after() {
+ ExpandWar.delete(tempDir.toFile());
+ }
+
+
public TestFileResourceSet() {
super(false);
}
+
+ @Override
+ protected String getDir1() {
+ return dir1.getAbsolutePath();
+ }
}
\ No newline at end of file
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java
Wed Sep 23 07:18:36 2015
@@ -18,7 +18,14 @@ package org.apache.catalina.webresources
public class TestFileResourceSetReadOnly extends AbstractTestFileResourceSet {
+ private static final String dir1 = "test/webresources/dir1";
+
public TestFileResourceSetReadOnly() {
- super(false);
+ super(true);
+ }
+
+ @Override
+ protected String getDir1() {
+ return dir1;
}
}
\ No newline at end of file
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
Wed Sep 23 07:18:36 2015
@@ -16,15 +16,47 @@
*/
package org.apache.catalina.webresources;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttribute;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+import org.apache.catalina.startup.ExpandWar;
+import org.apache.catalina.startup.TomcatBaseTest;
+
/**
* Mounts file resources in sub directories that do not exist in the main
* resoucres.
*/
public class TestFileResourceSetVirtual extends TestFileResourceSet {
+ private static Path tempDir;
+ private static File dir1;
+
+ @BeforeClass
+ public static void before() throws IOException {
+ tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
+ dir1 = new File(tempDir.toFile(), "dir1");
+ TomcatBaseTest.recurrsiveCopy(new
File("test/webresources/dir1").toPath(), dir1.toPath());
+ }
+
+ @AfterClass
+ public static void after() {
+ ExpandWar.delete(tempDir.toFile());
+ }
+
+
@Override
- public String getBaseDir() {
- return "test/webresources/dir3";
+ public File getBaseDir() {
+ return new File("test/webresources/dir3");
}
+ @Override
+ protected String getDir1() {
+ return dir1.getAbsolutePath();
+ }
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java
Wed Sep 23 07:18:36 2015
@@ -41,8 +41,8 @@ public class TestJarResourceSet extends
}
@Override
- public String getBaseDir() {
- return "test/webresources";
+ public File getBaseDir() {
+ return new File("test/webresources");
}
@Override
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java
Wed Sep 23 07:18:36 2015
@@ -41,8 +41,8 @@ public class TestJarResourceSetInternal
}
@Override
- public String getBaseDir() {
- return "test/webresources";
+ public File getBaseDir() {
+ return new File("test/webresources");
}
@Override
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java?rev=1704765&r1=1704764&r2=1704765&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java
Wed Sep 23 07:18:36 2015
@@ -39,7 +39,7 @@ public class TestJarResourceSetMount ext
}
@Override
- public String getBaseDir() {
- return "test/webresources";
+ public File getBaseDir() {
+ return new File("test/webresources");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
