2008-09-12 Omair Majid <omajid@redhat.com> * build.xml: Rearranged the tests to run in order of importance. If the first ones fail there's probably a big problem somewhere. * unittests/org/classpath/icedtea/pulseaudio/OtherSoundProvidersAvailableTest.java Fixed name of file in the license. Renamed selectedMixer to mixer. * unittests/org/classpath/icedtea/pulseaudio/PulseAudioClipTest.java Fixed the frameRate paramter for aSupportedFormat. (testObtainingAClip): Added output describing the test. (testClipOpenWrongUse): Likewise. (testPlayTwoClips): Assert that both clips are now closed. * unittests/org/classpath/icedtea/pulseaudio/PulseAudioEventLoopOverhead.java Added license text. Renamed selectedMixer to mixer. (setUp): Removed usage of PulseAudioMixer. (tearDown): Close the mixer. * unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerRawTest.java This file tests those capabilites of PulseAudioMixer which are not exposed by the sampled.Mixer interface. (testOpen): Removed function. (testLocalOpen): New function. (testLocalOpenAppName): New function. (testRemoveOpenWithInvalidPort): Likewise. (testRemoveOpenWithValidPort): Likewise. (testRemoteOpen): Likewise. (testInvalidRemoteOpen): Likewise. (tearDown): Close the mixer. * unittests/org/classpath/icedtea/pulseaudio/PulseAudioMixerTest.java This file tests capabilites of PulseAudioMixer which are exposed by the sampled.Mixer interface. Changed type of selectedMixer to Mixer. (setUp): Removed cast to PulseAudioMixer. (testOpenClose): New function. Tests that open and close methods work. (testLocalOpen): Moved method to PulseAudioMixerRawTest.java. (testLocalOpenAppName): Likewise. (testRemoteOpenWithInvalidPort): Likewise. (testRemoteOpenWithValidPort): Likewise. (testRemoteOpen): Likewise. (testInvalidRemoteOpen): Likewise. * unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineRawTest.java New file. Tests those capabilites of PulseAudioSourceDataLine which are not exposed through the SourceDataLine interface. (setUp): New function. (testStartNotificationOnCork): Likewise. (testVolumeAndMute): Likewise. (testSettingStreamName): Likewise. (messWithStreams): Likewise. (tearDown): Likewise. * unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java Renamed PulseSourceDataLineTest.java * unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourcePortTest.java Added license. (setUp): Removed dependency on knowing the internals of PulseAudioMixer. It uses the AudioSystem to get the mixer. (tearDown): Close the mixer if it isnt closed already. * unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLineTest.java Added license. * unittests/org/classpath/icedtea/pulseaudio/PulseAudioTargetPortTest.java Added license. (setUp): Removed dependency on knowing the interals of PulseAudioMixer. Uses AudioSystem to get the mixer now. (tearDown): Close the mixer if it isnt closed. * unittests/org/classpath/icedtea/pulseaudio/PulseSourceDataLineTest.java Renamed file to PulseAudioSourceDataLineTest.java

<project default="all">

	<property name="classdir" value="classes" />
	<property name="sourcedir" value="src/java" />
	<property name="headerdir" value="src/native" />
	<property name="pulsejar" value="pulseaudio-java.jar" />

	<target name="all" depends="compile,headers,jar">

	</target>

	<target name="clean">
		<delete dir="${classdir}" />
		<delete dir="${testclassdir}" />
		<delete file="${pulsejar}" />
		<!-- Only delete the generated header files -->
		<delete>
			<fileset dir="${headerdir}" includes="org_*.h" />
		</delete>
	</target>

	<target name="init">
		<mkdir dir="${classdir}" />
		<mkdir dir="${testclassdir}" />
	</target>

	<target name="compile" depends="init">
		<javac srcdir="${sourcedir}" destdir="${classdir}" />
		<copy todir="${classdir}/META-INF">
			<fileset dir="${sourcedir}/META-INF" />
		</copy>

	</target>

	<target name="jar" depends="compile">
		<jar destfile="${pulsejar}" basedir="${classdir}">
		</jar>
	</target>

	<target name="headers" depends="compile">
		<javah classpath="${classdir}" destdir="${headerdir}" verbose="no" force="yes">
			<class name="org.classpath.icedtea.pulseaudio.EventLoop" />
			<class name="org.classpath.icedtea.pulseaudio.Operation" />
			<class name="org.classpath.icedtea.pulseaudio.Stream" />
			<class name="org.classpath.icedtea.pulseaudio.PulseAudioSourcePort" />
			<class name="org.classpath.icedtea.pulseaudio.PulseAudioTargetPort" />
		</javah>
	</target>

	<!-- TESTS -->
	<property name="testclassdir" value="testclasses" />
	<property name="testsourcedir" value="unittests" />

	<property name="junitjar" value="/usr/share/java/junit4.jar" />

	<target name="compile-tests" depends="init">
		<javac srcdir="${testsourcedir}" destdir="${testclassdir}" classpath="${junitjar}:${pulsejar}" />
	</target>

	<target name="jar-tests" depends="compile-tests">
		<jar destfile="PulseAudio-Tests.jar" basedir="${testclassdir}" />
	</target>

	<target name="test" depends="compile-tests,jar">
		<junit printsummary="yes" haltonfailure="no" showoutput="yes" fork="yes">
			<classpath>
				<pathelement location="${pulsejar}" />
				<pathelement path="${junitjar}:${testclassdir}" />
			</classpath>
			<formatter type="plain" />

			<test name="org.classpath.icedtea.pulseaudio.OtherSoundProvidersAvailableTest" />
			<test name="org.classpath.icedtea.pulseaudio.PulseAudioMixerProviderTest" />

			<test name="org.classpath.icedtea.pulseaudio.PulseAudioMixerTest" />
			<test name="org.classpath.icedtea.pulseaudio.PulseAudioMixerRawTest" />

			<test name="org.classpath.icedtea.pulseaudio.PulseAudioEventLoopOverhead" />

			<test name="org.classpath.icedtea.pulseaudio.PulseAudioSourceDataLineTest" />
			<test name="org.classpath.icedtea.pulseaudio.PulseAudioSourceDataLineRawTest" />

			<test name="org.classpath.icedtea.pulseaudio.PulseAudioSourcePortTest" />

			<test name="org.classpath.icedtea.pulseaudio.PulseAudioTargetDataLineTest" />
			<test name="org.classpath.icedtea.pulseaudio.PulseAudioTargetPortTest" />

			<test name="org.classpath.icedtea.pulseaudio.PulseAudioClipTest" />

		</junit>
	</target>
</project>