Author: [email protected]
Date: Wed May 4 13:00:54 2011
New Revision: 1090
Log:
AMDATU-379 First fixing non static refactor
Modified:
trunk/amdatu-web/itest/base/src/main/java/org/amdatu/web/itest/base/WebFixture.java
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/WebTest.java
Modified:
trunk/amdatu-web/itest/base/src/main/java/org/amdatu/web/itest/base/WebFixture.java
==============================================================================
---
trunk/amdatu-web/itest/base/src/main/java/org/amdatu/web/itest/base/WebFixture.java
(original)
+++
trunk/amdatu-web/itest/base/src/main/java/org/amdatu/web/itest/base/WebFixture.java
Wed May 4 13:00:54 2011
@@ -21,7 +21,7 @@
public class WebFixture {
- public static Option provision() {
+ public Option provision() {
return org.ops4j.pax.exam.CoreOptions.provision(
mavenBundle().groupId("javax.servlet").artifactId("servlet-api").versionAsInProject(),
mavenBundle().groupId("org.amdatu.web").artifactId("org.amdatu.web.itest.base").versionAsInProject(),
Modified:
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/WebTest.java
==============================================================================
---
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/WebTest.java
(original)
+++
trunk/amdatu-web/itest/tests/src/test/java/org/amdatu/web/itest/tests/WebTest.java
Wed May 4 13:00:54 2011
@@ -21,19 +21,14 @@
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.LibraryOptions.junitBundles;
-import java.util.Properties;
-
import org.amdatu.core.itest.base.CoreFixture;
import org.amdatu.core.itest.base.TestContext;
import org.amdatu.core.tenant.TenantManagementService;
-import org.amdatu.core.tenant.TenantStorageProvider;
import org.amdatu.web.itest.base.WebFixture;
import org.amdatu.web.itest.tests.mock.TestService;
import org.amdatu.web.itest.tests.mock.TestServiceImpl;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.ServiceDependency;
-import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -42,30 +37,37 @@
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
import org.osgi.framework.BundleContext;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.log.LogService;
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class WebTest {
+ private CoreFixture m_coreFixture = new CoreFixture();
+ private WebFixture m_webFixture = new WebFixture();
+
@Configuration
public Option[] config() {
return options(
junitBundles(),
- CoreFixture.provisionWithFsStorage(),
- WebFixture.provision());
+ m_coreFixture.provisionWithFsStorage(),
+ m_webFixture.provision());
}
public TestContext testContextSetUp(BundleContext bundleContext) throws
Exception {
assertThat(bundleContext, is(notNullValue()));
TestContext testContext = new TestContext(bundleContext);
- // quickfix to let startlevel complete felix bundle locking issues
+ // FIXME quickfix to let startlevel complete to
+ // prevent felix bundle locking issues
Thread.sleep(1000);
- // Run the configurations
- CoreFixture.configure(testContext);
+ // Run the default configurations
+ m_coreFixture.configureDefaults(testContext);
+
+ // FIXME quickfix to let configadmin settle to
+ // prevent felix dropping configs
+ Thread.sleep(1000);
return testContext;
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
