Skip to content

Commit

Permalink
Merge pull request #206 from aegif/integration
Browse files Browse the repository at this point in the history
Version 2.3.11
  • Loading branch information
sixpetals committed Mar 24, 2016
2 parents 99abc4a + c6d89b9 commit 7c00556
Show file tree
Hide file tree
Showing 33 changed files with 1,338 additions and 129 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ jetty.log
!.gitkeep
setup/installer/*/log
target
/logs
Empty file added core/log4j.log
Empty file.
75 changes: 64 additions & 11 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>jp.aegif.nemaki</groupId>
<artifactId>core</artifactId>
<packaging>war</packaging>
<version>2.3.10</version>
<version>2.3.11</version>
<name>core</name>
<description>NemakiWare server</description>
<url>https://github.com/NemakiWare/NemakiWare</url>
Expand Down Expand Up @@ -66,6 +66,24 @@
<version>${org.apache.chemistry.opencmis.version}</version>
</dependency>

<dependency>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-client-bindings</artifactId>
<version>${org.apache.chemistry.opencmis.version}</version>
</dependency>

<dependency>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-test-util</artifactId>
<version>${org.apache.chemistry.opencmis.version}</version>
</dependency>

<dependency>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-test-tck</artifactId>
<version>${org.apache.chemistry.opencmis.version}</version>
</dependency>

<dependency>
<groupId>org.ektorp</groupId>
<artifactId>org.ektorp</artifactId>
Expand Down Expand Up @@ -260,7 +278,7 @@
<dependency>
<groupId>jp.aegif.nemakiware</groupId>
<artifactId>nemakiware-common</artifactId>
<version>2.3.6</version>
<version>2.3.10</version>
</dependency>
</dependencies>

Expand All @@ -277,6 +295,18 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<includes>
<include>**/*TestGroup.java</include>
</includes>
</configuration>
</plugin>

<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
Expand All @@ -297,9 +327,32 @@
<scanTarget>src/main/webapp</scanTarget>
</scanTargets>
</configuration>
</plugin>

<executions>
<execution>
<id>start-jetty</id>
<phase>test-compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<skip>${maven.test.skip}</skip>
<daemon>true</daemon>
</configuration>
</execution>
<execution>
<id>stop-jetty</id>
<phase>test</phase>
<goals>
<goal>stop</goal>
</goals>
<configuration>
<skip>${maven.test.skip}</skip>
</configuration>
</execution>
</executions>

</plugin>
</plugins>
</build>

Expand All @@ -316,19 +369,19 @@
<profile>
<id>product</id>
<properties>
<maven.test.skip>true</maven.test.skip>
<maven.test.skip>false</maven.test.skip>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<excludes>
<exclude>jp/aegif/nemaki/development/**/*.*</exclude>
</excludes>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<excludes>
<exclude>jp/aegif/nemaki/development/**/*.*</exclude>
</excludes>
</configuration>
</plugin>
</plugins>

Expand Down
26 changes: 26 additions & 0 deletions core/src/test/java/jp/aegif/nemaki/test/cmis/AllTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package jp.aegif.nemaki.test.cmis;

import org.junit.runner.RunWith;
import org.junit.runners.Suite;

import jp.aegif.nemaki.test.cmis.tests.BasicsTestGroup;
import jp.aegif.nemaki.test.cmis.tests.ControlTestGroup;
import jp.aegif.nemaki.test.cmis.tests.CrudTestGroup;
import jp.aegif.nemaki.test.cmis.tests.FilingTestGroup;
import jp.aegif.nemaki.test.cmis.tests.QueryTestGroup;
import jp.aegif.nemaki.test.cmis.tests.TypesTestGroup;
import jp.aegif.nemaki.test.cmis.tests.VersioningTestGroup;

@RunWith( Suite.class )
@Suite.SuiteClasses( {
BasicsTestGroup.class,
ControlTestGroup.class,
CrudTestGroup.class,
FilingTestGroup.class,
QueryTestGroup.class,
TypesTestGroup.class,
VersioningTestGroup.class,
} )
public class AllTest extends TckSuite{

}
116 changes: 116 additions & 0 deletions core/src/test/java/jp/aegif/nemaki/test/cmis/TckSuite.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
package jp.aegif.nemaki.test.cmis;

import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.apache.chemistry.opencmis.tck.CmisTest;
import org.apache.chemistry.opencmis.tck.CmisTestGroup;
import org.apache.chemistry.opencmis.tck.CmisTestReport;
import org.apache.chemistry.opencmis.tck.impl.AbstractCmisTestGroup;
import org.apache.chemistry.opencmis.tck.report.TextReport;
import org.apache.chemistry.opencmis.tck.report.XmlReport;
import org.junit.ClassRule;
import org.junit.rules.ExternalResource;
import jp.aegif.nemaki.test.cmis.tests.BasicsTestGroup;
import jp.aegif.nemaki.test.cmis.tests.ControlTestGroup;
import jp.aegif.nemaki.test.cmis.tests.CrudTestGroup;
import jp.aegif.nemaki.test.cmis.tests.FilingTestGroup;
import jp.aegif.nemaki.test.cmis.tests.QueryTestGroup;
import jp.aegif.nemaki.test.cmis.tests.TypesTestGroup;
import jp.aegif.nemaki.test.cmis.tests.VersioningTestGroup;

public class TckSuite extends TestGroupBase{

private static Map<String, DummyTestGroup> groupMapForReport = new HashMap<>();
private static Map<String, String> parameters = new HashMap<>();

@ClassRule
public static ExternalResource testRule = new ExternalResource(){
@Override
protected void before() throws Throwable{
TestGroupBase dummy = new TestGroupBase();
dummy.loadParameters(parametersFile);
parameters = dummy.getParameters();
};

@Override
protected void after(){
try{
List<CmisTestGroup> groups = new ArrayList<>();
groups.addAll(groupMapForReport.values());

CmisTestReport report = new TextReport();
report.createReport(parameters, groups, new PrintWriter(System.out));

CmisTestReport xmlReport = new XmlReport();
xmlReport.createReport(parameters, groups, new PrintWriter(System.out));

}catch(Exception e){
e.printStackTrace();
}
};
};

public static <T extends TestGroupBase> void addToGroup(Class<T> clazz, CmisTest test) throws Exception{
String simpleClassName = clazz.getSimpleName();

DummyTestGroup group = groupMapForReport.get(simpleClassName);
if(group == null){
DummyTestGroup _group = null;
if(simpleClassName.equals(BasicsTestGroup.class.getSimpleName())){
_group = new DummyTestGroup(new org.apache.chemistry.opencmis.tck.tests.basics.BasicsTestGroup());
}else if(simpleClassName.equals(ControlTestGroup.class.getSimpleName())){
_group = new DummyTestGroup(new org.apache.chemistry.opencmis.tck.tests.control.ControlTestGroup());
}else if(simpleClassName.equals(CrudTestGroup.class.getSimpleName())){
_group = new DummyTestGroup(new org.apache.chemistry.opencmis.tck.tests.crud.CRUDTestGroup());
}else if(simpleClassName.equals(FilingTestGroup.class.getSimpleName())){
_group = new DummyTestGroup(new org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup());
}else if(simpleClassName.equals(QueryTestGroup.class.getSimpleName())){
_group = new DummyTestGroup(new org.apache.chemistry.opencmis.tck.tests.query.QueryTestGroup());
}else if(simpleClassName.equals(TypesTestGroup.class.getSimpleName())){
_group = new DummyTestGroup(new org.apache.chemistry.opencmis.tck.tests.types.TypesTestGroup());
}else if(simpleClassName.equals(VersioningTestGroup.class.getSimpleName())){
_group = new DummyTestGroup(new org.apache.chemistry.opencmis.tck.tests.versioning.VersioningTestGroup());
}

if(_group != null){
_group.init(parameters);
groupMapForReport.put(simpleClassName, _group);
group = groupMapForReport.get(simpleClassName);
}
}

group.addTestWithoutInit(test);
groupMapForReport.put(simpleClassName, group);

}

private static class DummyTestGroup extends AbstractCmisTestGroup{

private List<CmisTest> dummyTests = new ArrayList<CmisTest>();

public DummyTestGroup(AbstractCmisTestGroup group) throws Exception{
super.init(parameters);

String name = group.getName();
setName(name);
String description = group.getDescription();
setDescription(description);
Boolean enabled = group.isEnabled();
setEnabled(enabled);
}

public void addTestWithoutInit(CmisTest test){
dummyTests.add(test);
}

@Override
public List<CmisTest> getTests() {
return dummyTests;
}

}
}
Loading

0 comments on commit 7c00556

Please sign in to comment.