Skip to content

Commit

Permalink
rework unit-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
tomsontom committed Feb 10, 2018
1 parent 68bc576 commit f21b289
Show file tree
Hide file tree
Showing 31 changed files with 74 additions and 164 deletions.
16 changes: 12 additions & 4 deletions modules/core/org.eclipse.fx.core.di.context.tests/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
8 changes: 2 additions & 6 deletions modules/core/org.eclipse.fx.core.di.context.tests/.project
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
Expand All @@ -27,6 +22,7 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions modules/core/org.eclipse.fx.core.di.context.tests/bnd.bnd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Test-Cases: ${classes;NAMED;*TestCase}
13 changes: 0 additions & 13 deletions modules/core/org.eclipse.fx.core.di.context.tests/build.properties

This file was deleted.

103 changes: 50 additions & 53 deletions modules/core/org.eclipse.fx.core.di.context.tests/pom.xml
Original file line number Diff line number Diff line change
@@ -1,61 +1,58 @@
<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>
<name>e(fx)clipse - Runtime - Core DI Context Tests</name>
<groupId>org.eclipse.fx</groupId>
<artifactId>org.eclipse.fx.core.di.context.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
<packaging>jar</packaging>

<parent>
<groupId>org.eclipse.fx</groupId>
<artifactId>releng</artifactId>
<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
<version>3.1.0-SNAPSHOT</version>
<groupId>org.eclipse.fx.runtime</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>4.0.0-SNAPSHOT</version>
</parent>

<build>
<resources>
<resource>
<directory>.</directory>
<includes>
<include>META-INF/</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<argLine>-Dorg.osgi.framework.bundle.parent=ext</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<dependency-resolution>
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.equinox.ds</id>
<versionRange>1.4.400</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.fx.core.di.context</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
</build>
</project>
<dependencies>
<dependency>
<groupId>org.eclipse.fx.runtime</groupId>
<artifactId>org.eclipse.fx.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.fx.runtime</groupId>
<artifactId>org.eclipse.fx.core.di</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.fx.runtime</groupId>
<artifactId>org.eclipse.fx.core.di.context</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>at.bestsolution.efxclipse.eclipse</groupId>
<artifactId>javax.inject</artifactId>
<version>${dep-javax.inject}</version>
</dependency>
<dependency>
<groupId>at.bestsolution.efxclipse.eclipse</groupId>
<artifactId>org.eclipse.e4.core.contexts</artifactId>
<version>${dep-org.eclipse.e4.core.contexts}</version>
</dependency>
<dependency>
<groupId>at.bestsolution.efxclipse.eclipse</groupId>
<artifactId>org.eclipse.core.databinding.observable</artifactId>
<version>${dep-org.eclipse.core.databinding.observable}</version>
</dependency>
<dependency>
<groupId>at.bestsolution.efxclipse.eclipse</groupId>
<artifactId>org.eclipse.equinox.preferences</artifactId>
<version>${dep-org.eclipse.equinox.preferences}</version>
</dependency>


<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.enroute.junit.wrapper</artifactId>
<version>4.12.0</version>
</dependency>
</dependencies>
</project>
2 changes: 2 additions & 0 deletions modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<dep-junit>4.12</dep-junit>
<dep-org.eclipse.e4.core.contexts>1.6.0</dep-org.eclipse.e4.core.contexts>
<dep-org.eclipse.e4.core.services>2.0.100</dep-org.eclipse.e4.core.services>
<dep-org.eclipse.equinox.preferences>3.7.0</dep-org.eclipse.equinox.preferences>

<plugin-maven-osgi-package-plugin>0.0.1</plugin-maven-osgi-package-plugin>
<plugin-bnd-maven-plugin>3.5.0</plugin-bnd-maven-plugin>
Expand All @@ -33,6 +34,7 @@
<module>core/org.eclipse.fx.core.databinding</module>
<module>core/org.eclipse.fx.core.di</module>
<module>core/org.eclipse.fx.core.di.context</module>
<module>core/org.eclipse.fx.core.di.context.tests</module>

<module>p2/org.eclipse.fx.target.feature</module>

Expand Down

0 comments on commit f21b289

Please sign in to comment.