From 645f60695b6158501e9106ec5d9824c7e5489a6a Mon Sep 17 00:00:00 2001
From: Irina Peshinskaya <ipeshinskaya@sipwise.com>
Date: Tue, 26 Apr 2016 13:32:29 +0300
Subject: [PATCH] MT#12347 Improve fake data clearance

Change-Id: I57d9a6bf1471e06503f0fec342287379c38807eb
---
 t/api-rest/api-peeringservers.t |  3 ++-
 t/api-rest/api-preferences.t    |  4 +++-
 t/lib/Test/FakeData.pm          | 42 +++++++++++++++++++++++----------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/t/api-rest/api-peeringservers.t b/t/api-rest/api-peeringservers.t
index ef2921a7d0..2b9eb955ea 100644
--- a/t/api-rest/api-peeringservers.t
+++ b/t/api-rest/api-peeringservers.t
@@ -49,6 +49,7 @@ $test_machine->check_get2put();
 $test_machine->check_bundle();
 $test_machine->clear_test_data_all();
 
+undef $test_machine;
+undef $fake_data;
 done_testing;
-
 # vim: set tabstop=4 expandtab:
diff --git a/t/api-rest/api-preferences.t b/t/api-rest/api-preferences.t
index 00c7360aee..9527cda233 100644
--- a/t/api-rest/api-preferences.t
+++ b/t/api-rest/api-preferences.t
@@ -95,9 +95,11 @@ foreach my $api (@apis){
     (undef, $preferences_put->{content}) = $test_machine->request_put($preferences_old,$preferences->{uri});
 }
 
+$test_machine->clear_test_data_all();
+undef $fake_data;
+undef $test_machine;
 done_testing;
 
-
 #----------------- aux
 sub get_preference_existen_value{
     my $preference = shift;
diff --git a/t/lib/Test/FakeData.pm b/t/lib/Test/FakeData.pm
index 15b9bcf563..d2e1aa6807 100644
--- a/t/lib/Test/FakeData.pm
+++ b/t/lib/Test/FakeData.pm
@@ -52,12 +52,7 @@ has 'FLAVOUR' => (
     is => 'rw',
     isa => 'Str',
 );
-#TODO: optimization - pre load and predelete should be done only for required collections and dependencies
-has 'work_collections' => (
-    is => 'rw',
-    isa => 'ArrayRef',
-    default => sub { [] },
-);
+          
 sub build_data_default{
     return {
         'products' => [
@@ -407,7 +402,6 @@ sub clear_cached_data{
     delete @{$self->loaded}{@collections};
     delete @{$self->created}{@collections};
     delete @{$self->searched}{@collections};
-
 }
 sub set_data_from_script{
     my($self, $data_in)  = @_;
@@ -471,14 +465,18 @@ sub get_id{
 }
 sub get_existent_item{
     my($self, $collection_name)  = @_;
-    my $item = $self->created->{$collection_name}->[0]
+    my $item = $self->created->{$collection_name}->{values}->[0]
         || $self->loaded->{$collection_name}->[0];
     return $item
 }
 sub get_existent_id{
     my($self, $collection_name)  = @_;
-    my $id = $self->test_machine->get_id_from_created($self->created->{$collection_name}->[0])
-        || $self->test_machine->get_id_from_created($self->loaded->{$collection_name}->[0]);
+    my $id;
+    if(exists $self->created->{$collection_name}){
+        $id = $self->test_machine->get_id_from_created($self->created->{$collection_name}->{values}->[0]);
+    }elsif(exists $self->loaded->{$collection_name}){
+        $id = $self->test_machine->get_id_from_created($self->loaded->{$collection_name}->[0]);
+    }
     return $id
 }
 sub collection_id_exists{
@@ -537,7 +535,7 @@ sub create{
     }else{
         $test_machine->check_create_correct(1);
     }
-    $self->created->{$collection_name} = [values %{$test_machine->DATA_CREATED->{ALL}}];
+    $self->created->{$collection_name} = {values=>[values %{$test_machine->DATA_CREATED->{ALL}}], order => scalar keys %{$self->created}};
 
     if($self->data->{$collection_name}->{process_cycled}){
         #parents is a flat description of the dependency hierarchy
@@ -553,7 +551,7 @@ sub create{
             delete $parents_temp{$last_parent};
             #short note: we don't need update already created collections, because we fell in recursion before creation, 
             #so no collection keeps wrong, redundant first item reference
-            #so all we need - update "created" field for further get_existent_id, which will be aclled on exit from this "create" function 
+            #so all we need - update "created" field for further get_existent_id, which will be called on exit from this "create" function 
             $self->create($last_parent,{%parents_temp} );
         }else{
             my $uri = $test_machine->get_uri_collection($last_parent).$self->get_existent_id($last_parent);
@@ -570,9 +568,27 @@ sub create{
     }
     return $self->get_existent_id($collection_name);
 }
+sub clear_test_data_all{
+    my $self = shift;
+        ( 'HASH' eq ref $self->created ) 
+            and ( $self->test_machine->clear_test_data_all(
+                [ 
+                    map {
+                        $_->{location}
+                    } 
+                    map {
+                        @{$_->{values}}
+                    }
+                    sort{
+                        $b->{order} <=> $a->{order}
+                    } 
+                    (values %{$self->created})
+                ]
+            ) );
+}
 sub DEMOLISH{
     my($self) = @_;
-    ( 'ARRAY' eq ref $self->created ) and ( $self->test_machine->clear_test_data_all([ map {$_->{location}} @$self->created ]) );
+    $self->clear_test_data_all();
     if( keys %{$self->undeletable} ){
         print "We have test items, which can't delete through API:\n";
         print Dumper [ sort { $a cmp $b } keys %{$self->undeletable} ];