#26: test fixes for pane / height and width on tests.

Author: tony

examples/blank-panes.json

@@ -4,7 +4,12 @@
       "panes": [
         null, 
         "pane", 
-        "blank", 
+        "blank"
+      ], 
+      "window_name": "Blank pane test"
+    }, 
+    {
+      "panes": [
         null, 
         {
           "shell_command": null
@@ -15,8 +20,7 @@
           ]
         }
       ], 
-      "layout": "tiled", 
-      "window_name": "Blank pane test"
+      "window_name": "More blank panes"
     }, 
     {
       "panes": [

examples/blank-panes.yaml

@@ -3,11 +3,12 @@ windows:
   # Emptiness will simply open a blank pane, if no shell_command_before.
   # All these are equivalent
   - window_name: Blank pane test
-    layout: tiled
     panes:
     -
     - pane
     - blank
+  - window_name: More blank panes
+    panes:
     - null
     - shell_command: 
     - shell_command:

tmuxp/testsuite/test_config.py

@@ -747,7 +747,6 @@ class ConfigBlankPanes(TestCase):
         'windows': [
             {
                 'window_name': 'Blank pane test',
-                'layout': 'tiled',
                 'panes': [
                     {
                         'shell_command': [],
@@ -757,7 +756,12 @@ class ConfigBlankPanes(TestCase):
                     },
                     {
                         'shell_command': [],
-                    },
+                    }
+                ]
+            },
+            {
+                'window_name': 'More blank panes',
+                'panes': [
                     {
                         'shell_command': [],
                     },

tmuxp/testsuite/test_pane.py

@@ -31,22 +31,22 @@ def test_resize_pane(self):
         pane1_height = pane1['pane_height']
         pane2 = window.split_window()
 
-        pane1.resize_pane(height=7)
+        pane1.resize_pane(height=4)
         self.assertNotEqual(pane1['pane_height'], pane1_height)
-        self.assertEqual(int(pane1['pane_height']), 7)
+        self.assertEqual(int(pane1['pane_height']), 4)
 
-        pane1.resize_pane(height=9)
-        self.assertEqual(int(pane1['pane_height']), 9)
+        pane1.resize_pane(height=3)
+        self.assertEqual(int(pane1['pane_height']), 3)
 
     def test_set_height(self):
         window = self.session.new_window(window_name='test_set_height')
         pane2 = window.split_window()
         pane1 = window.attached_pane()
         pane1_height = pane1['pane_height']
 
-        pane1.set_height(6)
+        pane1.set_height(2)
         self.assertNotEqual(pane1['pane_height'], pane1_height)
-        self.assertEqual(int(pane1['pane_height']), 6)
+        self.assertEqual(int(pane1['pane_height']), 2)
 
     def test_set_width(self):
         window = self.session.new_window(window_name='test_set_width')
@@ -56,8 +56,8 @@ def test_set_width(self):
         pane1 = window.attached_pane()
         pane1_width = pane1['pane_width']
 
-        pane1.set_width(25)
+        pane1.set_width(10)
         self.assertNotEqual(pane1['pane_width'], pane1_width)
-        self.assertEqual(int(pane1['pane_width']), 25)
+        self.assertEqual(int(pane1['pane_width']), 10)
 
         pane1.reset()

tmuxp/testsuite/test_workspacebuilder.py

@@ -195,22 +195,19 @@ class WindowOptions(TmuxTestCase):
     windows:
     - layout: main-horizontal
       options:
-        main-pane-height: 30
+        main-pane-height: 5
       panes:
-      - shell_command:
-        - vim
-        start_directory: '~'
-      - shell_command:
-        - echo "hey"
-      - shell_command:
-        - echo "moo"
+      - pane
+      - pane
+      - pane
       window_name: editor
     """
 
     def test_window_options(self):
         s = self.session
         sconfig = kaptan.Kaptan(handler='yaml')
         sconfig = sconfig.import_config(self.yaml_config).get()
+        sconfig = config.expand(sconfig)
 
         builder = WorkspaceBuilder(sconf=sconfig)
 
@@ -223,7 +220,7 @@ def test_window_options(self):
                 p = p
                 self.assertEqual(len(s._windows), window_count)
             self.assertIsInstance(w, Window)
-            self.assertEqual(w.show_window_option('main-pane-height'), 30)
+            self.assertEqual(w.show_window_option('main-pane-height'), 5)
 
             self.assertEqual(len(s._windows), window_count)
             window_count += 1
@@ -315,18 +312,23 @@ def test_blank_pane_count(self):
 
         test_config = kaptan.Kaptan().import_config(self.yaml_config_file).get()
         test_config = config.expand(test_config)
+        # for window in test_config['windows']:
+            # window['layout'] = 'tiled'
         builder = WorkspaceBuilder(sconf=test_config)
         builder.build(session=self.session)
 
+        self.assertEqual(self.session, builder.session)
+
         window1 = self.session.findWhere({'window_name': 'Blank pane test'})
-        self.assertEqual(len(window1._panes), 6)
+        self.assertEqual(len(window1._panes), 3)
+
+        window2 = self.session.findWhere({'window_name': 'More blank panes'})
+        self.assertEqual(len(window2._panes), 3)
 
-        window1 = self.session.findWhere(
+        window3 = self.session.findWhere(
             {'window_name': 'Empty string (return)'}
         )
-        self.assertEqual(len(window1._panes), 3)
-
-        self.assertEqual(self.session, builder.session)
+        self.assertEqual(len(window3._panes), 3)
 
 
 class StartDirectoryTest(TmuxTestCase):
@@ -406,6 +408,7 @@ class PaneOrderingTest(TmuxTestCase):
     windows:
     - options:
       - automatic_rename: on
+      layout: tiled
       panes:
       - cd /var/log
       - cd /sys