Skip to content
This repository
Browse code

Merge branch 'master' of git://github.com/Boddlnagg/MOSA-Project

  • Loading branch information...
commit 4825d512460ccc585a936788f40f6400fe59d610 2 parents 1cd0153 + bcfa646
Phil Garcia tgiphil authored
43 Source/Mosa.Test.Cases/IL/Initobj.cs
@@ -4,10 +4,10 @@
4 4 * Licensed under the terms of the New BSD License.
5 5 *
6 6 * Authors:
7   - * Phil Garcia (tgiphil) <phil@thinkedge.com>
  7 + * Kai Patrick Reisert (Boddlnagg) <kpreisert@googlemail.com>
8 8 *
9 9 */
10   -
  10 +
11 11
12 12 using MbUnit.Framework;
13 13
@@ -25,81 +25,94 @@ public Initobj()
25 25 }
26 26
27 27 [Test]
  28 + [Pending("Commented out until implemented")]
28 29 public void InitobjU1()
29 30 {
30   - Assert.AreEqual(InitobjTests.InitobjTestU1(), Run<byte>("Mosa.Test.Collection", "InitobjTests", "InitobjTestU1"));
  31 + //Assert.AreEqual(InitobjTests.InitobjTestU1(), Run<byte>("Mosa.Test.Collection", "InitobjTests", "InitobjTestU1"));
31 32 }
32 33
33 34 [Test]
  35 + [Pending("Commented out until implemented")]
34 36 public void InitobjU2()
35 37 {
36   - Assert.AreEqual(InitobjTests.InitobjTestU2(), Run<ushort>("Mosa.Test.Collection", "InitobjTests", "InitobjTestU2"));
  38 + //Assert.AreEqual(InitobjTests.InitobjTestU2(), Run<ushort>("Mosa.Test.Collection", "InitobjTests", "InitobjTestU2"));
37 39 }
38 40
39 41 [Test]
  42 + [Pending("Commented out until implemented")]
40 43 public void InitobjU4()
41 44 {
42   - Assert.AreEqual(InitobjTests.InitobjTestU4(), Run<uint>("Mosa.Test.Collection", "InitobjTests", "InitobjTestU4"));
  45 + //Assert.AreEqual(InitobjTests.InitobjTestU4(), Run<uint>("Mosa.Test.Collection", "InitobjTests", "InitobjTestU4"));
43 46 }
44 47
45 48 [Test]
  49 + [Pending("Commented out until implemented")]
46 50 public void InitobjU8()
47 51 {
48   - Assert.AreEqual(InitobjTests.InitobjTestU8(), Run<ulong>("Mosa.Test.Collection", "InitobjTests", "InitobjTestU8"));
  52 + //Assert.AreEqual(InitobjTests.InitobjTestU8(), Run<ulong>("Mosa.Test.Collection", "InitobjTests", "InitobjTestU8"));
49 53 }
50 54
51 55 [Test]
  56 + [Pending("Commented out until implemented")]
52 57 public void InitobjI1()
53 58 {
54   - Assert.AreEqual(InitobjTests.InitobjTestI1(), Run<sbyte>("Mosa.Test.Collection", "InitobjTests", "InitobjTestI1"));
  59 + //Assert.AreEqual(InitobjTests.InitobjTestI1(), Run<sbyte>("Mosa.Test.Collection", "InitobjTests", "InitobjTestI1"));
55 60 }
56 61
57 62 [Test]
  63 + [Pending("Commented out until implemented")]
58 64 public void InitobjI2()
59 65 {
60   - Assert.AreEqual(InitobjTests.InitobjTestI2(), Run<short>("Mosa.Test.Collection", "InitobjTests", "InitobjTestI2"));
  66 + //Assert.AreEqual(InitobjTests.InitobjTestI2(), Run<short>("Mosa.Test.Collection", "InitobjTests", "InitobjTestI2"));
61 67 }
62 68
63 69 [Test]
  70 + [Pending("Commented out until implemented")]
64 71 public void InitobjI4()
65 72 {
66   - Assert.AreEqual(InitobjTests.InitobjTestI4(), Run<int>("Mosa.Test.Collection", "InitobjTests", "InitobjTestI4"));
  73 + //Assert.AreEqual(InitobjTests.InitobjTestI4(), Run<int>("Mosa.Test.Collection", "InitobjTests", "InitobjTestI4"));
67 74 }
68 75
69 76 [Test]
  77 + [Pending("Commented out until implemented")]
70 78 public void InitobjI8()
71 79 {
72   - Assert.AreEqual(InitobjTests.InitobjTestI8(), Run<long>("Mosa.Test.Collection", "InitobjTests", "InitobjTestI8"));
  80 + //Assert.AreEqual(InitobjTests.InitobjTestI8(), Run<long>("Mosa.Test.Collection", "InitobjTests", "InitobjTestI8"));
73 81 }
74 82
75 83 [Test]
  84 + [Pending("Commented out until implemented")]
76 85 public void InitobjR4()
77 86 {
78   - Assert.AreEqual(InitobjTests.InitobjTestR4(), Run<float>("Mosa.Test.Collection", "InitobjTests", "InitobjTestR4"));
  87 + //Assert.AreEqual(InitobjTests.InitobjTestR4(), Run<float>("Mosa.Test.Collection", "InitobjTests", "InitobjTestR4"));
79 88 }
80 89
81 90 [Test]
  91 + [Pending("Commented out until implemented")]
82 92 public void InitobjR8()
83 93 {
84   - Assert.AreEqual(InitobjTests.InitobjTestR8(), Run<double>("Mosa.Test.Collection", "InitobjTests", "InitobjTestR8"));
  94 + //Assert.AreEqual(InitobjTests.InitobjTestR8(), Run<double>("Mosa.Test.Collection", "InitobjTests", "InitobjTestR8"));
85 95 }
86 96
87 97 [Test]
  98 + [Pending("Commented out until implemented")]
88 99 public void InitobjB()
89 100 {
90   - Assert.AreEqual(InitobjTests.InitobjTestB(), Run<bool>("Mosa.Test.Collection", "InitobjTests", "InitobjTestB"));
  101 + //Assert.AreEqual(InitobjTests.InitobjTestB(), Run<bool>("Mosa.Test.Collection", "InitobjTests", "InitobjTestB"));
91 102 }
92 103
93 104 [Test]
  105 + [Pending("Commented out until implemented")]
94 106 public void InitobjC()
95 107 {
96   - Assert.AreEqual(InitobjTests.InitobjTestC(), Run<char>("Mosa.Test.Collection", "InitobjTests", "InitobjTestC"));
  108 + //Assert.AreEqual(InitobjTests.InitobjTestC(), Run<char>("Mosa.Test.Collection", "InitobjTests", "InitobjTestC"));
97 109 }
98 110
99 111 [Test]
  112 + [Pending("Commented out until implemented")]
100 113 public void InitobjO()
101 114 {
102   - Assert.AreEqual(InitobjTests.InitobjTestO(), Run<object>("Mosa.Test.Collection", "InitobjTests", "InitobjTestO"));
  115 + //Assert.AreEqual(InitobjTests.InitobjTestO(), Run<object>("Mosa.Test.Collection", "InitobjTests", "InitobjTestO"));
103 116 }
104 117
105 118 }
14 Source/Mosa.Test.Cases/IL/Initobj.tt
... ... @@ -1,4 +1,13 @@
1   -<#@ include file="../TemplateLibrary.txt" #>
  1 +/*
  2 + * (c) 2011 MOSA - The Managed Operating System Alliance
  3 + *
  4 + * Licensed under the terms of the New BSD License.
  5 + *
  6 + * Authors:
  7 + * Kai Patrick Reisert (Boddlnagg) <kpreisert@googlemail.com>
  8 + *
  9 + */
  10 + <#@ include file="../TemplateLibrary.txt" #>
2 11
3 12 using MbUnit.Framework;
4 13
@@ -17,9 +26,10 @@ namespace Mosa.Test.Cases.IL
17 26 <# foreach (KeyValuePair<string, string> primitive in PrimitivesWithCharAndObject) { #>
18 27
19 28 [Test]
  29 + [Pending("Commented out until implemented")]
20 30 public void Initobj<#= primitive.Value #>()
21 31 {
22   - Assert.AreEqual(InitobjTests.InitobjTest<#= primitive.Value #>(), Run<<#= primitive.Key #>>("Mosa.Test.Collection", "InitobjTests", "InitobjTest<#= primitive.Value #>"));
  32 + //Assert.AreEqual(InitobjTests.InitobjTest<#= primitive.Value #>(), Run<<#= primitive.Key #>>("Mosa.Test.Collection", "InitobjTests", "InitobjTest<#= primitive.Value #>"));
23 33 }
24 34 <# } #>
25 35
4 Source/Mosa.Test.Cases/TemplateLibrary.txt
... ... @@ -1,4 +1,5 @@
1   -/*
  1 +<#
  2 +/*
2 3 * (c) 2011 MOSA - The Managed Operating System Alliance
3 4 *
4 5 * Licensed under the terms of the New BSD License.
@@ -7,6 +8,7 @@
7 8 * Phil Garcia (tgiphil) <phil@thinkedge.com>
8 9 *
9 10 */
  11 + #>
10 12 <#@ template language="C#" #>
11 13 <#@ import namespace="System.Collections" #>
12 14 <#@ import namespace="System.Collections.Generic" #>
130 Source/Mosa.Test.Collection/InitobjTests.cs
@@ -30,83 +30,83 @@ public struct InitobjTestsStruct
30 30
31 31 public static class InitobjTests
32 32 {
33   - public static byte InitobjTestU1()
34   - {
35   - InitobjTestsStruct d = new InitobjTestsStruct();
36   - return d.ValueU1;
37   - }
  33 + //public static byte InitobjTestU1()
  34 + //{
  35 + // InitobjTestsStruct d = new InitobjTestsStruct();
  36 + // return d.ValueU1;
  37 + //}
38 38
39   - public static ushort InitobjTestU2()
40   - {
41   - InitobjTestsStruct d = new InitobjTestsStruct();
42   - return d.ValueU2;
43   - }
  39 + //public static ushort InitobjTestU2()
  40 + //{
  41 + // InitobjTestsStruct d = new InitobjTestsStruct();
  42 + // return d.ValueU2;
  43 + //}
44 44
45   - public static uint InitobjTestU4()
46   - {
47   - InitobjTestsStruct d = new InitobjTestsStruct();
48   - return d.ValueU4;
49   - }
  45 + //public static uint InitobjTestU4()
  46 + //{
  47 + // InitobjTestsStruct d = new InitobjTestsStruct();
  48 + // return d.ValueU4;
  49 + //}
50 50
51   - public static ulong InitobjTestU8()
52   - {
53   - InitobjTestsStruct d = new InitobjTestsStruct();
54   - return d.ValueU8;
55   - }
  51 + //public static ulong InitobjTestU8()
  52 + //{
  53 + // InitobjTestsStruct d = new InitobjTestsStruct();
  54 + // return d.ValueU8;
  55 + //}
56 56
57   - public static sbyte InitobjTestI1()
58   - {
59   - InitobjTestsStruct d = new InitobjTestsStruct();
60   - return d.ValueI1;
61   - }
  57 + //public static sbyte InitobjTestI1()
  58 + //{
  59 + // InitobjTestsStruct d = new InitobjTestsStruct();
  60 + // return d.ValueI1;
  61 + //}
62 62
63   - public static short InitobjTestI2()
64   - {
65   - InitobjTestsStruct d = new InitobjTestsStruct();
66   - return d.ValueI2;
67   - }
  63 + //public static short InitobjTestI2()
  64 + //{
  65 + // InitobjTestsStruct d = new InitobjTestsStruct();
  66 + // return d.ValueI2;
  67 + //}
68 68
69   - public static int InitobjTestI4()
70   - {
71   - InitobjTestsStruct d = new InitobjTestsStruct();
72   - return d.ValueI4;
73   - }
  69 + //public static int InitobjTestI4()
  70 + //{
  71 + // InitobjTestsStruct d = new InitobjTestsStruct();
  72 + // return d.ValueI4;
  73 + //}
74 74
75   - public static long InitobjTestI8()
76   - {
77   - InitobjTestsStruct d = new InitobjTestsStruct();
78   - return d.ValueI8;
79   - }
  75 + //public static long InitobjTestI8()
  76 + //{
  77 + // InitobjTestsStruct d = new InitobjTestsStruct();
  78 + // return d.ValueI8;
  79 + //}
80 80
81   - public static float InitobjTestR4()
82   - {
83   - InitobjTestsStruct d = new InitobjTestsStruct();
84   - return d.ValueR4;
85   - }
  81 + //public static float InitobjTestR4()
  82 + //{
  83 + // InitobjTestsStruct d = new InitobjTestsStruct();
  84 + // return d.ValueR4;
  85 + //}
86 86
87   - public static double InitobjTestR8()
88   - {
89   - InitobjTestsStruct d = new InitobjTestsStruct();
90   - return d.ValueR8;
91   - }
  87 + //public static double InitobjTestR8()
  88 + //{
  89 + // InitobjTestsStruct d = new InitobjTestsStruct();
  90 + // return d.ValueR8;
  91 + //}
92 92
93   - public static bool InitobjTestB()
94   - {
95   - InitobjTestsStruct d = new InitobjTestsStruct();
96   - return d.ValueB;
97   - }
  93 + //public static bool InitobjTestB()
  94 + //{
  95 + // InitobjTestsStruct d = new InitobjTestsStruct();
  96 + // return d.ValueB;
  97 + //}
98 98
99   - public static char InitobjTestC()
100   - {
101   - InitobjTestsStruct d = new InitobjTestsStruct();
102   - return d.ValueC;
103   - }
  99 + //public static char InitobjTestC()
  100 + //{
  101 + // InitobjTestsStruct d = new InitobjTestsStruct();
  102 + // return d.ValueC;
  103 + //}
104 104
105   - public static object InitobjTestO()
106   - {
107   - InitobjTestsStruct d = new InitobjTestsStruct();
108   - return d.ValueO;
109   - }
  105 + //public static object InitobjTestO()
  106 + //{
  107 + // InitobjTestsStruct d = new InitobjTestsStruct();
  108 + // return d.ValueO;
  109 + //}
110 110
111 111 }
112 112 }
10 Source/Mosa.Test.Collection/InitobjTests.tt
@@ -21,11 +21,11 @@ namespace Mosa.Test.Collection
21 21 public static class InitobjTests
22 22 {
23 23 <# foreach (KeyValuePair<string, string> primitives in PrimitivesWithCharAndObject) {#>
24   - public static <#= primitives.Key #> InitobjTest<#= primitives.Value #>()
25   - {
26   - InitobjTestsStruct d = new InitobjTestsStruct();
27   - return d.Value<#= primitives.Value #>;
28   - }
  24 + //public static <#= primitives.Key #> InitobjTest<#= primitives.Value #>()
  25 + //{
  26 + // InitobjTestsStruct d = new InitobjTestsStruct();
  27 + // return d.Value<#= primitives.Value #>;
  28 + //}
29 29
30 30 <# } #>
31 31 }

0 comments on commit 4825d51

Please sign in to comment.
Something went wrong with that request. Please try again.