summaryrefslogtreecommitdiffstats
path: root/idrop-web
diff options
context:
space:
mode:
authorMike Conway <mikeconway@dhcp152-54-6-70.wireless.europa.renci.org>2011-03-04 19:20:05 (GMT)
committer Mike Conway <mikeconway@dhcp152-54-6-70.wireless.europa.renci.org>2011-03-04 19:20:05 (GMT)
commita5c7ae68da83bb0064e6dd45efae56f6a6d56e25 (patch)
tree8180b3f8af3587db78477800c505165cd1755889 /idrop-web
parent5506aefa9fb676cf53bca729ed30809cfb1d2956 (diff)
downloadQCG-Data-a5c7ae68da83bb0064e6dd45efae56f6a6d56e25.zip
QCG-Data-a5c7ae68da83bb0064e6dd45efae56f6a6d56e25.tar.gz
QCG-Data-a5c7ae68da83bb0064e6dd45efae56f6a6d56e25.tar.bz2
fix failing test case tagSearchController in web
Diffstat (limited to 'idrop-web')
-rw-r--r--idrop-web/application.properties3
-rw-r--r--idrop-web/test/unit/org/irods/mydrop/controller/SearchControllerTests.groovy11
2 files changed, 7 insertions, 7 deletions
diff --git a/idrop-web/application.properties b/idrop-web/application.properties
index 4f0f2d3..fbf9c89 100644
--- a/idrop-web/application.properties
+++ b/idrop-web/application.properties
@@ -1,7 +1,6 @@
#Grails Metadata file
-#Wed Feb 16 18:41:31 EST 2011
+#Fri Mar 04 14:10:26 EST 2011
app.version=0.9.1-SNAPSHOT
-plugins.acegi=0.5.3.2
app.servlet.version=2.4
app.grails.version=1.3.6
plugins.tomcat=1.3.5
diff --git a/idrop-web/test/unit/org/irods/mydrop/controller/SearchControllerTests.groovy b/idrop-web/test/unit/org/irods/mydrop/controller/SearchControllerTests.groovy
index 098f62c..21f3168 100644
--- a/idrop-web/test/unit/org/irods/mydrop/controller/SearchControllerTests.groovy
+++ b/idrop-web/test/unit/org/irods/mydrop/controller/SearchControllerTests.groovy
@@ -9,12 +9,12 @@ import org.irods.jargon.core.exception.JargonException
import org.irods.jargon.core.pub.CollectionAndDataObjectListAndSearchAO
import org.irods.jargon.core.pub.IRODSAccessObjectFactory
import org.irods.jargon.core.pub.IRODSFileSystem
+import org.irods.jargon.core.query.CollectionAndDataObjectListingEntry
import org.irods.jargon.spring.security.IRODSAuthenticationToken
import org.irods.jargon.testutils.TestingPropertiesHelper
-import org.irods.jargon.usertagging.FreeTaggingService;
-import org.irods.jargon.usertagging.domain.IRODSTagGrouping
-import org.irods.jargon.usertagging.domain.TagQuerySearchResult;
-import org.irods.jargon.core.query.CollectionAndDataObjectListingEntry
+import org.irods.jargon.usertagging.FreeTaggingService
+import org.irods.jargon.usertagging.TaggingServiceFactory
+import org.irods.jargon.usertagging.domain.TagQuerySearchResult
import org.mockito.Mockito
import org.springframework.security.core.context.SecurityContextHolder
@@ -112,7 +112,7 @@ class SearchControllerTests extends ControllerUnitTestCase {
FreeTaggingService freeTaggingService = Mockito.mock(FreeTaggingService.class)
def entries = new ArrayList<CollectionAndDataObjectListingEntry>()
- tagQuerySearchResult = TagQuerySearchResult.instance("tags", entries)
+ def tagQuerySearchResult = TagQuerySearchResult.instance("tags", entries)
Mockito.when(freeTaggingService.searchUsingFreeTagString(searchTerm)).thenReturn(tagQuerySearchResult)
TaggingServiceFactory taggingServiceFactory = Mockito.mock(TaggingServiceFactory.class)
@@ -121,6 +121,7 @@ class SearchControllerTests extends ControllerUnitTestCase {
controller.irodsAccount = irodsAccount
controller.irodsAccessObjectFactory = irodsAccessObjectFactory
+ controller.taggingServiceFactory = taggingServiceFactory
controller.params.searchTerm = searchTerm
controller.params.searchType = searchType
controller.search()