Skip to content
Snippets Groups Projects
Commit d0342f9a authored by akwizgran's avatar akwizgran
Browse files

Merge branch 'junit-4-not-3' into 'master' 

Don't mix JUnit 4's @Test with JUnit3's TestCase.

This is the world's most boring merge request. Android Studio was complaining about using JUnit 4's @Test annotations with JUnit 3's TestCase, so I fixed it.

Most of the changes come from Android Studio organising imports in a different order from Eclipse.

See merge request !8
parents a5afa2ef 123dff3a
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 91 additions and 75 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment