changeset 434:6a553efddc73

updated unittest and file handling to dmd-0.121
author thomask
date Fri, 15 Apr 2005 22:54:15 +0000
parents b310cc8b0391
children ec6d35cccfb5
files nocompile/html_htm_02.HTM nocompile/html_html_02.HTML nocompile/unittest_05.d nocompile/unittest_06.d nocompile/unittest_07.d run/html_htm_02.HTM run/html_html_02.HTML run/unittest_05.d run/unittest_06.d run/unittest_08.d
diffstat 10 files changed, 135 insertions(+), 78 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nocompile/html_htm_02.HTM	Fri Apr 15 22:54:15 2005 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+	<HEAD><TITLE>html_htm_02</TITLE></HEAD>
+	<BODY>
+		<PRE>
+<CODE>
+// $HeadURL$
+// $Date$
+// $Author$
+
+// @author@	Thomas Kuehne &#x3C;thomas@kuehne.thisisspam.cn&#x3E;
+// @date@	2005-01-23
+// @uri@	<a href='news:ct012k$4gt$1@digitaldaemon.com'>news:ct012k$4gt$1@digitaldaemon.com</a>
+// @url@	<a href='nntp://news.digitalmars.com/digitalmars.D.bugs/2742'>nntp://news.digitalmars.com/digitalmars.D.bugs/2742</a>
+
+module destress.nocompile.html_htm_02;
+
+int main(){
+	return 0;
+}
+</CODE></PRE>
+	</BODY>
+</HTML>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nocompile/html_html_02.HTML	Fri Apr 15 22:54:15 2005 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+	<HEAD><TITLE>html_html_02</TITLE></HEAD>
+	<BODY>
+		<PRE>
+<CODE>
+// $HeadURL$
+// $Date$
+// $Author$
+
+// @author@	Thomas Kuehne &#x3C;thomas@kuehne.thisisspam.cn&#x3E;
+// @date@	2005-01-23
+// @uri@	<a href='news:ct012k$4gt$1@digitaldaemon.com'>news:ct012k$4gt$1@digitaldaemon.com</a>
+// @url@	<a href='nntp://news.digitalmars.com/digitalmars.D.bugs/2742'>nntp://news.digitalmars.com/digitalmars.D.bugs/2742</a>
+
+module dstress.nocompile.html_html_02;
+
+int main(){
+	return 0;
+}
+</CODE></PRE>
+	</BODY>
+</HTML>
+
--- a/nocompile/unittest_05.d	Fri Apr 15 09:01:17 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-// $HeadURL$
-// $Date$
-// $Author$
-
-// according to dmd-0.105 documentation unittests are class member functions
-
-// __DSTRESS_ELINE__ 12
-
-module dstress.nocompile.unittest_05;
-
-union{
-	unittest{
-	}
-}
--- a/nocompile/unittest_06.d	Fri Apr 15 09:01:17 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-// $HeadURL$
-// $Date$
-// $Author$
-
-// according to dmd-0.105 documentation unittests are class member functions
-
-// __DSTRESS_ELINE__ 13
-
-module dstress.nocompile.unittest_06;
-
-enum TestEnum{
-	x=2,
-	unittest{
-	}
-}
--- a/nocompile/unittest_07.d	Fri Apr 15 09:01:17 2005 +0000
+++ b/nocompile/unittest_07.d	Fri Apr 15 22:54:15 2005 +0000
@@ -6,7 +6,7 @@
 // @date@	2005-04-10
 // @uri@	news:5v4mi2-l36.ln1@lnews.kuehne.cn
 
-// __DSTRESS_ELINE__ 
+// __DSTRESS_ELINE__ 17
 
 module dstress.nocompile.unittest_07;
 
--- a/run/html_htm_02.HTM	Fri Apr 15 09:01:17 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-	<HEAD><TITLE>html_htm_02</TITLE></HEAD>
-	<BODY>
-		<PRE>
-<CODE>
-// $HeadURL$
-// $Date$
-// $Author$
-
-// @author@	Thomas Kuehne &#x3C;thomas@kuehne.thisisspam.cn&#x3E;
-// @date@	2005-01-23
-// @uri@	<a href='news:ct012k$4gt$1@digitaldaemon.com'>news:ct012k$4gt$1@digitaldaemon.com</a>
-// @url@	<a href='nntp://news.digitalmars.com/digitalmars.D.bugs/2742'>nntp://news.digitalmars.com/digitalmars.D.bugs/2742</a>
-
-module dstress.run.html_htm_02;
-
-int main(){
-	return 0;
-}
-</CODE></PRE>
-	</BODY>
-</HTML>
-
--- a/run/html_html_02.HTML	Fri Apr 15 09:01:17 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-	<HEAD><TITLE>html_html_02</TITLE></HEAD>
-	<BODY>
-		<PRE>
-<CODE>
-// $HeadURL$
-// $Date$
-// $Author$
-
-// @author@	Thomas Kuehne &#x3C;thomas@kuehne.thisisspam.cn&#x3E;
-// @date@	2005-01-23
-// @uri@	<a href='news:ct012k$4gt$1@digitaldaemon.com'>news:ct012k$4gt$1@digitaldaemon.com</a>
-// @url@	<a href='nntp://news.digitalmars.com/digitalmars.D.bugs/2742'>nntp://news.digitalmars.com/digitalmars.D.bugs/2742</a>
-
-module dstress.run.html_html_02;
-
-int main(){
-	return 0;
-}
-</CODE></PRE>
-	</BODY>
-</HTML>
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/run/unittest_05.d	Fri Apr 15 22:54:15 2005 +0000
@@ -0,0 +1,21 @@
+// $HeadURL$
+// $Date$
+// $Author$
+
+// __DSTRESS_DFLAGS__ -unittest
+
+module dstress.run.unittest_05;
+
+int status;
+
+union E{
+	int i;	
+	unittest{
+		status++;
+	}
+}
+
+int main(){
+	assert(status==1);
+	return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/run/unittest_06.d	Fri Apr 15 22:54:15 2005 +0000
@@ -0,0 +1,21 @@
+// $HeadURL$
+// $Date$
+// $Author$
+
+// __DSTRESS_DFLAGS__ -unittest
+
+module dstress.run.unittest_06;
+
+int status;
+
+enum TestEnum{
+	x=2,
+	unittest{
+		status++;
+	}
+}
+
+int main(){
+	assert(status==1);
+	return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/run/unittest_08.d	Fri Apr 15 22:54:15 2005 +0000
@@ -0,0 +1,44 @@
+// $HeadURL$
+// $Date$
+// $Author$
+
+// Unit tests are run in the lexical order in which they appear
+// within a module
+
+// __DSTRESS_DFLAGS__ -unittest
+
+module dstress.run.unittest_08;
+
+int status;
+
+static this(){
+	assert(status==0);
+	status=1;
+}
+
+unittest{
+	assert(status==1);
+	status==2;
+}
+
+template Templ(T){
+	int dummy;
+	unittest{
+		assert(status==2);
+		status==3;
+	}
+}
+
+class MyClass{
+	unittest{
+		assert(status==3);
+		status==4;
+	}
+
+	mixin Templ!(int);	
+}
+
+int main(){
+	assert(status==4);
+	return 0;
+}