dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: remove the gimp-2-6 session compatibility test 

It was unreliable and a huge pain, and 2.6 is really old shit.
This commit is contained in:
Michael Natterer 2018-05-20 20:00:54 +02:00
parent 2e948d43d0
commit 4591452007
7 changed files with 0 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/tests/.gitignore vendored
View File

@ -9,7 +9,6 @@ test-gimpidtable*
test-gimptilebackendtilemanager*
test-layer-grouping*
test-save-and-export*
test-session-2-6-compatibility*
test-session-2-8-compatibility-multi-window*
test-session-2-8-compatibility-single-window*
test-single-window-mode*

1
app/tests/Makefile.am
View File

@ -22,7 +22,6 @@ TESTS = \
test-core \
test-gimpidtable \
test-save-and-export \
test-session-2-6-compatibility \
test-session-2-8-compatibility-multi-window \
test-session-2-8-compatibility-single-window \
test-single-window-mode \

3
app/tests/gimpdir/Makefile.am
View File

@ -5,14 +5,11 @@ SUBDIRS = \
EXTRA_DIST = \
dockrc \
dockrc-2-6 \
dockrc-2-8 \
dockrc-expected \
sessionrc \
sessionrc-2-6 \
sessionrc-2-8-multi-window \
sessionrc-2-8-single-window \
sessionrc-expected-2-6 \
sessionrc-expected-multi-window \
sessionrc-expected-single-window \
tags.xml

42
app/tests/gimpdir/dockrc-2-6
View File

@ -1,42 +0,0 @@
# recently closed docks
(GimpSessionInfo "Palettes - FG/BG - Images"
(position 585 115)
(size 200 575)
(open-on-exit)
(aux-info
(show-image-menu "false")
(follow-active-image "true"))
(gimp-dock
(book
(current-page 0)
(dockable "gimp-palette-list"
(tab-style preview)))
(book
(position 140)
(current-page 0)
(dockable "gimp-color-editor"
(tab-style preview)
(aux-info
(current-page "GimpColorSelect"))))
(book
(position 415)
(current-page 0)
(dockable "gimp-image-list"
(tab-style preview)))))
(GimpSessionInfo "Selection, Fonts"
(position 200 180)
(size 200 300)
(open-on-exit)
(aux-info
(show-image-menu "false")
(follow-active-image "true"))
(gimp-dock
(book
(current-page 1)
(dockable "gimp-selection-editor"
(tab-style icon))
(dockable "gimp-font-list"
(tab-style preview)))))
# end of recently closed docks

91
app/tests/gimpdir/sessionrc-2-6
View File

@ -1,91 +0,0 @@
# 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 "dock" "dock"
(position 565 170)
(size 210 535)
(open-on-exit)
(aux-info
(show-image-menu "false")
(follow-active-image "true"))
(dock
(book
(current-page 0)
(dockable "gimp-layer-list"
(tab-style icon)
(preview-size 32)))
(book
(position 289)
(current-page 0)
(dockable "gimp-brush-grid"
(tab-style preview)))))
(session-info "dock" "dock"
(position 140 290)
(size 405 300)
(open-on-exit)
(aux-info
(show-image-menu "false")
(follow-active-image "true"))
(dock
(book
(current-page 0)
(dockable "gimp-tool-options"
(tab-style icon)))))
(session-info "dock" "dock"
(position 795 45)
(size 200 265)
(open-on-exit)
(aux-info
(show-image-menu "true")
(follow-active-image "true"))
(dock
(book
(current-page 1)
(dockable "gimp-pattern-grid"
(tab-style preview))
(dockable "gimp-gradient-list"
(tab-style preview)))))
(session-info "dock" "dock"
(position 805 345)
(size 200 450)
(open-on-exit)
(aux-info
(show-image-menu "true")
(follow-active-image "true"))
(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 "Color History")
(zoom-factor "2.80"))))))
# Enable this when we have a way to handle that the toolbox size is
# likely to change due to the use of GDK_HINT_RESIZE_INC
# (session-info "toolbox" "dock"
# (position 15 35)
# (size 95 620)
# (open-on-exit))
(session-info "toplevel" "gimp-file-open-dialog"
(position 390 140)
(size 900 815))
(session-info "toplevel" "gimp-image-new-dialog"
(position 100 100))
(session-info "display" "gimp-empty-image-window"
(position 140 30)
(size 610 190))
(last-tip-shown 0)
# end of sessionrc

117
app/tests/gimpdir/sessionrc-expected-2-6
View File

@ -1,117 +0,0 @@
# 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)
(aux-info
(show-button-bar "true"))))
(book
(position 290)
(current-page 0)
(dockable "gimp-brush-grid"
(tab-style preview)
(aux-info
(show-button-bar "true"))))))
(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)
(aux-info
(show-button-bar "true"))))))
(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)
(aux-info
(show-button-bar "true")))
(dockable "gimp-gradient-list"
(tab-style preview)
(aux-info
(show-button-bar "true"))))))
(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)
(aux-info
(show-button-bar "true"))))
(book
(position 200)
(current-page 0)
(dockable "gimp-palette-editor"
(tab-style icon)
(aux-info
(show-button-bar "true")
(edit-active "true")
(current-data "Color History")
(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))
(session-info "toplevel"
(factory-entry "gimp-single-image-window")
(position 525 470)
(size 235 80)
(open-on-exit)
(aux-info
(left-docks-width "1")
(right-docks-width "3")
(maximized "no")))
(hide-docks no)
(single-window-mode yes)
(tabs-position 0)
(last-tip-shown 0)
# end of sessionrc

69
app/tests/test-session-2-6-compatibility.c
View File

@ -1,69 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 2011 Martin Nordholts
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <gegl.h>
#include <gtk/gtk.h>
#include "dialogs/dialogs-types.h"
#include "tests.h"
#include "gimp-test-session-utils.h"
#include "gimp-app-test-utils.h"
#define ADD_TEST(function) \
g_test_add_func ("/gimp-session-2-6-compatibility/" #function, function);
#define SKIP_TEST(function) \
g_test_add_func ("/gimp-session-2-6-compatibility/subprocess/" #function, function);
/**
* Tests that a sessionrc and dockrc from GIMP 2.6 is loaded and
* written (thus also interpreted) like we expect.
**/
static void
read_and_write_session_files (void)
{
gimp_test_session_load_and_write_session_files ("sessionrc-2-6",
"dockrc-2-6",
"sessionrc-expected-2-6",
"dockrc-expected",
FALSE /*single_window_mode*/);
}
int main(int argc, char **argv)
{
gimp_test_bail_if_no_display ();
gtk_test_init (&argc, &argv, NULL);
#ifdef HAVE_XVFB_RUN
ADD_TEST (read_and_write_session_files);
#else
SKIP_TEST (read_and_write_session_files);
#endif
/* Don't bother freeing stuff, the process is short-lived */
#ifdef HAVE_XVFB_RUN
return g_test_run ();
#else
return GIMP_EXIT_TEST_SKIPPED;
#endif
}