Commit 8523bb49 authored by Lionel Seinturier's avatar Lionel Seinturier

Move Juliet tests to a dedicated module.

parent 05432dfd
......@@ -13,74 +13,21 @@
<name>Tinfi Juliet</name>
<dependencies>
<dependency>
<groupId>org.objectweb.fractal.juliac.juliet</groupId>
<artifactId>juliac-juliet-julia</artifactId>
<version>${juliac.version}</version>
</dependency>
<dependency>
<dependency>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-mixins</artifactId>
<artifactId>frascati-tinfi-oo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-oo</artifactId>
<artifactId>frascati-tinfi-mixins</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<!-- ================================================ -->
<!-- Generate and compile the application with Juliac -->
<!-- ================================================ -->
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<version>${juliac.version}</version>
<executions>
<execution>
<id>juliac-compile</id>
<phase>generate-test-sources</phase>
<goals><goal>testCompile</goal></goals>
</execution>
</executions>
<configuration>
<srcs><src>src/test/java</src></srcs>
<adlParser>org.ow2.frascati.tinfi.tinfilet.TinfiParserSupportImpl</adlParser>
<opts>
<opt>org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator</opt>
<opt>OO</opt>
</opts>
<mixins>
<mixin>org.ow2.frascati.tinfi:frascati-tinfi-mixins:${project.version}:sources</mixin>
<mixin>org.objectweb.fractal.julia:julia-mixins:${julia.version}:sources</mixin>
</mixins>
<adls>
<adl>org.ow2.frascati.tinfi.ComponentNameImpl</adl>
<adl>org.ow2.frascati.tinfi.ProvidesImpl</adl>
</adls>
<modules>
<module>org.ow2.frascati.tinfi:frascati-tinfi-oo:${project.version}</module>
<module>org.objectweb.fractal.juliac:juliac-jdt:${juliac.version}</module>
<module>org.objectweb.fractal.juliac:juliac-spoon:${juliac.version}</module>
</modules>
<!-- debug>true</debug -->
</configuration>
</plugin>
</plugins>
</build>
</project>
/***
* OW2 FraSCAti Tinfi
* Copyright (C) 2007-2011 INRIA, USTL
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Contact: frascati@ow2.org
*
* Author: Lionel Seinturier
*/
package org.ow2.frascati.tinfi;
/**
* Interface implemented by components used for testing {@link
* org.osoa.sca.annotations.ComponentName} annotated elements.
*
* @author Lionel Seinturier <Lionel.Seinturier@univ-lille1.fr>
*/
public interface ComponentNameItf {
/**
* Return the name of the component.
*/
public String name();
}
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-tests-parent</artifactId>
<version>1.4.2-SNAPSHOT</version>
</parent>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-tests-juliet</artifactId>
<packaging>jar</packaging>
<name>Tinfi Tests For Juliet</name>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-tests-oasis</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.tinfi</groupId>
<artifactId>frascati-tinfi-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.juliac.juliet</groupId>
<artifactId>juliac-juliet-julia</artifactId>
<version>${juliac.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.tinfi.juliet</groupId>
<artifactId>frascati-tinfi-juliet</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<profiles>
<!-- ============================ -->
<!-- Profile for the regular mode -->
<!-- ============================ -->
<profile>
<id>regular</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<defaultGoal>test</defaultGoal>
<plugins>
<plugin>
<groupId>org.objectweb.fractal.juliac</groupId>
<artifactId>maven-juliac-plugin</artifactId>
<version>${juliac.version}</version>
<executions>
<execution>
<id>juliac-compile</id>
<phase>generate-test-sources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<srcs><src>src/main/java</src></srcs>
<adlParser>org.ow2.frascati.tinfi.tinfilet.TinfiParserSupportImpl</adlParser>
<opts>
<opt>org.ow2.frascati.tinfi.opt.oo.FCOOCtrlSourceCodeGenerator</opt>
<opt>OO</opt>
</opts>
<mixins>
<mixin>org.ow2.frascati.tinfi:frascati-tinfi-mixins:${project.version}:sources</mixin>
<mixin>org.objectweb.fractal.julia:julia-mixins:${julia.version}:sources</mixin>
</mixins>
<adls>
<adl>org.ow2.frascati.tinfi.juliet.ComponentNameImpl</adl>
<adl>org.ow2.frascati.tinfi.juliet.ProvidesImpl</adl>
</adls>
<modules>
<module>org.ow2.frascati.tinfi:frascati-tinfi-oo:${project.version}</module>
<module>org.objectweb.fractal.juliac:juliac-fractaladl:${juliac.version}</module>
<module>org.objectweb.fractal.juliac:juliac-jdt:${juliac.version}</module>
<module>org.objectweb.fractal.juliac:juliac-spoon:${juliac.version}</module>
</modules>
<!-- verbose>true</verbose -->
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
......@@ -21,13 +21,12 @@
* Author: Lionel Seinturier
*/
package org.ow2.frascati.tinfi;
package org.ow2.frascati.tinfi.juliet;
import org.oasisopen.sca.annotation.ComponentName;
import org.oasisopen.sca.annotation.Scope;
import org.oasisopen.sca.annotation.Service;
import org.objectweb.fractal.juliac.juliet.annot.JulietMembrane;
import org.ow2.frascati.tinfi.juliet.SCAPrimitive;
import org.ow2.frascati.tinfi.ComponentNameItf;
/**
* Component implementation used for testing
......@@ -39,17 +38,5 @@ import org.ow2.frascati.tinfi.juliet.SCAPrimitive;
@JulietMembrane(membrane=SCAPrimitive.class)
@Service(names="r",value=ComponentNameItf.class)
@Scope("COMPOSITE")
public class ComponentNameImpl implements ComponentNameItf {
@ComponentName
public String name;
/**
* Return the name of the component.
*
* @see org.ow2.frascati.tinfi.ComponentNameTestCase
*/
public String name() {
return name;
}
}
public class ComponentNameImpl
extends org.ow2.frascati.tinfi.ComponentNameImpl {}
......@@ -21,7 +21,7 @@
* Author: Lionel Seinturier
*/
package org.ow2.frascati.tinfi;
package org.ow2.frascati.tinfi.juliet;
import org.oasisopen.sca.annotation.Scope;
import org.oasisopen.sca.annotation.Service;
......
......@@ -21,7 +21,7 @@
* Author: Lionel Seinturier
*/
package org.ow2.frascati.tinfi;
package org.ow2.frascati.tinfi.juliet;
/**
* Interface implemented by components used for testing {@link
......
......@@ -21,13 +21,15 @@
* Author: Lionel Seinturier
*/
package org.ow2.frascati.tinfi;
package org.ow2.frascati.tinfi.juliet;
import org.junit.Assert;
import org.junit.Test;
import org.oasisopen.sca.annotation.ComponentName;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.util.Fractal;
import org.ow2.frascati.tinfi.ComponentNameItf;
import org.ow2.frascati.tinfi.TinfiDomain;
/**
* Class for testing {@link ComponentName} annotated elements.
......
......@@ -21,11 +21,12 @@
* Author: Lionel Seinturier
*/
package org.ow2.frascati.tinfi;
package org.ow2.frascati.tinfi.juliet;
import org.junit.Assert;
import org.junit.Test;
import org.objectweb.fractal.api.Component;
import org.ow2.frascati.tinfi.TinfiDomain;
import org.ow2.frascati.tinfi.annotations.Provides;
/**
......
......@@ -16,6 +16,7 @@
<module>oasis</module>
<module>osoa</module>
<module>fraclet</module>
<module>juliet</module>
</modules>
</project>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment