Project

General

Profile

« Previous | Next » 

Revision 4125

Added by daigle almost 16 years ago

Replace Options class with PropertyService

View differences:

ClientViewHelperTest.java
7 7

  
8 8
package edu.ucsb.nceas.metacat.clientview;
9 9

  
10
import edu.ucsb.nceas.utilities.Options;
11 10
import java.io.ByteArrayOutputStream;
12 11
import java.io.File;
13 12
import junit.framework.*;
14 13
import com.oreilly.servlet.multipart.MultipartParser;
15
import edu.ucsb.nceas.metacat.client.MetacatClient;
16 14
import java.io.InputStream;
17 15
import java.util.HashMap;
18 16
import java.util.Stack;
......
24 22
import org.w3c.dom.Document;
25 23
import org.w3c.dom.Node;
26 24

  
25
import edu.ucsb.nceas.metacat.client.MetacatClient;
26
import edu.ucsb.nceas.metacat.service.PropertyService;
27

  
27 28
/**
28 29
 * ClientViewHelper JUnit tests
29 30
 * @author barteau
......
32 33
    ClientViewHelper            instance;
33 34
    ClientView                  clientViewBean;
34 35
    
35
    final static String         PATH_TO_PROPERTIES = "projects/metacat/build/war/WEB-INF/metacat.properties";
36
//    final static String         PATH_TO_PROPERTIES = "projects/metacat/build/war/WEB-INF/metacat.properties";
37
    final static String         PATH_TO_PROPERTIES = "projects/metacat/build/war/WEB-INF";
36 38
    final static String         USR = "";
37 39
    final static String         ORG = "NCEAS";
38 40
    final static String         PWD = "";
......
59 61
        if (DOWNLOAD_DATA_DOCID.equals("")) 
60 62
            fail("Please set the class property DOWNLOAD_DATA_DOCID before running this test.");
61 63
        
62
        Options.initialize(new File(PATH_TO_PROPERTIES));
64
        PropertyService.getInstance(PATH_TO_PROPERTIES);
63 65
        
64 66
        clientViewBean = new ClientView();
65 67
        clientViewBean.setUsername(USR);

Also available in: Unified diff