Skip to content

Commit fe3cfc2

Browse files
author
Benedikt Waldvogel
committed
switched from EasyMock to Mockito
1 parent 19a2859 commit fe3cfc2

25 files changed

Lines changed: 105 additions & 90 deletions

‎pom.xml‎

Lines changed: 84 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,87 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>liblinear</groupId>
5-
<artifactId>liblinear</artifactId>
6-
<name>liblinear</name>
7-
<version>1.33</version>
8-
<url>http://www.csie.ntu.edu.tw/~cjlin/liblinear/</url>
9-
<build>
10-
<sourceDirectory>src/java</sourceDirectory>
11-
<testSourceDirectory>src/test</testSourceDirectory>
12-
<plugins>
13-
<plugin>
14-
<artifactId>maven-compiler-plugin</artifactId>
15-
<configuration>
16-
<source>1.5</source>
17-
<target>1.5</target>
18-
</configuration>
19-
</plugin>
20-
21-
<plugin>
22-
<artifactId>maven-assembly-plugin</artifactId>
23-
<executions>
24-
<execution>
25-
<phase>package</phase>
26-
<goals>
27-
<goal>assembly</goal>
28-
</goals>
29-
</execution>
30-
</executions>
31-
<configuration>
32-
<finalName>liblinear-${project.version}</finalName>
33-
<descriptors>
34-
<descriptor>assembly.xml</descriptor>
35-
</descriptors>
36-
</configuration>
37-
</plugin>
38-
</plugins>
39-
</build>
40-
<dependencies>
41-
<!-- this dependency needs to be installed manually (see the 'lib' folder) -->
42-
<dependency>
43-
<groupId>org.netlib.jlapack</groupId>
44-
<artifactId>blas</artifactId>
45-
<version>0.8</version>
46-
<scope>compile</scope>
47-
</dependency>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>liblinear</groupId>
5+
<artifactId>liblinear</artifactId>
6+
<name>liblinear</name>
7+
<version>1.33</version>
8+
<url>http://www.csie.ntu.edu.tw/~cjlin/liblinear/</url>
9+
<build>
10+
<plugins>
11+
<plugin>
12+
<artifactId>maven-compiler-plugin</artifactId>
13+
<configuration>
14+
<source>1.5</source>
15+
<target>1.5</target>
16+
</configuration>
17+
</plugin>
18+
<plugin>
19+
<artifactId>maven-assembly-plugin</artifactId>
20+
<executions>
21+
<execution>
22+
<phase>package</phase>
23+
<goals>
24+
<goal>assembly</goal>
25+
</goals>
26+
</execution>
27+
</executions>
28+
<configuration>
29+
<finalName>liblinear-${project.version}</finalName>
30+
<descriptors>
31+
<descriptor>assembly.xml</descriptor>
32+
</descriptors>
33+
</configuration>
34+
</plugin>
35+
</plugins>
36+
</build>
37+
<repositories>
38+
<repository>
39+
<id>powermock-repo</id>
40+
<url>http://powermock.googlecode.com/svn/repo/</url>
41+
</repository>
42+
<repository>
43+
<id>fest-assert</id>
44+
<url>http://svn.codehaus.org/fest/m2/repo/</url>
45+
</repository>
46+
</repositories>
47+
<properties>
48+
<powermock.version>1.2.5</powermock.version>
49+
</properties>
50+
<dependencies>
51+
<!--
52+
this dependency needs to be installed manually (see the 'lib' folder)
53+
-->
54+
<dependency>
55+
<groupId>org.netlib.jlapack</groupId>
56+
<artifactId>blas</artifactId>
57+
<version>0.8</version>
58+
<scope>compile</scope>
59+
</dependency>
4860

4961
<!-- dependencies for unit testing -->
50-
<dependency>
51-
<groupId>junit</groupId>
52-
<artifactId>junit</artifactId>
53-
<version>4.5</version>
54-
<scope>test</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>fest</groupId>
58-
<artifactId>fest-assert</artifactId>
59-
<version>1.0a1</version>
60-
<scope>test</scope>
61-
</dependency>
62-
<dependency>
63-
<groupId>org.easymock</groupId>
64-
<artifactId>easymockclassextension</artifactId>
65-
<version>2.4</version>
66-
<scope>test</scope>
67-
</dependency>
68-
</dependencies>
69-
</project>
62+
<dependency>
63+
<groupId>org.powermock.modules</groupId>
64+
<artifactId>powermock-module-junit4</artifactId>
65+
<version>${powermock.version}</version>
66+
<scope>test</scope>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.powermock.api</groupId>
70+
<artifactId>powermock-api-mockito</artifactId>
71+
<version>${powermock.version}</version>
72+
<scope>test</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>junit</groupId>
76+
<artifactId>junit</artifactId>
77+
<version>4.5</version>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.easytesting</groupId>
82+
<artifactId>fest-assert</artifactId>
83+
<version>1.1</version>
84+
<scope>test</scope>
85+
</dependency>
86+
</dependencies>
87+
</project>

src/java/liblinear/ArraySorter.java renamed to src/main/java/liblinear/ArraySorter.java

File renamed without changes.

src/java/liblinear/DoubleArrayPointer.java renamed to src/main/java/liblinear/DoubleArrayPointer.java

File renamed without changes.

src/java/liblinear/FeatureNode.java renamed to src/main/java/liblinear/FeatureNode.java

File renamed without changes.

src/java/liblinear/Function.java renamed to src/main/java/liblinear/Function.java

File renamed without changes.

src/java/liblinear/IntArrayPointer.java renamed to src/main/java/liblinear/IntArrayPointer.java

File renamed without changes.

src/java/liblinear/InvalidInputDataException.java renamed to src/main/java/liblinear/InvalidInputDataException.java

File renamed without changes.

src/java/liblinear/L2LossSVMFunction.java renamed to src/main/java/liblinear/L2LossSVMFunction.java

File renamed without changes.

src/java/liblinear/L2LrFunction.java renamed to src/main/java/liblinear/L2LrFunction.java

File renamed without changes.

src/java/liblinear/Linear.java renamed to src/main/java/liblinear/Linear.java

File renamed without changes.

0 commit comments

Comments
 (0)