Commit fe33c44f authored by Philippe Merle's avatar Philippe Merle

* Moved code from MinimalistNuxeoFeature to TestNuxeo classes.

* Removed unnecessary MinimalistNuxeoFeature classes.
parent a66cc00e
/**
* OW2 FraSCAti: Nuxeo as SCA components
* Copyright (c) 2012 Inria, University of Lille 1
*
* 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: Christophe Munilla
*
* Contributor(s): Philippe Merle
*
*/
package org.ow2.frascati.nuxeo.test;
import org.nuxeo.runtime.test.runner.Deploy;
import org.nuxeo.runtime.test.runner.LocalDeploy;
import org.nuxeo.runtime.test.runner.Features;
import org.nuxeo.runtime.test.runner.RuntimeFeature;
import org.nuxeo.runtime.test.runner.SimpleFeature;
@Features(RuntimeFeature.class)
@Deploy({
"org.nuxeo.runtime.reload"
})
@LocalDeploy({
"org.nuxeo.runtime.reload:OSGI-INF/reload-service.xml"
})
public class MinimalistNuxeoFeature extends SimpleFeature
{
}
......@@ -36,8 +36,10 @@ import org.nuxeo.runtime.api.login.LoginService;
import org.nuxeo.runtime.api.login.SecurityDomain;
import org.nuxeo.runtime.model.ComponentName;
import org.nuxeo.runtime.model.RegistrationInfo;
import org.nuxeo.runtime.test.runner.Deploy;
import org.nuxeo.runtime.test.runner.Features;
import org.nuxeo.runtime.test.runner.FeaturesRunner;
import org.nuxeo.runtime.test.runner.RuntimeFeature;
import org.nuxeo.runtime.reload.ReloadService;
import org.objectweb.fractal.api.Component;
......@@ -50,7 +52,11 @@ import org.ow2.frascati.FraSCAti;
* @author Philippe Merle.
*/
@RunWith(FeaturesRunner.class)
@Features(MinimalistNuxeoFeature.class)
@Features(RuntimeFeature.class) //, CoreFeature.class)
@Deploy({
"org.nuxeo.runtime.reload",
"org.nuxeo.ecm.core.event"
})
public class TestNuxeo
{
@Test
......
/**
* OW2 FraSCAti: Runnable Nuxeo Component Example
* Copyright (c) 2012 Inria, University of Lille 1
*
* 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: Christophe Munilla
*
* Contributor(s): Philippe Merle
*
*/
package org.ow2.frascati.examples.nuxeo.runnable.test;
import org.nuxeo.runtime.test.runner.Deploy;
import org.nuxeo.runtime.test.runner.LocalDeploy;
import org.nuxeo.runtime.test.runner.Features;
import org.nuxeo.runtime.test.runner.RuntimeFeature;
import org.nuxeo.runtime.test.runner.SimpleFeature;
@Features(RuntimeFeature.class)
@Deploy({
"runnable-nuxeo-component"
})
@LocalDeploy({
"runnable-nuxeo-component:OSGI-INF/runnable-nuxeo-component.xml"
})
public class MinimalistNuxeoFeature extends SimpleFeature
{
}
......@@ -30,8 +30,11 @@ package org.ow2.frascati.examples.nuxeo.runnable.test;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.nuxeo.runtime.test.runner.Deploy;
import org.nuxeo.runtime.test.runner.LocalDeploy;
import org.nuxeo.runtime.test.runner.Features;
import org.nuxeo.runtime.test.runner.FeaturesRunner;
import org.nuxeo.runtime.test.runner.RuntimeFeature;
import org.objectweb.fractal.api.Component;
......@@ -43,7 +46,13 @@ import org.ow2.frascati.FraSCAti;
* @author Philippe Merle.
*/
@RunWith(FeaturesRunner.class)
@Features(MinimalistNuxeoFeature.class)
@Features(RuntimeFeature.class)
@Deploy({
"runnable-nuxeo-component"
})
@LocalDeploy({
"runnable-nuxeo-component:OSGI-INF/runnable-nuxeo-component.xml"
})
public class TestNuxeo
{
/**
......
/**
* OW2 FraSCAti: SCA Implementation Nuxeo
* Copyright (c) 2012 Inria, University of Lille 1
*
* 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: Christophe Munilla
*
* Contributor(s): Philippe Merle
*
*/
package org.ow2.frascati.implementation.nuxeo.test;
import org.nuxeo.runtime.test.runner.Features;
import org.nuxeo.runtime.test.runner.RuntimeFeature;
import org.nuxeo.runtime.test.runner.SimpleFeature;
@Features(RuntimeFeature.class)
public class MinimalistNuxeoFeature extends SimpleFeature
{
}
......@@ -36,6 +36,7 @@ import org.junit.runner.RunWith;
import org.nuxeo.runtime.test.runner.Features;
import org.nuxeo.runtime.test.runner.FeaturesRunner;
import org.nuxeo.runtime.test.runner.RuntimeFeature;
import org.objectweb.fractal.api.Component;
......@@ -50,7 +51,7 @@ import org.ow2.frascati.assembly.factory.api.ProcessingContext;
* @author Philippe Merle.
*/
@RunWith(FeaturesRunner.class)
@Features(MinimalistNuxeoFeature.class)
@Features(RuntimeFeature.class)
public class TestNuxeo
{
FraSCAti frascati;
......
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