Skip to content
This repository has been archived by the owner on Jul 21, 2023. It is now read-only.

Commit

Permalink
Update tests to JUnit 4 style and FEST asserts.
Browse files Browse the repository at this point in the history 
Also move the pom to two-space indents.
  • Loading branch information
@JakeWharton
JakeWharton committed Apr 14, 2013
1 parent 1a2bd20 commit 7ebd418
Show file tree
Hide file tree
Showing 4 changed files with 371 additions and 359 deletions.
1 change: 0 additions & 1 deletion checkstyle.xml
View file
Expand Up @@ -100,7 +100,6 @@
<!-- See http://checkstyle.sf.net/config_coding.html -->
<!--module name="AvoidInlineConditionals"/-->
<module name="CovariantEquals"/>
<module name="DoubleCheckedLocking"/>
<module name="EmptyStatement"/>
<!--<module name="EqualsAvoidNull"/>-->
<module name="EqualsHashCode"/>
Expand Down
238 changes: 121 additions & 117 deletions pom.xml
View file
@@ -1,120 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>

<groupId>com.jakewharton</groupId>
<artifactId>disklrucache</artifactId>
<packaging>jar</packaging>
<version>1.3.2-SNAPSHOT</version>

<name>Disk LRU Cache</name>
<description>A disk-based implementaion of a least-recently used cache.</description>
<url>https://github.com/JakeWharton/DiskLruCache/</url>
<inceptionYear>2012</inceptionYear>

<developers>
<developer>
<name>Jake Wharton</name>
<email>jakewharton@gmail.com</email>
<id>jakewharton</id>
<url>http://jakewharton.com</url>
<timezone>-5</timezone>
<roles>
<role>developer</role>
</roles>
</developer>
</developers>

<licenses>
<license>
<name>Apache License Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>http://github.com/JakeWharton/DiskLruCache/</url>
<connection>scm:git:git://github.com/JakeWharton/DiskLruCache.git</connection>
<developerConnection>scm:git:git@github.com:JakeWharton/DiskLruCache.git</developerConnection>
</scm>

<organization>
<name>Jake Wharton</name>
<url>http://jakewharton.com</url>
</organization>

<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/JakeWharton/DiskLruCache/issues</url>
</issueManagement>

<properties>
<java.version>1.5</java.version>

<junit.version>4.8.2</junit.version>
<commons-io.version>2.1</commons-io.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.7</version>
<configuration>
<failsOnError>true</failsOnError>
<configLocation>${project.basedir}/checkstyle.xml</configLocation>
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>checkstyle</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>

<groupId>com.jakewharton</groupId>
<artifactId>disklrucache</artifactId>
<packaging>jar</packaging>
<version>1.3.2-SNAPSHOT</version>

<name>Disk LRU Cache</name>
<description>A disk-based implementaion of a least-recently used cache.</description>
<url>https://github.com/JakeWharton/DiskLruCache/</url>
<inceptionYear>2012</inceptionYear>

<developers>
<developer>
<name>Jake Wharton</name>
<email>jakewharton@gmail.com</email>
<id>jakewharton</id>
<url>http://jakewharton.com</url>
<timezone>-5</timezone>
<roles>
<role>developer</role>
</roles>
</developer>
</developers>

<licenses>
<license>
<name>Apache License Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>http://github.com/JakeWharton/DiskLruCache/</url>
<connection>scm:git:git://github.com/JakeWharton/DiskLruCache.git</connection>
<developerConnection>scm:git:git@github.com:JakeWharton/DiskLruCache.git</developerConnection>
</scm>

<organization>
<name>Jake Wharton</name>
<url>http://jakewharton.com</url>
</organization>

<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/JakeWharton/DiskLruCache/issues</url>
</issueManagement>

<properties>
<java.version>1.5</java.version>

<junit.version>4.10</junit.version>
<commons-io.version>2.1</commons-io.version>
<fest.version>2.0M10</fest.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert-core</artifactId>
<version>${fest.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.10</version>
<configuration>
<failsOnError>true</failsOnError>
<configLocation>${project.basedir}/checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>checkstyle</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 7ebd418

Please sign in to comment.