You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/05/20 11:45:10 UTC
svn commit: r1340649 - in /incubator/isis/trunk/framework: ./
core/testsupport/src/main/java/org/apache/isis/core/testsupport/files/
runtimes/dflt/objectstores/nosql/
runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectst...
Author: danhaywood
Date: Sun May 20 09:45:09 2012
New Revision: 1340649
URL: http://svn.apache.org/viewvc?rev=1340649&view=rev
Log:
ISIS-228: use profiles to run Sql and Mongo tests
Added:
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoIntegrationTest.java
- copied, changed from r1340365, incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoDbTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateReaderIntegrationTest.java
- copied, changed from r1340364, incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateReaderTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterIntegrationTest.java
- copied, changed from r1340364, incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java
- copied, changed from r1340384, incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlIntegrationTest.java
- copied, changed from r1340364, incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlIntegrationTest.java
- copied, changed from r1340364, incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java
Removed:
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoDbTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateReaderTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java
Modified:
incubator/isis/trunk/framework/core/testsupport/src/main/java/org/apache/isis/core/testsupport/files/Files.java
incubator/isis/trunk/framework/pom.xml
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/DemoMongo.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml
Modified: incubator/isis/trunk/framework/core/testsupport/src/main/java/org/apache/isis/core/testsupport/files/Files.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/testsupport/src/main/java/org/apache/isis/core/testsupport/files/Files.java?rev=1340649&r1=1340648&r2=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/testsupport/src/main/java/org/apache/isis/core/testsupport/files/Files.java (original)
+++ incubator/isis/trunk/framework/core/testsupport/src/main/java/org/apache/isis/core/testsupport/files/Files.java Sun May 20 09:45:09 2012
@@ -1,3 +1,21 @@
+/*
+ * 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.isis.core.testsupport.files;
import java.io.File;
Modified: incubator/isis/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/pom.xml?rev=1340649&r1=1340648&r2=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/pom.xml (original)
+++ incubator/isis/trunk/framework/pom.xml Sun May 20 09:45:09 2012
@@ -89,9 +89,8 @@
<pmd.ruleset>${trunkBaseDir}/src/site/resources/codequality/pmd.xml</pmd.ruleset>
<projectUrl>${project.url}</projectUrl>
-
- <!-- plugin versions -->
- <maven-project-info-reports-plugin>2.2</maven-project-info-reports-plugin>
+
+ <testsToExclude>**/*IntegrationTest.java</testsToExclude>
</properties>
<scm>
@@ -238,6 +237,17 @@
</repository>
</repositories>
+ <modules>
+ <module>site-skin</module>
+ <module>applib</module>
+ <module>core</module>
+ <module>runtimes</module>
+ <module>tck</module>
+ <module>progmodels</module>
+ <module>security</module>
+ <module>viewer</module>
+ <module>quickstart-archetype</module>
+ </modules>
<build>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -349,20 +359,23 @@
<!-- goal:compile binds to phase:compile -->
<!-- goal:testCompile binds to phase:test-compile -->
</plugin>
+
- <!-- Tests -->
+ <!-- Tests (ignore integration tests)-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
<configuration>
<excludes>
- <exclude>**/Test*.java</exclude>
+ <exclude>${testsToExclude}</exclude>
</excludes>
<printSummary>false</printSummary>
</configuration>
<!-- goal:test binds to phase:test -->
</plugin>
-
+
+
<!-- Test Reporting -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -713,7 +726,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${maven-project-info-reports-plugin}</version>
+ <version>2.2</version>
<!-- main configuration in reporting section (in inheriting
modules) -->
</plugin>
@@ -1448,6 +1461,33 @@ archetype includes this explicit depende
<directory>target-ide</directory>
</build>
</profile>
+
+ <profile>
+ <id>integtest-mongo</id>
+ <activation>
+ <property>
+ <name>integtest</name>
+ <value>mongo</value>
+ </property>
+ </activation>
+ <properties>
+ <testsToExclude>**/*Sql*IntegrationTest.java</testsToExclude>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>integtest-sql</id>
+ <activation>
+ <property>
+ <name>integtest</name>
+ <value>sql</value>
+ </property>
+ </activation>
+ <properties>
+ <testsToExclude>**/*Mongo*IntegrationTest.java</testsToExclude>
+ </properties>
+ </profile>
+
<profile>
<id>site-full</id>
<activation>
@@ -1461,7 +1501,7 @@ archetype includes this explicit depende
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${maven-project-info-reports-plugin}</version>
+ <version>2.2</version>
</plugin>
</plugins>
</reporting>
@@ -1644,25 +1684,6 @@ archetype includes this explicit depende
</properties>
</profile>
-
- <profile>
- <id>modules-all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>site-skin</module>
- <module>applib</module>
- <module>core</module>
- <module>runtimes</module>
- <module>tck</module>
- <module>progmodels</module>
- <module>security</module>
- <module>viewer</module>
- <module>quickstart-archetype</module>
- </modules>
- </profile>
-
<profile>
<id>modules-site</id>
<!-- modules that make up the site -->
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml?rev=1340649&r1=1340648&r2=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml Sun May 20 09:45:09 2012
@@ -49,18 +49,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <excludes>
- <exclude>**/MongoStateReaderTest.java</exclude>
- <exclude>**/MongoDbTest.java</exclude>
- <exclude>**/MongoStateWriterTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
<!--
REVIEW: have removed, cos for some bizarre reason causes maven
@@ -262,4 +250,5 @@
</dependency>
</dependencies>
+
</project>
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/DemoMongo.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/DemoMongo.java?rev=1340649&r1=1340648&r2=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/DemoMongo.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/DemoMongo.java Sun May 20 09:45:09 2012
@@ -27,6 +27,7 @@ import com.mongodb.DBCollection;
import com.mongodb.Mongo;
public class DemoMongo {
+
// @Test
public void installed() throws Exception {
Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoIntegrationTest.java (from r1340365, incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoDbTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoIntegrationTest.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoIntegrationTest.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoDbTest.java&r1=1340365&r2=1340649&rev=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoDbTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoIntegrationTest.java Sun May 20 09:45:09 2012
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.runtimes.dflt.objectstores.nosql.keys.KeyCreatorDefault;
import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures;
-public class MongoDbTest {
+public class MongoIntegrationTest {
@Rule
public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder().with(new MongoPersistorMechanismInstaller()).build();
Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateReaderIntegrationTest.java (from r1340364, incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateReaderTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateReaderIntegrationTest.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateReaderIntegrationTest.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateReaderTest.java&r1=1340364&r2=1340649&rev=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateReaderTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateReaderIntegrationTest.java Sun May 20 09:45:09 2012
@@ -36,9 +36,8 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.runtimes.dflt.objectstores.nosql.db.mongo.MongoStateReader;
-public class MongoStateReaderTest {
+public class MongoStateReaderIntegrationTest {
private static final String OBJECT_TYPE = "org.test.Object";
Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterIntegrationTest.java (from r1340364, incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterIntegrationTest.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterIntegrationTest.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterTest.java&r1=1340364&r2=1340649&rev=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/MongoStateWriterIntegrationTest.java Sun May 20 09:45:09 2012
@@ -36,7 +36,7 @@ import org.junit.Test;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-public class MongoStateWriterTest {
+public class MongoStateWriterIntegrationTest {
private static final String SPEC_NAME = "org.test.Object";
private DB testDb;
Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java (from r1340384, incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderTest.java&r1=1340384&r2=1340649&rev=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/test/java/org/apache/isis/runtimes/dflt/objectstores/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java Sun May 20 09:45:09 2012
@@ -44,7 +44,6 @@ import org.apache.isis.core.testsupport.
import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
import org.apache.isis.runtimes.dflt.objectstores.nosql.ObjectReader;
import org.apache.isis.runtimes.dflt.objectstores.nosql.db.StateReader;
-import org.apache.isis.runtimes.dflt.objectstores.nosql.db.mongo.MongoPersistorMechanismInstaller;
import org.apache.isis.runtimes.dflt.objectstores.nosql.encryption.DataEncryption;
import org.apache.isis.runtimes.dflt.objectstores.nosql.versions.VersionCreator;
import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
@@ -53,7 +52,7 @@ import org.apache.isis.tck.dom.refs.Pare
import org.apache.isis.tck.dom.refs.ReferencingEntity;
import org.apache.isis.tck.dom.refs.SimpleEntity;
-public class ObjectReaderTest {
+public class ObjectReaderMongoIntegrationTest {
@Rule
public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder().with(new MongoPersistorMechanismInstaller()).build();
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml?rev=1340649&r1=1340648&r2=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml Sun May 20 09:45:09 2012
@@ -74,27 +74,11 @@
</reporting>
- <profiles>
- <profile>
- <id>normal</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>sql-impl</module>
- <module>sql-tests-common</module>
- </modules>
- </profile>
- <profile>
- <id>integration-tests</id>
- <modules>
- <module>sql-impl</module>
- <module>sql-tests-common</module>
- <module>sql-tests-served</module>
- </modules>
- </profile>
-
- </profiles>
+ <modules>
+ <module>sql-impl</module>
+ <module>sql-tests-common</module>
+ <module>sql-tests-served</module>
+ </modules>
<dependencyManagement>
<dependencies>
Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlIntegrationTest.java (from r1340364, incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlIntegrationTest.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlIntegrationTest.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java&r1=1340364&r2=1340649&rev=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/MySqlIntegrationTest.java Sun May 20 09:45:09 2012
@@ -26,7 +26,7 @@ import java.util.Properties;
import org.apache.isis.runtimes.dflt.objectstores.sql.common.SqlIntegrationTestData;
-public class MySqlTest extends SqlIntegrationTestData {
+public class MySqlIntegrationTest extends SqlIntegrationTestData {
/**/
@Override
@@ -51,5 +51,5 @@ public class MySqlTest extends SqlIntegr
public String getPropertiesFilename() {
return "mysql.properties";
}
-
+
}
Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlIntegrationTest.java (from r1340364, incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlIntegrationTest.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlIntegrationTest.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java&r1=1340364&r2=1340649&rev=1340649&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-tests-served/src/test/java/org/apache/isis/runtimes/dflt/objectstores/sql/PostgreSqlIntegrationTest.java Sun May 20 09:45:09 2012
@@ -26,7 +26,7 @@ import java.util.Properties;
import org.apache.isis.runtimes.dflt.objectstores.sql.common.SqlIntegrationTestData;
-public class PostgreSqlTest extends SqlIntegrationTestData {
+public class PostgreSqlIntegrationTest extends SqlIntegrationTestData {
@Override
public Properties getProperties() {