fixing TestRememberAttributesController

Author: VitorVieiraZ

app/attributes/rememberattributescontroller.cpp

@@ -64,21 +64,15 @@ void RememberAttributesController::storeFeature( const FeatureLayerPair &pair )
   const QgsFields &fields = layer->fields();
   for ( int fieldIndex = 0; fieldIndex < fields.count(); fieldIndex++ )
   {
-    QString fieldEnabledKey = keyForField( "enabled", layer, fieldIndex );
-    bool fieldEnabled = settings.value( fieldEnabledKey, false ).toBool();
-    bool qgisReuseLastValue = layer->editFormConfig().reuseLastValue( ( fieldIndex ) );
-
-    if ( rememberValuesAllowed() ? fieldEnabled : qgisReuseLastValue ) //we want to keep QGIS's reuseLastValue independent when global switch off
-    {
-      QString fieldValueKey = keyForField( "value", layer, fieldIndex );
-      QVariant value = feature.attribute( fieldIndex );
-      settings.setValue( fieldValueKey, value );
-    }
+    QString fieldValueKey = keyForField( "value", layer, fieldIndex );
+    QVariant value = feature.attribute( fieldIndex );
+    settings.setValue( fieldValueKey, value );
   }
 
   settings.endGroup();
 }
 
+
 bool RememberAttributesController::shouldRememberValue( const QgsVectorLayer *layer, int fieldIndex ) const
 {
   if ( !layer )

app/test/testrememberattributescontroller.cpp

@@ -15,12 +15,17 @@
 
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
-
 #include "featurelayerpair.h"
 #include "rememberattributescontroller.h"
+#include "appsettings.h"
+#include "activelayer.h"
+#include "localprojectsmanager.h"
+#include "activeproject.h"
 
 void TestRememberAttributesController::init()
 {
+  QSettings settings;
+  settings.clear();
 }
 
 void TestRememberAttributesController::cleanup()
@@ -46,6 +51,12 @@ void TestRememberAttributesController::noFeatureTest()
 void TestRememberAttributesController::storedFeatureTest()
 {
   RememberAttributesController controller;
+  AppSettings appSettings;
+  ActiveLayer activeLayer;
+  LocalProjectsManager localProjectsManager( QDir::tempPath() );
+  ActiveProject activeProject( appSettings, activeLayer, localProjectsManager, this );
+  controller.setActiveProject( &activeProject );
+
   controller.setRememberValuesAllowed( true );
 
   std::unique_ptr<QgsVectorLayer> layer(
@@ -137,7 +148,13 @@ void TestRememberAttributesController::storedFeatureTest()
   QCOMPARE( val, 3 );
 
   // ok now user switched to completely different project
-  controller.reset();
+
+  // reset settings
+  QSettings settings;
+  settings.beginGroup( RememberAttributesController::CACHED_ATTRIBUTES_GROUP );
+  settings.remove( "" );
+  settings.endGroup();
+
   QCOMPARE( controller.shouldRememberValue( layer.get(), 0 ), false );
   QCOMPARE( controller.rememberedValue( layer.get(), 0, val ), false );
   QCOMPARE( controller.shouldRememberValue( layer.get(), 1 ), false );