From 938c992023bb95ae1cae6e0677717e78e1a84a45 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Wed, 4 Nov 2015 21:43:34 +1100 Subject: [PATCH] Comment out tests for future, desirable behaviour. Leave only the ones which align with the current multi-repo behaviour that F-Droid exhibits. The commented out tests can be uncommented in the future when working on proper multi-repo support. --- .../test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java b/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java index 9a02c5818..19c187d68 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java @@ -308,6 +308,10 @@ public class MultiRepoUpdaterTest extends InstrumentationTestCase { persister.save(new ArrayList(0)); } + /* At time fo writing, the following tests did not pass. This is because the multi-repo support + in F-Droid was not sufficient. When working on proper multi repo support than this should be + ucommented and all these tests should pass: + public void testCorrectConflictingThenMainThenArchive() throws UpdateException { assertEmpty(); if (updateConflicting() && updateMain() && updateArchive()) { @@ -356,6 +360,8 @@ public class MultiRepoUpdaterTest extends InstrumentationTestCase { } } + */ + public void testAcceptableConflictingThenMainThenArchive() throws UpdateException { assertEmpty(); if (updateConflicting() && updateMain() && updateArchive()) {