Skip to content

Commit 3dbf393

Browse files
mrwardmrward
authored
Merge pull request #338 from mono/dev/mrward/dotnetcore-external-code-when-just-my-code-enabled
Fix .NET Core tests due to use of external code changes
2 parents c90ecd9 + c148828 commit 3dbf393

File tree

3 files changed

+30
-51
lines changed

3 files changed

+30
-51
lines changed

‎UnitTests/Mono.Debugging.Tests/Shared/BreakpointsAndSteppingTests.cs‎

Lines changed: 18 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,7 @@ public void DebuggerNonUserCodeMethod ()
266266
//entering EmptyTestMethod
267267
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
268268
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
269-
if (IsVsDebugger)
270-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
271-
else
272-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
269+
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
273270
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
274271
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsDebuggerHidden);
275272
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsDebuggerHidden);
@@ -313,10 +310,7 @@ public void DebuggerNonUserCodeMethod ()
313310
//entering EmptyTestMethod
314311
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
315312
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
316-
if (IsVsDebugger)
317-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
318-
else
319-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
313+
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
320314
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
321315
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsDebuggerHidden);
322316
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsDebuggerHidden);
@@ -340,10 +334,7 @@ public void DebuggerNonUserCodeMethod ()
340334
//entering EmptyTestMethod
341335
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
342336
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
343-
if (IsVsDebugger)
344-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
345-
else
346-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
337+
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
347338
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
348339
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsDebuggerHidden);
349340
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsDebuggerHidden);
@@ -367,10 +358,7 @@ public void DebuggerNonUserCodeMethod ()
367358
//entering EmptyTestMethod
368359
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
369360
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
370-
if (IsVsDebugger)
371-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
372-
else
373-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
361+
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
374362
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
375363
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsDebuggerHidden);
376364
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsDebuggerHidden);
@@ -394,10 +382,7 @@ public void DebuggerNonUserCodeMethod ()
394382
//entering EmptyTestMethod
395383
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
396384
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
397-
if (IsVsDebugger)
398-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
399-
else
400-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
385+
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
401386
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
402387
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsDebuggerHidden);
403388
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsDebuggerHidden);
@@ -434,50 +419,35 @@ public void DebuggerNonUserCodeMethod ()
434419
CheckPosition ("02757896-0e76-40b8-8235-d09d2110da78");
435420
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
436421
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
437-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
422+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
438423
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
439424
StepIn ("49326780-f51b-4510-a52c-03e7af442dda", 1);
440425
StepIn ("02757896-0e76-40b8-8235-d09d2110da78");
441426
StepIn ("02757896-0e76-40b8-8235-d09d2110da78", 1);
442427
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
443428
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
444-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
445-
if (IsVsDebugger)
446-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
447-
else
448-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
449-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (3).IsExternalCode);
450-
if (IsVsDebugger)
451-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (4).IsExternalCode);
452-
else
453-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (4).IsExternalCode);
429+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
430+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
431+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (3).IsExternalCode);
432+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (4).IsExternalCode);
454433
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (5).IsExternalCode);
455434
StepIn ("49326780-f51b-4510-a52c-03e7af442dda", 1);
456435
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
457436
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
458-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
459-
if (IsVsDebugger)
460-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
461-
else
462-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
463-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (3).IsExternalCode);
437+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
438+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
439+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (3).IsExternalCode);
464440
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (4).IsExternalCode);
465441
StepIn ("49326780-f51b-4510-a52c-03e7af442dda", 1);
466442
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
467443
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
468-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
469-
if (IsVsDebugger)
470-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
471-
else
472-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
473-
if (IsVsDebugger)
474-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (3).IsExternalCode);
475-
else
476-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (3).IsExternalCode);
444+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
445+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
446+
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (3).IsExternalCode);
477447
StepIn ("49326780-f51b-4510-a52c-03e7af442dda", 1);
478448
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
479449
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
480-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
450+
Assert.AreEqual (!IsVsDebugger, Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
481451
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
482452
StepIn ("49326780-f51b-4510-a52c-03e7af442dda", 1);
483453
StepIn ("02757896-0e76-40b8-8235-d09d2110da78", 1);
@@ -553,10 +523,7 @@ public void DebuggerStepThroughMethod ()
553523
CheckPosition ("707ccd6c-3464-4700-8487-a83c948aa0c3");
554524
StepIn ("49326780-f51b-4510-a52c-03e7af442dda");
555525
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsExternalCode);
556-
if (IsVsDebugger)
557-
Assert.IsTrue (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
558-
else
559-
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
526+
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsExternalCode);
560527
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (2).IsExternalCode);
561528
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (0).IsDebuggerHidden);
562529
Assert.IsFalse (Session.ActiveThread.Backtrace.GetFrame (1).IsDebuggerHidden);

‎UnitTests/MonoDevelop.Debugger.Tests.NonUserCodeTestLibCore/NuGet.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<configuration>
2+
<packageSources>
3+
<clear />
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5+
</packageSources>
6+
</configuration>

‎UnitTests/MonoDevelop.Debugger.Tests.TestAppCore/NuGet.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<configuration>
2+
<packageSources>
3+
<clear />
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5+
</packageSources>
6+
</configuration>

0 commit comments

Comments
 (0)