Skip to content

Commit

Permalink
remove old unused search tests, general clean up
Browse files Browse the repository at this point in the history
Also, stop using asadmin to start glassfish #1983
  • Loading branch information
pdurbin committed Apr 15, 2015
1 parent 857793e commit 13eb021
Show file tree
Hide file tree
Showing 20 changed files with 6 additions and 612 deletions.
6 changes: 6 additions & 0 deletions scripts/database/homebrew/delete-all
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh
/Applications/NetBeans/glassfish4/glassfish/bin/asadmin stop-domain
scripts/database/homebrew/drop-database
scripts/search/clear
rm -rf ~/dataverse/files
scripts/database/homebrew/create-database
36 changes: 0 additions & 36 deletions scripts/database/homebrew/rebuild-and-test
Original file line number Diff line number Diff line change
@@ -1,45 +1,9 @@
#!/bin/sh
/Applications/NetBeans/glassfish4/glassfish/bin/asadmin stop-domain
scripts/database/homebrew/drop-database
scripts/search/clear
rm -rf ~/dataverse/files
scripts/database/homebrew/create-database
mvn clean
mvn package
/Applications/NetBeans/glassfish4/glassfish/bin/asadmin start-domain
# should probably use this instead: https://maven-glassfish-plugin.java.net/deploy-mojo.html
/Applications/NetBeans/glassfish4/glassfish/bin/asadmin deploy --force target/dataverse-4.0.war
#cp target/dataverse-4.0.war /Applications/NetBeans/glassfish4/glassfish/domains/domain1/autodeploy
#sleep 15
scripts/database/homebrew/run-post-create-post-deploy
scripts/search/tests/query-unparseable
echo "---"
echo "Creating search users"
scripts/search/populate-users > /dev/null
scripts/search/create-users > /dev/null
scripts/search/tests/grant-authusers-add-on-root
scripts/search/tests/create-all-and-test
#scripts/search/tests/create-saved-search-and-test

exit
# FIXME: clean up these old test and make them pass
scripts/search/tests/delete-dataverse
scripts/search/tests/highlighting-setup01 > /dev/null
scripts/search/tests/highlighting-setup02 > /dev/null
scripts/search/tests/highlighting-setup03 > /dev/null
scripts/search/tests/highlighting
scripts/search/tests/dataset-versioning01
scripts/search/tests/dataset-versioning02-setup > /dev/null
scripts/search/tests/dataset-versioning02
scripts/search/tests/dataset-versioning03-setup > /dev/null
scripts/search/tests/dataset-versioning03
# TODO: get the equivalent of these old scripts working again.
# They were taken out because we don't have a programmatic way
# to change descriptions for files ( https://redmine.hmdc.harvard.edu/issues/3232 ):
#
# https://github.com/IQSS/dataverse/blob/e99f67cd82f18587e0b20eceef291b5f6df3d497/scripts/search/tests/permissions-datasets01
# https://github.com/IQSS/dataverse/blob/e99f67cd82f18587e0b20eceef291b5f6df3d497/scripts/search/tests/permissions-datasets02
# https://github.com/IQSS/dataverse/blob/e99f67cd82f18587e0b20eceef291b5f6df3d497/scripts/search/tests/dataset-versioning04
# https://github.com/IQSS/dataverse/blob/e99f67cd82f18587e0b20eceef291b5f6df3d497/scripts/search/tests/dataset-versioning05
# https://github.com/IQSS/dataverse/blob/e99f67cd82f18587e0b20eceef291b5f6df3d497/scripts/search/tests/dataset-versioning06
# https://github.com/IQSS/dataverse/blob/e99f67cd82f18587e0b20eceef291b5f6df3d497/scripts/search/tests/special-characters
120 changes: 0 additions & 120 deletions scripts/search/data/dataset01-create-new.json

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/search/tests/dataset-versioning01

This file was deleted.

4 changes: 0 additions & 4 deletions scripts/search/tests/dataset-versioning02

This file was deleted.

4 changes: 0 additions & 4 deletions scripts/search/tests/dataset-versioning02-setup

This file was deleted.

34 changes: 0 additions & 34 deletions scripts/search/tests/dataset-versioning03

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/search/tests/dataset-versioning03-setup

This file was deleted.

17 changes: 0 additions & 17 deletions scripts/search/tests/delete-dataverse

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/search/tests/expected/dataset-versioning01anon

This file was deleted.

80 changes: 0 additions & 80 deletions scripts/search/tests/expected/dataset-versioning02anon

This file was deleted.

10 changes: 0 additions & 10 deletions scripts/search/tests/expected/dataset-versioning03pete-both

This file was deleted.

Loading

0 comments on commit 13eb021

Please sign in to comment.