Author: gert
Date: 2007-12-20 10:58:28 -0500 (Thu, 20 Dec 2007)
New Revision: 91714
Modified:
trunk/gert/standalone/bug82832/default.build
trunk/gert/standalone/bug82832/test.cs
Log:
Use common build file and Assert class. Improve test.
Modified: trunk/gert/standalone/bug82832/default.build
===================================================================
--- trunk/gert/standalone/bug82832/default.build 2007-12-20 15:06:43 UTC
(rev 91713)
+++ trunk/gert/standalone/bug82832/default.build 2007-12-20 15:58:28 UTC
(rev 91714)
@@ -1,20 +1,6 @@
<project name="bug82832" default="rebuild">
- <target name="mono-1.0">
- <property name="csc.defines"
value="NET_1_0,NET_1_1,ONLY_1_1,MONO" />
- </target>
-
- <target name="mono-2.0">
- <property name="csc.defines"
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0,MONO" />
- </target>
-
- <target name="net-1.1">
- <property name="csc.defines" value="NET_1_0,NET_1_1,ONLY_1_1" />
- </target>
-
- <target name="net-2.0">
- <property name="csc.defines"
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0" />
- </target>
-
+ <include buildfile="../../build/common.build" />
+
<property name="frameworks" value="mono-1.0,mono-2.0,net-1.1,net-2.0" />
<target name="clean">
@@ -27,33 +13,17 @@
</delete>
</target>
- <target name="build">
- <property name="original.targetframework"
value="${nant.settings.currentframework}" />
-
- <foreach property="framework" item="String" in="${frameworks}"
delim=",">
- <if test="${framework::exists(framework)}">
- <property name="nant.settings.currentframework"
value="${framework}" />
- <call
target="${nant.settings.currentframework}" />
- <call target="run" />
- <call target="clean" />
- </if>
- </foreach>
-
- <property name="nant.settings.currentframework"
value="${original.targetframework}" />
- </target>
-
- <target name="compile">
+ <target name="compile" depends="init">
<csc target="exe" define="${csc.defines}" output="test.exe"
warnaserror="true" warninglevel="4">
<sources>
+ <include name="../../build/common/Assert.cs" />
<include name="test.cs" />
</sources>
</csc>
</target>
- <target name="run" depends="compile">
+ <target name="run-test" depends="compile">
<exec program="test.exe" managed="true" output="out" />
<fail if="${file::exists('out')}" />
</target>
-
- <target name="rebuild" depends="clean, build" />
</project>
Modified: trunk/gert/standalone/bug82832/test.cs
===================================================================
--- trunk/gert/standalone/bug82832/test.cs 2007-12-20 15:06:43 UTC (rev
91713)
+++ trunk/gert/standalone/bug82832/test.cs 2007-12-20 15:58:28 UTC (rev
91714)
@@ -37,6 +37,11 @@
Assert.AreEqual ("2.0", fvi.ProductVersion, "#A3");
Assert.AreEqual ("DDD", fvi.LegalCopyright, "#A4");
Assert.AreEqual ("EEE", fvi.LegalTrademarks, "#A5");
+ Assert.AreEqual ("0.0.0.0", fvi.FileVersion, "#A6");
+ Assert.AreEqual (0, fvi.FileBuildPart, "#A7");
+ Assert.AreEqual (0, fvi.FileMajorPart, "#A8");
+ Assert.AreEqual (0, fvi.FileMinorPart, "#A9");
+ Assert.AreEqual (0, fvi.FilePrivatePart, "#A10");
File.Delete (assemblyFile);
}
@@ -66,6 +71,11 @@
Assert.AreEqual (" ", fvi.LegalCopyright, "#B8");
Assert.IsNotNull (fvi.LegalTrademarks, "#B9");
Assert.AreEqual (" ", fvi.LegalTrademarks, "#B10");
+ Assert.AreEqual ("0.0.0.0", fvi.FileVersion, "#B11");
+ Assert.AreEqual (0, fvi.FileBuildPart, "#B12");
+ Assert.AreEqual (0, fvi.FileMajorPart, "#B13");
+ Assert.AreEqual (0, fvi.FileMinorPart, "#B14");
+ Assert.AreEqual (0, fvi.FilePrivatePart, "#B15");
File.Delete (assemblyFile);
}
@@ -130,6 +140,11 @@
Assert.AreEqual (" ", fvi.ProductVersion, "#C3");
Assert.AreEqual ("Copyright 2007 Mono Hackers",
fvi.LegalCopyright, "#C4");
Assert.AreEqual ("Registered to All", fvi.LegalTrademarks,
"#C5");
+ Assert.AreEqual ("2.4.6.8", fvi.FileVersion, "#C6");
+ Assert.AreEqual (6, fvi.FileBuildPart, "#C7");
+ Assert.AreEqual (2, fvi.FileMajorPart, "#C8");
+ Assert.AreEqual (4, fvi.FileMinorPart, "#C9");
+ Assert.AreEqual (8, fvi.FilePrivatePart, "#C10");
File.Delete (assemblyFile);
}
@@ -194,6 +209,11 @@
Assert.AreEqual ("2.0", fvi.ProductVersion, "#D3");
Assert.AreEqual ("CCC", fvi.LegalCopyright, "#D4");
Assert.AreEqual ("DDD", fvi.LegalTrademarks, "#D5");
+ Assert.AreEqual ("0.0.0.0", fvi.FileVersion, "#D6");
+ Assert.AreEqual (0, fvi.FileBuildPart, "#D7");
+ Assert.AreEqual (0, fvi.FileMajorPart, "#D8");
+ Assert.AreEqual (0, fvi.FileMinorPart, "#D9");
+ Assert.AreEqual (0, fvi.FilePrivatePart, "#D10");
File.Delete (assemblyFile);
}
@@ -223,6 +243,11 @@
Assert.AreEqual (" ", fvi.LegalCopyright, "#E8");
Assert.IsNotNull (fvi.LegalTrademarks, "#E9");
Assert.AreEqual (" ", fvi.LegalTrademarks, "#E10");
+ Assert.AreEqual ("0.0.0.0", fvi.FileVersion, "#E11");
+ Assert.AreEqual (0, fvi.FileBuildPart, "#E12");
+ Assert.AreEqual (0, fvi.FileMajorPart, "#E13");
+ Assert.AreEqual (0, fvi.FileMinorPart, "#E14");
+ Assert.AreEqual (0, fvi.FilePrivatePart, "#E15");
File.Delete (assemblyFile);
}
@@ -253,59 +278,3 @@
File.Delete (assemblyFile);
}
}
-
-class Assert
-{
- public static void AreEqual (int x, int y, string msg)
- {
- if (x != y)
- throw new Exception (string.Format
(CultureInfo.InvariantCulture,
- "Expected: {0}, but was: {1}. {2}",
- x, y, msg));
- }
-
- public static void AreEqual (string x, string y, string msg)
- {
- if (x != y)
- throw new Exception (string.Format
(CultureInfo.InvariantCulture,
- "Expected: {0}, but was: {1}. {2}",
- x, y, msg));
- }
-
- public static void AreEqual (object x, object y, string msg)
- {
- if (x != y)
- throw new Exception (string.Format
(CultureInfo.InvariantCulture,
- "Expected: {0}, but was: {1}. {2}",
- x, y, msg));
- }
-
- public static void Fail (string msg)
- {
- throw new Exception (msg);
- }
-
- public static void IsNotNull (object value, string msg)
- {
- if (value == null)
- throw new Exception (msg);
- }
-
- public static void IsNull (object value, string msg)
- {
- if (value != null)
- throw new Exception (msg);
- }
-
- public static void IsFalse (bool value, string msg)
- {
- if (value)
- throw new Exception (msg);
- }
-
- public static void IsTrue (bool value, string msg)
- {
- if (!value)
- throw new Exception (msg);
- }
-}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
