You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/02/26 19:03:26 UTC
svn commit: r916773 - in
/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl:
BasicTests.java SVNTests.java WC.java
Author: hwright
Date: Fri Feb 26 18:03:26 2010
New Revision: 916773
URL: http://svn.apache.org/viewvc?rev=916773&view=rev
Log:
JavaHL: Type-parameterize the test code.
[ subversion/bindings/javahl/tests/ ]
* org/apache/subversion/javahl/BasicTests.java,
org/apache/subversion/javahl/SVNTests.java,
org/apache/subversion/javahl/WC.java:
Add type parameters to Maps, Lists, and Sets.
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=916773&r1=916772&r2=916773&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Fri Feb 26 18:03:26 2010
@@ -763,7 +763,7 @@
MyProplistCallback callback = new MyProplistCallback();
client.properties(itemPath, null, null, Depth.empty, null, callback);
- Map propMap = callback.getProperties(itemPath);
+ Map<String, String> propMap = callback.getProperties(itemPath);
Iterator it = propMap.keySet().iterator();
while (it.hasNext())
@@ -2314,7 +2314,7 @@
Mergeinfo mergeInfo = client.getMergeinfo(targetPath, Revision.HEAD);
assertNotNull("Missing merge info on '" + targetPath + '\'',
mergeInfo);
- List ranges = mergeInfo.getRevisions(mergeSrc);
+ List<RevisionRange> ranges = mergeInfo.getRevisions(mergeSrc);
assertTrue("Missing merge info for source '" + mergeSrc + "' on '" +
targetPath + '\'', ranges != null && !ranges.isEmpty());
RevisionRange range = (RevisionRange) ranges.get(0);
@@ -2351,10 +2351,10 @@
{
class Callback implements LogMessageCallback {
- List revList = new ArrayList();
+ List<Long> revList = new ArrayList<Long>();
public void singleMessage(ChangePath[] changedPaths, long revision,
- Map revprops, boolean hasChildren) {
+ Map<String, String> revprops, boolean hasChildren) {
revList.add(new Long(revision));
}
@@ -3444,17 +3444,17 @@
class RevpropLogCallback implements LogMessageCallback
{
- Map revprops;
+ Map<String, String> revprops;
public void singleMessage(ChangePath[] changedPaths,
long revision,
- Map revprops,
+ Map<String, String> revprops,
boolean hasChildren)
{
this.revprops = revprops;
}
- public Map getRevprops()
+ public Map<String, String> getRevprops()
{
return revprops;
}
@@ -3476,7 +3476,7 @@
CommitItemStateFlags.TextMods);
// commit the changes, with some extra revprops
- Map revprops = new HashMap();
+ Map<String, String> revprops = new HashMap<String, String>();
revprops.put("kfogel", "rockstar");
revprops.put("cmpilato", "theman");
assertEquals("wrong revision number from commit",
@@ -3496,11 +3496,11 @@
false, false, false,
new String[] {"kfogel", "cmpilato"}, 0,
callback);
- Map fetchedProps = callback.getRevprops();
+ Map<String, String> fetchedProps = callback.getRevprops();
assertEquals("wrong number of fetched revprops", revprops.size(),
fetchedProps.size());
- Set keys = fetchedProps.keySet();
+ Set<String> keys = fetchedProps.keySet();
for (Iterator it = keys.iterator(); it.hasNext(); )
{
String key = (String) it.next();
@@ -3545,7 +3545,7 @@
* A DiffSummaryReceiver implementation which collects all DiffSummary
* notifications.
*/
- private static class DiffSummaries extends HashMap
+ private static class DiffSummaries extends HashMap<String, DiffSummary>
implements DiffSummaryCallback
{
// Update the serialVersionUID when there is a incompatible
@@ -3558,7 +3558,7 @@
}
}
- private class MyChangelistCallback extends HashMap
+ private class MyChangelistCallback extends HashMap<String, List<String>>
implements ChangelistCallback
{
public void doChangelist(String path, String changelist)
@@ -3566,21 +3566,21 @@
if (super.containsKey(path))
{
// Append the changelist to the existing list
- List changelistList = (List) super.get(path);
+ List<String> changelistList = super.get(path);
changelistList.add(changelist);
}
else
{
// Create a new changelist with that list
- List changelistList = new ArrayList();
+ List<String> changelistList = new ArrayList<String>();
changelistList.add(changelist);
super.put(path, changelistList);
}
}
- public List get(String path)
+ public List<String> get(String path)
{
- return (List) super.get(path);
+ return super.get(path);
}
}
@@ -3598,22 +3598,23 @@
private class MyProplistCallback implements ProplistCallback
{
- Map propMap = new HashMap();
+ Map<String, Map<String, String>> propMap =
+ new HashMap<String, Map<String, String>>();
- public void singlePath(String path, Map props)
+ public void singlePath(String path, Map<String, String> props)
{
propMap.put(path, props);
}
- public Map getProperties(String path)
+ public Map<String, String> getProperties(String path)
{
- return (Map) propMap.get(path);
+ return propMap.get(path);
}
}
private class MyStatusCallback implements StatusCallback
{
- private List statuses = new ArrayList();
+ private List<Status> statuses = new ArrayList<Status>();
public void doStatus(Status status)
{
@@ -3622,7 +3623,7 @@
public Status[] getStatusArray()
{
- return (Status[]) statuses.toArray(new Status[statuses.size()]);
+ return statuses.toArray(new Status[statuses.size()]);
}
}
@@ -3633,16 +3634,17 @@
{
class MyProplistCallback implements ProplistCallback
{
- Map propMap = new HashMap();
+ Map<String, Map<String, String>> propMap =
+ new HashMap<String, Map<String, String>>();
- public void singlePath(String path, Map props)
+ public void singlePath(String path, Map<String, String> props)
{
propMap.put(path, props);
}
- public Map getProperties(String path)
+ public Map<String, String> getProperties(String path)
{
- return (Map) propMap.get(path);
+ return propMap.get(path);
}
}
@@ -3650,7 +3652,7 @@
client.properties(path, revision, revision, depth, changelists,
callback);
- Map propMap = callback.getProperties(path);
+ Map<String, String> propMap = callback.getProperties(path);
if (propMap == null)
return new PropertyData[0];
PropertyData[] props = new PropertyData[propMap.size()];
@@ -3675,7 +3677,7 @@
{
class MyListCallback implements ListCallback
{
- private List dirents = new ArrayList();
+ private List<DirEntry> dirents = new ArrayList<DirEntry>();
public void doEntry(DirEntry dirent, Lock lock)
{
@@ -3707,8 +3709,7 @@
public DirEntry[] getDirEntryArray()
{
- return (DirEntry[]) dirents.toArray(
- new DirEntry[dirents.size()]);
+ return dirents.toArray(new DirEntry[dirents.size()]);
}
}
@@ -3725,7 +3726,7 @@
{
class MyInfoCallback implements InfoCallback
{
- private List infos = new ArrayList();
+ private List<Info2> infos = new ArrayList<Info2>();
public void singleInfo(Info2 info)
{
@@ -3734,7 +3735,7 @@
public Info2[] getInfoArray()
{
- return (Info2[]) infos.toArray(new Info2[infos.size()]);
+ return infos.toArray(new Info2[infos.size()]);
}
}
@@ -3754,11 +3755,11 @@
{
class MyLogMessageCallback implements LogMessageCallback
{
- private List messages = new ArrayList();
+ private List<LogMessage> messages = new ArrayList<LogMessage>();
public void singleMessage(ChangePath[] changedPaths,
long revision,
- Map revprops,
+ Map<String, String> revprops,
boolean hasChildren)
{
String author = (String) revprops.get("svn:author");
@@ -3784,8 +3785,7 @@
public LogMessage[] getMessages()
{
- return (LogMessage[]) messages.toArray(
- new LogMessage[messages.size()]);
+ return messages.toArray(new LogMessage[messages.size()]);
}
}
@@ -3827,7 +3827,7 @@
{
/** list of blame records (lines) */
- private List lines = new ArrayList();
+ private List<BlameLine> lines = new ArrayList<BlameLine>();
public void singleLine(Date changed, long revision, String author,
String line)
@@ -3846,8 +3846,10 @@
line));
}
- public void singleLine(long lineNum, long rev, Map revProps,
- long mergedRevision, Map mergedRevProps,
+ public void singleLine(long lineNum, long rev,
+ Map<String, String> revProps,
+ long mergedRevision,
+ Map<String, String> mergedRevProps,
String mergedPath, String line,
boolean localChange)
throws ClientException
@@ -3902,7 +3904,7 @@
{
return null;
}
- return (BlameLine) this.lines.get(i);
+ return this.lines.get(i);
}
/**
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=916773&r1=916772&r2=916773&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Fri Feb 26 18:03:26 2010
@@ -124,7 +124,7 @@
* the map of all items expected to be received by the callback for the
* log message. After each commit, this will be cleared
*/
- protected Map expectedCommitItems;
+ protected Map<String, MyCommitItem> expectedCommitItems;
/**
* Common root directory for all tests. Can be set by the command
@@ -274,7 +274,7 @@
this.client.username("jrandom");
this.client.password("rayjandom");
this.client.setConfigDirectory(this.conf.getAbsolutePath());
- this.expectedCommitItems = new HashMap();
+ this.expectedCommitItems = new HashMap<String, MyCommitItem>();
}
/**
@@ -915,7 +915,7 @@
private class MyStatusCallback implements StatusCallback
{
- private List statuses = new ArrayList();
+ private List<Status> statuses = new ArrayList<Status>();
public void doStatus(Status status)
{
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java?rev=916773&r1=916772&r2=916773&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java Fri Feb 26 18:03:26 2010
@@ -43,7 +43,7 @@
* the map of the items of the working copy. The relative path is the key
* for the map
*/
- Map items = new HashMap();
+ Map<String, Item> items = new HashMap<String, Item>();
/**
* Generate from the expected state of the working copy a new working copy
@@ -53,10 +53,10 @@
public void materialize(File root) throws IOException
{
// generate all directories first
- Iterator it = items.values().iterator();
+ Iterator<Item> it = items.values().iterator();
while (it.hasNext())
{
- Item item = (Item) it.next();
+ Item item = it.next();
if (item.myContent == null) // is a directory
{
File dir = new File(root, item.myPath);
@@ -68,7 +68,7 @@
it = items.values().iterator();
while (it.hasNext())
{
- Item item = (Item) it.next();
+ Item item = it.next();
if (item.myContent != null) // is a file
{
File file = new File(root, item.myPath);
@@ -146,11 +146,11 @@
*/
public void setRevision(long revision)
{
- Iterator iter = this.items.values().iterator();
+ Iterator<Item> iter = this.items.values().iterator();
while (iter.hasNext())
{
- Item item = (Item) iter.next();
+ Item item = iter.next();
item.workingCopyRev = revision;
}
}
@@ -162,7 +162,7 @@
*/
public String getItemContent(String path)
{
- return ((Item) items.get(path)).myContent;
+ return items.get(path).myContent;
}
/**
@@ -299,10 +299,10 @@
public WC copy()
{
WC c = new WC();
- Iterator it = items.values().iterator();
+ Iterator<Item> it = items.values().iterator();
while (it.hasNext())
{
- ((Item) it.next()).copy(c);
+ it.next().copy(c);
}
return c;
}
@@ -334,10 +334,10 @@
void check(DirEntry[] tested, String basePath, boolean recursive)
{
// clear the touched flag of all items
- Iterator it = items.values().iterator();
+ Iterator<Item> it = items.values().iterator();
while (it.hasNext())
{
- Item item = (Item) it.next();
+ Item item = it.next();
item.touched = false;
}
@@ -439,10 +439,10 @@
throws IOException
{
// clear the touched flag of all items
- Iterator it = items.values().iterator();
+ Iterator<Item> it = items.values().iterator();
while (it.hasNext())
{
- Item item = (Item) it.next();
+ Item item = it.next();
item.touched = false;
}