[Joafip-svn] SF.net SVN: joafip:[2963] trunk/joafip-file/src/test/java/net/sf/joafip/ file

[<luc...@us...>]

Revision: 2963
          http://joafip.svn.sourceforge.net/joafip/?rev=2963&view=rev
Author:   luc_peuvrier
Date:     2011-11-12 16:49:48 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
for tests

Modified Paths:
--------------
    trunk/joafip-file/src/test/java/net/sf/joafip/file/entity/FileAccessRecord.java
    trunk/joafip-file/src/test/java/net/sf/joafip/file/service/ParallelRandomAccessFileForTest.java
    trunk/joafip-file/src/test/java/net/sf/joafip/file/service/RandomAccessFileProbeForTest.java

Modified: trunk/joafip-file/src/test/java/net/sf/joafip/file/entity/FileAccessRecord.java
===================================================================
--- trunk/joafip-file/src/test/java/net/sf/joafip/file/entity/FileAccessRecord.java	2011-11-12 16:47:42 UTC (rev 2962)
+++ trunk/joafip-file/src/test/java/net/sf/joafip/file/entity/FileAccessRecord.java	2011-11-12 16:49:48 UTC (rev 2963)
@@ -35,17 +35,11 @@
 
 	private final byte[] data;
 
-	public FileAccessRecord(final long positionInFile, final byte[] data) {
-		super();
-		this.positionInFile = positionInFile;
-		this.data = data.clone();
-	}
-
-	public FileAccessRecord(final long positionInFile, final byte[] data,
+	public FileAccessRecord(final long positionInFile, final byte[] data,final int offset,
 			final int length) {
 		super();
 		this.positionInFile = positionInFile;
-		this.data = Arrays.copyOf(data, length);
+		this.data = Arrays.copyOfRange(data, offset, offset+length);
 	}
 
 	public long getPositionInFile() {

Modified: trunk/joafip-file/src/test/java/net/sf/joafip/file/service/ParallelRandomAccessFileForTest.java
===================================================================
--- trunk/joafip-file/src/test/java/net/sf/joafip/file/service/ParallelRandomAccessFileForTest.java	2011-11-12 16:47:42 UTC (rev 2962)
+++ trunk/joafip-file/src/test/java/net/sf/joafip/file/service/ParallelRandomAccessFileForTest.java	2011-11-12 16:49:48 UTC (rev 2963)
@@ -181,6 +181,14 @@
 	}
 
 	@Override
+	public void write(final byte[] data, final int offset, final int length)
+			throws FileIOException {
+		randomFileDirect.write(data, offset, length);
+		randomFileDirectNio.write(data, offset, length);
+		randomFileReadWriteCache.write(data, offset, length);
+	}
+
+	@Override
 	public boolean isClose() throws FileIOException {
 		final boolean close1 = randomFileDirect.isClose();
 		final boolean close2 = randomFileDirectNio.isClose();

Modified: trunk/joafip-file/src/test/java/net/sf/joafip/file/service/RandomAccessFileProbeForTest.java
===================================================================
--- trunk/joafip-file/src/test/java/net/sf/joafip/file/service/RandomAccessFileProbeForTest.java	2011-11-12 16:47:42 UTC (rev 2962)
+++ trunk/joafip-file/src/test/java/net/sf/joafip/file/service/RandomAccessFileProbeForTest.java	2011-11-12 16:49:48 UTC (rev 2963)
@@ -59,7 +59,7 @@
 		final int read = delegate.read(data);
 		if (read > 0) {
 			final FileAccessRecord fileAccessRecord = new FileAccessRecord(
-					positionInFile, data);
+					positionInFile, data, 0, data.length);
 			readLog.add(fileAccessRecord);
 		}
 		return read;
@@ -69,7 +69,7 @@
 	public void write(final byte[] data) throws FileIOException {
 		final long positionInFile = delegate.currentPositionInFile();
 		final FileAccessRecord fileAccessRecord = new FileAccessRecord(
-				positionInFile, data);
+				positionInFile, data, 0, data.length);
 		delegate.write(data);
 		writeLog.add(fileAccessRecord);
 	}
@@ -79,11 +79,21 @@
 			throws FileIOException {
 		final long positionInFile = delegate.currentPositionInFile();
 		final FileAccessRecord fileAccessRecord = new FileAccessRecord(
-				positionInFile, data, length);
+				positionInFile, data, 0, length);
 		delegate.write(data);
 		writeLog.add(fileAccessRecord);
 	}
 
+	@Override
+	public void write(final byte[] data, final int offset, final int length)
+			throws FileIOException {
+		final long positionInFile = delegate.currentPositionInFile();
+		final FileAccessRecord fileAccessRecord = new FileAccessRecord(
+				positionInFile, data, offset, length);
+		delegate.write(data);
+		writeLog.add(fileAccessRecord);
+	}
+
 	public void clearLog() {
 		readLog.clear();
 		writeLog.clear();

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