joviality vs good humour

joviality and good humour both are nouns.

Word	Noun	Adjective	Verb	Adverb
joviality	Yes	No	No	No
good humour	Yes	No	No	No

As nouns, good humour is a hypernym of joviality; that is, good humour is a word with a broader meaning than joviality:

Other hypernyms of joviality include gaiety, merriment, amiability, good humor, good temper.

joviality (noun)	good humour (noun)
a jovial nature	a cheerful and agreeable mood
feeling jolly and jovial and full of good humor