Skip to content

Commit

Permalink
Fix Atom Test with Read from File (googleapis#490)
Browse files Browse the repository at this point in the history
  • Loading branch information
@geri-m
geri-m committed Oct 15, 2018
1 parent a12b274 commit 30bb523
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 1,125 deletions.
5 changes: 3 additions & 2 deletions google-http-client-xml/src/main/java/com/google/api/client/xml/Xml.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ public static void parseElement(XmlPullParser parser, Object destination,
* @throws IOException
* @throws XmlPullParserException
*/

private static boolean parseElementInternal(XmlPullParser parser,
ArrayList<Type> context,
Object destination,
Expand Down Expand Up @@ -296,8 +297,8 @@ private static boolean parseElementInternal(XmlPullParser parser,
Field field;
ArrayValueMap arrayValueMap = new ArrayValueMap(destination);

// is stopped is required for the ATOM Parser, just in case the parsing isStopped
// during parsing at some time.
// is stopped is required for the ATOM Parser, just in case the parsing
// isStopped during parsing at some time.
boolean isStopped = false;
// TODO(yanivi): support Void type as "ignore" element/attribute
main: while (true) {
Expand Down
79 changes: 50 additions & 29 deletions google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
import java.util.List;
import org.junit.Assert;
Expand All @@ -44,14 +42,12 @@
public class AtomTest {


private static final String SAMPLE_FEED = "<?xml version=\"1.0\" encoding=\"utf-8\"?><feed xmlns=\"http://www.w3.org/2005/Atom\"> <title>Example Feed</title> <link " +
"href=\"http://example.org/\"/> <updated>2003-12-13T18:31:02Z</updated> <author> <name>John Doe</name> </author> " +
"<id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id> " +
"<entry> <title>Atom-Powered Robots Run Amok</title> <link href=\"http://example.org/2003/12/13/atom03\"/> " +
"<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> <updated>2003-12-13T18:30:02Z</updated> <summary>Some text.</summary> </entry>" +
"<entry> <title>Atom-Powered Robots Run Amok!</title> <link href=\"http://example.org/2003/12/13/atom02\"/> " +
"<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa62</id> <updated>2003-12-13T18:32:02Z</updated> <summary>Some other text.</summary> </entry>" +
"</feed>";
private static final String SAMPLE_FEED = "<?xml version=\"1.0\" encoding=\"utf-8\"?><feed xmlns=\"http://www.w3.org/2005/Atom\"> <title>Example Feed</title> <link " + "href" +
"=\"http://example.org/\"/> <updated>2003-12-13T18:31:02Z</updated> <author> <name>John Doe</name> </author> " + "<id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6" +
"</id> " + "<entry> <title>Atom-Powered Robots Run Amok</title> <link href=\"http://example.org/2003/12/13/atom03\"/> " + "<id>urn:uuid:1225c695-cfb8-4ebb-aaaa" +
"-80da344efa6a</id> <updated>2003-12-13T18:30:02Z</updated> <summary>Some text.</summary> </entry>" + "<entry> <title>Atom-Powered Robots Run Amok!</title> " +
"<link href=\"http://example.org/2003/12/13/atom02\"/> " + "<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa62</id> <updated>2003-12-13T18:32:02Z</updated> " +
"<summary>Some other text.</summary> </entry>" + "</feed>";

@SuppressWarnings("unchecked")
@Test
Expand All @@ -70,7 +66,8 @@ public void subtestSetSlugHeader(HttpHeaders headers, String expectedValue, Stri
if (value == null) {
assertNull(headers.get("Slug"));
} else {
Assert.assertArrayEquals(new String[]{expectedValue}, ((List<String>) headers.get("Slug")).toArray());
Assert.assertArrayEquals(new String[]{expectedValue},
((List<String>) headers.get("Slug")).toArray());
}
}

Expand All @@ -93,24 +90,22 @@ public void testAtomFeedParser() throws XmlPullParserException, IOException {
assertEquals("Example Feed", feed.title);
assertEquals("http://example.org/", feed.link.href);

FeedEntry entry1 = (FeedEntry)atomParser.parseNextEntry();
FeedEntry entry1 = (FeedEntry) atomParser.parseNextEntry();
//assertNotNull(feed.entry);
assertEquals("urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a", entry1.id);
assertEquals("2003-12-13T18:30:02Z", entry1.updated);
assertEquals("Some text.", entry1.summary);
assertEquals("Atom-Powered Robots Run Amok", entry1.title);
assertEquals("http://example.org/2003/12/13/atom03", entry1.link.href);

FeedEntry entry2 = (FeedEntry)atomParser.parseNextEntry();
FeedEntry entry2 = (FeedEntry) atomParser.parseNextEntry();
assertEquals("urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa62", entry2.id);
assertEquals("2003-12-13T18:32:02Z", entry2.updated);
assertEquals("Some other text.", entry2.summary);
assertEquals("Atom-Powered Robots Run Amok!", entry2.title);
assertEquals("http://example.org/2003/12/13/atom02", entry2.link.href);
FeedEntry entry3 = (FeedEntry)atomParser.parseNextEntry();

FeedEntry entry3 = (FeedEntry) atomParser.parseNextEntry();
assertNull(entry3);

}


Expand All @@ -128,24 +123,50 @@ public void testAtomFeedParserManual() throws XmlPullParserException, IOExceptio
@Test
public void testHeiseFeedParser() throws IOException, XmlPullParserException {
XmlPullParser parser = Xml.createParser();
ClassLoader classLoader = getClass().getClassLoader();
File atomFile = new File(classLoader.getResource("heise-atom.xml").getFile());
InputStream stream = new FileInputStream(atomFile);
Reader atomReader = new FileReader(atomFile);
parser.setInput(atomReader);
final String read = readFile("heise-atom.xml");
parser.setInput(new StringReader(read));
XmlNamespaceDictionary namespaceDictionary = new XmlNamespaceDictionary();
AbstractAtomFeedParser atomParser = new AtomFeedParser<Feed, FeedEntry>(namespaceDictionary,
parser, stream, Feed.class, FeedEntry.class);
Feed feed = (Feed)atomParser.parseFeed();
parser, new ByteArrayInputStream(read.getBytes()), Feed.class, FeedEntry.class);
Feed feed = (Feed) atomParser.parseFeed();
assertNotNull(feed);

int counter = 0;
FeedEntry entry = (FeedEntry)atomParser.parseNextEntry();
assertNotNull(entry);
while (atomParser.parseNextEntry() != null) {
counter++;
}

// TODO: Iterative over Entries.
atomReader.close();
stream.close();
assertEquals(62, counter);

}

/**
* Taken from {@url https://stackoverflow.com/questions/326390/how-do-i-create-a-java-string-from-the-contents-of-a-file}
*
* We need to method to read the file into a string, as otherwise, the parsing does not work properly.
*
* @param file
* @return
* @throws IOException
*/

//
private String readFile(String file) throws IOException {
ClassLoader classLoader = getClass().getClassLoader();
BufferedReader reader = new BufferedReader(new FileReader(classLoader.getResource(file)
.getFile()));
String line;
StringBuilder stringBuilder = new StringBuilder();

try {
while ((line = reader.readLine()) != null) {
stringBuilder.append(line);
}

return stringBuilder.toString();
} finally {
reader.close();
}
}

public static class Feed {
Expand Down
Loading

0 comments on commit 30bb523

Please sign in to comment.