Permalink
Browse files

[OPENENGSB-3534, OPENENGSB-3480] Merged test project and fixed variou…

…s checkstyle errors
  • Loading branch information...
1 parent 7bb4b5a commit e49bb3bae76798a53caee38ce604576985fcb298 @anpieber anpieber committed Mar 15, 2013
Showing with 2,413 additions and 36 deletions.
  1. +0 −19 api/core/pom.xml
  2. +4 −0 components/common/pom.xml
  3. +4 −0 components/console/pom.xml
  4. +4 −0 components/edb/pom.xml
  5. +4 −0 components/ekb/common/pom.xml
  6. +2 −0 components/ekb/graphdb-orient/pom.xml
  7. +2 −0 components/ekb/modelregistry-tracker/pom.xml
  8. +5 −0 components/ekb/persistence-persist-edb/pom.xml
  9. +5 −0 components/ekb/persistence-query-edb/pom.xml
  10. +4 −0 components/ekb/transformation-wonderland/pom.xml
  11. +2 −0 components/persistence/pom.xml
  12. +11 −4 components/services/pom.xml
  13. +3 −0 components/util/pom.xml
  14. +3 −0 components/weaver/service/pom.xml
  15. +2 −0 components/weaver/test/pom.xml
  16. +9 −0 components/workflow/pom.xml
  17. +1 −0 connector/example/pom.xml
  18. +5 −1 connector/filewatcher/pom.xml
  19. +1 −0 connector/serviceacl/pom.xml
  20. +1 −0 connector/usernamepassword/pom.xml
  21. +1 −0 domain/auditing/pom.xml
  22. +2 −1 domain/authentication/pom.xml
  23. +2 −1 domain/authorization/pom.xml
  24. +4 −1 examples/remoteclient/pom.xml
  25. +2 −0 infrastructure/jms/pom.xml
  26. +2 −0 infrastructure/ldap/pom.xml
  27. +16 −4 itests/pom.xml
  28. +2 −0 persistence/connector/pom.xml
  29. +1 −0 persistence/context/pom.xml
  30. +4 −0 persistence/rulebase/pom.xml
  31. +1 −0 pom.xml
  32. +5 −0 ports/jms/pom.xml
  33. +3 −0 ports/ws/pom.xml
  34. +122 −0 test/.gitignore
  35. +8 −0 test/CHANGELOG
  36. +201 −0 test/LICENSE
  37. +29 −0 test/NOTICE
  38. +28 −0 test/etc/notice/license-mapping.xml
  39. +132 −0 test/pom.xml
  40. +45 −0 test/src/main/java/org/openengsb/core/test/AbstractOpenEngSBTest.java
  41. +506 −0 test/src/main/java/org/openengsb/core/test/AbstractOsgiMockServiceTest.java
  42. +80 −0 test/src/main/java/org/openengsb/core/test/BundleStringHelper.java
  43. +91 −0 test/src/main/java/org/openengsb/core/test/DummyConfigPersistenceService.java
  44. +45 −0 test/src/main/java/org/openengsb/core/test/DummyModel.java
  45. +37 −0 test/src/main/java/org/openengsb/core/test/NullDomain.java
  46. +90 −0 test/src/main/java/org/openengsb/core/test/NullDomainImpl.java
  47. +25 −0 test/src/main/java/org/openengsb/core/test/NullEvent.java
  48. +34 −0 test/src/main/java/org/openengsb/core/test/NullEvent2.java
  49. +55 −0 test/src/main/java/org/openengsb/core/test/NullEvent3.java
  50. +164 −0 test/src/main/java/org/openengsb/core/test/ServiceList.java
  51. +165 −0 test/src/main/java/org/openengsb/core/test/ServiceReferenceList.java
  52. +234 −0 test/src/main/java/org/openengsb/core/test/UserManagerStub.java
  53. +38 −0 test/src/main/java/org/openengsb/core/test/ValueAnswer.java
  54. +66 −0 test/src/main/java/org/openengsb/core/test/rules/DedicatedThread.java
  55. +68 −0 test/src/test/java/org/openengsb/core/test/BundleContextMockTest.java
  56. +22 −4 ui/admin/pom.xml
  57. +7 −0 ui/common/pom.xml
  58. +4 −1 ui/wicketacl/pom.xml
View
@@ -202,23 +202,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.openengsb</groupId>
- <artifactId>openengsb-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generateDocSrc</id>
- <goals>
- <goal>extractSource</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <sourcePath>${project.basedir}/src/</sourcePath>
- <targetPath>${project.basedir}/target/classes/docbook/snippets</targetPath>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -255,7 +238,6 @@
<configuration>
<descriptors>
<descriptor>${project.basedir}/target/assembly-resources/src.xml</descriptor>
- <descriptor>${project.basedir}/target/assembly-resources/docbook.xml</descriptor>
</descriptors>
</configuration>
<executions>
@@ -271,7 +253,6 @@
</plugins>
</build>
-
<dependencies>
<dependency>
<groupId>org.openengsb.labs.delegation</groupId>
@@ -104,18 +104,22 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework.ekb</groupId>
<artifactId>org.openengsb.framework.ekb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.test</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -54,19 +54,23 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.test</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.services</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -98,6 +98,7 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -124,11 +125,13 @@
<dependency>
<groupId>org.openengsb.framework.edb</groupId>
<artifactId>org.openengsb.framework.edb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -158,6 +161,7 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.services</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -135,20 +135,24 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework.edb</groupId>
<artifactId>org.openengsb.framework.edb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework.ekb</groupId>
<artifactId>org.openengsb.framework.ekb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -96,10 +96,12 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework.ekb</groupId>
<artifactId>org.openengsb.framework.ekb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -95,6 +95,7 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -105,6 +106,7 @@
<dependency>
<groupId>org.openengsb.framework.ekb</groupId>
<artifactId>org.openengsb.framework.ekb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -136,25 +136,30 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework.edb</groupId>
<artifactId>org.openengsb.framework.edb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework.ekb</groupId>
<artifactId>org.openengsb.framework.ekb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework.ekb</groupId>
<artifactId>org.openengsb.framework.ekb.common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -135,22 +135,27 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework.edb</groupId>
<artifactId>org.openengsb.framework.edb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework.ekb</groupId>
<artifactId>org.openengsb.framework.ekb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework.ekb</groupId>
<artifactId>org.openengsb.framework.ekb.common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -102,18 +102,22 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework.ekb</groupId>
<artifactId>org.openengsb.framework.ekb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -107,6 +107,7 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -116,6 +117,7 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -177,50 +177,57 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.domain</groupId>
<artifactId>org.openengsb.domain.authentication</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.domain</groupId>
<artifactId>org.openengsb.domain.authorization</artifactId>
- <version>${project.version}</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework.ekb</groupId>
- <artifactId>org.openengsb.framework.ekb.api</artifactId>
+ <artifactId>org.openengsb.framework.ekb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.connector</groupId>
<artifactId>org.openengsb.connector.usernamepassword</artifactId>
- <version>${project.version}</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openengsb.connector</groupId>
<artifactId>org.openengsb.connector.serviceacl</artifactId>
- <version>${project.version}</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.test</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.persistence</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -104,6 +104,7 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -129,6 +130,7 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.test</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -166,6 +168,7 @@
<artifactId>commons-codec</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -130,10 +130,12 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.openengsb.framework.edb</groupId>
<artifactId>org.openengsb.framework.edb.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -148,6 +150,7 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -136,11 +136,13 @@
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openengsb.framework</groupId>
<artifactId>org.openengsb.framework.util</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Oops, something went wrong.

0 comments on commit e49bb3b

Please sign in to comment.