You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/11/12 23:32:29 UTC
[jspwiki] 05/09: remove warnings from tests
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit c34f71238db13c82479b92a723b8d8188b4fe85f
Author: juanpablo <ju...@apache.org>
AuthorDate: Tue Nov 13 00:23:01 2018 +0100
remove warnings from tests
---
.../test/java/org/apache/wiki/TestJNDIContext.java | 46 +++++++++++++++++++---
.../java/org/apache/wiki/auth/UserManagerTest.java | 12 +++---
.../wiki/auth/permissions/GroupPermissionTest.java | 19 ++++-----
.../providers/BasicAttachmentProviderTest.java | 34 ++++++++--------
.../org/apache/wiki/providers/CounterProvider.java | 21 ++++++++--
.../apache/wiki/providers/VerySimpleProvider.java | 21 ++++++++--
.../apache/wiki/render/RenderingManagerTest.java | 4 +-
.../org/apache/wiki/search/SearchManagerTest.java | 18 ++++-----
8 files changed, 117 insertions(+), 58 deletions(-)
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestJNDIContext.java b/jspwiki-main/src/test/java/org/apache/wiki/TestJNDIContext.java
index 7706970..c8d24cc 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestJNDIContext.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestJNDIContext.java
@@ -22,7 +22,13 @@ import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
-import javax.naming.*;
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
/**
@@ -50,7 +56,7 @@ import javax.naming.spi.InitialContextFactory;
public class TestJNDIContext implements Context
{
- private final Map<String, Object> m_bindings = new HashMap<String, Object>();
+ private final Map<String, Object> m_bindings = new HashMap<>();
private static boolean initialized = false;
@@ -63,7 +69,8 @@ public class TestJNDIContext implements Context
private static Context ctx = null;
- public Context getInitialContext( Hashtable environment ) throws NamingException
+ @Override
+ public Context getInitialContext( Hashtable<?,?> environment ) throws NamingException
{
return ctx;
}
@@ -106,6 +113,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#addToEnvironment(java.lang.String, java.lang.Object)
*/
+ @Override
public Object addToEnvironment( String propName, Object propVal ) throws NamingException
{
return null;
@@ -115,6 +123,7 @@ public class TestJNDIContext implements Context
* No-op.
* @see javax.naming.Context#bind(javax.naming.Name, java.lang.Object)
*/
+ @Override
public void bind( Name name, Object obj ) throws NamingException
{
}
@@ -123,6 +132,7 @@ public class TestJNDIContext implements Context
* No-op.
* @see javax.naming.Context#close()
*/
+ @Override
public void close() throws NamingException
{
}
@@ -131,6 +141,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#composeName(javax.naming.Name, javax.naming.Name)
*/
+ @Override
public Name composeName( Name name, Name prefix ) throws NamingException
{
return null;
@@ -140,6 +151,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#composeName(java.lang.String, java.lang.String)
*/
+ @Override
public String composeName( String name, String prefix ) throws NamingException
{
return null;
@@ -149,6 +161,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#createSubcontext(javax.naming.Name)
*/
+ @Override
public Context createSubcontext( Name name ) throws NamingException
{
return null;
@@ -158,6 +171,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#createSubcontext(java.lang.String)
*/
+ @Override
public Context createSubcontext( String name ) throws NamingException
{
return null;
@@ -167,6 +181,7 @@ public class TestJNDIContext implements Context
* No-op.
* @see javax.naming.Context#destroySubcontext(javax.naming.Name)
*/
+ @Override
public void destroySubcontext( Name name ) throws NamingException
{
}
@@ -175,6 +190,7 @@ public class TestJNDIContext implements Context
* No-op.
* @see javax.naming.Context#destroySubcontext(java.lang.String)
*/
+ @Override
public void destroySubcontext( String name ) throws NamingException
{
}
@@ -183,10 +199,9 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#getEnvironment()
*/
- @SuppressWarnings("unchecked")
- public Hashtable getEnvironment() throws NamingException
+ @Override
+ public Hashtable<?,?> getEnvironment() throws NamingException
{
- // TODO Auto-generated method stub
return null;
}
@@ -194,6 +209,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#getNameInNamespace()
*/
+ @Override
public String getNameInNamespace() throws NamingException
{
return null;
@@ -203,6 +219,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#getNameParser(javax.naming.Name)
*/
+ @Override
public NameParser getNameParser( Name name ) throws NamingException
{
return null;
@@ -212,6 +229,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#getNameParser(java.lang.String)
*/
+ @Override
public NameParser getNameParser( String name ) throws NamingException
{
return null;
@@ -221,6 +239,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#list(javax.naming.Name)
*/
+ @Override
public NamingEnumeration<NameClassPair> list( Name name ) throws NamingException
{
return null;
@@ -230,6 +249,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#list(java.lang.String)
*/
+ @Override
public NamingEnumeration<NameClassPair> list( String name ) throws NamingException
{
return null;
@@ -239,6 +259,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#listBindings(javax.naming.Name)
*/
+ @Override
public NamingEnumeration<Binding> listBindings( Name name ) throws NamingException
{
return null;
@@ -248,6 +269,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#listBindings(java.lang.String)
*/
+ @Override
public NamingEnumeration<Binding> listBindings( String name ) throws NamingException
{
return null;
@@ -257,6 +279,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#lookup(javax.naming.Name)
*/
+ @Override
public Object lookup( Name name ) throws NamingException
{
return null;
@@ -266,6 +289,7 @@ public class TestJNDIContext implements Context
* Binds an object to a supplied String key.
* @see javax.naming.InitialContext#bind(java.lang.String, java.lang.Object)
*/
+ @Override
public void bind( String name, Object obj ) throws NamingException
{
m_bindings.put( name, obj );
@@ -276,6 +300,7 @@ public class TestJNDIContext implements Context
* throws a NamingException.
* @see javax.naming.InitialContext#lookup(java.lang.String)
*/
+ @Override
public Object lookup( String name ) throws NamingException
{
Object obj = m_bindings.get( name );
@@ -290,6 +315,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#lookupLink(javax.naming.Name)
*/
+ @Override
public Object lookupLink( Name name ) throws NamingException
{
return null;
@@ -299,6 +325,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#lookupLink(java.lang.String)
*/
+ @Override
public Object lookupLink( String name ) throws NamingException
{
return null;
@@ -308,6 +335,7 @@ public class TestJNDIContext implements Context
* No-op.
* @see javax.naming.Context#rebind(javax.naming.Name, java.lang.Object)
*/
+ @Override
public void rebind( Name name, Object obj ) throws NamingException
{
}
@@ -316,6 +344,7 @@ public class TestJNDIContext implements Context
* No-op.
* @see javax.naming.Context#rebind(java.lang.String, java.lang.Object)
*/
+ @Override
public void rebind( String name, Object obj ) throws NamingException
{
}
@@ -324,6 +353,7 @@ public class TestJNDIContext implements Context
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#removeFromEnvironment(java.lang.String)
*/
+ @Override
public Object removeFromEnvironment( String propName ) throws NamingException
{
return null;
@@ -333,6 +363,7 @@ public class TestJNDIContext implements Context
* No-op.
* @see javax.naming.Context#rename(javax.naming.Name, javax.naming.Name)
*/
+ @Override
public void rename( Name oldName, Name newName ) throws NamingException
{
}
@@ -341,6 +372,7 @@ public class TestJNDIContext implements Context
* No-op.
* @see javax.naming.Context#rename(java.lang.String, java.lang.String)
*/
+ @Override
public void rename( String oldName, String newName ) throws NamingException
{
}
@@ -349,6 +381,7 @@ public class TestJNDIContext implements Context
* No-op.
* @see javax.naming.Context#unbind(javax.naming.Name)
*/
+ @Override
public void unbind( Name name ) throws NamingException
{
}
@@ -357,6 +390,7 @@ public class TestJNDIContext implements Context
* No-op.
* @see javax.naming.Context#unbind(java.lang.String)
*/
+ @Override
public void unbind( String name ) throws NamingException
{
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java
index 7b35001..caaaa4e 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java
@@ -315,12 +315,12 @@ public class UserManagerTest {
// Now, look in Admin's queue, and verify there's a pending Decision there
DecisionQueue dq = m_engine.getWorkflowManager().getDecisionQueue();
- Collection decisions = dq.getActorDecisions( m_engine.adminSession() );
+ Collection< Decision > decisions = dq.getActorDecisions( m_engine.adminSession() );
Assertions.assertEquals( 1, decisions.size() );
// Verify that the Decision has all the facts and attributes we need
- Decision d = ( Decision )decisions.iterator().next();
- List facts = d.getFacts();
+ Decision d = decisions.iterator().next();
+ List< Fact > facts = d.getFacts();
Assertions.assertEquals( new Fact( UserManager.PREFS_FULL_NAME, profile.getFullname() ), facts.get( 0 ) );
Assertions.assertEquals( new Fact( UserManager.PREFS_LOGIN_NAME, profile.getLoginName() ), facts.get( 1 ) );
Assertions.assertEquals( new Fact( UserManager.FACT_SUBMITTER, session.getUserPrincipal().getName() ), facts.get( 2 ) );
@@ -366,12 +366,12 @@ public class UserManagerTest {
// Now, look in Admin's queue, and verify there's a pending Decision there
DecisionQueue dq = m_engine.getWorkflowManager().getDecisionQueue();
- Collection decisions = dq.getActorDecisions( m_engine.adminSession() );
+ Collection< Decision > decisions = dq.getActorDecisions( m_engine.adminSession() );
Assertions.assertEquals( 1, decisions.size() );
// Verify that the Decision has all the facts and attributes we need
- Decision d = ( Decision )decisions.iterator().next();
- List facts = d.getFacts();
+ Decision d = decisions.iterator().next();
+ List< Fact > facts = d.getFacts();
Assertions.assertEquals( new Fact( UserManager.PREFS_FULL_NAME, profile.getFullname() ), facts.get( 0 ) );
Assertions.assertEquals( new Fact( UserManager.PREFS_LOGIN_NAME, profile.getLoginName() ), facts.get( 1 ) );
Assertions.assertEquals( new Fact( UserManager.FACT_SUBMITTER, session.getUserPrincipal().getName() ), facts.get( 2 ) );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
index 0f10692..e1837be 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/permissions/GroupPermissionTest.java
@@ -301,21 +301,16 @@ public class GroupPermissionTest
* @param p2
* @return
*/
- protected final boolean subjectImplies( final Subject subject, final GroupPermission p1, final Permission p2 )
- {
- try
- {
- Boolean result = (Boolean)Subject.doAsPrivileged( subject, new PrivilegedAction()
- {
- public Object run()
- {
- return Boolean.valueOf( p1.impliesMember( p2 ) );
+ protected final boolean subjectImplies( final Subject subject, final GroupPermission p1, final Permission p2 ) {
+ try {
+ Boolean result = Subject.doAsPrivileged( subject, new PrivilegedAction< Boolean >() {
+ @Override
+ public Boolean run() {
+ return p1.impliesMember( p2 );
}
}, null );
return result.booleanValue();
- }
- catch( AccessControlException e )
- {
+ } catch( AccessControlException e ) {
return false;
}
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
index f65adb0..561e566 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/BasicAttachmentProviderTest.java
@@ -177,9 +177,9 @@ public class BasicAttachmentProviderTest
m_provider.putAttachmentData( att, new FileInputStream(in) );
- List res = m_provider.listAllChanged( new Date(0L) );
+ List< Attachment > res = m_provider.listAllChanged( new Date(0L) );
- Attachment a0 = (Attachment) res.get(0);
+ Attachment a0 = res.get(0);
Assertions.assertEquals( att.getName(), a0.getName(), "name" );
}
@@ -200,12 +200,12 @@ public class BasicAttachmentProviderTest
m_provider.putAttachmentData( att2, new FileInputStream(in) );
- List res = m_provider.listAllChanged( new Date(0L) );
+ List< Attachment > res = m_provider.listAllChanged( new Date(0L) );
Assertions.assertEquals( 2, res.size(), "list size" );
- Attachment a2 = (Attachment) res.get(0); // Most recently changed
- Attachment a1 = (Attachment) res.get(1); // Least recently changed
+ Attachment a2 = res.get(0); // Most recently changed
+ Attachment a1 = res.get(1); // Least recently changed
Assertions.assertEquals( att.getName(), a1.getName(), "a1 name" );
Assertions.assertEquals( att2.getName(), a2.getName(), "a2 name" );
@@ -236,12 +236,12 @@ public class BasicAttachmentProviderTest
m_provider.putAttachmentData( att2, new FileInputStream(in) );
- List res = m_provider.listAllChanged( new Date(0L) );
+ List< Attachment > res = m_provider.listAllChanged( new Date(0L) );
Assertions.assertEquals( 2, res.size(), "list size" );
- Attachment a2 = (Attachment) res.get(0); // Most recently changed
- Attachment a1 = (Attachment) res.get(1); // Least recently changed
+ Attachment a2 = res.get(0); // Most recently changed
+ Attachment a1 = res.get(1); // Least recently changed
Assertions.assertEquals( att.getName(), a1.getName(), "a1 name" );
Assertions.assertEquals( att2.getName(), a2.getName(), "a2 name" );
@@ -280,12 +280,12 @@ public class BasicAttachmentProviderTest
m_provider.putAttachmentData( att2, new FileInputStream(in) );
- List res = m_provider.listAllChanged( new Date(0L) );
+ List< Attachment > res = m_provider.listAllChanged( new Date(0L) );
Assertions.assertEquals( 2, res.size(), "list size" );
- Attachment a2 = (Attachment) res.get(0); // Most recently changed
- Attachment a1 = (Attachment) res.get(1); // Least recently changed
+ Attachment a2 = res.get(0); // Most recently changed
+ Attachment a1 = res.get(1); // Least recently changed
Assertions.assertEquals( att.getName(), a1.getName(), "a1 name" );
Assertions.assertEquals( att2.getName(), a2.getName(), "a2 name" );
@@ -325,12 +325,12 @@ public class BasicAttachmentProviderTest
m_provider.putAttachmentData( att2, new FileInputStream(in) );
- List res = m_provider.listAllChanged( new Date(0L) );
+ List< Attachment > res = m_provider.listAllChanged( new Date(0L) );
Assertions.assertEquals( 2, res.size(), "list size" );
- Attachment a2 = (Attachment) res.get(0); // Most recently changed
- Attachment a1 = (Attachment) res.get(1); // Least recently changed
+ Attachment a2 = res.get(0); // Most recently changed
+ Attachment a1 = res.get(1); // Least recently changed
Assertions.assertEquals( att.getName(), a1.getName(), "a1 name" );
Assertions.assertEquals( att2.getName(), a2.getName(), "a2 name" );
@@ -357,12 +357,12 @@ public class BasicAttachmentProviderTest
m_provider.putAttachmentData( att2, new FileInputStream(in) );
- List res = m_provider.listAllChanged( new Date(0L) );
+ List< Attachment > res = m_provider.listAllChanged( new Date(0L) );
Assertions.assertEquals( 2, res.size(), "list size" );
- Attachment a2 = (Attachment) res.get(0); // Most recently changed
- Attachment a1 = (Attachment) res.get(1); // Least recently changed
+ Attachment a2 = res.get(0); // Most recently changed
+ Attachment a1 = res.get(1); // Least recently changed
Assertions.assertEquals( att.getName(), a1.getName(), "a1 name" );
Assertions.assertEquals( att2.getName(), a2.getName(), "a2 name" );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/CounterProvider.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/CounterProvider.java
index 0a22e4d..fabe4ab 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/CounterProvider.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/CounterProvider.java
@@ -49,6 +49,7 @@ public class CounterProvider
String m_defaultText = "[Foo], [Bar], [Blat], [Blah]";
+ @Override
public void initialize( WikiEngine engine, Properties props )
{
m_pages = new WikiPage[]
@@ -67,16 +68,19 @@ public class CounterProvider
}
}
+ @Override
public String getProviderInfo()
{
return "Very Simple Provider.";
}
+ @Override
public void putPageText( WikiPage page, String text )
throws ProviderException
{
}
+ @Override
public boolean pageExists( String page )
{
m_pageExistsCalls++;
@@ -84,11 +88,13 @@ public class CounterProvider
return findPage( page ) != null;
}
+ @Override
public boolean pageExists( String page, int version )
{
return pageExists (page);
}
+ @Override
public Collection findPages( QueryItem[] query )
{
return null;
@@ -105,6 +111,7 @@ public class CounterProvider
return null;
}
+ @Override
public WikiPage getPageInfo( String page, int version )
{
m_getPageCalls++;
@@ -117,11 +124,12 @@ public class CounterProvider
return p;
}
+ @Override
public Collection getAllPages()
{
m_getAllPagesCalls++;
- Vector<WikiPage> v = new Vector<WikiPage>();
+ Vector<WikiPage> v = new Vector<>();
for( int i = 0; i < m_pages.length; i++ )
{
@@ -131,31 +139,37 @@ public class CounterProvider
return v;
}
+ @Override
public Collection getAllChangedSince( Date date )
{
return new Vector();
}
+ @Override
public int getPageCount()
{
return m_pages.length;
}
- public List getVersionHistory( String page )
+ @Override
+ public List< WikiPage > getVersionHistory( String page )
{
- return new Vector();
+ return new Vector<>();
}
+ @Override
public String getPageText( String page, int version )
{
m_getPageTextCalls++;
return m_defaultText;
}
+ @Override
public void deleteVersion( String page, int version )
{
}
+ @Override
public void deletePage( String page )
{
}
@@ -163,6 +177,7 @@ public class CounterProvider
/* (non-Javadoc)
* @see org.apache.wiki.providers.WikiPageProvider#movePage(java.lang.String, java.lang.String)
*/
+ @Override
public void movePage( String from, String to ) throws ProviderException
{
// TODO Auto-generated method stub
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java
index fc83c7b..b90fec5 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java
@@ -53,16 +53,19 @@ public class VerySimpleProvider implements WikiPageProvider
private WikiEngine m_engine;
+ @Override
public void initialize( WikiEngine engine, Properties props )
{
m_engine = engine;
}
+ @Override
public String getProviderInfo()
{
return "Very Simple Provider.";
}
+ @Override
public void putPageText( WikiPage page, String text )
throws ProviderException
{
@@ -71,6 +74,7 @@ public class VerySimpleProvider implements WikiPageProvider
/**
* Always returns true.
*/
+ @Override
public boolean pageExists( String page )
{
return true;
@@ -79,6 +83,7 @@ public class VerySimpleProvider implements WikiPageProvider
/**
* Always returns true.
*/
+ @Override
public boolean pageExists( String page, int version )
{
return true;
@@ -87,6 +92,7 @@ public class VerySimpleProvider implements WikiPageProvider
/**
* Always returns null.
*/
+ @Override
public Collection findPages( QueryItem[] query )
{
return null;
@@ -95,6 +101,7 @@ public class VerySimpleProvider implements WikiPageProvider
/**
* Returns always a valid WikiPage.
*/
+ @Override
public WikiPage getPageInfo( String page, int version )
{
m_latestReq = page;
@@ -110,9 +117,10 @@ public class VerySimpleProvider implements WikiPageProvider
/**
* Returns a single page.
*/
+ @Override
public Collection getAllPages()
{
- Vector<WikiPage> v = new Vector<WikiPage>();
+ Vector<WikiPage> v = new Vector<>();
v.add( getPageInfo( PAGENAME, 5 ) );
return v;
}
@@ -120,6 +128,7 @@ public class VerySimpleProvider implements WikiPageProvider
/**
* Returns the same as getAllPages().
*/
+ @Override
public Collection getAllChangedSince( Date date )
{
return getAllPages();
@@ -128,6 +137,7 @@ public class VerySimpleProvider implements WikiPageProvider
/**
* Always returns 1.
*/
+ @Override
public int getPageCount()
{
return 1;
@@ -136,15 +146,17 @@ public class VerySimpleProvider implements WikiPageProvider
/**
* Always returns an empty list.
*/
- public List getVersionHistory( String page )
+ @Override
+ public List< WikiPage > getVersionHistory( String page )
{
- return new Vector();
+ return new Vector<>();
}
/**
* Stores the page and version into public fields of this class,
* then returns an empty string.
*/
+ @Override
public String getPageText( String page, int version )
{
m_latestReq = page;
@@ -153,10 +165,12 @@ public class VerySimpleProvider implements WikiPageProvider
return "";
}
+ @Override
public void deleteVersion( String page, int version )
{
}
+ @Override
public void deletePage( String page )
{
}
@@ -164,6 +178,7 @@ public class VerySimpleProvider implements WikiPageProvider
/* (non-Javadoc)
* @see org.apache.wiki.providers.WikiPageProvider#movePage(java.lang.String, java.lang.String)
*/
+ @Override
public void movePage( String from, String to ) throws ProviderException
{
// TODO Auto-generated method stub
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
index 76a5522..3b28231 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/render/RenderingManagerTest.java
@@ -86,7 +86,7 @@ public class RenderingManagerTest {
sw.stop();
// System.out.println(" Nocache took "+sw);
- long nocachetime = sw.getTime();
+ // long nocachetime = sw.getTime();
sw.reset();
sw.start();
@@ -106,7 +106,7 @@ public class RenderingManagerTest {
sw.stop();
// System.out.println(" Cache took "+sw);
- long speedup = nocachetime / sw.getTime();
+ // long speedup = nocachetime / sw.getTime();
// System.out.println(" Approx speedup: "+speedup+"x");
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
index bb4e995..21f29e4 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
@@ -106,12 +106,12 @@ public class SearchManagerTest {
m_engine.saveText("TestPage", txt);
Thread.yield();
- Collection res = waitForIndex( "mankind" , "testSimpleSearch" );
+ Collection< SearchResult > res = waitForIndex( "mankind" , "testSimpleSearch" );
Assertions.assertNotNull( res, "null result" );
Assertions.assertEquals( 1, res.size(), "no pages" );
- Assertions.assertEquals( "TestPage", ((SearchResult)res.iterator().next()).getPage().getName(), "page" );
+ Assertions.assertEquals( "TestPage", res.iterator().next().getPage().getName(), "page" );
m_engine.deleteTestPage("TestPage");
}
@@ -124,12 +124,12 @@ public class SearchManagerTest {
m_engine.saveText("TestPage", txt + " 2");
Thread.yield();
- Collection res = waitForIndex( "mankind" , "testSimpleSearch2" );
+ Collection< SearchResult > res = waitForIndex( "mankind" , "testSimpleSearch2" );
Assertions.assertNotNull( res, "null result" );
Assertions.assertEquals( 1, res.size(), "no pages" );
- Assertions.assertEquals( "TestPage", ((SearchResult)res.iterator().next()).getPage().getName(), "page" );
+ Assertions.assertEquals( "TestPage", res.iterator().next().getPage().getName(), "page" );
m_engine.deleteTestPage( "TestPage" );
}
@@ -158,7 +158,7 @@ public class SearchManagerTest {
Assertions.assertNotNull( res, "null result" );
Assertions.assertEquals( 1, res.size(), "no pages" );
- Assertions.assertEquals( "TestPage", ((SearchResult)res.iterator().next()).getPage().getName(), "page" );
+ Assertions.assertEquals( "TestPage", res.iterator().next().getPage().getName(), "page" );
m_engine.deleteTestPage("TestPage");
}
@@ -195,12 +195,12 @@ public class SearchManagerTest {
m_engine.saveText("TestPage", txt);
Thread.yield();
- Collection res = waitForIndex( "Test" , "testTitleSearch" );
+ Collection< SearchResult > res = waitForIndex( "Test" , "testTitleSearch" );
Assertions.assertNotNull( res, "null result" );
Assertions.assertEquals( 1, res.size(), "no pages" );
- Assertions.assertEquals( "TestPage", ((SearchResult)res.iterator().next()).getPage().getName(), "page" );
+ Assertions.assertEquals( "TestPage", res.iterator().next().getPage().getName(), "page" );
m_engine.deleteTestPage("TestPage");
}
@@ -211,12 +211,12 @@ public class SearchManagerTest {
m_engine.saveText("TestPage", txt);
Thread.yield();
- Collection res = waitForIndex( "TestPage" , "testTitleSearch2" );
+ Collection< SearchResult > res = waitForIndex( "TestPage" , "testTitleSearch2" );
Assertions.assertNotNull( res, "null result" );
Assertions.assertEquals( 1, res.size(), "no pages" );
- Assertions.assertEquals( "TestPage", ((SearchResult)res.iterator().next()).getPage().getName(), "page" );
+ Assertions.assertEquals( "TestPage", res.iterator().next().getPage().getName(), "page" );
m_engine.deleteTestPage("TestPage");
}