diff --git a/musical_notes/__init__.py b/musical_notes/__init__.py index 8eb02a9..6751eb0 100644 --- a/musical_notes/__init__.py +++ b/musical_notes/__init__.py @@ -1 +1 @@ -from musical_notes.notes_test import game_notes, random_image \ No newline at end of file +from musical_notes.notes_test import game_notes \ No newline at end of file diff --git a/musical_notes/__pycache__/__init__.cpython-36.pyc b/musical_notes/__pycache__/__init__.cpython-36.pyc index 5ac0e62..b148aaf 100644 Binary files a/musical_notes/__pycache__/__init__.cpython-36.pyc and b/musical_notes/__pycache__/__init__.cpython-36.pyc differ diff --git a/musical_notes/__pycache__/notes_test.cpython-36.pyc b/musical_notes/__pycache__/notes_test.cpython-36.pyc index 223031c..2f5506a 100644 Binary files a/musical_notes/__pycache__/notes_test.cpython-36.pyc and b/musical_notes/__pycache__/notes_test.cpython-36.pyc differ diff --git a/musical_notes/notes_test.py b/musical_notes/notes_test.py index 6db72e0..5677a1d 100644 --- a/musical_notes/notes_test.py +++ b/musical_notes/notes_test.py @@ -4,12 +4,9 @@ from PIL import ImageTk, Image from random import randint +def imagegen(numb, imagelist): + return "musical_notes/musicalnotes/" + imagelist[numb]+".png" -class random_image: - # Random number generator: - def __init__ (self, inputlist): - randnumb = randint(0, len(inputlist)-1) - return randnumb class game_notes: @@ -41,13 +38,12 @@ def start_note_practice (): notes_list = ['C_test', 'C1_test', 'D_test', 'D1_test', 'E_test', 'E1_test', 'F_test', 'F1_test', 'G_test', 'G1_test', 'A_test', 'A1_test', 'B_test', 'B1_test'] # Random number generator: - def randimg (self, inputlist): - randnumb = randint(0, len(inputlist)-1) - randnote = "musical_notes/musicalnotes/" + inputlist[randnumb]+".png" + randnumb = randint(0, len(notes_list)-1) + randnote = "musical_notes/musicalnotes/" + notes_list[randnumb]+".png" # Creating images: global note_image - note_image = ImageTk.PhotoImage(Image.open(randimg(notes_list))) + note_image = ImageTk.PhotoImage(Image.open(randnote)) show_note = Label(start_note_practice_frame, image=note_image) show_note.pack(pady=15) diff --git a/musical_notes/test/__pycache__/test_notes.cpython-36.pyc b/musical_notes/test/__pycache__/test_notes.cpython-36.pyc index c72b45a..85dd844 100644 Binary files a/musical_notes/test/__pycache__/test_notes.cpython-36.pyc and b/musical_notes/test/__pycache__/test_notes.cpython-36.pyc differ diff --git a/musical_notes/test/test_notes.py b/musical_notes/test/test_notes.py index 371c776..6c9458c 100644 --- a/musical_notes/test/test_notes.py +++ b/musical_notes/test/test_notes.py @@ -4,13 +4,19 @@ import tkinter -from musical_notes.notes_test import game_notes +from musical_notes.notes_test import game_notes, imagegen -class TestWidget(self): - def test_entry_widget(self): - widget=Widget('answer_box') - self.assertEqual(widget.size(), (50, 50)) + +class TestRandomNote(unittest.TestCase): + def test_notepick(self): + self.note1 = imagegen(6, ['C_test', 'C1_test', 'D_test', 'D1_test', 'E_test', 'E1_test', 'F_test', 'F1_test', 'G_test', 'G1_test', 'A_test', 'A1_test', 'B_test', 'B1_test']) + self.note2 = imagegen(10, ['C_test', 'C1_test', 'D_test', 'D1_test', 'E_test', 'E1_test', 'F_test', 'F1_test', 'G_test', 'G1_test', 'A_test', 'A1_test', 'B_test', 'B1_test']) + self.note3 = imagegen(2, ['C_test', 'C1_test', 'D_test', 'D1_test', 'E_test', 'E1_test', 'F_test', 'F1_test', 'G_test', 'G1_test', 'A_test', 'A1_test', 'B_test', 'B1_test']) + + self.assertEqual(self.note1, "musical_notes/musicalnotes/F_test.png") + self.assertEqual(self.note2, "musical_notes/musicalnotes/A_test.png") + self.assertEqual(self.note3, "musical_notes/musicalnotes/D_test.png") if __name__ == '__main__': unittest.main()