From 16a0344cebc825073d5bb2e0c27e1e18612cae54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 3 Sep 2015 17:28:52 -0700
Subject: [PATCH] Update RepoXMLHandlerTest to make tests pass
---
.../org/fdroid/fdroid/RepoXMLHandlerTest.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java b/F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java
index 6527eb3da..d929cc94d 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java
@@ -22,7 +22,7 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-public class RepoXMLHandlerTest extends AndroidTestCase implements ProgressListener {
+public class RepoXMLHandlerTest extends AndroidTestCase {
private static final String TAG = "RepoXMLHandlerTest";
private Repo repo;
@@ -610,10 +610,10 @@ public class RepoXMLHandlerTest extends AndroidTestCase implements ProgressListe
private void handlerTestSuite(Repo repo, RepoXMLHandler handler, int appCount, int apkCount) {
assertNotNull(handler);
- assertFalse(TextUtils.isEmpty(handler.getPubKey()));
- assertEquals(repo.pubkey.length(), handler.getPubKey().length());
- assertEquals(repo.pubkey, handler.getPubKey());
- assertFalse(fakePubkey.equals(handler.getPubKey()));
+ assertFalse(TextUtils.isEmpty(handler.getSigningCertFromIndexXml()));
+ assertEquals(repo.pubkey.length(), handler.getSigningCertFromIndexXml().length());
+ assertEquals(repo.pubkey, handler.getSigningCertFromIndexXml());
+ assertFalse(fakePubkey.equals(handler.getSigningCertFromIndexXml()));
assertFalse(TextUtils.isEmpty(handler.getName()));
assertEquals(repo.name.length(), handler.getName().length());
@@ -637,7 +637,7 @@ public class RepoXMLHandlerTest extends AndroidTestCase implements ProgressListe
try {
parser = SAXParserFactory.newInstance().newSAXParser();
XMLReader reader = parser.getXMLReader();
- RepoXMLHandler handler = new RepoXMLHandler(repo, this);
+ RepoXMLHandler handler = new RepoXMLHandler(repo);
reader.setContentHandler(handler);
String resName = "assets/" + indexFilename;
Log.i(TAG, "test file: " + getClass().getClassLoader().getResource(resName));
@@ -661,8 +661,4 @@ public class RepoXMLHandlerTest extends AndroidTestCase implements ProgressListe
return null;
}
- @Override
- public void onProgress(Event event) {
- // Log.i(TAG, "onProgress " + event.toString());
- }
}