Project

General

Profile

« Previous | Next » 

Revision c0248cde

Added by Andreas Müller over 7 years ago

ref #3658 remove nomenclaturalCode from all datasource related classes

  • and rename NomenclaturalCodeAwareDataSource

View differences:

cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmDataSourceTest.java
1 1
/**
2 2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
5
* 
5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
9 9

  
10 10
package eu.etaxonomy.cdm.database;
11 11

  
12
import static org.junit.Assert.*;
12
import static org.junit.Assert.assertEquals;
13
import static org.junit.Assert.assertNotNull;
13 14

  
14 15
import org.apache.log4j.Logger;
15 16
import org.junit.After;
......
24 25
/**
25 26
 * @author a.mueller
26 27
 * @created 18.12.2008
27
 * @version 1.0
28 28
 */
29 29
public class CdmDataSourceTest {
30 30
	private static final Logger logger = Logger.getLogger(CdmDataSourceTest.class);
......
35 35
	private static String pwd;
36 36
	private static int port;
37 37
	private static ICdmDataSource datasource;
38
	
38

  
39 39
	/**
40 40
	 * @throws java.lang.Exception
41 41
	 */
......
60 60
		username = "myUsername";
61 61
		pwd = "myPassword";
62 62
		port = 80;
63
		datasource = CdmDataSource.NewMySqlInstance(server, database, port, username, pwd, null);
64
		
63
		datasource = CdmDataSource.NewMySqlInstance(server, database, port, username, pwd);
64

  
65 65
	}
66 66

  
67 67
	/**
......
72 72
	}
73 73

  
74 74
//*************** TESTS ***********************************************
75
	
75

  
76 76
	/**
77 77
	 * Test method for {@link eu.etaxonomy.cdm.database.CdmDataSource#NewMySqlInstance(java.lang.String, java.lang.String, java.lang.String, java.lang.String, NomenclaturalCode)}.
78 78
	 */
......
88 88
	}
89 89

  
90 90
	/**
91
	 * Test method for {@link eu.etaxonomy.cdm.database.CdmDataSource#NewMySqlInstance(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, NomenclaturalCode)}.
91
	 * Test method for {@link eu.etaxonomy.cdm.database.CdmDataSource#NewMySqlInstance(java.lang.String, java.lang.String, int, java.lang.String)}.
92 92
	 */
93 93
	@Test
94 94
	public void testNewMySqlInstanceStringStringIntStringString() {
95
		ICdmDataSource ds = CdmDataSource.NewMySqlInstance(server, database, port, username, pwd, null);
95
		ICdmDataSource ds = CdmDataSource.NewMySqlInstance(server, database, port, username, pwd);
96 96
		assertNotNull("NewMySqlInstance(String, String, int, String, String) should not return null ", ds);
97 97
		assertEquals(server, ds.getServer());
98 98
		assertEquals(database, ds.getDatabase());
......
103 103
	}
104 104

  
105 105
	/**
106
	 * Test method for {@link eu.etaxonomy.cdm.database.CdmDataSource#NewSqlServer2005Instance(java.lang.String, java.lang.String, java.lang.String, java.lang.String, NomenclaturalCode)}.
106
	 * Test method for {@link eu.etaxonomy.cdm.database.CdmDataSource#NewSqlServer2005Instance(java.lang.String, java.lang.String, java.lang.String, java.lang.String)}.
107 107
	 */
108 108
	@Test
109 109
	public void testNewSqlServer2005InstanceStringStringStringString() {
110
		ICdmDataSource ds = CdmDataSource.NewSqlServer2005Instance(server, database, -1, username, pwd, null);
110
		ICdmDataSource ds = CdmDataSource.NewSqlServer2005Instance(server, database, -1, username, pwd);
111 111
		assertNotNull("NewSqlServer2005Instance(String, String, String, String) should not return null ", ds);
112 112
		assertEquals(server, ds.getServer());
113 113
		assertEquals(database, ds.getDatabase());
......
117 117
	}
118 118

  
119 119
	/**
120
	 * Test method for {@link eu.etaxonomy.cdm.database.CdmDataSource#NewSqlServer2005Instance(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, NomenclaturalCode)}.
120
	 * Test method for {@link eu.etaxonomy.cdm.database.CdmDataSource#NewSqlServer2005Instance(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String)}.
121 121
	 */
122 122
	@Test
123 123
	public void testNewSqlServer2005InstanceStringStringIntStringString() {
......
132 132
	}
133 133

  
134 134
	/**
135
	 * Test method for {@link eu.etaxonomy.cdm.database.CdmDataSource#NewH2EmbeddedInstance(java.lang.String, java.lang.String, java.lang.String, NomenclaturalCode)}.
135
	 * Test method for {@link eu.etaxonomy.cdm.database.CdmDataSource#NewH2EmbeddedInstance(java.lang.String, java.lang.String, java.lang.String)}.
136 136
	 */
137 137
	@Test
138 138
	public void testNewH2EmbeddedInstanceStringStringString() {
......
153 153
		ICdmDataSource ds = CdmDataSource.NewH2InMemoryInstance();
154 154
		assertNotNull("NewH2InMemoryInstance() should not return null ", ds);
155 155
		assertEquals(DatabaseTypeEnum.H2, ds.getDatabaseType());
156
		assertEquals(null, ds.getServer()); 
156
		assertEquals(null, ds.getServer());
157 157
		assertEquals(null, ds.getDatabase());
158 158
		assertEquals("sa", ds.getUsername()); //TODO right?
159 159
		assertEquals("", ds.getPassword());
......
168 168
		DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
169 169
		H2Mode h2Mode = H2Mode.EMBEDDED;
170 170
		String filePath = "path";
171
		ICdmDataSource ds = new CdmDataSource(dbType, server, database, port, username, pwd, filePath, h2Mode, null);
171
		ICdmDataSource ds = new CdmDataSource(dbType, server, database, port, username, pwd, filePath, h2Mode);
172 172
		assertNotNull("new datasource() should not be null", ds);
173 173
	}
174 174

  
......
258 258
	public void testGetFilePath() {
259 259
		assertEquals(null, datasource.getFilePath());
260 260
		String filePath = "path";
261
		ICdmDataSource ds = new CdmDataSource(DatabaseTypeEnum.H2, server, database, port, username, pwd, filePath, H2Mode.EMBEDDED, null);
261
		ICdmDataSource ds = new CdmDataSource(DatabaseTypeEnum.H2, server, database, port, username, pwd, filePath, H2Mode.EMBEDDED);
262 262
		assertNotNull("new datasource() should not be null", ds);
263 263
		assertEquals(filePath, ds.getFilePath());
264 264
	}
......
268 268
	 */
269 269
	@Test
270 270
	public void testGetPort() {
271
		assertEquals(port, datasource.getPort());	
271
		assertEquals(port, datasource.getPort());
272 272
	}
273 273

  
274 274
	/**
......
287 287
		assertEquals(null, datasource.getFilePath());
288 288
		String filePath = "path";
289 289
		H2Mode mode = H2Mode.EMBEDDED;
290
		ICdmDataSource ds = new CdmDataSource(DatabaseTypeEnum.H2, server, database, port, username, pwd, filePath, mode, null);
290
		ICdmDataSource ds = new CdmDataSource(DatabaseTypeEnum.H2, server, database, port, username, pwd, filePath, mode);
291 291
		assertNotNull("new datasource() should not be null", ds);
292 292
		assertEquals(mode, ds.getMode());
293 293
	}

Also available in: Unified diff