[tracker/sam/functional-test-fixes: 26/28] functional-tests: Improve 600-applications-camera.py

[Sam Thursfield <sthursfield src gnome org>]

commit df68865462634803b674f7a477e278717f84188f
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun Jul 20 15:25:55 2014 +0100

    functional-tests: Improve 600-applications-camera.py

 tests/functional-tests/600-applications-camera.py |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/tests/functional-tests/600-applications-camera.py 
b/tests/functional-tests/600-applications-camera.py
index f793665..7be69c1 100755
--- a/tests/functional-tests/600-applications-camera.py
+++ b/tests/functional-tests/600-applications-camera.py
@@ -76,9 +76,10 @@ class TrackerCameraPicturesApplicationTests (CommonTrackerApplicationTest):
         WHERE { <%s> nie:url ?_2 }
 
         INSERT { <%s> a       rdfs:Resource ;
-                      nie:url \"%s\"
+                      nie:url \"%s\" ;
+                      nie:isStoredAs <%s>
         }
-        """ % (fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, dest_fileuri)
+        """ % (fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, dest_fileuri, fileurn)
         self.tracker.update (insert)
         self.assertEquals (self.get_urn_count_by_url (dest_fileuri), 1)
 
@@ -134,9 +135,10 @@ class TrackerCameraPicturesApplicationTests (CommonTrackerApplicationTest):
         WHERE { <%s> nie:url ?_2 }
 
         INSERT { <%s> a       rdfs:Resource ;
-                      nie:url \"%s\"
+                      nie:url \"%s\" ;
+                      nie:isStoredAs <%s>
         }
-        """ % (fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, dest_fileuri)
+        """ % (fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, dest_fileuri, fileurn)
         self.tracker.update (insert)
         self.assertEquals (self.get_urn_count_by_url (dest_fileuri), 1)
 
@@ -219,9 +221,10 @@ class TrackerCameraVideosApplicationTests (CommonTrackerApplicationTest):
         WHERE { <%s> nie:url ?_2 }
 
         INSERT { <%s> a       rdfs:Resource ;
-                      nie:url \"%s\"
+                      nie:url \"%s\" ;
+                      nie:isStoredAs <%s>
         }
-        """ % (fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, dest_fileuri)
+        """ % (fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, dest_fileuri, fileurn)
         self.tracker.update (insert)
         self.assertEquals (self.get_urn_count_by_url (dest_fileuri), 1)
 
@@ -278,9 +281,10 @@ class TrackerCameraVideosApplicationTests (CommonTrackerApplicationTest):
         WHERE { <%s> nie:url ?_2 }
 
         INSERT { <%s> a       rdfs:Resource ;
-                      nie:url \"%s\"
+                      nie:url \"%s\" ;
+                      nie:isStoredAs <%s>
         }
-        """ % (fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, dest_fileuri)
+        """ % (fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, fileurn, dest_fileuri, fileurn)
         self.tracker.update (insert)
         self.assertEquals (self.get_urn_count_by_url (dest_fileuri), 1)