[Jason-developers] SF.net SVN: jason: [1175] trunk

[<jom...@us...>]

Revision: 1175
          http://jason.svn.sourceforge.net/jason/?rev=1175&view=rev
Author:   jomifred
Date:     2008-03-26 02:15:42 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
add a TestAll class in AS-Unit to run all tests

Modified Paths:
--------------
    trunk/applications/as-unit-test/build.xml
    trunk/demos/directives/b.asl
    trunk/demos/sync-environment/dcount.asl

Added Paths:
-----------
    trunk/applications/as-unit-test/src/jason/tests/TestAll.java

Modified: trunk/applications/as-unit-test/build.xml
===================================================================
--- trunk/applications/as-unit-test/build.xml	2008-03-24 21:15:02 UTC (rev 1174)
+++ trunk/applications/as-unit-test/build.xml	2008-03-26 09:15:42 UTC (rev 1175)
@@ -49,7 +49,7 @@
 			<formatter type="plain" usefile="false" />
 			<batchtest>
 				<fileset dir="${basedir}/src" includes="example/**/Test*.java" />
-				<fileset dir="${basedir}/src" includes="jason/tests/**/Test*.java" />
+				<fileset dir="${basedir}/src" includes="jason/tests/TestAll.java" />
 			</batchtest>
 		</junit>
 		<fail message="test failed" if="test.failure" />
@@ -72,63 +72,6 @@
 		</javadoc>
 	</target>
 
-	<target name="dist" depends="jar" description="Build distribution.">
-
-		<echo message="Generating Jason ASUnit ${version}.${release}" />
-
-		<propertyfile file="${dist.properties}">
-			<entry key="version" value="${version}" />
-			<entry key="release" value="${release}" />
-			<!-- entry default="0" key="build" operation="+" type="int" /-->
-			<entry key="build.date" type="date" value="now" />
-		</propertyfile>
-		<property file="${dist.properties}" />
-
-		<fixcrlf eol="crlf" includes="**/*.txt,**/*.bat" srcdir="${basedir}" />
-
-		<delete failonerror="no" includeEmptyDirs="true">
-			<fileset dir="${distDir}" />
-		</delete>
-		<delete dir="${distDir}/.." />
-
-		<mkdir dir="${distDir}" />
-
-		<copy todir="${distDir}">
-			<fileset dir="${basedir}" includes="*.*" />
-			<fileset dir="${basedir}" includes="LICENSE" />
-			<fileset dir="${basedir}" includes="README" />
-
-			<fileset dir="${basedir}" includes="bin/*" excludes="bin/jedit.tgz" />
-			<fileset dir="${basedir}" includes="bin/jedit/**/*" />
-			<fileset dir="${basedir}" includes="doc/**/*" />
-			<fileset dir="${basedir}" includes="examples/**/*" />
-			<fileset dir="${basedir}" includes="demos/**/*" />
-			<fileset dir="${basedir}" includes="lib/**/*" />
-			<fileset dir="${basedir}" includes="src/**/*" />
-		</copy>
-
-		<delete failonerror="no" includeEmptyDirs="true">
-			<fileset dir="${distDir}" includes=".settings" />
-			<fileset dir="${distDir}" includes=".project" />
-			<fileset dir="${distDir}" includes=".classpath" />
-		</delete>
-		<delete dir="${distDir}/bin/classes" />
-		<delete dir="${distDir}/doc/faq" />
-		<delete dir="${distDir}/doc/mini-tutorial/src" />
-
-		<tar compression="gzip" tarfile="${distFile}.tgz">
-			<tarfileset dir="${distDir}/.." mode="755">
-				<include name="Jason-${version}.${release}/**/*.sh" />
-				<include name="Jason-${version}.${release}/**/asl2*" />
-			</tarfileset>
-			<tarfileset dir="${distDir}/..">
-				<include name="Jason-${version}.${release}/**/*" />
-				<exclude name="Jason-${version}.${release}/**/*.sh" />
-				<exclude name="Jason-${version}.${release}/**/asl2*" />
-			</tarfileset>
-		</tar>
-	</target>
-
 	<target name="clean">
 		<delete dir="${build.dir}" />
 	</target>

Added: trunk/applications/as-unit-test/src/jason/tests/TestAll.java
===================================================================
--- trunk/applications/as-unit-test/src/jason/tests/TestAll.java	                        (rev 0)
+++ trunk/applications/as-unit-test/src/jason/tests/TestAll.java	2008-03-26 09:15:42 UTC (rev 1175)
@@ -0,0 +1,14 @@
+package jason.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+    BugVarsInInitBels.class,
+    TestAddLogExprInBB.class,
+    TestKQML.class,
+    TestVarInContext.class
+ })
+public class TestAll { }

Modified: trunk/demos/directives/b.asl
===================================================================
--- trunk/demos/directives/b.asl	2008-03-24 21:15:02 UTC (rev 1174)
+++ trunk/demos/directives/b.asl	2008-03-26 09:15:42 UTC (rev 1175)
@@ -2,13 +2,13 @@
 +!start : true <- myp.list_plans; !d(1); !d(2).
 
 { begin ld }
-+!d(X) <- act.
-+!d(X) <- act.
++!d(X) <- act(X).
++!d(X) <- act(X).
 { end }
 
 /*
 The above plans will be changed by the directive to:
-  +!d(X) <- .print("Entering ",d(X)); .print(d1); .print("Leaving ",d(X)).
-  +!d(X) <- .print("Entering ",d(X)); .print(d2); .print("Leaving ",d(X)).
+  +!d(X) <- .print("Entering ",d(X)); act(X); .print("Leaving ",d(X)).
+  +!d(X) <- .print("Entering ",d(X)); act(X); .print("Leaving ",d(X)).
 */
 

Modified: trunk/demos/sync-environment/dcount.asl
===================================================================
--- trunk/demos/sync-environment/dcount.asl	2008-03-24 21:15:02 UTC (rev 1174)
+++ trunk/demos/sync-environment/dcount.asl	2008-03-26 09:15:42 UTC (rev 1175)
@@ -1,9 +1,10 @@
 // this agent has TWO intentions to act 
 
+vl(0).
+
 !i1.
 !i2.
 
-vl(0).
 
 /* Plans */
 


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