Index: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/LoadForeignPropertiesTest.xml |
— | — | @@ -1,30 +0,0 @@ |
2 | | -<?xml version='1.0' encoding='UTF-8'?> |
3 | | -<dataset> |
4 | | - table.addField( new DatabaseField(this, "external_authority", getTextType(64), null, true, null) ); |
5 | | - table.addField( new DatabaseField(this, "external_id", getTextType(255), null, true, null) ); |
6 | | - |
7 | | - table.addField( new DatabaseField(this, "property", getTextType(255), null, true, KeyType.INDEX) ); |
8 | | - table.addField( new DatabaseField(this, "value", getTextType(255), null, true, null) ); |
9 | | - table.addField( new DatabaseField(this, "qualifier", getTextType(64), null, false, null) ); |
10 | | - |
11 | | - <tripleImport external_authority="acme" external_id="FooBar" property="concept_name" value="FooBar"/> |
12 | | - <tripleImport external_authority="acme" external_id="FooBar" property="firstName" value="Bar"/> |
13 | | - <tripleImport external_authority="acme" external_id="FooBar" property="name" value="Foo"/> |
14 | | - <tripleImport external_authority="acme" external_id="FooBar" property="phone" value="12345"/> |
15 | | - |
16 | | - <tripleImport external_authority="acme" external_id="XyzzyQuux" property="concept_name" value="XyzzyQuux"/> |
17 | | - <tripleImport external_authority="acme" external_id="XyzzyQuux" property="firstName" value="Quux"/> |
18 | | - <tripleImport external_authority="acme" external_id="XyzzyQuux" property="name" value="Xyzzy"/> |
19 | | - <tripleImport external_authority="acme" external_id="XyzzyQuux" property="phone" value="67890"/> |
20 | | - |
21 | | - <tableImport external_authority="acme" external_id="FooBar" property="concept_name" value="FooBar"/> |
22 | | - <tableImport external_authority="acme" external_id="FooBar" property="firstName" value="Bar"/> |
23 | | - <tableImport external_authority="acme" external_id="FooBar" property="name" value="Foo"/> |
24 | | - <tableImport external_authority="acme" external_id="FooBar" property="phone" value="12345"/> |
25 | | - |
26 | | - <tableImport external_authority="acme" external_id="XyzzyQuux" property="concept_name" value="XyzzyQuux"/> |
27 | | - <tableImport external_authority="acme" external_id="XyzzyQuux" property="firstName" value="Quux"/> |
28 | | - <tableImport external_authority="acme" external_id="XyzzyQuux" property="name" value="Xyzzy"/> |
29 | | - <tableImport external_authority="acme" external_id="XyzzyQuux" property="phone" value="67890"/> |
30 | | -</dataset> |
31 | | - |
Index: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/LoadForeignPropertiesTest.data |
— | — | @@ -0,0 +1,23 @@ |
| 2 | +<?xml version='1.0' encoding='UTF-8'?> |
| 3 | +<dataset> |
| 4 | + <tripleImport external_authority="acme" external_id="FooBar" property="concept_name" value="FooBar" qualifier="dummy"/> |
| 5 | + <tripleImport external_authority="acme" external_id="FooBar" property="firstName" value="Bar" qualifier="dummy"/> |
| 6 | + <tripleImport external_authority="acme" external_id="FooBar" property="name" value="Foo" qualifier="dummy"/> |
| 7 | + <tripleImport external_authority="acme" external_id="FooBar" property="phone" value="12345" qualifier="dummy"/> |
| 8 | + |
| 9 | + <tripleImport external_authority="acme" external_id="XyzzyQuux" property="concept_name" value="XyzzyQuux" qualifier="dummy"/> |
| 10 | + <tripleImport external_authority="acme" external_id="XyzzyQuux" property="firstName" value="Quux" qualifier="dummy"/> |
| 11 | + <tripleImport external_authority="acme" external_id="XyzzyQuux" property="name" value="Xyzzy" qualifier="dummy"/> |
| 12 | + <tripleImport external_authority="acme" external_id="XyzzyQuux" property="phone" value="67890" qualifier="dummy"/> |
| 13 | + |
| 14 | + <tableImport external_authority="acme" external_id="FooBar" property="concept_name" value="FooBar" qualifier="dummy"/> |
| 15 | + <tableImport external_authority="acme" external_id="FooBar" property="firstName" value="Bar" qualifier="dummy"/> |
| 16 | + <tableImport external_authority="acme" external_id="FooBar" property="name" value="Foo" qualifier="dummy"/> |
| 17 | + <tableImport external_authority="acme" external_id="FooBar" property="phone" value="12345" qualifier="dummy"/> |
| 18 | + |
| 19 | + <tableImport external_authority="acme" external_id="XyzzyQuux" property="concept_name" value="XyzzyQuux" qualifier="dummy"/> |
| 20 | + <tableImport external_authority="acme" external_id="XyzzyQuux" property="firstName" value="Quux" qualifier="dummy"/> |
| 21 | + <tableImport external_authority="acme" external_id="XyzzyQuux" property="name" value="Xyzzy" qualifier="dummy"/> |
| 22 | + <tableImport external_authority="acme" external_id="XyzzyQuux" property="phone" value="67890" qualifier="dummy"/> |
| 23 | +</dataset> |
| 24 | + |
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/LoadForeignPropertiesTest.data |
___________________________________________________________________ |
Added: svn:mergeinfo |
Index: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/LoadForeignPropertiesTest-tableImport.properties |
— | — | @@ -4,3 +4,4 @@ |
5 | 5 | fields=(concept_name,name,firstName,phone) |
6 | 6 | skip-header=true |
7 | 7 | file-format="csv" |
| 8 | +property-qualifier="dummy" |
\ No newline at end of file |
Index: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/LoadForeignPropertiesTest-tripleImport.properties |
— | — | @@ -4,3 +4,4 @@ |
5 | 5 | property-name-field="property" |
6 | 6 | property-value-field="value" |
7 | 7 | file-format="csv" |
| 8 | +property-qualifier="dummy" |
\ No newline at end of file |
Index: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/IntegratorAppTestBase.java |
— | — | @@ -2,13 +2,7 @@ |
3 | 3 | |
4 | 4 | import java.io.IOException; |
5 | 5 | import java.net.URL; |
6 | | -import java.sql.Connection; |
7 | | -import java.sql.DatabaseMetaData; |
8 | | -import java.sql.ResultSet; |
9 | | -import java.sql.Statement; |
10 | 6 | |
11 | | -import org.dbunit.dataset.Column; |
12 | | -import org.dbunit.dataset.ITable; |
13 | 7 | import org.dbunit.operation.DatabaseOperation; |
14 | 8 | |
15 | 9 | import de.brightbyte.db.testing.DatabaseTestBase; |