Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test cases now run on non-Windows OSes #73

Merged
merged 4 commits into from
May 1, 2023
Merged

Test cases now run on non-Windows OSes #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b424eeb
Fixed misspelled file name
Zacch Apr 25, 2023
e2b9297
Fixed misspelled file name
Zacch Apr 25, 2023
e25c6fc
Fixed misspelled file name
Zacch Apr 25, 2023
fd6fe34
Replaced Windows-specific paths with calls to Path.Combine()
Zacch Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions test/PlantUmlClassDiagramGeneratorTest/ClassDiagramGeneratorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class ClassDiagramGeneratorTest
[TestMethod]
public void GenerateTestAll()
{
var code = File.ReadAllText("testData\\inputClasses.cs");
var code = File.ReadAllText(Path.Combine("testData", "InputClasses.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -24,7 +24,7 @@ public void GenerateTestAll()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\all.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "all.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
Expand All @@ -33,7 +33,7 @@ public void GenerateTestAll()
[TestMethod]
public void GenerateTestPublic()
{
var code = File.ReadAllText("testData\\inputClasses.cs");
var code = File.ReadAllText(Path.Combine("testData", "InputClasses.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -46,7 +46,7 @@ public void GenerateTestPublic()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\public.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "public.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
Expand All @@ -55,7 +55,7 @@ public void GenerateTestPublic()
[TestMethod]
public void GenerateTestWithoutPrivate()
{
var code = File.ReadAllText("testData\\inputClasses.cs");
var code = File.ReadAllText(Path.Combine("testdata", "InputClasses.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -66,7 +66,7 @@ public void GenerateTestWithoutPrivate()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\withoutPrivate.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "withoutPrivate.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
Expand All @@ -75,7 +75,7 @@ public void GenerateTestWithoutPrivate()
[TestMethod]
public void GenerateTestGenericsTypes()
{
var code = File.ReadAllText("testData\\GenericsType.cs");
var code = File.ReadAllText(Path.Combine("testdata", "GenericsType.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -87,7 +87,7 @@ public void GenerateTestGenericsTypes()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\genericsType.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "genericsType.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
Expand Down Expand Up @@ -117,7 +117,7 @@ public void NullableTestNullableTypes()
[TestMethod]
public void GenerateTestAtPrefixType()
{
var code = File.ReadAllText("testData\\AtPrefixType.cs");
var code = File.ReadAllText(Path.Combine("testData", "AtPrefixType.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -129,7 +129,7 @@ public void GenerateTestAtPrefixType()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\AtPrefixType.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "AtPrefixType.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
Expand All @@ -138,7 +138,7 @@ public void GenerateTestAtPrefixType()
//[TestMethod]
public void GenerateTestCurlyBrackets()
{
var code = File.ReadAllText("testData\\CurlyBrackets.cs");
var code = File.ReadAllText(Path.Combine("testData", "CurlyBrackets.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -150,7 +150,7 @@ public void GenerateTestCurlyBrackets()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\CurlyBrackets.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "CurlyBrackets.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
Expand All @@ -165,7 +165,7 @@ private static string ConvertNewLineCode(string text, string newline)
[TestMethod]
public void GenerateTestRecordTypes()
{
var code = File.ReadAllText("testData\\RecordType.cs");
var code = File.ReadAllText(Path.Combine("testData", "RecordType.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -177,7 +177,7 @@ public void GenerateTestRecordTypes()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\RecordType.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "RecordType.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
Expand All @@ -186,7 +186,7 @@ public void GenerateTestRecordTypes()
[TestMethod]
public void GenerateTestAttributes()
{
var code = File.ReadAllText("testData\\Attributes.cs");
var code = File.ReadAllText(Path.Combine("testData", "Attributes.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -198,16 +198,16 @@ public void GenerateTestAttributes()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\Attributes.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "Attributes.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
}

[TestMethod]
public void GenerateTestAttributeRequierd()
public void GenerateTestAttributeRequired()
{
var code = File.ReadAllText("testData\\AttributeRequierd.cs");
var code = File.ReadAllText(Path.Combine("testData", "AttributeRequired.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -218,16 +218,16 @@ public void GenerateTestAttributeRequierd()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\AttributeRequierd.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "AttributeRequired.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
}

[TestMethod]
public void GenerateTestNotAttributeRequierd()
public void GenerateTestNotAttributeRequired()
{
var code = File.ReadAllText("testData\\AttributeRequierd.cs");
var code = File.ReadAllText(Path.Combine("testData", "AttributeRequired.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -238,15 +238,15 @@ public void GenerateTestNotAttributeRequierd()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\NotAttributeRequierd.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "NotAttributeRequired.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
}
[TestMethod]
public void GenerateTestWithoutUmlStartEnd()
{
var code = File.ReadAllText("testData\\inputClasses.cs");
var code = File.ReadAllText(Path.Combine("testData", "inputClasses.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -257,15 +257,15 @@ public void GenerateTestWithoutUmlStartEnd()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\withoutStartEndUml.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "withoutStartEndUml.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
}
[TestMethod]
public void GenerateTestDefaultModifierType()
{
var code = File.ReadAllText("testData\\DefaultModifierType.cs");
var code = File.ReadAllText(Path.Combine("testData", "DefaultModifierType.cs"));
var tree = CSharpSyntaxTree.ParseText(code);
var root = tree.GetRoot();

Expand All @@ -276,10 +276,10 @@ public void GenerateTestDefaultModifierType()
gen.Generate(root);
}

var expected = ConvertNewLineCode(File.ReadAllText(@"uml\DefaultModifierType.puml"), Environment.NewLine);
var expected = ConvertNewLineCode(File.ReadAllText(Path.Combine("uml", "DefaultModifierType.puml")), Environment.NewLine);
var actual = output.ToString();
Console.Write(actual);
Assert.AreEqual(expected, actual);
}
}
}
}
11 changes: 5 additions & 6 deletions test/PlantUmlClassDiagramGeneratorTest/PlantUmlClassDiagramGeneratorTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<ItemGroup>
<Compile Remove="testData\AtPrefixType.cs" />
<Compile Remove="testData\AttributeRequierd.cs" />
<Compile Remove="testData\Attributes.cs" />
<Compile Remove="testData\DefaultModifierType.cs" />
<Compile Remove="testData\GenericsType.cs" />
Expand All @@ -38,9 +37,6 @@
<None Include="testData\AtPrefixType.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="testData\AttributeRequierd.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="testData\Attributes.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand All @@ -59,16 +55,19 @@
<None Include="testData\RecordType.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="testData\AttributeRequired.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<None Update="uml\DefaultModifierType.puml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="uml\NotAttributeRequierd.puml">
<None Update="uml\NotAttributeRequired.puml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="uml\AttributeRequierd.puml">
<None Update="uml\AttributeRequired.puml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="uml\Attributes.puml">
Expand Down
0 ...neratorTest/testData/AttributeRequierd.cs → ...neratorTest/testData/AttributeRequired.cs
View file
Open in desktop
File renamed without changes.
0 ...mGeneratorTest/uml/AttributeRequierd.puml → ...mGeneratorTest/uml/AttributeRequired.puml
View file
Open in desktop
File renamed without changes.
0 ...neratorTest/uml/NotAttributeRequierd.puml → ...neratorTest/uml/NotAttributeRequired.puml
View file
Open in desktop
File renamed without changes.