Author: rezan
Date: Tue Jan 6 01:26:05 2015
New Revision: 1649708
URL: http://svn.apache.org/r1649708
Log:
classifier unit test cleanup
Modified:
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientFileTestOptional.java
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientJarTest.java
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUnitTest.java
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUrlTestOptional.java
Modified:
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientFileTestOptional.java
URL:
http://svn.apache.org/viewvc/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientFileTestOptional.java?rev=1649708&r1=1649707&r2=1649708&view=diff
==============================================================================
---
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientFileTestOptional.java
(original)
+++
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientFileTestOptional.java
Tue Jan 6 01:26:05 2015
@@ -28,7 +28,7 @@ import org.apache.devicemap.loader.Loade
public class DeviceMapClientFileTestOptional {
@Test
- public void DeviceMapClientFolderTest() throws Exception {
+ public void deviceMapClientFolderTest() throws Exception {
DeviceMapClient client = new DeviceMapClient();
client.initDeviceData(LoaderOption.FOLDER,
"../../../data/device-data/src/main/resources/devicedata");
@@ -41,7 +41,7 @@ public class DeviceMapClientFileTestOpti
}
@Test
- public void DeviceMapClientFolderFailureTest() throws Exception {
+ public void deviceMapClientFolderFailureTest() throws Exception {
DeviceMapClient client = new DeviceMapClient();
try {
@@ -55,7 +55,7 @@ public class DeviceMapClientFileTestOpti
}
@Test
- public void DeviceMapFactoryFileTest() throws Exception {
+ public void deviceMapFactoryFileTest() throws Exception {
String test = "Mozilla/5.0 (Linux; U; Android 2.2; en; HTC Aria A6380
Build/ERE27) AppleWebKit/540.13+ (KHTML, like Gecko) Version/3.1 Mobile
Safari/524.15.0";
Device device = DeviceMapFactory.getClient(LoaderOption.FOLDER,
"../../../data/device-data/src/main/resources/devicedata").classifyDevice(test);
Modified:
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientJarTest.java
URL:
http://svn.apache.org/viewvc/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientJarTest.java?rev=1649708&r1=1649707&r2=1649708&view=diff
==============================================================================
---
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientJarTest.java
(original)
+++
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientJarTest.java
Tue Jan 6 01:26:05 2015
@@ -28,7 +28,7 @@ import org.apache.devicemap.loader.Loade
public class DeviceMapClientJarTest {
@Test
- public void DeviceMapClientJarTest() throws Exception {
+ public void deviceMapClientJarTest() throws Exception {
DeviceMapClient client = new DeviceMapClient();
client.initDeviceData(LoaderOption.JAR);
@@ -41,7 +41,7 @@ public class DeviceMapClientJarTest {
}
@Test
- public void DeviceMapClientJarFailureTest() throws Exception {
+ public void deviceMapClientJarFailureTest() throws Exception {
DeviceMapClient client = new DeviceMapClient();
try {
@@ -55,7 +55,7 @@ public class DeviceMapClientJarTest {
}
@Test
- public void DeviceMapFactoryJarTest() throws Exception {
+ public void deviceMapFactoryJarTest() throws Exception {
String test = "Mozilla/5.0 (Linux; U; Android 2.2; en; HTC Aria A6380
Build/ERE27) AppleWebKit/540.13+ (KHTML, like Gecko) Version/3.1 Mobile
Safari/524.15.0";
Device device =
DeviceMapFactory.getClient(LoaderOption.JAR).classifyDevice(test);
Modified:
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUnitTest.java
URL:
http://svn.apache.org/viewvc/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUnitTest.java?rev=1649708&r1=1649707&r2=1649708&view=diff
==============================================================================
---
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUnitTest.java
(original)
+++
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUnitTest.java
Tue Jan 6 01:26:05 2015
@@ -21,12 +21,10 @@ package org.apache.devicemap;
import org.junit.Assert;
import org.junit.Test;
import org.apache.devicemap.data.Device;
-import org.apache.devicemap.loader.LoaderOption;
-import org.junit.BeforeClass;
public class DeviceMapClientUnitTest {
@Test
- public void DeviceMapClientUninitializedTest() throws Exception {
+ public void deviceMapClientUninitializedTest() throws Exception {
DeviceMapClient uninit = new DeviceMapClient();
try {
@@ -40,7 +38,7 @@ public class DeviceMapClientUnitTest {
}
@Test
- public void DeviceMapClientUnknownTest() throws Exception {
+ public void deviceMapClientUnknownTest() throws Exception {
Device device = DeviceMapFactory.getClient().classifyDevice("");
Assert.assertEquals("test ua not unknown", Device.UNKNOWN_ID,
device.getId());
@@ -51,7 +49,7 @@ public class DeviceMapClientUnitTest {
}
@Test
- public void DeviceMapClientMutateTest() throws Exception {
+ public void deviceMapClientMutateTest() throws Exception {
String test = "Mozilla/5.0 (Linux; U; Android 2.2; en; HTC Aria A6380
Build/ERE27) AppleWebKit/540.13+ (KHTML, like Gecko) Version/3.1 Mobile
Safari/524.15.0";
Device device = DeviceMapFactory.getClient().classifyDevice(test);
@@ -69,7 +67,7 @@ public class DeviceMapClientUnitTest {
}
@Test
- public void DeviceMapClientMutateUnknownTest() throws Exception {
+ public void deviceMapClientMutateUnknownTest() throws Exception {
Device device = DeviceMapFactory.getClient().classifyDevice("unknown");
Assert.assertEquals("test ua not unknown", Device.UNKNOWN_ID,
device.getId());
Modified:
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUrlTestOptional.java
URL:
http://svn.apache.org/viewvc/devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUrlTestOptional.java?rev=1649708&r1=1649707&r2=1649708&view=diff
==============================================================================
---
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUrlTestOptional.java
(original)
+++
devicemap/trunk/devicemap/java/classifier/src/test/java/org/apache/devicemap/DeviceMapClientUrlTestOptional.java
Tue Jan 6 01:26:05 2015
@@ -22,14 +22,13 @@ import java.io.FileNotFoundException;
import org.apache.devicemap.data.Device;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.apache.devicemap.loader.LoaderOption;
public class DeviceMapClientUrlTestOptional {
@Test
- public void DeviceMapClientUrlTest() throws Exception {
+ public void deviceMapClientUrlTest() throws Exception {
DeviceMapClient client = new DeviceMapClient();
client.initDeviceData(LoaderOption.URL);
@@ -42,7 +41,7 @@ public class DeviceMapClientUrlTestOptio
}
@Test
- public void DeviceMapClientCustomUrlTest() throws Exception {
+ public void deviceMapClientCustomUrlTest() throws Exception {
DeviceMapClient client = new DeviceMapClient();
client.initDeviceData(LoaderOption.URL,
"http://devicemap-vm.apache.org/data/latest/";);
@@ -55,7 +54,7 @@ public class DeviceMapClientUrlTestOptio
}
@Test
- public void DeviceMapClientUrlFailureTest() throws Exception {
+ public void deviceMapClientUrlFailureTest() throws Exception {
DeviceMapClient client = new DeviceMapClient();
try {
@@ -69,7 +68,7 @@ public class DeviceMapClientUrlTestOptio
}
@Test
- public void DeviceMapFactoryUrlTest() throws Exception {
+ public void deviceMapFactoryUrlTest() throws Exception {
String test = "Mozilla/5.0 (Linux; U; Android 2.2; en; HTC Aria A6380
Build/ERE27) AppleWebKit/540.13+ (KHTML, like Gecko) Version/3.1 Mobile
Safari/524.15.0";
Device device =
DeviceMapFactory.getClient(LoaderOption.URL).classifyDevice(test);
