You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/12/18 01:17:05 UTC
svn commit: r357406 - in /incubator/roller/trunk: custom/custom-ant.xmlf
tests/org/roller/business/PlanetManagerLocalTest.java
tests/org/roller/business/RefererManagerTest.java
tests/org/roller/business/UserManagerTest.java
Author: snoopdave
Date: Sat Dec 17 16:16:57 2005
New Revision: 357406
URL: http://svn.apache.org/viewcvs?rev=357406&view=rev
Log:
More unit test fixes
Modified:
incubator/roller/trunk/custom/custom-ant.xmlf
incubator/roller/trunk/tests/org/roller/business/PlanetManagerLocalTest.java
incubator/roller/trunk/tests/org/roller/business/RefererManagerTest.java
incubator/roller/trunk/tests/org/roller/business/UserManagerTest.java
Modified: incubator/roller/trunk/custom/custom-ant.xmlf
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/custom/custom-ant.xmlf?rev=357406&r1=357405&r2=357406&view=diff
==============================================================================
--- incubator/roller/trunk/custom/custom-ant.xmlf (original)
+++ incubator/roller/trunk/custom/custom-ant.xmlf Sat Dec 17 16:16:57 2005
@@ -3,7 +3,7 @@
<!-- Netbeans debug single file
-->
- <target name="debug-selected-files" if="netbeans.home" depends="build-test"
+ <target name="debug-selected-files" if="netbeans.home" depends="build-tests"
description="Debug a Single File">
<fail unless="classname">Must set property 'classname'</fail>
<nbjpdastart name="${classname}" addressproperty="jpda.address" transport="dt_socket">
@@ -24,7 +24,7 @@
<!-- Netbeans debug.single target
-->
- <target name="test-selected-files" if="netbeans.home" depends="build-test"
+ <target name="test-selected-files" if="netbeans.home" depends="build-tests"
description="Test/debug a Single File">
<fail unless="classname">Must set property 'classname'</fail>
<nbjpdastart name="junit.textui.TestRunner" addressproperty="jpda.address" transport="dt_socket">
Modified: incubator/roller/trunk/tests/org/roller/business/PlanetManagerLocalTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/business/PlanetManagerLocalTest.java?rev=357406&r1=357405&r2=357406&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/business/PlanetManagerLocalTest.java (original)
+++ incubator/roller/trunk/tests/org/roller/business/PlanetManagerLocalTest.java Sat Dec 17 16:16:57 2005
@@ -36,7 +36,7 @@
junit.textui.TestRunner.run(PlanetManagerLocalTest.class);
}
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
super.setUpTestWeblogs();
}
Modified: incubator/roller/trunk/tests/org/roller/business/RefererManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/business/RefererManagerTest.java?rev=357406&r1=357405&r2=357406&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/business/RefererManagerTest.java (original)
+++ incubator/roller/trunk/tests/org/roller/business/RefererManagerTest.java Sat Dec 17 16:16:57 2005
@@ -1 +1 @@
-package org.roller.business;
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.roller.RollerException;
import org.roller.model.PropertiesManager;
import org.roller.model.RefererManager;
import org.roller.model.Roller;
import org.roller.pojos.RefererData;
import org.roller.pojos.RollerPropertyData;
import org.roller.pojos.UserData;
import org.roller.pojos.WeblogEntryData;
import org.roller.pojos.WebsiteData;
import org.roller.util.DateUtil;
import org.roller.RollerTestBase;
/**
* Test Roller Referer Management.
*/
public class RefererManagerTest extends RollerTestBase
{
RefererManager rmgr;
//List refs;
int count = 20;
String testDay;
String origSpamWords;
//------------------------------------------------------------------------
public RefererManagerTest(String name)
{
super(name);
}
//--------
----------------------------------------------------------------
public static void main(String args[])
{
junit.textui.TestRunner.run(RefererManagerTest.class);
}
//------------------------------------------------------------------------
public static Test suite()
{
return new TestSuite(RefererManagerTest.class);
}
protected void setUp() throws Exception
{
super.setUp();
// add "spamtest" to refererSpamWords
Roller mRoller = getRoller();
PropertiesManager pmgr = mRoller.getPropertiesManager();
RollerPropertyData spamprop = pmgr.getProperty("spam.blacklist");
this.origSpamWords = spamprop.getValue();
spamprop.setValue(spamprop.getValue() + ", spamtest");
pmgr.store(spamprop);
// Process count unique referers
rmgr = getRoller().getRefererManager();
Calendar lCalendar = Calendar.getInstance();
lCalendar.setTime(new Dat
e());
for (int i = 0; i < count; i++)
{
lCalendar.add(Calendar.DATE, -1);
Timestamp day = new Timestamp(lCalendar.getTime().getTime());
getRoller().begin(UserData.SYSTEM_USER);
MockRequest mock = new MockRequest(
DateUtil.format8chars(day),
"http://test"+i,
"http://test"+i,
null,
mWebsite
);
rmgr.processRequest(mock);
getRoller().commit();
testDay = mock.getDateString();
}
}
public void tearDown() throws Exception
{
List refs = rmgr.getReferers(mWebsite);
// Remove all referers processes
for (int i = 0; i < refs.size(); i++)
{
rmgr.removeReferer(((RefererData)refs.get(i)).getId());
}
// Make sure
all were removed
refs = rmgr.getReferers(mWebsite);
assertEquals(0,refs.size());
// reset refererSpamWords to original value
Roller mRoller = getRoller();
PropertiesManager pmgr = mRoller.getPropertiesManager();
RollerPropertyData spamprop = pmgr.getProperty("spam.blacklist");
spamprop.setValue(this.origSpamWords);
pmgr.store(spamprop);
super.tearDown();
}
//------------------------------------------------------------------------
public void testGetReferersToDate() throws Exception
{
List referers = rmgr.getReferersToDate(mWebsite, testDay);
assertEquals("Should be one Referer.", referers.size(), 1);
}
//------------------------------------------------------------------------
public void testRefererProcessing() throws RollerException
{
List refs = rmgr.getReferers(mWebsite);
assertEquals("number o
f referers should equal count", count, refs.size());
int hits = rmgr.getDayHits(mWebsite);
assertEquals("There should be one fewer hits than referers", count, hits);
}
public void testSelfRefererDenial() throws RollerException
{
// test against "self referrals"
getRoller().begin(UserData.SYSTEM_USER);
// create "direct" referer
boolean isSpam = rmgr.processRequest(
new MockRequest(
"20020101",
"direct",
"http://test.com",
null, mWebsite
)
);
getRoller().commit();
assertFalse("is not spam", isSpam);
int newRefCount = rmgr.getReferers(mWebsite).size();
// now create self-referer
getRoller().begin(UserData.SYSTEM_USER);
isSpam = rmgr.processRequest(
new MockRequest(
"20020202",
"http://test.com
/page/" + mWebsite.getHandle(),
"http://test.com",
null, mWebsite
)
);
getRoller().commit();
assertFalse("is not spam", isSpam);
// number of referrers should not have changed
List refs = rmgr.getReferers(mWebsite);
assertEquals("self referal not ignored", newRefCount, refs.size());
// now create self-referer from editor page
isSpam = rmgr.processRequest(
new MockRequest(
"20020202",
"http://test.com/weblog.do",
"http://test.com",
null, mWebsite
)
);
getRoller().commit();
assertFalse("is not spam", isSpam);
// number of referrers should not have changed
refs = rmgr.getReferers(mWebsite);
assertEquals("editor referal not ignored", newRefCount, refs.size());
}
/**
* T
est to see if Referer Spam detection works.
*/
public void testSpamBlocking()
{
boolean isSpam = rmgr.processRequest(
new MockRequest(
"20040101",
"http://www.spamtest.com",
"http://test.com",
null, mWebsite
)
);
//assertTrue("failed to detect referer spam", isSpam);
}
public void testApplyRefererFilters() throws Exception
{
List refs = rmgr.getReferers(mWebsite);
assertEquals(count, refs.size());
String origWords = null;
getRoller().begin(UserData.SYSTEM_USER);
Roller mRoller = getRoller();
PropertiesManager pmgr = mRoller.getPropertiesManager();
RollerPropertyData spamprop = pmgr.getProperty("spam.blacklist");
origWords = spamprop.getValue();
spamprop.setValue(spamprop.getValue() + ", test");
pmgr.store(spamprop);
getRoller().commit();
getRoller().begin(UserData.SYSTEM_USER);
getRoller().getRefererManager().applyRefererFilters();
getRoller().commit();
refs = rmgr.getReferers(mWebsite);
assertEquals(0, refs.size());
getRoller().begin(UserData.SYSTEM_USER);
spamprop = pmgr.getProperty("spam.blacklist");
spamprop.setValue(origWords);
pmgr.store(spamprop);
getRoller().commit();
}
public void testApplyRefererFiltersWebsite() throws Exception
{
List refs = rmgr.getReferers(mWebsite);
assertEquals(count, refs.size());
String origWords = null;
getRoller().begin(UserData.SYSTEM_USER);
mWebsite = getRoller().getUserManager().retrieveWebsite(mWebsite.getId());
origWords = mWebsite.getBlacklist();
mWebsite.setBlacklist("test");
mWebsite.save();
getRoller().commit();
getRoller().begin(UserData.SYSTEM_USER);
getRoller().getRefererManager().applyRefererFilters();
getRoller().commit();
refs = rmgr.getReferers(mWebsite);
assertEquals(0, refs.size());
}
}
class MockRequest implements org.roller.model.ParsedRequest
{
private String mDateStr = null;
private String mRefUrl = null;
private String mReqUrl = null;
private WeblogEntryData mEntry = null;
private WebsiteData mWebsite = null;
private boolean mIsDateSpecified = false;
public MockRequest(
String dateStr, String refUrl, String reqUrl,
WeblogEntryData entry, WebsiteData website)
{
mDateStr = dateStr;
mRefUrl = refUrl;
mReqUrl = reqUrl;
mEntry = entry;
mWebsite = website;
if (mDateStr != null) mIsDateSpecified = true;
}
/**
* @see org.roller.pojos.ParsedRequest#getDateString()
*/
public String getDateString()
{
return mDateStr;
}
/**
* @see org.roller.pojos.ParsedRequest#getRefererURL()
*/
public String getRefererURL()
{
return mRefUrl;
}
/**
* @see org.roller.pojos.ParsedRequest#getRequestURL()
*/
public String getRequestURL()
{
return mReqUrl;
}
/**
* @see org.roller.pojos.ParsedRequest#getWeblogEntry()
*/
public WeblogEntryData getWeblogEntry()
{
return mEntry;
}
/**
* @see org.roller.pojos.ParsedRequest#getWebsite()
*/
public WebsiteData getWebsite()
{
return mWebsite;
}
/**
* Returns the isDateSpecified.
* @return boolean
*/
public boolean isDateSpecified()
{
return mIsDateSpecified;
}
/**
* Sets the isDateSpecified.
* @param isDateSpecified The isDateSpecified to set
*/
public void setDateSpecified(boolean isDateSpecified)
{
mIsDateSpecified = isDateSpecified;
}
/**
* @s
ee org.roller.pojos.ParsedRequest#isEnableLinkback()
*/
public boolean isEnableLinkback()
{
return false;
}
}
\ No newline at end of file
+package org.roller.business;
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.roller.RollerException;
import org.roller.model.PropertiesManager;
import org.roller.model.RefererManager;
import org.roller.model.Roller;
import org.roller.pojos.RefererData;
import org.roller.pojos.RollerPropertyData;
import org.roller.pojos.UserData;
import org.roller.pojos.WeblogEntryData;
import org.roller.pojos.WebsiteData;
import org.roller.util.DateUtil;
import org.roller.RollerTestBase;
/**
* Test Roller Referer Management.
*/
public class RefererManagerTest extends RollerTestBase
{
RefererManager rmgr;
//List refs;
int count = 20;
String testDay;
String origSpamWords;
//------------------------------------------------------------------------
public RefererManagerTest(String name)
{
super(name);
}
//--------
----------------------------------------------------------------
public static void main(String args[])
{
junit.textui.TestRunner.run(RefererManagerTest.class);
}
//------------------------------------------------------------------------
public static Test suite()
{
return new TestSuite(RefererManagerTest.class);
}
public void setUp() throws Exception
{
super.setUp();
// add "spamtest" to refererSpamWords
Roller mRoller = getRoller();
PropertiesManager pmgr = mRoller.getPropertiesManager();
RollerPropertyData spamprop = pmgr.getProperty("spam.blacklist");
this.origSpamWords = spamprop.getValue();
spamprop.setValue(spamprop.getValue() + ", spamtest");
pmgr.store(spamprop);
// Process count unique referers
rmgr = getRoller().getRefererManager();
Calendar lCalendar = Calendar.getInstance();
lCalendar.setTime(new Date()
);
for (int i = 0; i < count; i++)
{
lCalendar.add(Calendar.DATE, -1);
Timestamp day = new Timestamp(lCalendar.getTime().getTime());
getRoller().begin(UserData.SYSTEM_USER);
MockRequest mock = new MockRequest(
DateUtil.format8chars(day),
"http://test"+i,
"http://test"+i,
null,
mWebsite
);
rmgr.processRequest(mock);
getRoller().commit();
testDay = mock.getDateString();
}
}
public void tearDown() throws Exception
{
List refs = rmgr.getReferers(mWebsite);
// Remove all referers processes
for (int i = 0; i < refs.size(); i++)
{
rmgr.removeReferer(((RefererData)refs.get(i)).getId());
}
// Make sure al
l were removed
refs = rmgr.getReferers(mWebsite);
assertEquals(0,refs.size());
// reset refererSpamWords to original value
Roller mRoller = getRoller();
PropertiesManager pmgr = mRoller.getPropertiesManager();
RollerPropertyData spamprop = pmgr.getProperty("spam.blacklist");
spamprop.setValue(this.origSpamWords);
pmgr.store(spamprop);
super.tearDown();
}
//------------------------------------------------------------------------
public void testGetReferersToDate() throws Exception
{
List referers = rmgr.getReferersToDate(mWebsite, testDay);
assertEquals("Should be one Referer.", referers.size(), 1);
}
//------------------------------------------------------------------------
public void testRefererProcessing() throws RollerException
{
List refs = rmgr.getReferers(mWebsite);
assertEquals("number of r
eferers should equal count", count, refs.size());
int hits = rmgr.getDayHits(mWebsite);
assertEquals("There should be one fewer hits than referers", count, hits);
}
public void testSelfRefererDenial() throws RollerException
{
// test against "self referrals"
getRoller().begin(UserData.SYSTEM_USER);
// create "direct" referer
boolean isSpam = rmgr.processRequest(
new MockRequest(
"20020101",
"direct",
"http://test.com",
null, mWebsite
)
);
getRoller().commit();
assertFalse("is not spam", isSpam);
int newRefCount = rmgr.getReferers(mWebsite).size();
// now create self-referer
getRoller().begin(UserData.SYSTEM_USER);
isSpam = rmgr.processRequest(
new MockRequest(
"20020202",
"http://test.com/pa
ge/" + mWebsite.getHandle(),
"http://test.com",
null, mWebsite
)
);
getRoller().commit();
assertFalse("is not spam", isSpam);
// number of referrers should not have changed
List refs = rmgr.getReferers(mWebsite);
assertEquals("self referal not ignored", newRefCount, refs.size());
// now create self-referer from editor page
isSpam = rmgr.processRequest(
new MockRequest(
"20020202",
"http://test.com/weblog.do",
"http://test.com",
null, mWebsite
)
);
getRoller().commit();
assertFalse("is not spam", isSpam);
// number of referrers should not have changed
refs = rmgr.getReferers(mWebsite);
assertEquals("editor referal not ignored", newRefCount, refs.size());
}
/**
* Test
to see if Referer Spam detection works.
*/
public void testSpamBlocking()
{
boolean isSpam = rmgr.processRequest(
new MockRequest(
"20040101",
"http://www.spamtest.com",
"http://test.com",
null, mWebsite
)
);
//assertTrue("failed to detect referer spam", isSpam);
}
public void testApplyRefererFilters() throws Exception
{
List refs = rmgr.getReferers(mWebsite);
assertEquals(count, refs.size());
String origWords = null;
getRoller().begin(UserData.SYSTEM_USER);
Roller mRoller = getRoller();
PropertiesManager pmgr = mRoller.getPropertiesManager();
RollerPropertyData spamprop = pmgr.getProperty("spam.blacklist");
origWords = spamprop.getValue();
spamprop.setValue(spamprop.getValue() + ", test");
pmgr.store(spamprop);
getRoller().commit();
getRoller().begin(UserData.SYSTEM_USER);
getRoller().getRefererManager().applyRefererFilters();
getRoller().commit();
refs = rmgr.getReferers(mWebsite);
assertEquals(0, refs.size());
getRoller().begin(UserData.SYSTEM_USER);
spamprop = pmgr.getProperty("spam.blacklist");
spamprop.setValue(origWords);
pmgr.store(spamprop);
getRoller().commit();
}
public void testApplyRefererFiltersWebsite() throws Exception
{
List refs = rmgr.getReferers(mWebsite);
assertEquals(count, refs.size());
String origWords = null;
getRoller().begin(UserData.SYSTEM_USER);
mWebsite = getRoller().getUserManager().retrieveWebsite(mWebsite.getId());
origWords = mWebsite.getBlacklist();
mWebsite.setBlacklist("test");
mWebsite.save();
getRoller().commit();
getRoller().begin(UserData.SYSTEM_USER);
getRoller().getRefererManager().applyRefererFilters();
getRoller().commit();
refs = rmgr.getReferers(mWebsite);
assertEquals(0, refs.size());
}
}
class MockRequest implements org.roller.model.ParsedRequest
{
private String mDateStr = null;
private String mRefUrl = null;
private String mReqUrl = null;
private WeblogEntryData mEntry = null;
private WebsiteData mWebsite = null;
private boolean mIsDateSpecified = false;
public MockRequest(
String dateStr, String refUrl, String reqUrl,
WeblogEntryData entry, WebsiteData website)
{
mDateStr = dateStr;
mRefUrl = refUrl;
mReqUrl = reqUrl;
mEntry = entry;
mWebsite = website;
if (mDateStr != null) mIsDateSpecified = true;
}
/**
* @see org.roller.pojos.ParsedRequest#getDateString()
*/
public String getDateString()
{
return mDateStr;
}
/
**
* @see org.roller.pojos.ParsedRequest#getRefererURL()
*/
public String getRefererURL()
{
return mRefUrl;
}
/**
* @see org.roller.pojos.ParsedRequest#getRequestURL()
*/
public String getRequestURL()
{
return mReqUrl;
}
/**
* @see org.roller.pojos.ParsedRequest#getWeblogEntry()
*/
public WeblogEntryData getWeblogEntry()
{
return mEntry;
}
/**
* @see org.roller.pojos.ParsedRequest#getWebsite()
*/
public WebsiteData getWebsite()
{
return mWebsite;
}
/**
* Returns the isDateSpecified.
* @return boolean
*/
public boolean isDateSpecified()
{
return mIsDateSpecified;
}
/**
* Sets the isDateSpecified.
* @param isDateSpecified The isDateSpecified to set
*/
public void setDateSpecified(boolean isDateSpecified)
{
mIsDateSpecified = isDateSpecified;
}
/**
* @see
org.roller.pojos.ParsedRequest#isEnableLinkback()
*/
public boolean isEnableLinkback()
{
return false;
}
}
\ No newline at end of file
Modified: incubator/roller/trunk/tests/org/roller/business/UserManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/business/UserManagerTest.java?rev=357406&r1=357405&r2=357406&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/business/UserManagerTest.java (original)
+++ incubator/roller/trunk/tests/org/roller/business/UserManagerTest.java Sat Dec 17 16:16:57 2005
@@ -64,7 +64,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();