-(assert (matchp-name :function 'cl-user::one 2))
-(assert (matchp #'cl-user::one 2))
-(assert (matchp-name :generic-function 'cl-user::two 3))
-(assert (matchp (car (sb-pcl:generic-function-methods #'cl-user::two)) 4))
-
-(assert (matchp-name :variable 'cl-user::*a* 8))
-(assert (matchp-name :variable 'cl-user::*b* 9))
-(assert (matchp-name :class 'cl-user::a 10))
-(assert (matchp-name :condition 'cl-user::b 11))
-(assert (matchp-name :structure 'cl-user::c 12))
-(assert (matchp-name :function 'cl-user::make-c 12))
-(assert (matchp-name :function 'cl-user::c-e 12))
-(assert (matchp-name :structure 'cl-user::d 13))
-(assert (matchp-name :function 'cl-user::make-d 13))
-(assert (matchp-name :function 'cl-user::d-e 13))
-(assert (matchp-name :package 'cl-user::e 14))
-(assert (matchp-name :symbol-macro 'cl-user::f 15))
-(assert (matchp-name :type 'cl-user::g 16))
-(assert (matchp-name :constant 'cl-user::+h+ 17))
-(assert (matchp-length :method 'cl-user::j 2))
-(assert (matchp-name :macro 'cl-user::l 20))
-(assert (matchp-name :compiler-macro 'cl-user::m 21))
-(assert (matchp-name :setf-expander 'cl-user::n 22))
-(assert (matchp-name :function '(setf cl-user::o) 23))
-(assert (matchp-name :method '(setf cl-user::p) 24))
-(assert (matchp-name :macro 'cl-user::q 25))
-(assert (matchp-name :method-combination 'cl-user::r 26))
-(assert (matchp-name :setf-expander 'cl-user::s 27))
-
-(let ((fin (make-instance 'sb-mop:funcallable-standard-object)))
- (sb-mop:set-funcallable-instance-function fin #'cl-user::one)
- (assert (matchp fin 2)))
-
-(sb-profile:profile cl-user::one)
-(assert (matchp-name :function 'cl-user::one 2))
-(sb-profile:unprofile cl-user::one)
-
-
-;;;; Check correctness of FUNCTION-LAMBDA-LIST.
-
-(assert (equal (function-lambda-list 'cl-user::one)
- '(cl-user::a cl-user::b cl-user::c)))
-(assert (equal (function-lambda-list 'the)
- '(sb-c::value-type sb-c::form)))
+(deftest find-source-stuff.1
+ (matchp-name :function 'cl-user::one 2)
+ t)
+
+(deftest find-source-stuff.2
+ (matchp #'cl-user::one 2)
+ t)
+
+(deftest find-source-stuff.3
+ (matchp-name :generic-function 'cl-user::two 3)
+ t)
+
+(deftest find-source-stuff.4
+ (matchp (car (sb-pcl:generic-function-methods #'cl-user::two)) 4)
+ t)
+
+(deftest find-source-stuff.5
+ (matchp-name :variable 'cl-user::*a* 8)
+ t)
+
+(deftest find-source-stuff.6
+ (matchp-name :variable 'cl-user::*b* 9)
+ t)
+
+(deftest find-source-stuff.7
+ (matchp-name :class 'cl-user::a 10)
+ t)
+
+(deftest find-source-stuff.8
+ (matchp-name :condition 'cl-user::b 11)
+ t)
+
+(deftest find-source-stuff.9
+ (matchp-name :structure 'cl-user::c 12)
+ t)
+
+(deftest find-source-stuff.10
+ (matchp-name :function 'cl-user::make-c 12)
+ t)
+
+(deftest find-source-stuff.11
+ (matchp-name :function 'cl-user::c-e 12)
+ t)
+
+(deftest find-source-stuff.12
+ (matchp-name :structure 'cl-user::d 13)
+ t)
+
+(deftest find-source-stuff.13
+ (matchp-name :function 'cl-user::make-d 13)
+ t)
+
+(deftest find-source-stuff.14
+ (matchp-name :function 'cl-user::d-e 13)
+ t)
+
+(deftest find-source-stuff.15
+ (matchp-name :package 'cl-user::e 14)
+ t)
+
+(deftest find-source-stuff.16
+ (matchp-name :symbol-macro 'cl-user::f 15)
+ t)
+
+(deftest find-source-stuff.17
+ (matchp-name :type 'cl-user::g 16)
+ t)
+
+(deftest find-source-stuff.18
+ (matchp-name :constant 'cl-user::+h+ 17)
+ t)
+
+(deftest find-source-stuff.19
+ (matchp-length :method 'cl-user::j 2)
+ t)
+
+(deftest find-source-stuff.20
+ (matchp-name :macro 'cl-user::l 20)
+ t)
+
+(deftest find-source-stuff.21
+ (matchp-name :compiler-macro 'cl-user::m 21)
+ t)
+
+(deftest find-source-stuff.22
+ (matchp-name :setf-expander 'cl-user::n 22)
+ t)
+
+(deftest find-source-stuff.23
+ (matchp-name :function '(setf cl-user::o) 23)
+ t)
+
+(deftest find-source-stuff.24
+ (matchp-name :method '(setf cl-user::p) 24)
+ t)
+
+(deftest find-source-stuff.25
+ (matchp-name :macro 'cl-user::q 25)
+ t)
+
+
+(deftest find-source-stuff.26
+ (matchp-name :method-combination 'cl-user::r 26)
+ t)
+
+
+(deftest find-source-stuff.27
+ (matchp-name :setf-expander 'cl-user::s 27)
+ t)
+
+(deftest find-source-stuff.28
+ (let ((fin (make-instance 'sb-mop:funcallable-standard-object)))
+ (sb-mop:set-funcallable-instance-function fin #'cl-user::one)
+ (matchp fin 2))
+ t)
+
+(deftest find-source-stuff.29
+ (unwind-protect
+ (progn
+ (sb-profile:profile cl-user::one)
+ (matchp-name :function 'cl-user::one 2))
+ (sb-profile:unprofile cl-user::one))
+ t)
+
+(deftest find-source-stuff.30
+ ;; Test finding a type that isn't one
+ (not (find-definition-sources-by-name 'fboundp :type))
+ t)
+
+(deftest find-source-stuff.31
+ (matchp-name :function 'cl-user::compile-time-too-fun 28)
+ t)
+
+(deftest find-source-stuff.32
+ (matchp-name :function 'cl-user::loaded-as-source-fun 3)
+ t)