[Unicore-cvs-commits] SF.net SVN: unicore:[18322] uftp/trunk/uftp-core/src

[<bsc...@us...>]

Revision: 18322
          http://sourceforge.net/p/unicore/svn/18322
Author:   bschuller
Date:     2014-09-18 09:05:19 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
avoid potential race condition in test; reduce testing log verbosity

Modified Paths:
--------------
    uftp/trunk/uftp-core/src/main/java/eu/unicore/uftp/client/SessionCommands.java
    uftp/trunk/uftp-core/src/test/java/eu/unicore/uftp/dpc/TestSessionMode.java
    uftp/trunk/uftp-core/src/test/java/eu/unicore/uftp/server/ClientServerTestBase.java
    uftp/trunk/uftp-core/src/test/resources/log4j.properties
    uftp/trunk/uftp-core/src/test/resources/session_cmd_file

Modified: uftp/trunk/uftp-core/src/main/java/eu/unicore/uftp/client/SessionCommands.java
===================================================================
--- uftp/trunk/uftp-core/src/main/java/eu/unicore/uftp/client/SessionCommands.java	2014-09-18 07:31:50 UTC (rev 18321)
+++ uftp/trunk/uftp-core/src/main/java/eu/unicore/uftp/client/SessionCommands.java	2014-09-18 09:05:19 UTC (rev 18322)
@@ -25,6 +25,10 @@
 		if("lcd".equalsIgnoreCase(name)){
 			cmd=new LCD(args);
 		}
+		if("pwd".equalsIgnoreCase(name)){
+			cmd=new PWD();
+		}
+		
 		if(cmd!=null)cmd.setClient(client);
 		return cmd;
 	}
@@ -118,6 +122,7 @@
 			}
 		}
 	}
+	
 	/**
 	 * change local base dir
 	 */
@@ -134,4 +139,19 @@
 		}
 	}
 
+	/**
+	 * change local base dir
+	 */
+	public static class PWD extends CmdBase {
+		
+		public PWD(){}
+
+		public void run(){
+			try{
+				System.out.println(client.pwd());
+			}catch(Exception ex){
+				throw new RuntimeException(ex);
+			}
+		}
+	}
 }

Modified: uftp/trunk/uftp-core/src/test/java/eu/unicore/uftp/dpc/TestSessionMode.java
===================================================================
--- uftp/trunk/uftp-core/src/test/java/eu/unicore/uftp/dpc/TestSessionMode.java	2014-09-18 07:31:50 UTC (rev 18321)
+++ uftp/trunk/uftp-core/src/test/java/eu/unicore/uftp/dpc/TestSessionMode.java	2014-09-18 09:05:19 UTC (rev 18322)
@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 
 import eu.unicore.uftp.client.SessionCommands.Get;
@@ -207,13 +208,15 @@
 		String expected = Utils.md5(realSource);
 		checkFile(new File(target), expected);
 	}
-
+	
 	@Test
 	public void testSessonCMDFile() throws Exception {
 		File commandFile=new File("src/test/resources/session_cmd_file");
 		File source=commandFile;
 		File target=new File("target/foo_1");
 		File target2=new File("target/foo_2");
+		FileUtils.deleteQuietly(target);
+		FileUtils.deleteQuietly(target2);
 		String secret = String.valueOf(System.currentTimeMillis());
 		File cwd=new File(".").getAbsoluteFile();
 		UFTPTransferRequest job = new UFTPTransferRequest(host, true, 1,  
@@ -226,7 +229,6 @@
 		client.setBaseDirectory(cwd);
 		client.setCommandFile(commandFile.getAbsolutePath());
 		client.run();
-
 		// check that file exists and has correct content
 		String expected = Utils.md5(source);
 		checkFile(target, expected);

Modified: uftp/trunk/uftp-core/src/test/java/eu/unicore/uftp/server/ClientServerTestBase.java
===================================================================
--- uftp/trunk/uftp-core/src/test/java/eu/unicore/uftp/server/ClientServerTestBase.java	2014-09-18 07:31:50 UTC (rev 18321)
+++ uftp/trunk/uftp-core/src/test/java/eu/unicore/uftp/server/ClientServerTestBase.java	2014-09-18 09:05:19 UTC (rev 18322)
@@ -74,6 +74,6 @@
 	protected void checkFile(File target, String md5)throws Exception{
 		assertTrue(target.exists());
 		String actual = Utils.md5(target);
-		assertEquals("File contents "+target.getName()+" do not match", md5, actual);
+		assertEquals("File <"+target+">: contents "+target.getName()+" do not match", md5, actual);
 	}
 }
\ No newline at end of file

Modified: uftp/trunk/uftp-core/src/test/resources/log4j.properties
===================================================================
--- uftp/trunk/uftp-core/src/test/resources/log4j.properties	2014-09-18 07:31:50 UTC (rev 18321)
+++ uftp/trunk/uftp-core/src/test/resources/log4j.properties	2014-09-18 09:05:19 UTC (rev 18322)
@@ -1,13 +1,7 @@
-#
-#default log4j configuration
-#
+log4j.rootLogger=INFO, A1
 
-# Set root logger level to WARN and its only appender to A1.
-log4j.rootLogger=DEBUG, A1
-
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
-# A1 uses PatternLayout.
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c{1} %x - %m%n
 
-log4j.logger.eu.unicore.uftp.dpc=DEBUG
\ No newline at end of file
+log4j.logger.eu.unicore.uftp.dpc=INFO

Modified: uftp/trunk/uftp-core/src/test/resources/session_cmd_file
===================================================================
--- uftp/trunk/uftp-core/src/test/resources/session_cmd_file	2014-09-18 07:31:50 UTC (rev 18321)
+++ uftp/trunk/uftp-core/src/test/resources/session_cmd_file	2014-09-18 09:05:19 UTC (rev 18322)
@@ -1,2 +1,3 @@
 GET "src/test/resources/session_cmd_file" "target/foo_1"
 PUT "src/test/resources/session_cmd_file" "target/foo_2"
+PWD

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.