Skip to content

Commit 82ef0d0

Browse files
joelmartinezjoelmartinez
committed
removed the exception flag on integration tests.
An updated local version of mdoc started causing test output changes which clashed with the CI build agent's config. So this change removes this functionality from the integration tests, and adds a few unit tests that tests the exception functionality. Closes #341
1 parent 4b629cb commit 82ef0d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+134
-4915
lines changed

‎mdoc/Makefile

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -261,27 +261,27 @@ check-monodocer-addNonGeneric:
261261
-rm -Rf Test/en.actual
262262
# first, make a docset with the generic method
263263
$(MAKE) Test/DocTest-addNonGeneric.dll
264-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-addNonGeneric.dll
264+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-addNonGeneric.dll
265265

266266
# now add a non-generic version of the method and update several times
267267
$(MAKE) Test/DocTest-addNonGeneric-v2.dll
268-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-addNonGeneric-v2.dll
269-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-addNonGeneric-v2.dll
270-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-addNonGeneric-v2.dll
268+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-addNonGeneric-v2.dll
269+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-addNonGeneric-v2.dll
270+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-addNonGeneric-v2.dll
271271
$(DIFF) Test/en.expected-addNonGeneric Test/en.actual
272272

273273
check-monodocer-membergroup: Test/DocTest-addNonGeneric-v2.dll Test/DocTest-addNonGeneric.dll
274274
-rm -Rf Test/en.actual
275275
cp -r Test/en.expected-membergroup Test/en.actual
276-
$(MONO) $(PROGRAM) update --debug --exceptions=all -o Test/en.actual Test/DocTest-addNonGeneric-v2.dll
276+
$(MONO) $(PROGRAM) update --debug -o Test/en.actual Test/DocTest-addNonGeneric-v2.dll
277277
$(DIFF) Test/en.expected-membergroup Test/en.actual
278278
$(MONO) $(PROGRAM) validate -f ecma Test/en.actual
279279

280280
check-monodocer-dropns-classic:
281281
# tests the simplest --dropns case, a single class where the root namespace was dropped.
282282
-rm -Rf Test/en.actual
283283
$(MAKE) Test/DocTest-DropNS-classic.dll
284-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-DropNS-classic.dll --api-style=classic
284+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-DropNS-classic.dll --api-style=classic
285285
$(MAKE) update-monodocer-dropns-unified
286286
$(DIFF) Test/en.expected-dropns-classic-v1 Test/en.actual
287287

@@ -293,12 +293,12 @@ check-monodocer-dropns-multi:
293293
$(MAKE) Test/DocTest-DropNS-unified-multitest.dll
294294

295295
# mdoc update for both classic and unified
296-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic
297-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework
296+
$(MONO) $(PROGRAM) update -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic
297+
$(MONO) $(PROGRAM) update -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework
298298

299299
# now run it again to verify idempotency
300-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic
301-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework
300+
$(MONO) $(PROGRAM) update -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic
301+
$(MONO) $(PROGRAM) update -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework
302302

303303
$(DIFF) Test/en.expected-dropns-multi Test/en.actual
304304

@@ -311,12 +311,12 @@ check-monodocer-dropns-multi-withexisting:
311311
$(MAKE) Test/DocTest-DropNS-unified-multitest.dll
312312

313313
# mdoc update to show a pre-existing set of documents
314-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-DropNS-classic.dll --api-style=classic
315-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-DropNS-unified.dll --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework
314+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-DropNS-classic.dll --api-style=classic
315+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-DropNS-unified.dll --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework
316316

317317
# mdoc update for both classic and unified
318-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic
319-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework
318+
$(MONO) $(PROGRAM) update -o Test/en.actual $(MULTI-CLASSIC) --api-style=classic
319+
$(MONO) $(PROGRAM) update -o Test/en.actual $(MULTI-UNIFIED) --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework --dropns Test/DocTest-DropNS-unified-multitest.dll=MyFramework
320320

321321
$(DIFF) Test/en.expected-dropns-multi-withexisting Test/en.actual
322322

@@ -326,13 +326,13 @@ check-monodocer-dropns-delete:
326326
rm -Rf Test/DocTest-DropNS-classic-deletetest.dll
327327
rm -Rf Test/DocTest-DropNS-unified-deletetest.dll
328328
$(MAKE) Test/DocTest-DropNS-classic-deletetest.dll
329-
$(MONO) $(PROGRAM) update --delete --exceptions=all -o Test/en.actual Test/DocTest-DropNS-classic-deletetest.dll --api-style=classic
329+
$(MONO) $(PROGRAM) update --delete -o Test/en.actual Test/DocTest-DropNS-classic-deletetest.dll --api-style=classic
330330
$(MAKE) Test/DocTest-DropNS-unified-deletetest.dll
331-
$(MONO) $(PROGRAM) update --delete --exceptions=all -o Test/en.actual Test/DocTest-DropNS-unified-deletetest.dll --api-style=unified --dropns Test/DocTest-DropNS-unified-deletetest.dll=MyFramework
331+
$(MONO) $(PROGRAM) update --delete -o Test/en.actual Test/DocTest-DropNS-unified-deletetest.dll --api-style=unified --dropns Test/DocTest-DropNS-unified-deletetest.dll=MyFramework
332332
$(MAKE) Test/DocTest-DropNS-classic-deletetest-V2.dll
333-
$(MONO) $(PROGRAM) update --delete --exceptions=all -o Test/en.actual Test/DocTest-DropNS-classic-deletetest.dll --api-style=classic
333+
$(MONO) $(PROGRAM) update --delete -o Test/en.actual Test/DocTest-DropNS-classic-deletetest.dll --api-style=classic
334334
$(MAKE) Test/DocTest-DropNS-unified-deletetest-V2.dll
335-
$(MONO) $(PROGRAM) update --delete --exceptions=all -o Test/en.actual Test/DocTest-DropNS-unified-deletetest.dll --api-style=unified --dropns Test/DocTest-DropNS-unified-deletetest.dll=MyFramework -statistics Test/actual_statistics.txt
335+
$(MONO) $(PROGRAM) update --delete -o Test/en.actual Test/DocTest-DropNS-unified-deletetest.dll --api-style=unified --dropns Test/DocTest-DropNS-unified-deletetest.dll=MyFramework -statistics Test/actual_statistics.txt
336336
$(DIFF) Test/en.expected-dropns-delete Test/en.actual
337337
$(DIFF) Test/expected_remove_statistics.txt Test/actual_statistics.txt
338338

@@ -341,83 +341,83 @@ check-monodocer-dropns-classic-withsecondary:
341341
-rm -Rf Test/en.actual
342342
$(MAKE) Test/DocTest-DropNS-classic.dll
343343
$(MAKE) Test/DocTest-DropNS-classic-secondary.dll
344-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-DropNS-classic.dll Test/DocTest-DropNS-classic-secondary.dll --api-style=classic
344+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-DropNS-classic.dll Test/DocTest-DropNS-classic-secondary.dll --api-style=classic
345345
$(MAKE) update-monodocer-dropns-unified-withsecondary
346346
$(DIFF) Test/en.expected-dropns-classic-withsecondary Test/en.actual
347347

348348
update-monodocer-dropns-unified:
349349
$(MAKE) Test/DocTest-DropNS-unified.dll
350-
$(MONO) $(PROGRAM) update --debug --exceptions=all -o Test/en.actual Test/DocTest-DropNS-unified.dll --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework
350+
$(MONO) $(PROGRAM) update --debug -o Test/en.actual Test/DocTest-DropNS-unified.dll --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework
351351

352352
update-monodocer-dropns-unified-withsecondary:
353353
$(MAKE) Test/DocTest-DropNS-unified.dll
354-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-DropNS-unified.dll Test/DocTest-DropNS-classic-secondary.dll --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework
354+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-DropNS-unified.dll Test/DocTest-DropNS-classic-secondary.dll --api-style=unified --dropns Test/DocTest-DropNS-unified.dll=MyFramework
355355

356356
update-monodocer-dropns-classic-secondary:
357357
$(MAKE) Test/DocTest-DropNS-classic-secondary.dll
358-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-DropNS-classic-secondary.dll --api-style=classic
358+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-DropNS-classic-secondary.dll --api-style=classic
359359

360360
check-monodocer-internal-interface:
361361
# Tests to make sure internal interfaces that are explicitly implemented are not documented
362362
-rm -Rf Test/en.actual
363363
$(MAKE) Test/DocTest-InternalInterface.dll
364-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-InternalInterface.dll -lang VB.NET
364+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-InternalInterface.dll -lang VB.NET
365365
$(DIFF) Test/en.expected-internal-interface Test/en.actual
366366

367367
check-monodocer-enumerations:
368368
-rm -Rf Test/en.actual
369369
$(MAKE) Test/DocTest-enumerations.dll
370-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.actual Test/DocTest-enumerations.dll
370+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/DocTest-enumerations.dll
371371
$(DIFF) Test/en.expected-enumerations Test/en.actual
372372

373373
check-monodocer-update:
374374
find Test/en.expected -name \*.xml -exec rm "{}" \;
375375
$(MAKE) Test/DocTest.dll-v1
376-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.expected Test/DocTest.dll -lang docid -lang vb.net -lang fsharp -lang javascript -lang c++/cli -lang c++/cx -lang c++/winrt
376+
$(MONO) $(PROGRAM) update -o Test/en.expected Test/DocTest.dll -lang docid -lang vb.net -lang fsharp -lang javascript -lang c++/cli -lang c++/cx -lang c++/winrt
377377

378378
check-monodocer:
379379
-rm -Rf Test/en.actual
380380
$(MAKE) Test/DocTest.dll-v1
381-
$(MONO) $(PROGRAM) update --debug --exceptions=all -o Test/en.actual Test/DocTest.dll -lang docid -lang vb.net -lang fsharp -lang javascript -lang c++/cli -lang c++/cx -lang c++/winrt
381+
$(MONO) $(PROGRAM) update --debug -o Test/en.actual Test/DocTest.dll -lang docid -lang vb.net -lang fsharp -lang javascript -lang c++/cli -lang c++/cx -lang c++/winrt
382382
$(DIFF) Test/en.expected Test/en.actual
383-
$(MONO) $(PROGRAM) update --debug --exceptions=all -o Test/en.actual Test/DocTest.dll -lang docid -lang vb.net -lang fsharp -lang javascript -lang c++/cli -lang c++/cx -lang c++/winrt
383+
$(MONO) $(PROGRAM) update --debug -o Test/en.actual Test/DocTest.dll -lang docid -lang vb.net -lang fsharp -lang javascript -lang c++/cli -lang c++/cx -lang c++/winrt
384384
$(DIFF) Test/en.expected Test/en.actual
385385

386386
check-monodocer-since-update:
387387
find Test/en.expected.since -name \*.xml -exec rm "{}" \;
388388
$(MAKE) Test/DocTest.dll-v1
389-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.expected.since Test/DocTest.dll
389+
$(MONO) $(PROGRAM) update -o Test/en.expected.since Test/DocTest.dll
390390
$(MAKE) Test/DocTest.dll-v2
391-
$(MONO) $(PROGRAM) update --exceptions=all --since="Version 2.0" \
391+
$(MONO) $(PROGRAM) update --since="Version 2.0" \
392392
-o Test/en.expected.since Test/DocTest.dll
393393

394394
check-monodocer-since:
395395
rm -Rf Test/en.actual
396396
$(MAKE) Test/DocTest.dll-v1
397-
$(MONO) $(PROGRAM) --debug update --exceptions=all -o Test/en.actual Test/DocTest.dll
397+
$(MONO) $(PROGRAM) --debug update -o Test/en.actual Test/DocTest.dll
398398
$(MAKE) Test/DocTest.dll-v2
399-
$(MONO) $(PROGRAM) --debug update --exceptions=all --since="Version 2.0" \
399+
$(MONO) $(PROGRAM) --debug update --since="Version 2.0" \
400400
-o Test/en.actual Test/DocTest.dll
401401
$(DIFF) Test/en.expected.since Test/en.actual
402402

403403
check-monodocer-delete-update:
404404
find Test/en.expected.delete -type f -exec rm "{}" \;
405405
$(MAKE) Test/DocTest.dll-v1
406-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.expected.delete Test/DocTest.dll
406+
$(MONO) $(PROGRAM) update -o Test/en.expected.delete Test/DocTest.dll
407407
$(MAKE) Test/DocTest.dll-v2
408-
$(MONO) $(PROGRAM) update --exceptions=all -o Test/en.expected.delete Test/DocTest.dll
408+
$(MONO) $(PROGRAM) update -o Test/en.expected.delete Test/DocTest.dll
409409
$(MAKE) Test/DocTest.dll-v1
410-
$(MONO) $(PROGRAM) update -fno-assembly-versions --delete --exceptions=all \
410+
$(MONO) $(PROGRAM) update -fno-assembly-versions --delete \
411411
-o Test/en.expected.delete Test/DocTest.dll
412412

413413
check-monodocer-delete:
414414
rm -Rf Test/en.actual
415415
$(MAKE) Test/DocTest.dll-v1
416-
$(MONO) $(PROGRAM) --debug update --exceptions=all -o Test/en.actual Test/DocTest.dll
416+
$(MONO) $(PROGRAM) --debug update -o Test/en.actual Test/DocTest.dll
417417
$(MAKE) Test/DocTest.dll-v2
418-
$(MONO) $(PROGRAM) --debug update --exceptions=all -o Test/en.actual Test/DocTest.dll
418+
$(MONO) $(PROGRAM) --debug update -o Test/en.actual Test/DocTest.dll
419419
$(MAKE) Test/DocTest.dll-v1
420-
$(MONO) $(PROGRAM) --debug update -fno-assembly-versions --delete --exceptions=all -o Test/en.actual Test/DocTest.dll
420+
$(MONO) $(PROGRAM) --debug update -fno-assembly-versions --delete -o Test/en.actual Test/DocTest.dll
421421
$(DIFF) Test/en.expected.delete Test/en.actual
422422

423423
check-monodocer-ignore-invalid-assemblies: Test/DocTest-addNonGeneric.dll Test/DocTest-addNonGeneric-v2.dll
@@ -430,13 +430,13 @@ check-monodocer-ignore-invalid-assemblies: Test/DocTest-addNonGeneric.dll Test/D
430430
check-monodocer-importslashdoc-update:
431431
find Test/en.expected.importslashdoc -name \*.xml -exec rm "{}" \;
432432
$(MAKE) Test/DocTest.dll-v1 TEST_CSCFLAGS=-doc:Test/DocTest.xml
433-
$(MONO) $(PROGRAM) --debug update --exceptions=all -i Test/DocTest.xml \
433+
$(MONO) $(PROGRAM) --debug update -i Test/DocTest.xml \
434434
-o Test/en.expected.importslashdoc Test/DocTest.dll
435435

436436
check-monodocer-importslashdoc:
437437
rm -Rf Test/en.actual
438438
$(MAKE) Test/DocTest.dll-v1 TEST_CSCFLAGS=-doc:Test/DocTest.xml
439-
$(MONO) $(PROGRAM) --debug update --exceptions=all -i Test/DocTest.xml \
439+
$(MONO) $(PROGRAM) --debug update -i Test/DocTest.xml \
440440
-o Test/en.actual Test/DocTest.dll
441441
$(DIFF) Test/en.expected.importslashdoc Test/en.actual
442442

@@ -453,15 +453,15 @@ check-multiple-mdoc:
453453
check-monodocer-importecmadoc-update:
454454
find Test/en.expected.importecmadoc -name \*.xml -exec rm "{}" \;
455455
$(MAKE) Test/DocTest.dll-v1
456-
$(MONO) $(PROGRAM) --debug update --exceptions=all -i Test/TestEcmaDocs.xml \
456+
$(MONO) $(PROGRAM) --debug update -i Test/TestEcmaDocs.xml \
457457
'--type=System.Action`1' --type=System.AsyncCallback \
458458
--type=System.Environment --type=System.Array \
459459
-o Test/en.expected.importecmadoc Test/DocTest.dll
460460

461461
check-monodocer-importecmadoc:
462462
rm -Rf Test/en.actual
463463
$(MAKE) Test/DocTest.dll-v1
464-
$(MONO) $(PROGRAM) --debug update --exceptions=all -i Test/TestEcmaDocs.xml \
464+
$(MONO) $(PROGRAM) --debug update -i Test/TestEcmaDocs.xml \
465465
'--type=System.Action`1' --type=System.AsyncCallback \
466466
--type=System.Environment --type=System.Array \
467467
-o Test/en.actual Test/DocTest.dll
@@ -752,7 +752,7 @@ check-doc-tools: check-monodocer-Eii-importslashdoc \
752752
check-monodocer-cppwinrtUwp\
753753
check-monodocer-frameworkalternate-fromold \
754754
check-monodocer-frameworkalternate \
755-
check-monodocer-embedded-type \
755+
check-monodocer-embedded-type \
756756
check-ignored-namespace-generic \
757757
check-multiple-mdoc \
758758

‎mdoc/Mono.Documentation/exceptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ internal ExceptionSources (TypeReference exception)
5252
}
5353

5454
public TypeReference Exception { get; private set; }
55-
internal HashSet<MemberReference> Sources;
55+
public HashSet<MemberReference> Sources;
5656
}
5757

5858

0 commit comments

Comments
 (0)