Differential D2617 Diff 6380 libs/ui/tests/kis_derived_resources_test.cpp

Changeset View

Standalone View

View Options

libs/ui/tests/kis_derived_resources_test.cpp

Show All 27 Lines
28#include "kis_canvas_resource_provider.h" 28​#include "kis_canvas_resource_provider.h"
29#include <util.h> 29​#include <util.h>
30#include <KisMainWindow.h> 30​#include <KisMainWindow.h>
31#include <KisDocument.h> 31​#include <KisDocument.h>
32#include <KisPart.h> 32​#include <KisPart.h>
33#include <KisView.h> 33​#include <KisView.h>
34#include <KisViewManager.h> 34​#include <KisViewManager.h>
35#include <kis_paintop_settings.h> 35​#include <kis_paintop_settings.h>
36 36​#include <KoResourcePaths.h>
37 37​
38#include "testutil.h" 38​#include "testutil.h"
39 39​
40​void addResourceTypes()
41​{
42​ // All Krita's resource types
43​ KoResourcePaths::addResourceType("kis_pics", "data", "/pics/");
44​ KoResourcePaths::addResourceType("kis_images", "data", "/images/");
45​ KoResourcePaths::addResourceType("icc_profiles", "data", "/profiles/");
46​ KoResourcePaths::addResourceType("metadata_schema", "data", "/metadata/schemas/");
47​ KoResourcePaths::addResourceType("kis_brushes", "data", "/brushes/");
48​ KoResourcePaths::addResourceType("kis_taskset", "data", "/taskset/");
49​ KoResourcePaths::addResourceType("kis_taskset", "data", "/taskset/");
50​ KoResourcePaths::addResourceType("gmic_definitions", "data", "/gmic/");
51​ KoResourcePaths::addResourceType("kis_resourcebundles", "data", "/bundles/");
52​ KoResourcePaths::addResourceType("kis_defaultpresets", "data", "/defaultpresets/");
53​ KoResourcePaths::addResourceType("kis_paintoppresets", "data", "/paintoppresets/");
54​ KoResourcePaths::addResourceType("kis_workspaces", "data", "/workspaces/");
55​ KoResourcePaths::addResourceType("psd_layer_style_collections", "data", "/asl");
56​ KoResourcePaths::addResourceType("ko_patterns", "data", "/patterns/", true);
57​ KoResourcePaths::addResourceType("ko_gradients", "data", "/gradients/");
58​ KoResourcePaths::addResourceType("ko_gradients", "data", "/gradients/", true);
59​ KoResourcePaths::addResourceType("ko_palettes", "data", "/palettes/", true);
60​ KoResourcePaths::addResourceType("kis_shortcuts", "data", "/shortcuts/");
61​ KoResourcePaths::addResourceType("kis_actions", "data", "/actions");
62​ KoResourcePaths::addResourceType("icc_profiles", "data", "/color/icc");
63​ KoResourcePaths::addResourceType("ko_effects", "data", "/effects/");
64​ KoResourcePaths::addResourceType("tags", "data", "/tags/");
65​
66​}
67​
40 68​
41 69​
42void KisDerivedResourcesTest::test() 70​void KisDerivedResourcesTest::test()
43{ 71​{
44 KisDocument* doc = createEmptyDocument(); 72​ KisDocument* doc = createEmptyDocument();
73​
74​ addResourceTypes();
75​
45 KisMainWindow* mainWindow = KisPart::instance()->createMainWindow(); 76​ KisMainWindow* mainWindow = KisPart::instance()->createMainWindow();
46 QPointer<KisView> view = new KisView(doc, mainWindow->resourceManager(), mainWindow->actionCollection(), mainWindow); 77​ QPointer<KisView> view = new KisView(doc, mainWindow->resourceManager(), mainWindow->actionCollection(), mainWindow);
47 KisViewManager *viewManager = new KisViewManager(mainWindow, mainWindow->actionCollection()); 78​ KisViewManager *viewManager = new KisViewManager(mainWindow, mainWindow->actionCollection());
48 KoCanvasResourceManager *manager = viewManager->resourceProvider()->resourceManager(); 79​ KoCanvasResourceManager *manager = viewManager->resourceProvider()->resourceManager();
49 80​
50 QApplication::processEvents(); 81​ QApplication::processEvents();
51 82​
52 QString presetFileName = "autobrush_300px.kpp"; 83​ QString presetFileName = "autobrush_300px.kpp";
Show All 21 Lines
74 QCOMPARE(spy[0][1].value<KisPaintOpPresetSP>(), preset); 105​ QCOMPARE(spy[0][1].value<KisPaintOpPresetSP>(), preset);
75 106​
76 QCOMPARE(spy[1][0].toInt(), (int)KisCanvasResourceProvider::EraserMode); 107​ QCOMPARE(spy[1][0].toInt(), (int)KisCanvasResourceProvider::EraserMode);
77 QCOMPARE(spy[1][1].toBool(), false); 108​ QCOMPARE(spy[1][1].toBool(), false);
78 109​
79 QCOMPARE(spy[2][0].toInt(), (int)KisCanvasResourceProvider::LodAvailability); 110​ QCOMPARE(spy[2][0].toInt(), (int)KisCanvasResourceProvider::LodAvailability);
80 QCOMPARE(spy[2][1].toBool(), true); 111​ QCOMPARE(spy[2][1].toBool(), true);
81 112​
82 QCOMPARE(spy[3][0].toInt(), (int)KisCanvasResourceProvider::Opacity); 113​ QCOMPARE(spy[3][0].toInt(), (int)KisCanvasResourceProvider::Size);
eingermanAuthorUnsubmitted
Not Done

Dmitry, I see that several new signals are sent by setResource. I added them to the test. Please, check that that's expected behavior.

eingerman: Dmitry, I see that several new signals are sent by setResource. I added them to the test.
dkazakovUnsubmitted
Not Done

Looks good!

dkazakov: Looks good!
83 QCOMPARE(spy[3][1].toDouble(), 1.0); 114​ QCOMPARE(spy[3][1].toDouble(), 1.0);
84 115​
85 QCOMPARE(spy[4][0].toInt(), (int)KisCanvasResourceProvider::CurrentEffectiveCompositeOp); 116​ QCOMPARE(spy[4][0].toInt(), (int)KisCanvasResourceProvider::Flow);
86 QCOMPARE(spy[4][1].toString(), COMPOSITE_OVER); 117​ QCOMPARE(spy[4][1].toDouble(), 1.0);
118​
119​ QCOMPARE(spy[5][0].toInt(), (int)KisCanvasResourceProvider::Opacity);
120​ QCOMPARE(spy[5][1].toDouble(), 1.0);
121​
122​ QCOMPARE(spy[6][0].toInt(), (int)KisCanvasResourceProvider::CurrentEffectiveCompositeOp);
123​ QCOMPARE(spy[6][1].toString(), COMPOSITE_OVER);
87 124​
88 spy.clear(); 125​ spy.clear();
89 126​
90 preset->settings()->setPaintOpOpacity(0.8); 127​ preset->settings()->setPaintOpOpacity(0.8);
91 128​
92 QCOMPARE(spy.size(), 1); 129​ QCOMPARE(spy.size(), 1);
93 QCOMPARE(spy[0][0].toInt(), (int)KisCanvasResourceProvider::Opacity); 130​ QCOMPARE(spy[0][0].toInt(), (int)KisCanvasResourceProvider::Opacity);
94 QCOMPARE(spy[0][1].toDouble(), 0.8); 131​ QCOMPARE(spy[0][1].toDouble(), 0.8);
Show All 12 Lines