You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by bd...@apache.org on 2013/02/15 17:08:29 UTC
svn commit: r1446664 - in /incubator/devicemap/trunk/openddr/java: ./
src/test/java/org/apache/devicemap/simpleddr/test/
src/test/resources/config/ src/test/resources/openddr-test-data/
src/test/resources/openddr/
Author: bdelacretaz
Date: Fri Feb 15 16:08:29 2013
New Revision: 1446664
URL: http://svn.apache.org/r1446664
Log:
DMAP-17 - TestDeviceDataQueries added, basic tests using our real device data
Added:
incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/DeviceMapService.java (with props)
incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDataService.java (with props)
incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDeviceDataQueries.java (with props)
incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.devicemap.properties (with props)
incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.test.properties (contents, props changed)
- copied, changed from r1446586, incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties
incubator/devicemap/trunk/openddr/java/src/test/resources/openddr-test-data/
- copied from r1446586, incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/
Removed:
incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties
incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/
Modified:
incubator/devicemap/trunk/openddr/java/pom.xml
incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/ServiceSetup.java
incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestServiceCreation.java
incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestSimpleQueries.java
Modified: incubator/devicemap/trunk/openddr/java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/pom.xml?rev=1446664&r1=1446663&r2=1446664&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/pom.xml (original)
+++ incubator/devicemap/trunk/openddr/java/pom.xml Fri Feb 15 16:08:29 2013
@@ -61,6 +61,26 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>unpack-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includes>**/*.xml</includes>
+ <outputDirectory>${project.build.directory}/devicemap</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -94,6 +114,12 @@
<version>2008-04-04</version>
</dependency>
<dependency>
+ <groupId>org.apache.devicemap</groupId>
+ <artifactId>devicemap-device-data</artifactId>
+ <version>0.9.9-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
Added: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/DeviceMapService.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/DeviceMapService.java?rev=1446664&view=auto
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/DeviceMapService.java (added)
+++ incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/DeviceMapService.java Fri Feb 15 16:08:29 2013
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.devicemap.simpleddr.test;
+
+import org.w3c.ddr.simple.Service;
+
+/** Provides a DeviceMap Service singleton
+ * that uses actual DeviceMap data.
+ */
+public class DeviceMapService {
+ public static final Service DEVICEMAP_SERVICE;
+
+ static {
+ DEVICEMAP_SERVICE = ServiceSetup.getService("config/openddr.devicemap.properties");
+ }
+
+ /** Do not instantiate, use DEVICEMAP_SERVICE instead */
+ private DeviceMapService() {
+ }
+}
Propchange: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/DeviceMapService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/DeviceMapService.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/ServiceSetup.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/ServiceSetup.java?rev=1446664&r1=1446663&r2=1446664&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/ServiceSetup.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/ServiceSetup.java Fri Feb 15 16:08:29 2013
@@ -26,18 +26,15 @@ import java.util.Properties;
import org.w3c.ddr.simple.Service;
import org.w3c.ddr.simple.ServiceFactory;
-/** Provides a DeviceMap Service singleton
+/** Provides a DeviceMap Service instance
* for tests.
*/
public class ServiceSetup {
- private static String CFG_RESOURCE_PATH = "config/openddr.properties";
- public static final Service S;
-
- static {
+ static Service getService(String resourcePath) {
try {
final Properties props = new Properties();
- final InputStream cfg = ServiceSetup.class.getClassLoader().getResourceAsStream(CFG_RESOURCE_PATH);
- assertNotNull("Expecting " + CFG_RESOURCE_PATH + " resource to be available", cfg);
+ final InputStream cfg = ServiceSetup.class.getClassLoader().getResourceAsStream(resourcePath);
+ assertNotNull("Expecting " + resourcePath + " resource to be available", cfg);
try {
props.load(cfg);
} finally {
@@ -45,13 +42,9 @@ public class ServiceSetup {
}
final String vocabIRI = props.getProperty("oddr.vocabulary.device");
final String serviceClass = props.getProperty("oddr.service.class");
- S = ServiceFactory.newService(serviceClass, vocabIRI, props);
+ return ServiceFactory.newService(serviceClass, vocabIRI, props);
} catch(Exception e) {
throw new RuntimeException("Failed to initialize Service", e);
}
}
-
- /** Do not instantiate, use S instead */
- private ServiceSetup() {
- }
}
Added: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDataService.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDataService.java?rev=1446664&view=auto
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDataService.java (added)
+++ incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDataService.java Fri Feb 15 16:08:29 2013
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.devicemap.simpleddr.test;
+
+import org.w3c.ddr.simple.Service;
+
+/** Provides a DeviceMap Service singleton
+ * that uses test data.
+ */
+public class TestDataService {
+ public static final Service TEST_DATA_SERVICE;
+
+ static {
+ TEST_DATA_SERVICE = ServiceSetup.getService("config/openddr.test.properties");
+ }
+
+ /** Do not instantiate, use TEST_DATA_SERVICE instead */
+ private TestDataService() {
+ }
+}
Propchange: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDataService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDataService.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Added: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDeviceDataQueries.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDeviceDataQueries.java?rev=1446664&view=auto
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDeviceDataQueries.java (added)
+++ incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDeviceDataQueries.java Fri Feb 15 16:08:29 2013
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.devicemap.simpleddr.test;
+
+import static org.apache.devicemap.simpleddr.test.DeviceMapService.DEVICEMAP_SERVICE;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.w3c.ddr.simple.PropertyRef;
+import org.w3c.ddr.simple.PropertyValue;
+import org.w3c.ddr.simple.PropertyValues;
+import org.w3c.ddr.simple.exception.NameException;
+import org.w3c.ddr.simple.exception.ValueException;
+
+/** Test a simple DDR query */
+public class TestDeviceDataQueries {
+
+ public static final String [] PROP_NAMES = { "vendor", "model", "displayWidth", "displayHeight" };
+ public static final PropertyRef [] PROP_REFS = new PropertyRef[PROP_NAMES.length];
+
+ static {
+ try {
+ for(int i=0; i < PROP_NAMES.length; i++) {
+ PROP_REFS[i] = DEVICEMAP_SERVICE.newPropertyRef(PROP_NAMES[i]);
+ }
+ } catch(Exception e) {
+ throw new RuntimeException("Exception while creating PropertyRefs", e);
+ }
+ }
+
+ private void assertProperties(String [] expected, PropertyValues actual, PropertyRef [] refs) throws NameException, ValueException {
+ assertNotNull("Expecting non-null PropertyValues", actual);
+ for(int i=0; i < refs.length; i++) {
+ final PropertyValue pv = actual.getValue(PROP_REFS[i]);
+ assertNotNull("Expecting non-null PropertyValue for "
+ + refs[i].getLocalPropertyName(), pv);
+ if(expected[i] == null) {
+ assertFalse("Expecting property to have exist==false: " + PROP_REFS[i].getLocalPropertyName(), pv.exists());
+ } else {
+ assertTrue("Expecting property to exist:" + PROP_REFS[i].getLocalPropertyName(), pv.exists());
+ assertEquals("Expecting value " + expected[i] + " for "
+ + refs[i].getLocalPropertyName(), expected[i], pv.getString());
+ }
+ }
+ }
+
+ @Test
+ public void SamsungGtIsFound() throws Exception {
+ final String [] expected = { "Samsung", "GT-B7610", "480", "800" };
+ final String UA = "SAMSUNG-GT-B7610/1.0 Browser/Opera/9.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 UNTRUSTED/1.0";
+
+ final PropertyValues pvs = DEVICEMAP_SERVICE.getPropertyValues(new UserAgentEvidence(UA));
+ assertProperties(expected, pvs, PROP_REFS);
+ }
+
+ @Test
+ public void iPhone5IsFound() throws Exception {
+ final String [] expected = { "Apple", "iPhone", "320", "480" };
+ final String UA = "Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3";
+
+ final PropertyValues pvs = DEVICEMAP_SERVICE.getPropertyValues(new UserAgentEvidence(UA));
+ assertProperties(expected, pvs, PROP_REFS);
+ }
+}
\ No newline at end of file
Propchange: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDeviceDataQueries.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestDeviceDataQueries.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestServiceCreation.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestServiceCreation.java?rev=1446664&r1=1446663&r2=1446664&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestServiceCreation.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestServiceCreation.java Fri Feb 15 16:08:29 2013
@@ -21,13 +21,13 @@ package org.apache.devicemap.simpleddr.t
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-import static org.apache.devicemap.simpleddr.test.ServiceSetup.S;
+import static org.apache.devicemap.simpleddr.test.TestDataService.TEST_DATA_SERVICE;
/** Verify that our test Service is correctly initialized */
public class TestServiceCreation {
@Test
public void testServiceFactory() throws Exception {
- assertNotNull("Expecting non-null API version", S.getAPIVersion());
+ assertNotNull("Expecting non-null API version", TEST_DATA_SERVICE.getAPIVersion());
}
}
\ No newline at end of file
Modified: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestSimpleQueries.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestSimpleQueries.java?rev=1446664&r1=1446663&r2=1446664&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestSimpleQueries.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/simpleddr/test/TestSimpleQueries.java Fri Feb 15 16:08:29 2013
@@ -18,7 +18,8 @@
*/
package org.apache.devicemap.simpleddr.test;
-import static org.apache.devicemap.simpleddr.test.ServiceSetup.S;
+import static org.apache.devicemap.simpleddr.test.TestDataService.TEST_DATA_SERVICE;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -40,7 +41,7 @@ public class TestSimpleQueries {
static {
try {
for(int i=0; i < PROP_NAMES.length; i++) {
- PROP_REFS[i] = S.newPropertyRef(PROP_NAMES[i]);
+ PROP_REFS[i] = TEST_DATA_SERVICE.newPropertyRef(PROP_NAMES[i]);
}
} catch(Exception e) {
throw new RuntimeException("Exception while creating PropertyRefs", e);
@@ -68,7 +69,7 @@ public class TestSimpleQueries {
final String [] expected = { "Apache DeviceMap", "Nexus One", "245", "324", "true" };
final String nexusUA = "Mozilla/5.0 (Linux; U; Android 2.2; en-us; Nexus One Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
- final PropertyValues pvs = S.getPropertyValues(new UserAgentEvidence(nexusUA));
+ final PropertyValues pvs = TEST_DATA_SERVICE.getPropertyValues(new UserAgentEvidence(nexusUA));
assertProperties(expected, pvs, PROP_REFS);
}
@@ -79,7 +80,7 @@ public class TestSimpleQueries {
// but maybe there's a good reason.
final String [] expected = new String[PROP_REFS.length];
- final PropertyValues pvs = S.getPropertyValues(new UserAgentEvidence("foo"));
+ final PropertyValues pvs = TEST_DATA_SERVICE.getPropertyValues(new UserAgentEvidence("foo"));
assertProperties(expected, pvs, PROP_REFS);
}
}
\ No newline at end of file
Added: incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.devicemap.properties
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.devicemap.properties?rev=1446664&view=auto
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.devicemap.properties (added)
+++ incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.devicemap.properties Fri Feb 15 16:08:29 2013
@@ -0,0 +1,18 @@
+# Properties used to test the openddr module with our actual device data
+oddr.service.class=org.apache.devicemap.simpleddr.ODDRService
+
+oddr.ua.device.builder.path=${project.build.directory}/devicemap/devicedata/BuilderDataSource.xml
+oddr.ua.device.datasource.path=${project.build.directory}/devicemap/devicedata/DeviceDataSource.xml
+oddr.ua.device.builder.patch.paths=${project.build.directory}/devicemap/devicedata/BuilderDataSourcePatch.xml
+oddr.ua.device.datasource.patch.paths=${project.build.directory}/devicemap/devicedata/DeviceDataSourcePatch.xml
+
+oddr.ua.browser.datasource.path=${project.build.directory}/devicemap/devicedata/BrowserDataSource.xml
+
+oddr.ua.operatingSystem.datasource.path=${project.build.directory}/devicemap/devicedata/OperatingSystemDataSource.xml
+
+ddr.vocabulary.core.path=${project.build.directory}/devicemap/devicedata/coreVocabulary.xml
+oddr.vocabulary.path=${project.build.directory}/devicemap/devicedata/oddrVocabulary.xml
+oddr.limited.vocabulary.path=${project.build.directory}/devicemap/devicedata/oddrLimitedVocabulary.xml
+oddr.vocabulary.device=http://www.openddr.org/oddr-vocabulary
+
+oddr.threshold=70
\ No newline at end of file
Propchange: incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.devicemap.properties
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.test.properties (from r1446586, incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.test.properties?p2=incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.test.properties&p1=incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties&r1=1446586&r2=1446664&rev=1446664&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties (original)
+++ incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.test.properties Fri Feb 15 16:08:29 2013
@@ -1,18 +1,18 @@
-# Properties used to test the openddr module
+# Properties used to test the openddr module with a small test data set
oddr.service.class=org.apache.devicemap.simpleddr.ODDRService
-oddr.ua.device.builder.path=${project.build.directory}/test-classes/openddr/TEST_BuilderDataSource.xml
-oddr.ua.device.datasource.path=${project.build.directory}/test-classes/openddr/TEST_DeviceDataSource.xml
-oddr.ua.device.builder.patch.paths=${project.build.directory}/test-classes/openddr/TEST_BuilderDataSourcePatch.xml
-oddr.ua.device.datasource.patch.paths=${project.build.directory}/test-classes/openddr/TEST_DeviceDataSourcePatch.xml
+oddr.ua.device.builder.path=${project.build.directory}/test-classes/openddr-test-data/TEST_BuilderDataSource.xml
+oddr.ua.device.datasource.path=${project.build.directory}/test-classes/openddr-test-data/TEST_DeviceDataSource.xml
+oddr.ua.device.builder.patch.paths=${project.build.directory}/test-classes/openddr-test-data/TEST_BuilderDataSourcePatch.xml
+oddr.ua.device.datasource.patch.paths=${project.build.directory}/test-classes/openddr-test-data/TEST_DeviceDataSourcePatch.xml
-oddr.ua.browser.datasource.path=${project.build.directory}/test-classes/openddr/TEST_BrowserDataSource.xml
+oddr.ua.browser.datasource.path=${project.build.directory}/test-classes/openddr-test-data/TEST_BrowserDataSource.xml
-oddr.ua.operatingSystem.datasource.path=${project.build.directory}/test-classes/openddr/TEST_OperatingSystemDataSource.xml
+oddr.ua.operatingSystem.datasource.path=${project.build.directory}/test-classes/openddr-test-data/TEST_OperatingSystemDataSource.xml
-ddr.vocabulary.core.path=${project.build.directory}/test-classes/openddr/TEST_coreVocabulary.xml
-oddr.vocabulary.path=${project.build.directory}/test-classes/openddr/TEST_oddrVocabulary.xml
-oddr.limited.vocabulary.path=${project.build.directory}/test-classes/openddr/TEST_oddrLimitedVocabulary.xml
+ddr.vocabulary.core.path=${project.build.directory}/test-classes/openddr-test-data/TEST_coreVocabulary.xml
+oddr.vocabulary.path=${project.build.directory}/test-classes/openddr-test-data/TEST_oddrVocabulary.xml
+oddr.limited.vocabulary.path=${project.build.directory}/test-classes/openddr-test-data/TEST_oddrLimitedVocabulary.xml
oddr.vocabulary.device=http://www.openddr.org/oddr-vocabulary
oddr.threshold=70
\ No newline at end of file
Propchange: incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.test.properties
------------------------------------------------------------------------------
svn:eol-style = native