waggery vs jocularity

waggery and jocularity both are nouns.

Word	Noun	Adjective	Verb	Adverb
waggery	Yes	No	No	No
jocularity	Yes	No	No	No

As nouns, jocularity is a hypernym of waggery; that is, jocularity is a word with a broader meaning than waggery:

Other hypernyms of waggery include jest, joke.

waggery (noun)	jocularity (noun)
a quaint and amusing jest	activity characterized by good humor
waggish behavior	fun characterized by humor
	a feeling of facetious merriment