Author: tmortagne
Date: 2007-09-27 13:44:08 +0200 (Thu, 27 Sep 2007)
New Revision: 5106
Modified:
xwiki-platform/xwiki-plugins/trunk/application-manager/src/test/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocumentTest.java
xwiki-platform/xwiki-plugins/trunk/application-manager/src/test/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/TestAbstractSuperClassTest.java
Log:
Add/corrections unit tests.
Modified:
xwiki-platform/xwiki-plugins/trunk/application-manager/src/test/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocumentTest.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/application-manager/src/test/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocumentTest.java
2007-09-27 11:02:10 UTC (rev 5105)
+++
xwiki-platform/xwiki-plugins/trunk/application-manager/src/test/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultSuperDocumentTest.java
2007-09-27 11:44:08 UTC (rev 5106)
@@ -29,6 +29,8 @@
import com.xpn.xwiki.store.XWikiHibernateVersioningStore;
import com.xpn.xwiki.store.XWikiStoreInterface;
import com.xpn.xwiki.store.XWikiVersioningStoreInterface;
+import com.xpn.xwiki.user.api.XWikiRightService;
+
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Invocation;
@@ -36,6 +38,7 @@
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -60,6 +63,9 @@
this.context = new XWikiContext();
this.xwiki = new XWiki(new XWikiConfig(), this.context);
+ ////////////////////////////////////////////////////
+ // XWikiHibernateStore
+
this.mockXWikiStore =
mock(XWikiHibernateStore.class, new Class[] {XWiki.class,
XWikiContext.class},
new Object[] {this.xwiki, this.context});
@@ -105,6 +111,43 @@
this.xwiki.setStore((XWikiStoreInterface) mockXWikiStore.proxy());
this.xwiki.setVersioningStore((XWikiVersioningStoreInterface)
mockXWikiVersioningStore
.proxy());
+
+
+
//////////////////////////////////////////////////////////////////////////////////
+ // XWikiRightService
+
+ this.xwiki.setRightService(new XWikiRightService() {
+ public boolean checkAccess(String action, XWikiDocument doc,
XWikiContext context) throws XWikiException
+ {
+ return true;
+ }
+
+ public boolean hasAccessLevel(String right, String username,
String docname,
+ XWikiContext context) throws XWikiException
+ {
+ return true;
+ }
+
+ public boolean hasAdminRights(XWikiContext context)
+ {
+ return true;
+ }
+
+ public boolean hasProgrammingRights(XWikiContext context)
+ {
+ return true;
+ }
+
+ public boolean hasProgrammingRights(XWikiDocument doc,
XWikiContext context)
+ {
+ return true;
+ }
+
+ public List listAllLevels(XWikiContext context) throws
XWikiException
+ {
+ return Collections.EMPTY_LIST;
+ }
+ });
}
/////////////////////////////////////////////////////////////////////////////////////////:
@@ -120,7 +163,7 @@
/////
- TestAbstractSuperClassTest.DispatchSuperClass sclass =
TestAbstractSuperClassTest.DispatchSuperClass.getInstance(context);
+ SuperClass sclass =
TestAbstractSuperClassTest.DispatchSuperClass.getInstance(context);
DefaultSuperDocument sdoc =
(DefaultSuperDocument)sclass.newSuperDocument(context);
assertNotNull(sdoc);
@@ -138,7 +181,7 @@
/////
- TestAbstractSuperClassTest.DispatchSuperClass sclass =
TestAbstractSuperClassTest.DispatchSuperClass.getInstance(context);
+ SuperClass sclass =
TestAbstractSuperClassTest.DispatchSuperClass.getInstance(context);
DefaultSuperDocument sdoc =
(DefaultSuperDocument)sclass.newSuperDocument(DEFAULT_DOCFULLNAME, context);
assertNotNull(sdoc);
@@ -159,7 +202,7 @@
XWikiDocument doc = xwiki.getDocument(DEFAULT_DOCFULLNAME, context);
xwiki.saveDocument(doc, context);
- TestAbstractSuperClassTest.DispatchSuperClass sclass =
TestAbstractSuperClassTest.DispatchSuperClass.getInstance(context);
+ SuperClass sclass =
TestAbstractSuperClassTest.DispatchSuperClass.getInstance(context);
DefaultSuperDocument sdoc =
(DefaultSuperDocument)sclass.newSuperDocument(DEFAULT_DOCFULLNAME, context);
assertNotNull(sdoc);
Modified:
xwiki-platform/xwiki-plugins/trunk/application-manager/src/test/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/TestAbstractSuperClassTest.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/application-manager/src/test/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/TestAbstractSuperClassTest.java
2007-09-27 11:02:10 UTC (rev 5105)
+++
xwiki-platform/xwiki-plugins/trunk/application-manager/src/test/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/TestAbstractSuperClassTest.java
2007-09-27 11:44:08 UTC (rev 5106)
@@ -22,6 +22,7 @@
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.jmock.Mock;
@@ -41,6 +42,7 @@
import com.xpn.xwiki.store.XWikiHibernateVersioningStore;
import com.xpn.xwiki.store.XWikiStoreInterface;
import com.xpn.xwiki.store.XWikiVersioningStoreInterface;
+import com.xpn.xwiki.user.api.XWikiRightService;
/**
* Unit tests for [EMAIL PROTECTED]
com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.AbstractSuperClass}.
@@ -64,6 +66,9 @@
this.context = new XWikiContext();
this.xwiki = new XWiki(new XWikiConfig(), this.context);
+ ////////////////////////////////////////////////////
+ // XWikiHibernateStore
+
this.mockXWikiStore =
mock(XWikiHibernateStore.class, new Class[] {XWiki.class,
XWikiContext.class},
new Object[] {this.xwiki, this.context});
@@ -105,10 +110,46 @@
returnValue(null));
this.mockXWikiVersioningStore.stubs().method("resetRCSArchive").will(
returnValue(null));
-
+
this.xwiki.setStore((XWikiStoreInterface) mockXWikiStore.proxy());
this.xwiki.setVersioningStore((XWikiVersioningStoreInterface)
mockXWikiVersioningStore
.proxy());
+
+
//////////////////////////////////////////////////////////////////////////////////
+ // XWikiRightService
+
+ this.xwiki.setRightService(new XWikiRightService() {
+ public boolean checkAccess(String action, XWikiDocument doc,
XWikiContext context) throws XWikiException
+ {
+ return true;
+ }
+
+ public boolean hasAccessLevel(String right, String username,
String docname,
+ XWikiContext context) throws XWikiException
+ {
+ return true;
+ }
+
+ public boolean hasAdminRights(XWikiContext context)
+ {
+ return true;
+ }
+
+ public boolean hasProgrammingRights(XWikiContext context)
+ {
+ return true;
+ }
+
+ public boolean hasProgrammingRights(XWikiDocument doc,
XWikiContext context)
+ {
+ return true;
+ }
+
+ public List listAllLevels(XWikiContext context) throws
XWikiException
+ {
+ return Collections.EMPTY_LIST;
+ }
+ });
}
/////////////////////////////////////////////////////////////////////////////////////////:
@@ -164,12 +205,12 @@
*/
public static final String FIELDPN_stringlist = "String List";
- static abstract public class SuperClass extends AbstractSuperClass
+ static abstract public class TestSuperClass extends AbstractSuperClass
{
/**
* Default constructor for XWikiApplicationClass.
*/
- protected SuperClass(String spaceprefix, String prefix, boolean
dispatch)
+ protected TestSuperClass(String spaceprefix, String prefix, boolean
dispatch)
{
super(spaceprefix, prefix, dispatch);
}
@@ -185,7 +226,7 @@
}
}
- static public class DispatchSuperClass extends SuperClass
+ static public class DispatchSuperClass extends TestSuperClass
{
/**
* Unique instance of XWikiApplicationClass;
@@ -218,7 +259,7 @@
}
}
- static public class NoDispatchSuperClass extends SuperClass
+ static public class NoDispatchSuperClass extends TestSuperClass
{
/**
* Unique instance of XWikiApplicationClass;
@@ -257,7 +298,7 @@
/////
- DispatchSuperClass sclass = DispatchSuperClass.getInstance(context);
+ SuperClass sclass = DispatchSuperClass.getInstance(context);
assertEquals(CLASS_SPACE_PREFIX, sclass.getClassSpacePrefix());
assertEquals(CLASS_PREFIX, sclass.getClassPrefix());
@@ -280,7 +321,7 @@
/////
- NoDispatchSuperClass sclass =
NoDispatchSuperClass.getInstance(context);
+ SuperClass sclass = NoDispatchSuperClass.getInstance(context);
assertEquals(CLASS_SPACE_PREFIX, sclass.getClassSpacePrefix());
assertEquals(CLASS_PREFIX, sclass.getClassPrefix());
@@ -454,13 +495,25 @@
assertEquals(DEFAULT_ITEMDOCUMENT_NAME,
NoDispatchSuperClass.getInstance(context).getItemDocumentDefaultName(DEFAULT_ITEM_NAME,
context));
}
- public void getItemDocumentDefaultFullNameDispatch() throws XWikiException
+ public void testGetItemDocumentDefaultFullNameDispatch() throws
XWikiException
{
assertEquals(DISPATCH_DEFAULT_ITEMDOCUMENT_FULLNAME,
DispatchSuperClass.getInstance(context).getItemDocumentDefaultFullName(DEFAULT_ITEM_NAME,
context));
}
- public void getItemDocumentDefaultFullNameNoDispatch() throws
XWikiException
+ public void testGetItemDocumentDefaultFullNameNoDispatch() throws
XWikiException
{
assertEquals(NODISPATCH_DEFAULT_ITEMDOCUMENT_FULLNAME,
NoDispatchSuperClass.getInstance(context).getItemDocumentDefaultFullName(DEFAULT_ITEM_NAME,
context));
}
+
+ public void testIsInstanceNoDispatch() throws XWikiException
+ {
+
assertTrue(NoDispatchSuperClass.getInstance(context).isInstance(NoDispatchSuperClass.getInstance(context).newSuperDocument(context).getDocument(),
context));
+ assertFalse(NoDispatchSuperClass.getInstance(context).isInstance(new
XWikiDocument(), context));
+ }
+
+ public void testIsInstanceDispatch() throws XWikiException
+ {
+
assertTrue(DispatchSuperClass.getInstance(context).isInstance(DispatchSuperClass.getInstance(context).newSuperDocument(context).getDocument(),
context));
+ assertFalse(DispatchSuperClass.getInstance(context).isInstance(new
XWikiDocument(), context));
+ }
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
