Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.virgo.kernel.deployer.test')
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/.settings/org.eclipse.wst.common.project.facet.core.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java30
2 files changed, 6 insertions, 26 deletions
diff --git a/org.eclipse.virgo.kernel.deployer.test/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.kernel.deployer.test/.settings/org.eclipse.wst.common.project.facet.core.xml
index 801f856c..92aa2909 100644
--- a/org.eclipse.virgo.kernel.deployer.test/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/org.eclipse.virgo.kernel.deployer.test/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="com.springsource.server.bundle" version="1.0"/>
+ <installed facet="org.eclipse.virgo.server.bundle" version="1.0"/>
</faceted-project>
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
index 4188f98e..4806476b 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
@@ -16,12 +16,14 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
import java.util.Set;
+import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.util.io.JarUtils;
+import org.eclipse.virgo.util.io.PathReference;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -29,12 +31,6 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
-import org.eclipse.virgo.util.io.JarUtils;
-import org.eclipse.virgo.util.io.PathReference;
-
/**
* Test refreshing individual modules of a deployed application.
* <p />
@@ -46,8 +42,6 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
private static final String REFRESH_EXPORTER_VERSION = "1.0.0.BUILD-20100310081114";
- private static final File LOG_FILE = new File("target/serviceability/eventlog/eventlog.log");
-
private final String TEST_IMPORTER_BUNDLE_SYMBOLIC_NAME = "RefreshTest-1-RefreshImporter";
private final String TEST_IMPORT_BUNDLE_IMPORTER_BUNDLE_SYMBOLIC_NAME = "RefreshTest-Import-Bundle-1-RefreshImporter";
@@ -62,18 +56,6 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
private PathReference parImportBundle;
- private int existingLines;
-
- public void countExistingLogLines() throws IOException {
- BufferedReader reader = new BufferedReader(new FileReader(LOG_FILE));
- String line = reader.readLine();
- existingLines = 0;
- while (line != null) {
- existingLines++;
- line = reader.readLine();
- }
- }
-
@Before
public void setUp() throws Exception {
PathReference pr = new PathReference("./target/org.eclipse.virgo.kernel");
@@ -90,8 +72,6 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
JarUtils.unpackTo(par, explodedPar);
parImportBundle = new PathReference("src/test/resources/refresh-import-bundle.par");
-
- countExistingLogLines();
}
@After

Back to the top