[folks/648811-dummy-backend-rebase1: 42/48] dummy: Remove irrelevant changes



commit 9a4b4c95c845a28f7fb523c503e4bd7cebaabe27
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Thu Nov 7 09:02:43 2013 +0000

    dummy: Remove irrelevant changes

 tests/folks/aggregation.vala             |    1 -
 tests/key-file/individual-retrieval.vala |    1 -
 tests/lib/test-case.vala                 |    2 +-
 tests/lib/test-utils.vala                |   69 ------------------------------
 4 files changed, 1 insertions(+), 72 deletions(-)
---
diff --git a/tests/folks/aggregation.vala b/tests/folks/aggregation.vala
index 0176398..22946bb 100644
--- a/tests/folks/aggregation.vala
+++ b/tests/folks/aggregation.vala
@@ -1362,4 +1362,3 @@ public int main (string[] args)
 
   return 0;
 }
-
diff --git a/tests/key-file/individual-retrieval.vala b/tests/key-file/individual-retrieval.vala
index d1a1f51..42ca874 100644
--- a/tests/key-file/individual-retrieval.vala
+++ b/tests/key-file/individual-retrieval.vala
@@ -155,4 +155,3 @@ public int main (string[] args)
 
   return 0;
 }
-
diff --git a/tests/lib/test-case.vala b/tests/lib/test-case.vala
index e739fbf..a174f64 100644
--- a/tests/lib/test-case.vala
+++ b/tests/lib/test-case.vala
@@ -59,7 +59,7 @@ public abstract class Folks.TestCase : Object
 
       if (Environment.get_variable ("FOLKS_TESTS_INSTALLED") == null)
         {
-          string[] locations = {              
+          string[] locations = {
               Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/key-file/.libs/key-file.so",
               Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/dummy/.libs/dummy.so",
           };
diff --git a/tests/lib/test-utils.vala b/tests/lib/test-utils.vala
index 129bc0e..c45e527 100644
--- a/tests/lib/test-utils.vala
+++ b/tests/lib/test-utils.vala
@@ -336,73 +336,4 @@ public class Folks.TestUtils
           return BuildConf.ABS_TOP_BUILDDIR + "/tests/" + filename;
         }
     }
-
-  /**
-   * TODO
-   *
-   * @since UNRELEASED
-   */
-  public static bool personas_set_equals (Set<Persona> actual_personas,
-      string[] expected_personas)
-    {
-      if (actual_personas.size != expected_personas.length)
-        {
-          return false;
-        }
-
-      foreach (var p in actual_personas)
-        {
-          if (!(p.uid in expected_personas))
-            {
-              return false;
-            }
-        }
-
-      return true;
-    }
-
-  /**
-   * TODO
-   *
-   * @since UNRELEASED
-   */
-  public static bool individuals_map_equals (
-      Map<string, Individual> actual_individuals, string[] expected_individuals)
-    {
-      if (actual_individuals.size != expected_individuals.length)
-        {
-          return false;
-        }
-
-      var _actual_individuals = new HashSet<Individual> ();
-      _actual_individuals.add_all (actual_individuals.values);
-      assert (_actual_individuals.size == actual_individuals.size);
-
-      var _expected_individuals = new HashSet<string> ();
-      foreach (var i in expected_individuals)
-        {
-          _expected_individuals.add (i);
-        }
-
-      foreach (var i in _actual_individuals)
-        {
-          var actual_personas = i.personas;
-
-          foreach (var _expected_personas in _expected_individuals)
-            {
-              var expected_personas = _expected_personas.split (",");
-
-              if (TestUtils.personas_set_equals (actual_personas,
-                  expected_personas) == true)
-                {
-                  _expected_individuals.remove (_expected_personas);
-                  break;
-                }
-            }
-
-          return false;
-        }
-
-      return true;
-    }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]