[test] Fix failures by modifying tests
diff --git a/plugins/org.eclipse.mylyn.docs.intent.collab.ide/src/org/eclipse/mylyn/docs/intent/collab/ide/resource/RepoModelResource.java b/plugins/org.eclipse.mylyn.docs.intent.collab.ide/src/org/eclipse/mylyn/docs/intent/collab/ide/resource/RepoModelResource.java
index 447f9b7..375a5a7 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.collab.ide/src/org/eclipse/mylyn/docs/intent/collab/ide/resource/RepoModelResource.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.collab.ide/src/org/eclipse/mylyn/docs/intent/collab/ide/resource/RepoModelResource.java
@@ -46,12 +46,13 @@
return true;
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#setModified(boolean)
- */
+ @Override
public void setModified(boolean isModified) {
// Do nothing: never used in case of a repository resource
}
+
+ @Override
+ public void setTimeStamp(long timeStamp) {
+ // Do nothing: never used in case of a repository resource
+ }
}
diff --git a/tests/org.eclipse.mylyn.docs.intent.client.ui.test/src/org/eclipse/mylyn/docs/intent/client/ui/test/unit/project/ProjectTest.java b/tests/org.eclipse.mylyn.docs.intent.client.ui.test/src/org/eclipse/mylyn/docs/intent/client/ui/test/unit/project/ProjectTest.java
index bfdc719..7768a05 100644
--- a/tests/org.eclipse.mylyn.docs.intent.client.ui.test/src/org/eclipse/mylyn/docs/intent/client/ui/test/unit/project/ProjectTest.java
+++ b/tests/org.eclipse.mylyn.docs.intent.client.ui.test/src/org/eclipse/mylyn/docs/intent/client/ui/test/unit/project/ProjectTest.java
@@ -46,25 +46,10 @@
public void testCloseProject() {
try {
intentProject.close(new NullProgressMonitor());
+ intentProject.open(new NullProgressMonitor());
} catch (CoreException e) {
fail(e.getMessage());
}
}
- // TODO fix or remove incorrect test: the repository is not the same after toggling
- // /**
- // * Ensures that the project nature can be activated/deactivated.
- // */
- // public void testToggleNature() {
- // ToggleNatureAction.toggleNature(intentProject);
- //
- // waitForAllOperationsInUIThread();
- //
- // ToggleNatureAction.toggleNature(intentProject);
- //
- // waitForAllOperationsInUIThread();
- //
- // openIntentEditor();
- // }
-
}
diff --git a/tests/org.eclipse.mylyn.docs.intent.client.ui.test/src/org/eclipse/mylyn/docs/intent/client/ui/test/util/AbstractIntentUITest.java b/tests/org.eclipse.mylyn.docs.intent.client.ui.test/src/org/eclipse/mylyn/docs/intent/client/ui/test/util/AbstractIntentUITest.java
index 111e953..0a3a43f 100644
--- a/tests/org.eclipse.mylyn.docs.intent.client.ui.test/src/org/eclipse/mylyn/docs/intent/client/ui/test/util/AbstractIntentUITest.java
+++ b/tests/org.eclipse.mylyn.docs.intent.client.ui.test/src/org/eclipse/mylyn/docs/intent/client/ui/test/util/AbstractIntentUITest.java
@@ -184,12 +184,11 @@
// Step 2: clean workspace
try {
if (intentProject != null) {
- IntentRepositoryManager.INSTANCE.deleteRepository(intentProject.getName());
- waitForAllOperationsInUIThread();
-
intentProject.delete(true, true, new NullProgressMonitor());
+ IntentRepositoryManager.INSTANCE.deleteRepository(intentProject.getName());
}
} finally {
+ waitForAllOperationsInUIThread();
IntentEditorActivator.getDefault().getLog().removeLogListener(this);
WorkspaceUtils.cleanWorkspace();
@@ -318,6 +317,8 @@
public void run(IProgressMonitor monitor) throws CoreException {
IProject project = WorkspaceUtils.createProject(projectName, monitor);
ToggleNatureAction.toggleNature(project);
+ assertTrue("Test project has not the expected intent nature",
+ project.hasNature("org.eclipse.mylyn.docs.intent.client.ui.ide.intentNature"));
intentProject = project;
setUpRepository(project);
}
@@ -354,31 +355,6 @@
waitForAllOperationsInUIThread();
}
- // /**
- // * Loads the {@link IntentStructuredElement} located at the given path. If it contains an
- // IntentDocument,
- // * also updates the intentDocument field.
- // *
- // * @param intentDocumentModelPath
- // * the path of the Intent document model (from
- // * org.eclipse.mylyn.docs.intent.client.ui.test/data)
- // * @return the loaded {@link IntentStructuredElement}
- // */
- // protected IntentStructuredElement loadIntentDocumentFromTests(String intentDocumentModelPath) {
- // ResourceSet rs = new ResourceSetImpl();
- // URI documentURI = URI.createURI("platform:/plugin/org.eclipse.mylyn.docs.intent.client.ui.test/data/"
- // + intentDocumentModelPath);
- // Resource documentResource = rs.getResource(documentURI, true);
- // if (documentResource != null && documentResource.getContents().iterator().hasNext()
- // && documentResource.getContents().iterator().next() instanceof IntentStructuredElement) {
- // if (documentResource.getContents().iterator().next() instanceof IntentDocument) {
- // intentDocument = (IntentDocument)documentResource.getContents().iterator().next();
- // }
- // return (IntentStructuredElement)documentResource.getContents().iterator().next();
- // }
- // throw new AssertionFailedError("Could not load Intent model at " + intentDocumentModelPath);
- // }
-
/**
* Parses the {@link IntentStructuredElement} located at the given path. If it contains an IntentDocument,
* also updates the intentDocument field.
