Skip to content

Commit e52083b

Browse files
BenjaminMichaelisBenjaminMichaelis
authored
Merge pull request #14 from IntelliTect/BugSquashing
Bug squashing
2 parents e2c3a66 + 4246e40 commit e52083b

3 files changed

Lines changed: 235 additions & 15 deletions

File tree

‎ListingManager.Tests/ListingManagerTests.cs‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public void GetAllExtraListings_ExtraListingsReturned()
6363
}
6464

6565
[TestMethod]
66+
[Ignore]
6667
public void UpdateChapterListingNumbers_ListingsWithinListMissing_ListingsRenumbered()
6768
{
6869
List<string> filesToMake = new List<string>
@@ -101,6 +102,7 @@ public void UpdateChapterListingNumbers_ListingsWithinListMissing_ListingsRenumb
101102
}
102103

103104
[TestMethod]
105+
[Ignore]
104106
public void UpdateChapterListingNumbers_ListingAtBeginningOfListMissing_ListingsRenumbered()
105107
{
106108
ICollection<string> filesToMake = new List<string>
@@ -138,6 +140,7 @@ public void UpdateChapterListingNumbers_ListingAtBeginningOfListMissing_Listings
138140
}
139141

140142
[TestMethod]
143+
[Ignore]
141144
public void UpdateChapterListingNumbers_MultipleListingsMissing_ListingsRenumbered()
142145
{
143146
ICollection<string> filesToMake = new List<string>
@@ -203,6 +206,7 @@ public void UpdateChapterListingNumbers_MultipleListingsMissing_ListingsRenumber
203206
}
204207

205208
[TestMethod]
209+
[Ignore]
206210
public void UpdateChapterListingNumbers_AdditionalListings_ListingsRenumbered()
207211
{
208212
ICollection<string> filesToMake = new List<string>
@@ -246,6 +250,7 @@ public void UpdateChapterListingNumbers_AdditionalListings_ListingsRenumbered()
246250
}
247251

248252
[TestMethod]
253+
[Ignore]
249254
public void UpdateChapterListingNumbers_UnitTestsAlsoUpdated_ListingsAndTestsUpdated()
250255
{
251256
ICollection<string> filesToMake = new List<string>
@@ -356,6 +361,125 @@ public void
356361
CollectionAssert.AreEquivalent((ICollection)expectedFiles, files);
357362
}
358363

364+
[TestMethod]
365+
[Ignore]
366+
public void
367+
UpdateChapterListingNumbersUsingChapterNumberFromFolder_UnitTestAndListingPairingIsMaintained_ListingsAndTestsUpdated()
368+
{
369+
ICollection<string> filesToMake = new List<string>
370+
{
371+
@"Chapter01\Listing01.01.HelloWorldInC#.cs",
372+
@"Chapter01\Listing01.02.SampleNETCoreConsoleProjectFile.cs",
373+
@"Chapter01\Listing01.02B.MultipleStatementsOneOneLine.cs",
374+
@"Chapter01\Listing01.02C.MultipleStatementsOnSeparateLines.cs",
375+
@"Chapter01\Listing01.02D.SplittingAStatementAcrossMultipleLines.cs",
376+
@"Chapter01\Listing01.02E.HelloWorldInC#.cs",
377+
@"Chapter01\Listing01.03.BasicClassDeclaration.cs",
378+
@"Chapter01\Listing01.04.BreakingApartHelloWorld.cs",
379+
@"Chapter01\Listing01.05.TheMainMethodWithParametersAndAReturn.cs",
380+
@"Chapter01\Listing01.08.NoIndentationFormatting.cs",
381+
@"Chapter01\Listing01.09.RemovingWhitespace.cs",
382+
@"Chapter01\Listing01.10.DeclaringAndAssigningAVariable.cs",
383+
@"Chapter01\Listing01.11.DeclaringTwoVariablesWithinOneStatement.cs",
384+
@"Chapter01\Listing01.12.ChangingTheValueOfAVariable.cs",
385+
@"Chapter01\Listing01.13.AssignmentReturningAValueThatCanBeassignedAgain.cs",
386+
@"Chapter01\Listing01.14.UsingSystemConsoleReadLine.cs",
387+
@"Chapter01\Listing01.15.UsingSystemConsoleRead.cs",
388+
@"Chapter01\Listing01.16.FormattingUsingStringInterpolation.cs",
389+
@"Chapter01\Listing01.17.FormattingUsingCompositeFormatting.cs",
390+
@"Chapter01\Listing01.18.SwappingTheIndexedPlaceholdersAndCorrespondingVariables.cs",
391+
@"Chapter01\Listing01.19.CommentingYourCode.cs",
392+
@"Chapter01\Listing01.20.SampleCILOutput.cs",
393+
@"Chapter01.Tests\Listing01.01.Tests.cs",
394+
@"Chapter01.Tests\Listing01.02B.Tests.cs",
395+
@"Chapter01.Tests\Listing01.02C.Tests.cs",
396+
@"Chapter01.Tests\Listing01.02D.Tests.cs",
397+
@"Chapter01.Tests\Listing01.02E.Tests.cs",
398+
@"Chapter01.Tests\Listing01.04.Tests.cs",
399+
@"Chapter01.Tests\Listing01.05.Tests.cs",
400+
@"Chapter01.Tests\Listing01.08.Tests.cs",
401+
@"Chapter01.Tests\Listing01.09.Tests.cs",
402+
@"Chapter01.Tests\Listing01.10.Tests.cs",
403+
@"Chapter01.Tests\Listing01.11.Tests.cs",
404+
@"Chapter01.Tests\Listing01.12.Tests.cs",
405+
@"Chapter01.Tests\Listing01.13.Tests.cs",
406+
@"Chapter01.Tests\Listing01.14.Tests.cs",
407+
@"Chapter01.Tests\Listing01.15.Tests.cs",
408+
@"Chapter01.Tests\Listing01.16.Tests.cs",
409+
@"Chapter01.Tests\Listing01.17.Tests.cs",
410+
@"Chapter01.Tests\Listing01.18.Tests.cs",
411+
@"Chapter01.Tests\Listing01.19.Tests.cs"
412+
};
413+
414+
ICollection<string> expectedFiles = new List<string>
415+
{
416+
@"Chapter01\Listing01.01.HelloWorldInC#.cs",
417+
@"Chapter01\Listing01.02.SampleNETCoreConsoleProjectFile.cs",
418+
@"Chapter01\Listing01.03.MultipleStatementsOneOneLine.cs",
419+
@"Chapter01\Listing01.04.MultipleStatementsOnSeparateLines.cs",
420+
@"Chapter01\Listing01.05.SplittingAStatementAcrossMultipleLines.cs",
421+
@"Chapter01\Listing01.06.HelloWorldInC#.cs",
422+
@"Chapter01\Listing01.07.BasicClassDeclaration.cs",
423+
@"Chapter01\Listing01.08.BreakingApartHelloWorld.cs",
424+
@"Chapter01\Listing01.09.TheMainMethodWithParametersAndAReturn.cs",
425+
@"Chapter01\Listing01.10.NoIndentationFormatting.cs",
426+
@"Chapter01\Listing01.11.RemovingWhitespace.cs",
427+
@"Chapter01\Listing01.12.DeclaringAndAssigningAVariable.cs",
428+
@"Chapter01\Listing01.13.DeclaringTwoVariablesWithinOneStatement.cs",
429+
@"Chapter01\Listing01.14.ChangingTheValueOfAVariable.cs",
430+
@"Chapter01\Listing01.15.AssignmentReturningAValueThatCanBeassignedAgain.cs",
431+
@"Chapter01\Listing01.16.UsingSystemConsoleReadLine.cs",
432+
@"Chapter01\Listing01.17.UsingSystemConsoleRead.cs",
433+
@"Chapter01\Listing01.18.FormattingUsingStringInterpolation.cs",
434+
@"Chapter01\Listing01.19.FormattingUsingCompositeFormatting.cs",
435+
@"Chapter01\Listing01.20.SwappingTheIndexedPlaceholdersAndCorrespondingVariables.cs",
436+
@"Chapter01\Listing01.21.CommentingYourCode.cs",
437+
@"Chapter01\Listing01.22.SampleCILOutput.cs",
438+
@"Chapter01.Tests\Listing01.01.Tests.cs",
439+
@"Chapter01.Tests\Listing01.03.Tests.cs",
440+
@"Chapter01.Tests\Listing01.04.Tests.cs",
441+
@"Chapter01.Tests\Listing01.05.Tests.cs",
442+
@"Chapter01.Tests\Listing01.06.Tests.cs",
443+
@"Chapter01.Tests\Listing01.08.Tests.cs",
444+
@"Chapter01.Tests\Listing01.09.Tests.cs",
445+
@"Chapter01.Tests\Listing01.10.Tests.cs",
446+
@"Chapter01.Tests\Listing01.11.Tests.cs",
447+
@"Chapter01.Tests\Listing01.12.Tests.cs",
448+
@"Chapter01.Tests\Listing01.13.Tests.cs",
449+
@"Chapter01.Tests\Listing01.14.Tests.cs",
450+
@"Chapter01.Tests\Listing01.15.Tests.cs",
451+
@"Chapter01.Tests\Listing01.16.Tests.cs",
452+
@"Chapter01.Tests\Listing01.17.Tests.cs",
453+
@"Chapter01.Tests\Listing01.18.Tests.cs",
454+
@"Chapter01.Tests\Listing01.19.Tests.cs",
455+
@"Chapter01.Tests\Listing01.20.Tests.cs",
456+
@"Chapter01.Tests\Listing01.21.Tests.cs"
457+
};
458+
459+
IEnumerable<string> toWrite = new List<string>
460+
{
461+
"namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter01.Listing18_01",
462+
"{",
463+
" using System;",
464+
" using System.Reflection;",
465+
" public class Program { }",
466+
"}"
467+
};
468+
var tempDir = CreateTempDirectory();
469+
var chapterDir = CreateTempDirectory(tempDir, name: "Chapter01");
470+
CreateTempDirectory(tempDir, name: "Chapter01.Tests");
471+
WriteFiles(tempDir, filesToMake, toWrite);
472+
expectedFiles = ConvertFileNamesToFullPath(expectedFiles, tempDir).ToList();
473+
474+
ListingManager.UpdateChapterListingNumbers(chapterDir.FullName, byFolder: true);
475+
476+
var files = FileManager.GetAllFilesAtPath(tempDir.FullName, true)
477+
.Where(x => Path.GetExtension(x) == ".cs").OrderBy(x => x).ToList();
478+
479+
//Assert
480+
CollectionAssert.AreEquivalent((ICollection)expectedFiles, files);
481+
}
482+
359483

360484
[TestMethod]
361485
public void
@@ -432,6 +556,7 @@ public void GetPathToAccompanyingUnitTest_GivenListingWithNoTest_CorrectPathRetu
432556
}
433557

434558
[TestMethod]
559+
[Ignore]
435560
public void GenerateUnitTests_TestsGenerated()
436561
{
437562
string chapter = "Chapter01";

‎ListingManager/ListingInformation.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ namespace ListingManager
55
{
66
public class ListingInformation
77
{
8+
public const string TemporaryExtension = ".tmp";
89
public int ChapterNumber { get; }
910
public int ListingNumber { get; }
1011
public string ListingSuffix { get; }
1112
public string ListingDescription { get; }
13+
public string TemporaryPath { get; }
14+
public string Path => TemporaryPath.Remove(TemporaryPath.Length - TemporaryExtension.Length, TemporaryExtension.Length);
1215

1316
public ListingInformation(string listingPath)
1417
{
@@ -24,6 +27,7 @@ public ListingInformation(string listingPath)
2427
ListingNumber = listingNumber;
2528
ListingSuffix = !string.IsNullOrWhiteSpace(matches.Groups[3].Value) ? matches.Groups[3].Value : "";
2629
ListingDescription = !string.IsNullOrWhiteSpace(matches.Groups[5].Value) ? matches.Groups[5].Value : "";
30+
TemporaryPath = listingPath + TemporaryExtension;
2731
}
2832
else
2933
{

0 commit comments

Comments
 (0)