Merge "Re-activate tests"
diff --git a/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/AddReviewerCommandTest.java b/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/AddReviewerCommandTest.java
index 6d60ae8..69cc662 100644
--- a/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/AddReviewerCommandTest.java
+++ b/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/AddReviewerCommandTest.java
@@ -56,12 +56,12 @@
/**
* Test method for {@link org.eclipse.egerrit.internal.core.command.AddReviewerCommand#call()}.
*/
-// @Test
+ @Test
public void testAddGroupCall() {
// Add a valid reviewer group. I.e. the current Group defined: "Administrator".
AddReviewerCommand command = fGerrit.addReviewer(change_id);
AddReviewerInput addreviewerInput = new AddReviewerInput();
- addreviewerInput.setReviewer("Administrators");
+ addreviewerInput.setReviewer("test1");
command.setCommandInput(addreviewerInput);
AddReviewerResult reviewerCmdResult = null;
diff --git a/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/ChangeCommitMsgCommandTest.java b/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/ChangeCommitMsgCommandTest.java
index db0f51b..130d2c0 100644
--- a/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/ChangeCommitMsgCommandTest.java
+++ b/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/ChangeCommitMsgCommandTest.java
@@ -1,50 +1,53 @@
-/*******************************************************************************
- * Copyright (c) 2015 Ericssona
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v1.0 which
- * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ericsson - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.egerrit.core.command.tests;
-
-import static org.junit.Assert.fail;
-
-import org.eclipse.egerrit.internal.core.command.ChangeCommitMsgCommand;
-import org.eclipse.egerrit.internal.core.command.PublishChangeEditCommand;
-import org.eclipse.egerrit.internal.core.exception.EGerritException;
-import org.eclipse.egerrit.internal.core.rest.ChangeEditMessageInput;
-
-/**
- * Test suite for {@link org.eclipse.egerrit.internal.core.command.ChangeCommitMsgCommand}
- *
- * @since 1.0
- */
-@SuppressWarnings("nls")
-public class ChangeCommitMsgCommandTest extends CommandTestWithSimpleReview {
- /**
- * Test method for {@link org.eclipse.egerrit.internal.core.command.ChangeCommitMsgCommand#call()}.
- */
-// @Test
- public void testCall() {
- ChangeCommitMsgCommand editMessageCmd = fGerrit.editMessage(change_id);
- ChangeEditMessageInput changeEditMessageInput = new ChangeEditMessageInput();
- changeEditMessageInput.setMessage("A new message to be saved ...");
-
- editMessageCmd.setCommandInput(changeEditMessageInput);
- PublishChangeEditCommand publishChangeEditCmd = fGerrit.publishChangeEdit(change_id);
-
- try {
- editMessageCmd.call();
- publishChangeEditCmd.call();
- System.out.println(fGerrit.getChange(change_id).call().getSubject());
- } catch (EGerritException e) {
- fail(e.getMessage());
- }
-
- }
-}
+/*******************************************************************************
+ * Copyright (c) 2015 Ericssona
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ericsson - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.egerrit.core.command.tests;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.egerrit.internal.core.command.ChangeCommitMsgCommand;
+import org.eclipse.egerrit.internal.core.command.PublishChangeEditCommand;
+import org.eclipse.egerrit.internal.core.exception.EGerritException;
+import org.eclipse.egerrit.internal.core.rest.ChangeEditMessageInput;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Test suite for {@link org.eclipse.egerrit.internal.core.command.ChangeCommitMsgCommand}
+ *
+ * @since 1.0
+ */
+@SuppressWarnings("nls")
+public class ChangeCommitMsgCommandTest extends CommandTestWithSimpleReview {
+ /**
+ * Test method for {@link org.eclipse.egerrit.internal.core.command.ChangeCommitMsgCommand#call()}.
+ */
+ @Test
+ public void testCall() {
+ ChangeCommitMsgCommand editMessageCmd = fGerrit.editMessage(change_id);
+ ChangeEditMessageInput changeEditMessageInput = new ChangeEditMessageInput();
+ changeEditMessageInput.setMessage("A new message to be saved ...\n\nChange-Id: " + change_id);
+
+ editMessageCmd.setCommandInput(changeEditMessageInput);
+ PublishChangeEditCommand publishChangeEditCmd = fGerrit.publishChangeEdit(change_id);
+
+ try {
+ editMessageCmd.call();
+ publishChangeEditCmd.call();
+ Assert.assertTrue(
+ fGerrit.getChange(change_id).call().getSubject().contains("A new message to be saved ..."));
+ } catch (EGerritException e) {
+ fail(e.getMessage());
+ }
+
+ }
+}
diff --git a/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/PublishChangeEditCommandTest.java b/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/PublishChangeEditCommandTest.java
deleted file mode 100644
index ceb675b..0000000
--- a/org.eclipse.egerrit.core.tests/src/org/eclipse/egerrit/core/command/tests/PublishChangeEditCommandTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Ericsson
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v1.0 which
- * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ericsson - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.egerrit.core.command.tests;
-
-import static org.junit.Assert.fail;
-
-import org.eclipse.egerrit.core.tests.Common;
-import org.eclipse.egerrit.internal.core.command.ChangeCommitMsgCommand;
-import org.eclipse.egerrit.internal.core.command.PublishChangeEditCommand;
-import org.eclipse.egerrit.internal.core.exception.EGerritException;
-import org.eclipse.egerrit.internal.core.rest.ChangeEditMessageInput;
-
-/**
- * Test suite for {@link org.eclipse.egerrit.internal.core.command.PublishChangeEditCommand}
- *
- * @since 1.0
- */
-@SuppressWarnings("nls")
-public class PublishChangeEditCommandTest extends CommandTestWithSimpleReview {
- /**
- * Test method for {@link org.eclipse.egerrit.internal.core.command.PublishChangeEditCommand#call()}.
- */
-// @Test
- public void testCall() {
- ChangeCommitMsgCommand editMessageCmd = fGerrit.editMessage(Common.TEST_PROJECT + "~master~" + change_id);
- ChangeEditMessageInput changeEditMessageInput = new ChangeEditMessageInput();
- changeEditMessageInput.setMessage("A new message to be saved ...");
-
- editMessageCmd.setCommandInput(changeEditMessageInput);
-
- try {
- editMessageCmd.call();
- } catch (EGerritException e) {
- fail(e.getMessage());
- }
-
- PublishChangeEditCommand publishChangeEditCmd = fGerrit
- .publishChangeEdit(Common.TEST_PROJECT + "~master~" + change_id);
-
- String publishChangeEditCmdResult = null;
- try {
- publishChangeEditCmdResult = publishChangeEditCmd.call();
-
- } catch (EGerritException e) {
- fail(e.getMessage());
- }
-
- // Verify result
- assert (true);
-
- }
-}
