Project

General

Profile

« Previous | Next » 

Revision 4816

Added by daigle about 15 years ago

Remove initialization of MetacatUtil.buildIndexPaths in test files. This is taken care of in the background now using SystemUtil.getIndexPaths()

View differences:

test/edu/ucsb/nceas/metacattest/QuerySpecificationTest.java
94 94
    {
95 95
  	  try
96 96
  	  {
97
//		  PropertyService.getInstance("build/tests");
98 97
		  PropertyService.getInstance();
99
  		  MetacatUtil.pathsForIndexing 
100
  		         = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
101
  	  }
98
 	  }
102 99
  	  catch(Exception e)
103 100
  	  {
104 101
  		  System.err.println("Exception in initialize option in MetacatServletNetTest "+e.getMessage());
test/edu/ucsb/nceas/metacattest/SubTreeTest.java
52 52
  {
53 53
	  try
54 54
	  {
55
		  MetacatUtil.pathsForIndexing 
56
		         = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
55
		  PropertyService.getInstance();
57 56
	  }
58 57
	  catch(Exception e)
59 58
	  {
test/edu/ucsb/nceas/metacattest/UploadIPCCDataTest.java
81 81
	  {
82 82
		  try
83 83
		  {
84
//			  PropertyService.getInstance("build/tests");
85 84
			  PropertyService.getInstance();
86
			  MetacatUtil.pathsForIndexing 
87
			         = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
88 85
		  }
89 86
		  catch(Exception e)
90 87
		  {
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestDetailLogTest.java
55 55
  {
56 56
	  try
57 57
	  {
58
		  MetacatUtil.pathsForIndexing 
59
		         = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
58
		  PropertyService.getInstance();
60 59
	  }
61 60
	  catch(Exception e)
62 61
	  {
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvesterTest.java
47 47
	/* Initialize Properties */
48 48
	static {
49 49
		try {
50
			MetacatUtil.pathsForIndexing = MetacatUtil.getOptionList(
51
					PropertyService.getProperty("xml.indexPaths"));
50
			PropertyService.getInstance();
52 51
		} catch (Exception e) {
53 52
			System.err.println("Exception in initialize option in MetacatServletNetTest "
54 53
					+ e.getMessage());
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestDocumentTest.java
54 54
  {
55 55
	  try
56 56
	  {
57
		  MetacatUtil.pathsForIndexing 
58
		         = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
57
		  PropertyService.getInstance();
59 58
	  }
60 59
	  catch(Exception e)
61 60
	  {
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestLogTest.java
58 58
  {
59 59
	  try
60 60
	  {
61
		  MetacatUtil.pathsForIndexing 
62
		         = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
61
		  PropertyService.getInstance();
63 62
	  }
64 63
	  catch(Exception e)
65 64
	  {
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestSiteScheduleTest.java
53 53
  {
54 54
	  try
55 55
	  {
56
		  MetacatUtil.pathsForIndexing 
57
		         = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
56
		  PropertyService.getInstance();
58 57
	  }
59 58
	  catch(Exception e)
60 59
	  {
test/edu/ucsb/nceas/metacattest/QueryGroupTest.java
45 45
    {
46 46
  	  try
47 47
  	  {
48
  		  MetacatUtil.pathsForIndexing 
49
  		         = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
50
  	  }
48
			PropertyService.getInstance();
49
 	  }
51 50
  	  catch(Exception e)
52 51
  	  {
53 52
  		  System.err.println("Exception in initialize option in MetacatServletNetTest "+e.getMessage());
test/edu/ucsb/nceas/metacattest/BuildIndexTest.java
61 61
	private static String password;
62 62
	static {
63 63
		try {
64
			PropertyService.getInstance();
64 65
			metacatUrl = PropertyService.getProperty("test.metacatUrl");
65 66
			username = PropertyService.getProperty("test.mcUser");
66 67
			password = PropertyService.getProperty("test.mcPassword");
67 68
		} catch (PropertyNotFoundException pnfe) {
68 69
			System.err.println("Could not get property in static block: "
69 70
					+ pnfe.getMessage());
71
		} catch (ServiceException se) {
72
			System.err.println("Service problem in static block: "
73
					+ se.getMessage());
70 74
		}
71 75
	}
72 76

  
......
75 79
	private String testfile = "test/eml-sample.xml";
76 80
	private String testdocument = "";
77 81
	private Metacat m;
78
	/* Initialize properties */
79
	static {
80
		try {
81
//			PropertyService.getInstance("build/tests");
82
			PropertyService.getInstance();
83
			MetacatUtil.pathsForIndexing = MetacatUtil.getOptionList(PropertyService
84
					.getProperty("xml.indexPaths"));
85
		} catch (Exception e) {
86
			System.err.println("Exception in initialize option in MetacatServletNetTest "
87
					+ e.getMessage());
88
		}
89
	}
90 82

  
91 83
	/**
92 84
	 * Constructor to build the test
test/edu/ucsb/nceas/metacattest/ReplicationServerListTest.java
49 49
	  {
50 50
		  try
51 51
		  {
52
			 PropertyService.getInstance();
52 53
			 metacatReplicationURL=
53 54
                     PropertyService.getProperty("junitreplicationurl");
54
			  MetacatUtil.pathsForIndexing 
55
			         = MetacatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
56 55
		  }
57 56
		  catch(Exception e)
58 57
		  {

Also available in: Unified diff