Modified: subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=1494817&r1=1494816&r2=1494817&view=diff ============================================================================== --- subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original) +++ subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Thu Jun 20 00:19:28 2013 @@ -145,6 +145,16 @@ class SVNTests extends TestCase protected static String rootUrl; /** + * Username to use in tests + */ + protected final static String USERNAME = "jrandom"; + + /** + * Password to use in tests + */ + protected final static String PASSWORD = "rayjandom"; + + /** * Create a JUnit <code>TestCase</code> instance. */ protected SVNTests() @@ -276,7 +286,7 @@ class SVNTests extends TestCase this.client = new SVNClient(); this.client.notification2(new MyNotifier()); this.client.setPrompt(new DefaultPromptUserPassword()); - this.client.username("jrandom"); + this.client.username(USERNAME); this.client.setProgressCallback(new DefaultProgressListener()); this.client.setConfigDirectory(this.conf.getAbsolutePath()); this.expectedCommitItems = new HashMap<String, MyCommitItem>(); @@ -284,7 +294,7 @@ class SVNTests extends TestCase /** * the default prompt : never prompts the user, provides defaults answers */ - private static class DefaultPromptUserPassword implements UserPasswordCallback + protected static class DefaultPromptUserPassword implements UserPasswordCallback { public int askTrustSSLServer(String info, boolean allowPermanently) @@ -304,12 +314,12 @@ class SVNTests extends TestCase public String getPassword() { - return "rayjandom"; + return PASSWORD; } public String getUsername() { - return "jrandom"; + return USERNAME; } public boolean prompt(String realm, String username)
Modified: subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1494817&r1=1494816&r2=1494817&view=diff ============================================================================== --- subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java (original) +++ subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Thu Jun 20 00:19:28 2013 @@ -2176,6 +2176,7 @@ public class BasicTests extends SVNTests * are no revisions to return. * @since 1.5 */ + @SuppressWarnings("unchecked") private long[] getMergeinfoRevisions(int kind, String pathOrUrl, Revision pegRevision, String mergeSourceUrl, @@ -3039,10 +3040,12 @@ public class BasicTests extends SVNTests conflict.getSrcLeftVersion().getPathInRepos(), tcTest.getUrl() + "/A/B/E/alpha"); assertEquals(conflict.getSrcLeftVersion().getPegRevision(), 1L); - assertEquals(conflict.getSrcRightVersion().getNodeKind(), NodeKind.none); - assertEquals(conflict.getSrcRightVersion().getReposURL(), tcTest.getUrl()); - assertEquals(conflict.getSrcRightVersion().getPegRevision(), 2L); - + if (conflict.getSrcRightVersion() != null) + { + assertEquals(conflict.getSrcRightVersion().getNodeKind(), NodeKind.none); + assertEquals(conflict.getSrcRightVersion().getReposURL(), tcTest.getUrl()); + assertEquals(conflict.getSrcRightVersion().getPegRevision(), 2L); + } } /** @@ -3240,6 +3243,7 @@ public class BasicTests extends SVNTests * @throws Throwable * @since 1.5 */ + @SuppressWarnings("unchecked") public void testCommitRevprops() throws Throwable { @@ -3346,6 +3350,7 @@ public class BasicTests extends SVNTests // change made to this class. private static final long serialVersionUID = 1L; + @SuppressWarnings("unchecked") public void onSummary(DiffSummary descriptor) { super.put(descriptor.getPath(), descriptor); @@ -3355,6 +3360,7 @@ public class BasicTests extends SVNTests private class MyChangelistCallback extends HashMap implements ChangelistCallback { + @SuppressWarnings("unchecked") public void doChangelist(String path, String changelist) { if (super.containsKey(path)) Modified: subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java?rev=1494817&r1=1494816&r2=1494817&view=diff ============================================================================== --- subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java (original) +++ subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java Thu Jun 20 00:19:28 2013 @@ -47,6 +47,7 @@ public class RunTests * * @return The complete test suite. */ + @SuppressWarnings("unchecked") public static TestSuite suite() { TestSuite suite = new SVNTestSuite(); @@ -75,9 +76,8 @@ public class RunTests Constructor ctor = clazz.getDeclaredConstructor(argTypes); methodName = methodName.substring(i + 1); - String[] args = { methodName }; testCases[testCaseIndex++] = - (TestCase) ctor.newInstance(args); + (TestCase) ctor.newInstance(methodName); } catch (Exception e) { Modified: subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java?rev=1494817&r1=1494816&r2=1494817&view=diff ============================================================================== --- subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java (original) +++ subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java Thu Jun 20 00:19:28 2013 @@ -438,6 +438,7 @@ class SVNTests extends TestCase * @param stateFlags expected commit state flags * (see CommitItemStateFlags) */ + @SuppressWarnings("unchecked") protected void addExpectedCommitItem(String workingCopyPath, String baseUrl, String itemPath, Modified: subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java?rev=1494817&r1=1494816&r2=1494817&view=diff ============================================================================== --- subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java (original) +++ subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java Thu Jun 20 00:19:28 2013 @@ -627,6 +627,7 @@ public class WC * @param path the path of the item. * @param content the content of the item. A null signals a directory. */ + @SuppressWarnings("unchecked") private Item(String path, String content) { myPath = path; @@ -639,6 +640,7 @@ public class WC * @param source the copy source. * @param owner the WC of the copy */ + @SuppressWarnings("unchecked") private Item(Item source, WC owner) { myPath = source.myPath;
