Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow Enums in DataMaps #505

Merged
merged 19 commits into from
Nov 6, 2018
Merged

Allow Enums in DataMaps #505

merged 19 commits into from
Nov 6, 2018

Conversation

geri-m
Copy link
Contributor

@geri-m geri-m commented Oct 28, 2018

Fixes #504.

  • Fix issue in DataMap that caused the problem
  • A bunch of tests was added; not only for Enum-Array issue, but other data structures as well
  • Replace deprecated junit.framework and use annotations

@geri-m geri-m requested a review from a team as a code owner October 28, 2018 11:05
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Oct 28, 2018
elharo
elharo reviewed Oct 29, 2018
View reviewed changes
Copy link
Contributor

@elharo elharo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly nits

google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated
ClassLoader classLoader = getClass().getClassLoader();
BufferedReader reader = new BufferedReader(new FileReader(classLoader.getResource(file)
.getFile()));
String line;

This comment was marked as spam.

Sign in to view

google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated
}

/**
* Author Element as part of the {@link Feed} Element to map the XML to

This comment was marked as spam.

Sign in to view

google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated
}

/**
* Link Element as part of the {@link Feed} Element to map the XML to

This comment was marked as spam.

Sign in to view

google-http-client-xml/src/test/java/com/google/api/client/xml/XmlEnumTest.java Show resolved Hide resolved
@geri-m geri-m changed the title Issue 504 Allow Enums in DataMaps Oct 29, 2018
elharo
elharo reviewed Oct 31, 2018
View reviewed changes
google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/XmlEnumTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/XmlEnumTest.java Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/XmlEnumTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/XmlEnumTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/XmlEnumTest.java Outdated Show resolved Hide resolved
google-http-client-xml/src/test/java/com/google/api/client/xml/XmlEnumTest.java Outdated Show resolved Hide resolved
@chingor13 chingor13 added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Oct 31, 2018
@kokoro-team kokoro-team removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Oct 31, 2018
@chingor13 chingor13 added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Nov 2, 2018
@kokoro-team kokoro-team removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Nov 2, 2018
@chingor13 chingor13 added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Nov 6, 2018
@kokoro-team kokoro-team removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Nov 6, 2018
@chingor13 chingor13 dismissed elharo’s stale review November 6, 2018 23:17

All changes requested have been resolved.

@chingor13 chingor13 merged commit 287cca1 into googleapis:master Nov 6, 2018
chingor13 added a commit that referenced this pull request Nov 7, 2018
@chingor13
Revert "Allow Enums in DataMaps (#505)"
5a0de5d 
This reverts commit 287cca1.
@geri-m geri-m deleted the issue-504 branch November 7, 2018 16:02
@chingor13 chingor13 mentioned this pull request Nov 9, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elharo elharo elharo left review comments

@chingor13 chingor13 chingor13 approved these changes

Assignees
No one assigned
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@geri-m @chingor13 @elharo @googlebot @kokoro-team