Author: bago
Date: Thu Jan 7 17:44:36 2010
New Revision: 896939
URL: http://svn.apache.org/viewvc?rev=896939&view=rev
Log:
Some generics for test classes (and many suppresswarnings) (JSPF-78)
Modified:
james/jspf/trunk/resolver/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
james/jspf/trunk/tester/src/main/java/org/apache/james/jspf/tester/DNSTestingServer.java
james/jspf/trunk/tester/src/main/java/org/apache/james/jspf/tester/SPFYamlTestDescriptor.java
Modified:
james/jspf/trunk/resolver/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/resolver/src/test/java/org/apache/james/jspf/AbstractYamlTest.java?rev=896939&r1=896938&r2=896939&view=diff
==============================================================================
---
james/jspf/trunk/resolver/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
(original)
+++
james/jspf/trunk/resolver/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
Thu Jan 7 17:44:36 2010
@@ -239,7 +239,7 @@
}
private SPFResult runSingleTest(String testName) {
- HashMap currentTest = (HashMap) data.getTests().get(testName);
+ Map<String, ?> currentTest = data.getTests().get(testName);
Logger testLogger = log.getChildLogger(testName);
testLogger.info("TESTING "+testName+":
"+currentTest.get("description"));
@@ -263,9 +263,10 @@
return res;
}
+ @SuppressWarnings("unchecked")
private void verifyResult(String testName, SPFResult res) {
String resultSPF = res.getResult();
- HashMap<String,Object> currentTest = data.getTests().get(testName);
+ Map<String,?> currentTest = data.getTests().get(testName);
Logger testLogger = log.getChildLogger(testName+"-verify");
if (currentTest.get("result") instanceof String) {
assertEquals("Test "+testName+"
("+currentTest.get("description")+") failed. Returned: "+resultSPF+" Expected:
"+currentTest.get("result")+" [["+resultSPF+"||"+res.getHeaderText()+"]]",
currentTest.get("result"), resultSPF);
@@ -326,6 +327,7 @@
/**
* @return a dns resolver pointing to the local fake server
*/
+ @SuppressWarnings("unchecked")
protected DNSService getDNSServiceFakeServer() {
Resolver resolver = null;
try {
@@ -349,7 +351,7 @@
}
}
- dnsTestServer.setData(data.getZonedata());
+ dnsTestServer.setData((Map<String, List<?>>) data.getZonedata());
DNSServiceXBillImpl serviceXBillImpl = new DNSServiceXBillImpl(log) {
@@ -381,10 +383,10 @@
final class SPFYamlDNSService implements DNSService {
- private HashMap<String,Object> zonedata;
+ private Map<String,?> zonedata;
private int recordLimit;
- public SPFYamlDNSService(HashMap<String,Object> zonedata) {
+ public SPFYamlDNSService(Map<String,?> zonedata) {
this.zonedata = zonedata;
this.recordLimit = 10;
}
@@ -416,6 +418,7 @@
return getRecords(request.getHostname(), request.getRecordType(),
6);
}
+ @SuppressWarnings("unchecked")
public List<String> getRecords(String hostname, int recordType, int
depth) throws TimeoutException {
String type = getRecordTypeDescription(recordType);
Modified:
james/jspf/trunk/tester/src/main/java/org/apache/james/jspf/tester/DNSTestingServer.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/tester/src/main/java/org/apache/james/jspf/tester/DNSTestingServer.java?rev=896939&r1=896938&r2=896939&view=diff
==============================================================================
---
james/jspf/trunk/tester/src/main/java/org/apache/james/jspf/tester/DNSTestingServer.java
(original)
+++
james/jspf/trunk/tester/src/main/java/org/apache/james/jspf/tester/DNSTestingServer.java
Thu Jan 7 17:44:36 2010
@@ -89,12 +89,13 @@
import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Random;
+import java.util.Set;
public class DNSTestingServer implements ResponseGenerator {
@@ -104,7 +105,7 @@
protected Zone zone;
- private HashSet timeoutServers;
+ private Set<Name> timeoutServers;
Random random = new Random();
@@ -127,16 +128,17 @@
zone = null;
}
- public synchronized void setData(HashMap zonedata) {
+ @SuppressWarnings("unchecked")
+ public synchronized void setData(Map<String, List<?>> map) {
try {
- this.timeoutServers = new HashSet();
- List records = new LinkedList();
+ this.timeoutServers = new HashSet<Name>();
+ List<Record> records = new LinkedList<Record>();
records.add(new SOARecord(Name.root, DClass.IN, 3600, Name.root,
Name.root, 857623948, 0, 0, 0, 0));
records.add(new NSRecord(Name.root, DClass.IN, 3600, Name.root));
- Iterator hosts = zonedata.keySet().iterator();
+ Iterator<String> hosts = map.keySet().iterator();
while (hosts.hasNext()) {
String host = (String) hosts.next();
Name hostname;
@@ -146,20 +148,20 @@
hostname = Name.fromString(host);
}
- List l = (List) zonedata.get(host);
+ List<?> l = map.get(host);
if (l != null)
- for (Iterator i = l.iterator(); i.hasNext();) {
+ for (Iterator<?> i = l.iterator(); i.hasNext();) {
Object o = i.next();
- if (o instanceof HashMap) {
- HashMap hm = (HashMap) o;
+ if (o instanceof Map) {
+ Map<String, ?> hm = (Map) o;
- Iterator types = hm.keySet().iterator();
+ Iterator<String> types = hm.keySet().iterator();
while (types.hasNext()) {
String type = (String) types.next();
if ("MX".equals(type)) {
- List mxList = (List) hm.get(type);
- Iterator mxs = mxList.iterator();
+ List<?> mxList = (List<?>) hm.get(type);
+ Iterator<?> mxs = mxList.iterator();
while (mxs.hasNext()) {
Long prio = (Long) mxs.next();
String cname = (String) mxs.next();
@@ -183,17 +185,17 @@
DClass.IN, 3600, Address
.getByAddress((String)
value)));
} else if ("SPF".equals(type)) {
- if (value instanceof List) {
+ if (value instanceof List<?>) {
records.add(new SPFRecord(hostname,
- DClass.IN, 3600, (List)
value));
+ DClass.IN, 3600, (List<?>)
value));
} else {
records.add(new SPFRecord(hostname,
DClass.IN, 3600, (String)
value));
}
} else if ("TXT".equals(type)) {
- if (value instanceof List) {
+ if (value instanceof List<?>) {
records.add(new TXTRecord(hostname,
- DClass.IN, 3600, (List)
value));
+ DClass.IN, 3600, (List<?>)
value));
} else {
records.add(new TXTRecord(hostname,
DClass.IN, 3600, (String)
value));
@@ -282,13 +284,14 @@
return sr;
}
+ @SuppressWarnings("unchecked")
void addRRset(Name name, Message response, RRset rrset, int section,
int flags) {
for (int s = 1; s <= section; s++)
if (response.findRRset(name, rrset.getType(), s))
return;
if ((flags & FLAG_SIGONLY) == 0) {
- Iterator it = rrset.rrs();
+ Iterator<Record> it = rrset.rrs();
while (it.hasNext()) {
Record r = (Record) it.next();
if (r.getName().isWild() && !name.isWild())
Modified:
james/jspf/trunk/tester/src/main/java/org/apache/james/jspf/tester/SPFYamlTestDescriptor.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/tester/src/main/java/org/apache/james/jspf/tester/SPFYamlTestDescriptor.java?rev=896939&r1=896938&r2=896939&view=diff
==============================================================================
---
james/jspf/trunk/tester/src/main/java/org/apache/james/jspf/tester/SPFYamlTestDescriptor.java
(original)
+++
james/jspf/trunk/tester/src/main/java/org/apache/james/jspf/tester/SPFYamlTestDescriptor.java
Thu Jan 7 17:44:36 2010
@@ -34,6 +34,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.Set;
/**
@@ -42,16 +43,17 @@
*/
public class SPFYamlTestDescriptor {
private String comment;
- private HashMap<String,HashMap<String,Object>> tests;
- private HashMap zonedata;
+ private Map<String, Map<String, ?>> tests;
+ private Map<String, Map> zonedata;
- public SPFYamlTestDescriptor(HashMap source, int i) {
+ @SuppressWarnings("unchecked")
+ public SPFYamlTestDescriptor(Map<String, ?> source, int i) {
this.setComment((String) source.get("description"));
if (this.getComment() == null) {
this.setComment("Test #"+i);
}
- this.setTests((HashMap) source.get("tests"));
- this.setZonedata((HashMap) source.get("zonedata"));
+ this.setTests((Map) source.get("tests"));
+ this.setZonedata((Map) source.get("zonedata"));
}
public String getComment() {
@@ -60,19 +62,19 @@
public void setComment(String comment) {
this.comment = comment;
}
- public HashMap<String,HashMap<String,Object>> getTests() {
+ public Map<String,Map<String,?>> getTests() {
return tests;
}
- public void setTests(HashMap<String, HashMap<String,Object>> tests) {
+ public void setTests(Map<String, Map<String,?>> tests) {
this.tests = tests;
}
- public HashMap getZonedata() {
+ public Map<String, ?> getZonedata() {
return zonedata;
}
- public void setZonedata(HashMap zonedata) {
- this.zonedata = new HashMap();
- Set keys = zonedata.keySet();
- for (Iterator i = keys.iterator(); i.hasNext(); ) {
+ public void setZonedata(Map<String, Map> zonedata) {
+ this.zonedata = new HashMap<String, Map>();
+ Set<String> keys = zonedata.keySet();
+ for (Iterator<String> i = keys.iterator(); i.hasNext(); ) {
String hostname = (String) i.next();
String lowercase = hostname.toLowerCase(Locale.US);
this.zonedata.put(lowercase, zonedata.get(hostname));
@@ -92,8 +94,8 @@
int i = 1;
while(ctor.checkData()) {
Object o = ctor.getData();
- if (o instanceof HashMap) {
- HashMap m = (HashMap) o;
+ if (o instanceof Map) {
+ Map m = (Map) o;
SPFYamlTestDescriptor ts = new SPFYamlTestDescriptor(m, i);
tests.add(ts);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
