Make sure toolbar is initialized to fix tests

Author: planarvoid

aztec/src/test/kotlin/org/wordpress/aztec/HeadingTest.kt

@@ -45,23 +45,23 @@ class HeadingTest {
         sourceText = SourceViewEditText(activity)
         sourceText.setCalypsoMode(false)
         toolbar = AztecToolbar(activity)
-        toolbar.setEditor(editText, sourceText)
         toolbar.setToolbarItems(ToolbarItems.BasicLayout(
                 ToolbarAction.HEADING,
+                ToolbarAction.PREFORMAT,
                 ToolbarAction.LIST,
                 ToolbarAction.QUOTE,
                 ToolbarAction.BOLD,
                 ToolbarAction.ITALIC,
                 ToolbarAction.LINK,
                 ToolbarAction.UNDERLINE,
-                ToolbarAction.PREFORMAT,
                 ToolbarAction.STRIKETHROUGH,
                 ToolbarAction.ALIGN_LEFT,
                 ToolbarAction.ALIGN_CENTER,
                 ToolbarAction.ALIGN_RIGHT,
                 ToolbarAction.HORIZONTAL_RULE,
                 ToolbarAction.HTML
         ))
+        toolbar.setEditor(editText, sourceText)
         buttonQuote = toolbar.findViewById<ToggleButton>(R.id.format_bar_button_quote)
         menuHeading = toolbar.getHeadingMenu() as PopupMenu
         menuHeading1 = menuHeading.menu.getItem(1)

aztec/src/test/kotlin/org/wordpress/aztec/PreformatTest.kt

@@ -45,7 +45,6 @@ class PreformatTest {
         sourceText = SourceViewEditText(activity)
         sourceText.setCalypsoMode(false)
         toolbar = AztecToolbar(activity)
-        toolbar.setEditor(editText, sourceText)
         toolbar.setToolbarItems(ToolbarItems.BasicLayout(
                 ToolbarAction.HEADING,
                 ToolbarAction.PREFORMAT,
@@ -62,6 +61,7 @@ class PreformatTest {
                 ToolbarAction.HORIZONTAL_RULE,
                 ToolbarAction.HTML
         ))
+        toolbar.setEditor(editText, sourceText)
         menuHeading = toolbar.getHeadingMenu() as PopupMenu
         menuParagraph = menuHeading.menu.getItem(0)
         buttonPreformat = toolbar.findViewById<ToggleButton>(R.id.format_bar_button_pre)