This is the mail archive of the mauve-patches@sourceware.org mailing list for the Mauve project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

RFC: Additional NIO tests.


Hi,

Attached a couple of addtional tests for the NIO package.

Regards,
Michael Barker.
Index: ChangeLog
===================================================================
RCS file: /cvs/mauve/mauve/ChangeLog,v
retrieving revision 1.1585
diff -u -r1.1585 ChangeLog
--- ChangeLog	6 Apr 2006 13:05:04 -0000	1.1585
+++ ChangeLog	6 Apr 2006 14:33:17 -0000
@@ -1,3 +1,13 @@
+2006-04-06  Michael Barker  <mike@middlesoft.co.uk>
+
+	* gnu/testlet/java/nio/channels/FileChannel/multibufferIO.java: Added
+	* gnu/testlet/java/nio/channels/FileChannel/multidirectbufferIO.java: Added
+	* gnu/testlet/java/nio/channels/FileChannel/singlebufferIO.java: Added
+	* gnu/testlet/java/nio/channels/Pipe/Pipe.java: Added (placeholder)
+	* gnu/testlet/java/nio/channels/SocketChannel/select.java Added flip() to
+	reset buffer.
+	
+	
 2006-04-06  Mark Wielaard  <mark@klomp.org>
 
 	* gnu/testlet/java/lang/Class/security.java: Add check for no
===================================================================
Index: gnu/testlet/java/nio/channels/SocketChannel/select.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/nio/channels/SocketChannel/select.java,v
retrieving revision 1.2
diff -u -r1.2 select.java
--- gnu/testlet/java/nio/channels/SocketChannel/select.java	23 Oct 2005 17:38:28 -0000	1.2
+++ gnu/testlet/java/nio/channels/SocketChannel/select.java	6 Apr 2006 14:33:21 -0000
@@ -150,8 +150,8 @@
 	else
 	  harness.check(true);
 
+    bb.flip();
 	sc.write(bb);
-
 	sc.close();
 	ssc.close();
       }
Index: gnu/testlet/java/nio/channels/FileChannel/multibufferIO.java
===================================================================
RCS file: gnu/testlet/java/nio/channels/FileChannel/multibufferIO.java
diff -N gnu/testlet/java/nio/channels/FileChannel/multibufferIO.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/java/nio/channels/FileChannel/multibufferIO.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,46 @@
+/* mulitbufferIO.java -- FIXME: describe
+ Copyright (C) 2006 FIXME: your info here
+ This file is part of Mauve.
+
+ Mauve is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ Mauve is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Mauve; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ */
+
+// Tags: FIXME
+
+
+package gnu.testlet.java.nio.channels.FileChannel;
+
+import gnu.testlet.Testlet;
+
+import java.nio.ByteBuffer;
+
+/**
+ * @author mike
+ */
+public class multibufferIO extends multidirectbufferIO
+    implements Testlet
+{
+
+  private void initBuffer(ByteBuffer[] bs, byte[] data)
+  {
+    for (int i = 0; i < bs.length; i++)
+      {
+        bs[i] = ByteBuffer.wrap(data);
+      }
+  }
+
+}
Index: gnu/testlet/java/nio/channels/FileChannel/multidirectbufferIO.java
===================================================================
RCS file: gnu/testlet/java/nio/channels/FileChannel/multidirectbufferIO.java
diff -N gnu/testlet/java/nio/channels/FileChannel/multidirectbufferIO.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/java/nio/channels/FileChannel/multidirectbufferIO.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,109 @@
+/* mulitbufferIO.java -- FIXME: describe
+ Copyright (C) 2006 FIXME: your info here
+ This file is part of Mauve.
+
+ Mauve is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ Mauve is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Mauve; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ */
+
+// Tags: FIXME
+
+
+package gnu.testlet.java.nio.channels.FileChannel;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.util.Arrays;
+
+/**
+ * @author mike
+ */
+public class multidirectbufferIO
+    implements Testlet
+{
+
+  private void initBuffer(ByteBuffer[] bs, byte[] data)
+  {
+    for (int i = 0; i < bs.length; i++)
+      {
+        bs[i] = ByteBuffer.allocateDirect(data.length);
+        bs[i].put(data);
+        bs[i].flip();
+      }
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see gnu.testlet.Testlet#test(gnu.testlet.TestHarness)
+   */
+  public void test(TestHarness harness)
+  {
+    final int BUF_LEN = 17;
+    final int MAX_BUFFERS = 16;
+    byte[] data = "qwertyuiopasdfghjklzxcvbnm".getBytes();
+    ByteBuffer[] out = new ByteBuffer[BUF_LEN];
+    ByteBuffer[] in = new ByteBuffer[BUF_LEN];
+    initBuffer(out, data);
+    initBuffer(in, new byte[data.length]);
+    String tmpfile = harness.getTempDirectory() + File.separator
+                     + "mauve-multibuffer.tmp";
+    try
+      {
+        File f = new File(tmpfile);
+        f.createNewFile();
+        FileChannel fcOut = new FileOutputStream(f).getChannel();
+        long numWritten = fcOut.write(out);
+        fcOut.close();
+        /* The SUN JDK limits the number of buffers to 16 */
+        harness.check(numWritten, (MAX_BUFFERS * data.length));
+        for (int i = 0; i < MAX_BUFFERS; i++)
+          {
+            harness.check(out[i].position() == out[i].limit(), "Position - Limit mismatch");
+          }
+
+        FileChannel fcIn = new FileInputStream(f).getChannel();
+        long numRead = fcIn.read(in);
+        /* The SUN JDK limits the number of buffers to 16 */
+        harness.check(numRead, (16 * data.length));
+
+        for (int i = 0; i < MAX_BUFFERS; i++)
+          {
+            byte[] dIn = new byte[data.length];
+            byte[] dOut  = new byte[data.length];
+            in[i].flip();
+            out[i].flip();
+            in[i].get(dIn);
+            out[i].get(dOut);
+            harness.check(Arrays.equals(dIn, dOut));
+          }
+        
+        f.delete();
+      }
+    catch (IOException e)
+      {
+        harness.fail("Unexpected exception: " + e);
+      }
+  }
+
+}
Index: gnu/testlet/java/nio/channels/FileChannel/singlebufferIO.java
===================================================================
RCS file: gnu/testlet/java/nio/channels/FileChannel/singlebufferIO.java
diff -N gnu/testlet/java/nio/channels/FileChannel/singlebufferIO.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/java/nio/channels/FileChannel/singlebufferIO.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,78 @@
+/* mulitbufferIO.java -- FIXME: describe
+ Copyright (C) 2006 FIXME: your info here
+ This file is part of Mauve.
+
+ Mauve is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ Mauve is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Mauve; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ */
+
+// Tags: FIXME
+
+
+package gnu.testlet.java.nio.channels.FileChannel;
+
+import gnu.testlet.TestHarness;
+import gnu.testlet.Testlet;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.util.Arrays;
+
+/**
+ * @author mike
+ */
+public class singlebufferIO
+    implements Testlet
+{
+  /*
+   * (non-Javadoc)
+   * 
+   * @see gnu.testlet.Testlet#test(gnu.testlet.TestHarness)
+   */
+  public void test(TestHarness harness)
+  {
+    byte[] data = "qwertyuiopasdfghjklzxcvbnm".getBytes();
+    ByteBuffer out = ByteBuffer.wrap(data);
+    ByteBuffer in = ByteBuffer.wrap(new byte[data.length]);
+    String tmpfile = harness.getTempDirectory() + File.separator
+                     + "mauve-singlebuffer.tmp";
+    try
+      {
+        File f = new File(tmpfile);
+        f.createNewFile();
+        FileChannel fcOut = new FileOutputStream(f).getChannel();
+        fcOut.write(out);
+        fcOut.close();
+        harness.check(out.position() == out.limit(), "Position - Limit mismatch");
+
+        FileChannel fcIn = new FileInputStream(f).getChannel();
+        fcIn.read(in);
+
+        System.out.println("Position: " + in.position() + ", Limit: " + in.limit());
+        System.out.println("Position: " + out.position() + ", Limit: " + out.limit());
+        harness.check(Arrays.equals(out.array(), in.array()));
+      }
+    catch (IOException e)
+      {
+        harness.fail("Unexpected exception: " + e);
+      }
+  }
+
+}
Index: gnu/testlet/java/nio/channels/Pipe/Pipe.java
===================================================================
RCS file: gnu/testlet/java/nio/channels/Pipe/Pipe.java
diff -N gnu/testlet/java/nio/channels/Pipe/Pipe.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/testlet/java/nio/channels/Pipe/Pipe.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,32 @@
+/* Pipe.java -- FIXME: describe
+   Copyright (C) 2006 FIXME: your info here
+This file is part of Mauve.
+
+Mauve is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+Mauve is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Mauve; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+*/
+
+// Tags: FIXME
+
+package gnu.testlet.java.nio.channels.Pipe;
+
+/**
+ * @author mike
+ *
+ */
+public class Pipe {
+
+}

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]