Strabon

changeset 1065:82a91860d76d

Removed postgis.defaultUser from database properties (Actually not needed).
author Panayiotis Smeros <psmeros@di.uoa.gr>
date Mon Apr 22 16:13:39 2013 +0300 (2013-04-22)
parents 2e32beaa5a09
children 9228a4f5b773
files testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java testsuite/src/test/resources/databases.properties
line diff
     1.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java	Mon Apr 22 15:54:55 2013 +0300
     1.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java	Mon Apr 22 16:13:39 2013 +0300
     1.3 @@ -55,7 +55,6 @@
     1.4  	private static final String dbPropertiesFile=File.separator+"databases.properties";
     1.5  	
     1.6  	private static String databaseTemplateName = null;
     1.7 -	private static String defaultUser = null;
     1.8  	private static String serverName = null;
     1.9  	private static String username = null;
    1.10  	private static String password = null;
    1.11 @@ -81,11 +80,6 @@
    1.12  		{
    1.13  			databaseTemplateName = properties.getProperty("postgis.databaseTemplateName");
    1.14  		}
    1.15 -
    1.16 -		if((defaultUser = System.getProperty("postgis.defaultUser"))==null)
    1.17 -		{
    1.18 -			defaultUser = properties.getProperty("postgis.defaultUser");
    1.19 -		}
    1.20  		
    1.21  		if((serverName = System.getProperty("postgis.serverName"))==null)
    1.22  		{
    1.23 @@ -108,7 +102,7 @@
    1.24  		}
    1.25  		
    1.26  		//Connect to server and create the temp database
    1.27 -		url = "jdbc:postgresql://"+serverName+":"+port+"/"+defaultUser;
    1.28 +		url = "jdbc:postgresql://"+serverName+":"+port;
    1.29  		conn = DriverManager.getConnection(url, username, password);
    1.30  		
    1.31          pst = conn.prepareStatement("SELECT * FROM pg_catalog.pg_database");
    1.32 @@ -208,7 +202,7 @@
    1.33  		
    1.34  		//Drop the temp database
    1.35  		conn.close();
    1.36 -		String url = "jdbc:postgresql://"+serverName+":"+port+"/"+defaultUser;
    1.37 +		String url = "jdbc:postgresql://"+serverName+":"+port;
    1.38  		conn = DriverManager.getConnection(url, username, password);
    1.39  		
    1.40  		PreparedStatement pst = conn.prepareStatement("DROP DATABASE "+databaseName);
     2.1 --- a/testsuite/src/test/resources/databases.properties	Mon Apr 22 15:54:55 2013 +0300
     2.2 +++ b/testsuite/src/test/resources/databases.properties	Mon Apr 22 16:13:39 2013 +0300
     2.3 @@ -1,6 +1,5 @@
     2.4  # PostGIS
     2.5  postgis.databaseTemplateName = template_postgis
     2.6 -postgis.defaultUser = postgres
     2.7  postgis.serverName = localhost
     2.8  postgis.username = postgres
     2.9  postgis.password = postgres