changeset in /hg/pulseaudio: 2008-09-30 Omair Majid <omajid at redh...

[Omair Majid]

changeset 609dcbe6d5b8 in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=609dcbe6d5b8
description:
	2008-09-30 Omair Majid <omajid at redhat.com>

	    * unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java
	    (testWriteWithoutStart): New function. Checks that writing to line that
	    hasnt been started doesnt play any sound.
	    (testDrainWithoutStart): fixed function. Tries to drain a line with data
	    written to it that hasnt been started. Now writes in a separate thread so
	    that the function doesnt block on write.
	    (testFlushWithoutStart): New test. Tries to flush a line that hasnt been
	    started.

diffstat:

1 file changed, 92 insertions(+), 17 deletions(-)
unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java |  109 ++++++++--

diffs (154 lines):

diff -r 0894592be2a2 -r 609dcbe6d5b8 unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java
--- a/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java	Tue Sep 30 10:31:32 2008 -0400
+++ b/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java	Tue Sep 30 11:49:05 2008 -0400
@@ -230,6 +230,59 @@ public class PulseAudioSourceDataLineTes
 	}
 
 	@Test
+	public void testWriteWithoutStart() throws UnsupportedAudioFileException,
+			IOException, LineUnavailableException, InterruptedException {
+
+		System.out
+				.println("This test doesnt play a file; you shouldnt hear anything");
+
+		File soundFile = new File("testsounds/startup.wav");
+		final AudioInputStream audioInputStream = AudioSystem
+				.getAudioInputStream(soundFile);
+		final AudioFormat audioFormat = audioInputStream.getFormat();
+
+		sourceDataLine = (SourceDataLine) mixer.getLine(new DataLine.Info(
+				SourceDataLine.class, audioFormat));
+		Assert.assertNotNull(sourceDataLine);
+
+		Thread writer = new Thread() {
+			@Override
+			public void run() {
+				try {
+					sourceDataLine.open(audioFormat);
+					byte[] abData = new byte[1000];
+					int bytesRead = 0;
+					int total = 0;
+
+					while (bytesRead >= 0 && total < 50) {
+						bytesRead = audioInputStream.read(abData, 0,
+								abData.length);
+						if (bytesRead > 0) {
+							sourceDataLine.write(abData, 0, bytesRead);
+						}
+						total++;
+					}
+				} catch (LineUnavailableException e) {
+					Assert.fail();
+				} catch (IOException e) {
+					Assert.fail();
+				}
+			}
+
+		};
+
+		writer.start();
+
+		Thread.sleep(100);
+
+		writer.join(1000);
+
+		/* assert that the writer is still waiting in write */
+		Assert.assertTrue(writer.isAlive());
+
+	}
+
+	@Test
 	public void testWriteAndClose() throws UnsupportedAudioFileException,
 			IOException, LineUnavailableException, InterruptedException {
 		System.out.println("This test tires to close the line during a write");
@@ -393,6 +446,9 @@ public class PulseAudioSourceDataLineTes
 	public void testStartedStopped() throws LineUnavailableException,
 			UnsupportedAudioFileException, IOException {
 
+		System.out
+				.println("This test check START/STOP events. You should see 1 START and 1 STOP event");
+
 		File soundFile = new File("testsounds/startup.wav");
 		AudioInputStream audioInputStream = AudioSystem
 				.getAudioInputStream(soundFile);
@@ -1013,7 +1069,7 @@ public class PulseAudioSourceDataLineTes
 			UnsupportedAudioFileException, IOException, InterruptedException {
 
 		File soundFile = new File("testsounds/logout.wav");
-		AudioInputStream audioInputStream = AudioSystem
+		final AudioInputStream audioInputStream = AudioSystem
 				.getAudioInputStream(soundFile);
 		AudioFormat audioFormat = audioInputStream.getFormat();
 
@@ -1024,29 +1080,39 @@ public class PulseAudioSourceDataLineTes
 		int available = sourceDataLine.available();
 		Assert.assertTrue(available > 1000);
 
-		byte[] abData = new byte[1000];
-		int bytesRead = 0;
-
-		bytesRead = audioInputStream.read(abData, 0, abData.length);
-		Assert.assertTrue(bytesRead > 0);
-		sourceDataLine.write(abData, 0, bytesRead);
-
-		Runnable blocker = new Runnable() {
+		Thread writer = new Thread() {
+			@Override
+			public void run() {
+				try {
+					final byte[] abData = new byte[100000];
+					int bytesRead = 0;
+
+					bytesRead = audioInputStream.read(abData, 0, abData.length);
+					Assert.assertTrue(bytesRead > 0);
+
+					sourceDataLine.write(abData, 0, bytesRead);
+				} catch (IOException e) {
+
+				}
+			}
+		};
+
+		Thread drainer = new Thread() {
 			@Override
 			public void run() {
 				sourceDataLine.drain();
 			}
 		};
 
-		Thread th = new Thread(blocker);
-		th.start();
-
-		th.join(1000);
-
-		if (th.isAlive()) {
+		writer.start();
+		drainer.start();
+
+		drainer.join(1000);
+
+		if (drainer.isAlive()) {
 			sourceDataLine.close();
-			th.join(1000);
-			if (th.isAlive()) {
+			drainer.join(1000);
+			if (drainer.isAlive()) {
 				Assert
 						.fail("drain() does not return when the line has been closed");
 			} else {
@@ -1086,6 +1152,15 @@ public class PulseAudioSourceDataLineTes
 		sourceDataLine = (SourceDataLine) mixer.getLine(new DataLine.Info(
 				SourceDataLine.class, aSupportedFormat, 1000));
 
+		sourceDataLine.flush();
+
+	}
+
+	@Test
+	public void testFlushWithoutStart() throws LineUnavailableException {
+		sourceDataLine = (SourceDataLine) mixer.getLine(new DataLine.Info(
+				SourceDataLine.class, aSupportedFormat, 1000));
+		sourceDataLine.open();
 		sourceDataLine.flush();
 
 	}