[gimp] app/tests: Make sessionrc-2-6 more realistic

[Martin Nordholts <martinn src gnome org>]

commit 981546c02e9532de96a892804393c50ae82993c8
Author: Martin Nordholts <martinn src gnome org>
Date:   Tue May 31 22:57:24 2011 +0200

    app/tests: Make sessionrc-2-6 more realistic
    
    GIMP 2.6 session files can't have many docks in a dock window, so
    remove that from the GIMP 2.6 session file we use for compatibility
    testing. Also remove the "gimp-single-image-window" entry.
    
    The downside is that we need a separate 'expected'-file, but we need
    to live with that.

 app/tests/gimpdir/Makefile.am              |    1 +
 app/tests/gimpdir/sessionrc-2-6            |    9 ---
 app/tests/gimpdir/sessionrc-expected-2-6   |   93 ++++++++++++++++++++++++++++
 app/tests/test-session-2-6-compatibility.c |    2 +-
 4 files changed, 95 insertions(+), 10 deletions(-)
---
diff --git a/app/tests/gimpdir/Makefile.am b/app/tests/gimpdir/Makefile.am
index 8a71c56..cbe0fcd 100644
--- a/app/tests/gimpdir/Makefile.am
+++ b/app/tests/gimpdir/Makefile.am
@@ -12,4 +12,5 @@ EXTRA_DIST = \
 	sessionrc-2-6		\
 	sessionrc-2-8		\
 	sessionrc-expected	\
+	sessionrc-expected-2-6	\
 	tags.xml
diff --git a/app/tests/gimpdir/sessionrc-2-6 b/app/tests/gimpdir/sessionrc-2-6
index 3222cc1..370d4f8 100644
--- a/app/tests/gimpdir/sessionrc-2-6
+++ b/app/tests/gimpdir/sessionrc-2-6
@@ -34,11 +34,6 @@
         (book
             (current-page 0)
             (dockable "gimp-tool-options"
-                (tab-style icon))))
-    (dock
-        (book
-            (current-page 0)
-            (dockable "gimp-device-status"
                 (tab-style icon)))))
 (session-info "dock" "dock"
     (position 795 45)
@@ -90,10 +85,6 @@
 (session-info "display" "gimp-empty-image-window"
     (position 140 30)
     (size 610 190))
-(session-info "toplevel"
-    (factory-entry "gimp-single-image-window")
-    (position 10 40)
-    (size 900 600))
 
 (last-tip-shown 0)
 
diff --git a/app/tests/gimpdir/sessionrc-expected-2-6 b/app/tests/gimpdir/sessionrc-expected-2-6
new file mode 100644
index 0000000..1656557
--- /dev/null
+++ b/app/tests/gimpdir/sessionrc-expected-2-6
@@ -0,0 +1,93 @@
+# GIMP sessionrc
+# 
+# This file takes session-specific info (that is info, you want to keep
+# between two GIMP sessions).  You are not supposed to edit it manually, but
+# of course you can do.  The sessionrc will be entirely rewritten every time
+# you quit GIMP.  If this file isn't found, defaults are used.
+
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 565 170)
+    (size 210 535)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-layer-list"
+                (tab-style icon)
+                (preview-size 32)))
+        (book
+            (position 290)
+            (current-page 0)
+            (dockable "gimp-brush-grid"
+                (tab-style preview)))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 140 290)
+    (size 405 300)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "false")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-tool-options"
+                (tab-style icon)))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 795 45)
+    (size 200 265)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "true")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 1)
+            (dockable "gimp-pattern-grid"
+                (tab-style preview))
+            (dockable "gimp-gradient-list"
+                (tab-style preview)))))
+(session-info "toplevel"
+    (factory-entry "gimp-dock-window")
+    (position 805 345)
+    (size 200 450)
+    (open-on-exit)
+    (aux-info
+        (show-image-menu "true")
+        (follow-active-image "true"))
+    (gimp-dock
+        (book
+            (current-page 0)
+            (dockable "gimp-channel-list"
+                (tab-style automatic)
+                (preview-size 32)))
+        (book
+            (position 200)
+            (current-page 0)
+            (dockable "gimp-palette-editor"
+                (tab-style icon)
+                (aux-info
+                    (edit-active "true")
+                    (current-data "Standard")
+                    (zoom-factor "2.80"))))))
+(session-info "toplevel"
+    (factory-entry "gimp-file-open-dialog")
+    (position 390 140)
+    (size 900 815))
+(session-info "toplevel"
+    (factory-entry "gimp-image-new-dialog")
+    (position 100 100))
+(session-info "toplevel"
+    (factory-entry "gimp-empty-image-window")
+    (position 140 30)
+    (size 610 190)
+    (open-on-exit))
+
+(last-tip-shown 0)
+
+# end of sessionrc
diff --git a/app/tests/test-session-2-6-compatibility.c b/app/tests/test-session-2-6-compatibility.c
index 607b919..97f9783 100644
--- a/app/tests/test-session-2-6-compatibility.c
+++ b/app/tests/test-session-2-6-compatibility.c
@@ -52,7 +52,7 @@ read_and_write_session_files (GimpTestFixture *fixture,
 {
   gimp_test_session_load_and_write_session_files ("sessionrc-2-6",
                                                   "dockrc-2-6",
-                                                  "sessionrc-expected",
+                                                  "sessionrc-expected-2-6",
                                                   "dockrc-expected");
 }