You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/02/22 11:58:04 UTC
svn commit: r1292232 - in /incubator/directmemory/trunk: ./
directmemory-tests/ directmemory-tests/src/ directmemory-tests/src/main/
directmemory-tests/src/main/java/ directmemory-tests/src/main/java/org/
directmemory-tests/src/main/java/org/apache/ di...
Author: olamy
Date: Wed Feb 22 10:58:03 2012
New Revision: 1292232
URL: http://svn.apache.org/viewvc?rev=1292232&view=rev
Log:
add a test module which will contain test utilities
Added:
incubator/directmemory/trunk/directmemory-tests/
incubator/directmemory/trunk/directmemory-tests/pom.xml (with props)
incubator/directmemory/trunk/directmemory-tests/src/
incubator/directmemory/trunk/directmemory-tests/src/main/
incubator/directmemory/trunk/directmemory-tests/src/main/java/
incubator/directmemory/trunk/directmemory-tests/src/main/java/org/
incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/
incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/
incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/
incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/Wine.java (contents, props changed)
- copied, changed from r1292175, incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/Wine.java
incubator/directmemory/trunk/directmemory-tests/src/test/
incubator/directmemory/trunk/directmemory-tests/src/test/java/
incubator/directmemory/trunk/directmemory-tests/src/test/java/org/
incubator/directmemory/trunk/directmemory-tests/src/test/java/org/apache/
incubator/directmemory/trunk/directmemory-tests/src/test/java/org/apache/directmemory/
incubator/directmemory/trunk/directmemory-tests/src/test/java/org/apache/directmemory/test/
incubator/directmemory/trunk/directmemory-tests/src/test/java/org/apache/directmemory/test/AppTest.java (contents, props changed)
- copied, changed from r1292175, incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/Wine.java
Removed:
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/Wine.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/Wine.java
Modified:
incubator/directmemory/trunk/pom.xml
incubator/directmemory/trunk/server/directmemory-server-commons/pom.xml
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriterTest.java
incubator/directmemory/trunk/server/directmemory-server/pom.xml
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java
Added: incubator/directmemory/trunk/directmemory-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-tests/pom.xml?rev=1292232&view=auto
==============================================================================
--- incubator/directmemory/trunk/directmemory-tests/pom.xml (added)
+++ incubator/directmemory/trunk/directmemory-tests/pom.xml Wed Feb 22 10:58:03 2012
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.directmemory</groupId>
+ <artifactId>directmemory-parent</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>directmemory-tests</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Apache DirectMemory :: Tests</name>
+ <description>${project.name}</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.directmemory</groupId>
+ <artifactId>directmemory-cache</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: incubator/directmemory/trunk/directmemory-tests/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-tests/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/Wine.java (from r1292175, incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/Wine.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/Wine.java?p2=incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/Wine.java&p1=incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/Wine.java&r1=1292175&r2=1292232&rev=1292232&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/Wine.java (original)
+++ incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/Wine.java Wed Feb 22 10:58:03 2012
@@ -1,4 +1,4 @@
-package org.apache.directmemory.server.services;
+package org.apache.directmemory.test;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -30,6 +30,11 @@ public class Wine
private String description;
+ public Wine()
+ {
+ // no op
+ }
+
public Wine( String name, String description )
{
this.name = name;
Propchange: incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/Wine.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-tests/src/main/java/org/apache/directmemory/test/Wine.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/directmemory-tests/src/test/java/org/apache/directmemory/test/AppTest.java (from r1292175, incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/Wine.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-tests/src/test/java/org/apache/directmemory/test/AppTest.java?p2=incubator/directmemory/trunk/directmemory-tests/src/test/java/org/apache/directmemory/test/AppTest.java&p1=incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/Wine.java&r1=1292175&r2=1292232&rev=1292232&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/Wine.java (original)
+++ incubator/directmemory/trunk/directmemory-tests/src/test/java/org/apache/directmemory/test/AppTest.java Wed Feb 22 10:58:03 2012
@@ -1,4 +1,5 @@
-package org.apache.directmemory.server.commons;
+package org.apache.directmemory.test;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,28 +19,39 @@ package org.apache.directmemory.server.c
* under the License.
*/
-import java.io.Serializable;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
/**
- * @author Olivier Lamy
+ * Unit test for simple App.
*/
-public class Wine
- implements Serializable
+public class AppTest
+ extends TestCase
{
- private String name;
-
- public Wine()
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
{
- // no op
+ super( testName );
}
- public String getName()
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
{
- return name;
+ return new TestSuite( AppTest.class );
}
- public void setName( String name )
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
{
- this.name = name;
+ assertTrue( true );
}
}
Propchange: incubator/directmemory/trunk/directmemory-tests/src/test/java/org/apache/directmemory/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-tests/src/test/java/org/apache/directmemory/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/directmemory/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/pom.xml?rev=1292232&r1=1292231&r2=1292232&view=diff
==============================================================================
--- incubator/directmemory/trunk/pom.xml (original)
+++ incubator/directmemory/trunk/pom.xml Wed Feb 22 10:58:03 2012
@@ -17,8 +17,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -193,6 +192,7 @@ under the License.
<modules>
<module>directmemory-cache</module>
+ <module>directmemory-tests</module>
<module>platforms</module>
<module>server</module>
<module>integrations</module>
@@ -492,6 +492,11 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.directmemory</groupId>
+ <artifactId>directmemory-tests</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directmemory</groupId>
<artifactId>directmemory-protostuff</artifactId>
<version>${project.version}</version>
</dependency>
@@ -796,4 +801,4 @@ under the License.
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Modified: incubator/directmemory/trunk/server/directmemory-server-commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/pom.xml?rev=1292232&r1=1292231&r2=1292232&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/pom.xml (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/pom.xml Wed Feb 22 10:58:03 2012
@@ -46,6 +46,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.directmemory</groupId>
+ <artifactId>directmemory-tests</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriterTest.java?rev=1292232&r1=1292231&r2=1292232&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriterTest.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriterTest.java Wed Feb 22 10:58:03 2012
@@ -21,6 +21,7 @@ package org.apache.directmemory.server.c
import org.apache.directmemory.serialization.Serializer;
import org.apache.directmemory.serialization.SerializerFactory;
+import org.apache.directmemory.test.Wine;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/directmemory/trunk/server/directmemory-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/pom.xml?rev=1292232&r1=1292231&r2=1292232&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/pom.xml (original)
+++ incubator/directmemory/trunk/server/directmemory-server/pom.xml Wed Feb 22 10:58:03 2012
@@ -62,6 +62,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.directmemory</groupId>
+ <artifactId>directmemory-tests</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java?rev=1292232&r1=1292231&r2=1292232&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.java Wed Feb 22 10:58:03 2012
@@ -24,6 +24,7 @@ import org.apache.directmemory.server.co
import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
import org.apache.directmemory.server.commons.DirectMemoryCacheWriter;
+import org.apache.directmemory.test.Wine;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
Modified: incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java?rev=1292232&r1=1292231&r2=1292232&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java Wed Feb 22 10:58:03 2012
@@ -29,6 +29,7 @@ import org.apache.directmemory.server.cl
import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
import org.apache.directmemory.server.commons.ExchangeType;
+import org.apache.directmemory.test.Wine;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;