Commit in projects/lcsim/trunk on MAIN
parent/pom.xml+2-213105 -> 3106
util/src/main/java/org/lcsim/util/test/TestUtil.java+35-393105 -> 3106
+37-60
2 modified files
Improve TestOutputFile so it creates the directory if it does not exist.  Remove ant target for creating this dir from the build.

projects/lcsim/trunk/parent
pom.xml 3105 -> 3106
--- projects/lcsim/trunk/parent/pom.xml	2014-05-05 17:56:13 UTC (rev 3105)
+++ projects/lcsim/trunk/parent/pom.xml	2014-05-05 18:16:56 UTC (rev 3106)
@@ -277,11 +277,8 @@
                         </execution>
                     </executions>     
                 </plugin>
-                <plugin>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.7</version>
-                </plugin>
                 <!-- This fixes the lifecycle not covered by plugin execution error in Eclipse. -->
+                <!--  
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
                     <artifactId>lifecycle-mapping</artifactId>
@@ -308,27 +305,11 @@
                         </lifecycleMappingMetadata>
                     </configuration>
                 </plugin>
+                -->
             </plugins>
         </pluginManagement>
         <plugins>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>create-test-output-dir</id>
-                        <phase>generate-test-resources</phase>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${project.build.directory}/test-output" />
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.3</version>

projects/lcsim/trunk/util/src/main/java/org/lcsim/util/test
TestUtil.java 3105 -> 3106
--- projects/lcsim/trunk/util/src/main/java/org/lcsim/util/test/TestUtil.java	2014-05-05 17:56:13 UTC (rev 3105)
+++ projects/lcsim/trunk/util/src/main/java/org/lcsim/util/test/TestUtil.java	2014-05-05 18:16:56 UTC (rev 3106)
@@ -6,46 +6,42 @@
 
 import org.lcsim.util.cache.FileCache;
 
-public abstract class TestUtil 
-{
+public abstract class TestUtil {
+
     private final static String lcioTestFileURL = "http://www.lcsim.org/test/lcio";
-    
-    public static String getLCIOTestURL(String filename)
-    {
+
+    public static String getLCIOTestURL(String filename) {
         return lcioTestFileURL + "/" + filename;
     }
-    
-	public static String getTestOutputDir()
-	{
-		return "target/test-output/";
-	}
-	
-	public static class TestOutputFile extends File
-	{
-		public TestOutputFile(String filename)
-		{
-			super(getTestOutputDir() + filename);
-		}
-	}
-	
-	public static class CachedInputFile
-	{
-		File file;
-		
-		public CachedInputFile(String url)
-		{
-			try {
-				file = (new FileCache()).getCachedFile(new URL(url));
-			}
-			catch (IOException x)
-			{
-				throw new RuntimeException(x);
-			}
-		}
-		
-		public File getFile()
-		{
-			return file;
-		}
-	}
+
+    public static String getTestOutputDir() {
+        return "target/test-output/";
+    }
+
+    public static class TestOutputFile extends File {
+
+        public TestOutputFile(String filename) {
+            super(getTestOutputDir() + filename);
+            File dir = new File(getTestOutputDir());
+            if (!dir.exists())
+                dir.mkdir();
+        }
+    }
+
+    public static class CachedInputFile {
+
+        File file;
+
+        public CachedInputFile(String url) {
+            try {
+                file = (new FileCache()).getCachedFile(new URL(url));
+            } catch (IOException x) {
+                throw new RuntimeException(x);
+            }
+        }
+
+        public File getFile() {
+            return file;
+        }
+    }
 }
\ No newline at end of file
SVNspam 0.1


Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1