ConDec-132: Refactor in order to release version v2.1.1

cures-hub · Jul 15, 2018 · c89566e · c89566e
1 parent 1325cac
commit c89566e
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 86 deletions.
diff --git a/src/main/resources/js/management.js b/src/main/resources/js/management.js
@@ -114,7 +114,7 @@ function getProjectId() {
 
 function getIssueKey() {
 	var issueKey = JIRA.Issue.getIssueKey();
-	if (issueKey == null) {
+	if (issueKey === null) {
 		issueKey = AJS.Meta.get("issue-key");
 	}
 	return issueKey;

diff --git a/src/main/resources/js/view.decision.knowledge.page.js b/src/main/resources/js/view.decision.knowledge.page.js
@@ -25,7 +25,7 @@ function initializeDecisionKnowledgePage() {
 
 function updateView(nodeId) {
 	buildTreeViewer();
-	if (nodeId == null) {
+	if (nodeId === null) {
 		var rootElement = getCurrentRootElement();
 		if (rootElement) {
 			selectNodeInTreeViewer(rootElement.id);

diff --git a/src/main/resources/js/view.treant.js b/src/main/resources/js/view.treant.js
@@ -6,7 +6,7 @@ var treantTree;
 function buildTreant(elementKey) {
 	var depthOfTreeInput = document.getElementById("depth-of-tree-input");
 	var depthOfTree = 4;
-	if (depthOfTreeInput != null) {
+	if (depthOfTreeInput !== null) {
 		depthOfTree = depthOfTreeInput.value;
 	}
 	getTreant(elementKey, depthOfTree, function(treeStructure) {
@@ -109,9 +109,9 @@ function addCommits(commits, elementArray) {
 
 		var decision;
 		var element;
-		for ( var i in splitMessage) {
+		for (var i in splitMessage) {
 			var split = splitMessage[i].split(" ");
-			var message = splitMessage[i].substr(splitMessage[i].indexOf(" ") + 1);
+			message = splitMessage[i].substr(splitMessage[i].indexOf(" ") + 1);
 			switch (split[0]) {
 			case "Decision:":
 				decision = {

diff --git a/src/test/java/de/uhd/ifi/se/decision/management/jira/mocks/MockVelocityManager.java b/src/test/java/de/uhd/ifi/se/decision/management/jira/mocks/MockVelocityManager.java
@@ -10,48 +10,56 @@
 import java.util.Map;
 
 public class MockVelocityManager implements VelocityManager {
-    @Override
-    public String getBody(String templateDirectory, String template, Map<String, Object> contextParameters) throws VelocityException {
-        return null;
-    }
-
-    @Override
-    public String getBody(String templateDirectory, String template, String baseurl, Map<String, Object> contextParameters) throws VelocityException {
-        return null;
-    }
-
-    @Override
-    public String getEncodedBody(String templateDirectory, String template, String encoding, Map<String, Object> contextParameters) throws VelocityException {
-        return "Test";
-    }
-
-    @Override
-    public String getEncodedBody(String templateDirectory, String template, String baseurl, String encoding, Map<String, Object> contextParameters) throws VelocityException {
-        return "Test";
-    }
-
-    @Override
-    public String getEncodedBodyForContent(String content, String baseurl, Map<String, Object> contextParameters) throws VelocityException {
-        return null;
-    }
-
-    @Override
-    public DateFormat getDateFormat() {
-        return null;
-    }
-
-    @Override
-    public String getEncodedBody(String templateDirectory, String template, String baseurl, String encoding, Context context) throws VelocityException {
-        return null;
-    }
-
-    @Override
-    public void writeEncodedBodyForContent(Writer writer, String contentFragment, Context context) throws VelocityException, IOException {
-        contentFragment.equals("do Something?");
-    }
-
-    @Override
-    public void writeEncodedBody(Writer writer, String templateDirectory, String template, String encoding, Context context) throws VelocityException, IOException {
-        templateDirectory.equals("do Something?");
-    }
+	@Override
+	public String getBody(String templateDirectory, String template, Map<String, Object> contextParameters)
+			throws VelocityException {
+		return null;
+	}
+
+	@Override
+	public String getBody(String templateDirectory, String template, String baseurl,
+			Map<String, Object> contextParameters) throws VelocityException {
+		return null;
+	}
+
+	@Override
+	public String getEncodedBody(String templateDirectory, String template, String encoding,
+			Map<String, Object> contextParameters) throws VelocityException {
+		return "Test";
+	}
+
+	@Override
+	public String getEncodedBody(String templateDirectory, String template, String baseurl, String encoding,
+			Map<String, Object> contextParameters) throws VelocityException {
+		return "Test";
+	}
+
+	@Override
+	public String getEncodedBodyForContent(String content, String baseurl, Map<String, Object> contextParameters)
+			throws VelocityException {
+		return null;
+	}
+
+	@Override
+	public DateFormat getDateFormat() {
+		return null;
+	}
+
+	@Override
+	public String getEncodedBody(String templateDirectory, String template, String baseurl, String encoding,
+			Context context) throws VelocityException {
+		return null;
+	}
+
+	@Override
+	public void writeEncodedBodyForContent(Writer writer, String contentFragment, Context context)
+			throws VelocityException, IOException {
+		// method empty since not used for testing
+	}
+
+	@Override
+	public void writeEncodedBody(Writer writer, String templateDirectory, String template, String encoding,
+			Context context) throws VelocityException, IOException {
+		// method empty since not used for testing
+	}
 }
diff --git a/src/test/java/de/uhd/ifi/se/decision/management/jira/persistence/TestConfigPersistence.java b/src/test/java/de/uhd/ifi/se/decision/management/jira/persistence/TestConfigPersistence.java
@@ -18,115 +18,113 @@
 @RunWith(ActiveObjectsJUnitRunner.class)
 public class TestConfigPersistence extends TestSetUp{
     private EntityManager entityManager;
-    private ConfigPersistence configPersistence;
 
     @Before
     public void setUp(){
         initialization();
         TestComponentGetter.init(new TestActiveObjects(entityManager), new MockTransactionTemplate(),
                 new MockDefaultUserManager());
-        configPersistence = new ConfigPersistence();
     }
 
     //IsIssueStrategy
     //Because the TransactionCallbacks are hardcoded on true in the Test the Tests are only fore the Right values
     @Ignore
     public void testIsIssueStrategyInvalid(){
-        assertFalse(configPersistence.isIssueStrategy("InvalidKey"));
+        assertFalse(ConfigPersistence.isIssueStrategy("InvalidKey"));
     }
 
     @Test
     public void testIsIssueStrategyOk(){
-        assertTrue(configPersistence.isIssueStrategy("TEST"));
+        assertTrue(ConfigPersistence.isIssueStrategy("TEST"));
     }
 
     //SetIssueStrategy
     @Test
     public void testSetIssueStrategyNullFalse(){
-        configPersistence.setIssueStrategy(null,false);
+        ConfigPersistence.setIssueStrategy(null,false);
     }
 
     @Test
     public void testSetIssueStrategyNullTrue(){
-        configPersistence.setIssueStrategy(null,true);
+        ConfigPersistence.setIssueStrategy(null,true);
     }
 
     @Test
     public void testSetIssueStrategyValid(){
-        configPersistence.setIssueStrategy("TEST", true);
+        ConfigPersistence.setIssueStrategy("TEST", true);
     }
 
     //IsActivated
     @Ignore
     public void testIsActivatedInvalid(){
-        assertFalse(configPersistence.isActivated("InvalidKey"));
+        assertFalse(ConfigPersistence.isActivated("InvalidKey"));
     }
 
     @Test
     public void testIsActivatedOk(){
-        assertTrue(configPersistence.isActivated("TEST"));
+        assertTrue(ConfigPersistence.isActivated("TEST"));
     }
 
     //SetActivated
     @Test
     public void testSetActivatedNullFalse(){
-        configPersistence.setActivated(null,false);
+        ConfigPersistence.setActivated(null,false);
     }
 
     @Test
     public void testSetActivateNullTrue(){
-        configPersistence.setActivated(null, true);
+        ConfigPersistence.setActivated(null, true);
     }
 
     @Test
     public void testSetActivatedValid(){
-        configPersistence.setActivated("TEST", true);
+        ConfigPersistence.setActivated("TEST", true);
     }
 
     //IsKnowledgeExtractedFromGit
     @Test
     public void testIsKnowledgeExtractedNull(){
-        assertFalse(configPersistence.isKnowledgeExtractedFromGit(null));
+        assertFalse(ConfigPersistence.isKnowledgeExtractedFromGit(null));
     }
 
     @Ignore
     public void testIsKnowledgeExtractedInvalid(){
-        assertFalse(configPersistence.isKnowledgeExtractedFromGit("NotTEST"));
+        assertFalse(ConfigPersistence.isKnowledgeExtractedFromGit("NotTEST"));
     }
 
     @Test
     public void testIsKnowledgeExtractedFilled(){
-        assertTrue(configPersistence.isKnowledgeExtractedFromGit("TEST"));
+        assertTrue(ConfigPersistence.isKnowledgeExtractedFromGit("TEST"));
     }
 
     //SetKnowledgeExtractedFromGit
     @Test
     public void testSetKnowledgeExtractedNullFalse(){
-        configPersistence.setKnowledgeExtractedFromGit(null,false);
+        ConfigPersistence.setKnowledgeExtractedFromGit(null,false);
     }
 
     @Test
     public void testSetKnowledgeExtractedNullTrue(){
-        configPersistence.setKnowledgeExtractedFromGit(null,true);
+        ConfigPersistence.setKnowledgeExtractedFromGit(null,true);
     }
 
     @Test
     public void testSetKnowledgeExtractedInvalidFalse(){
-        configPersistence.setKnowledgeExtractedFromGit("NotTEST", false);
+        ConfigPersistence.setKnowledgeExtractedFromGit("NotTEST", false);
     }
 
     @Test
     public void testSetKnowledgeExtractedInvalidTrue(){
-        configPersistence.setKnowledgeExtractedFromGit("NotTEST", true);
+        ConfigPersistence.setKnowledgeExtractedFromGit("NotTEST", true);
     }
 
     @Test
     public void testSetKnowledgeExtractedFilledFalse(){
-        configPersistence.setKnowledgeExtractedFromGit("TEST", false);
+        ConfigPersistence.setKnowledgeExtractedFromGit("TEST", false);
     }
 
     @Test
     public void testSetKnowledgeExtractedFilledTrue(){
-        configPersistence.setKnowledgeExtractedFromGit("TEST", true);
+        ConfigPersistence.setKnowledgeExtractedFromGit("TEST", true);
     }
 }
diff --git a/src/test/java/de/uhd/ifi/se/decision/management/jira/view/TestIssueTabPanelRenderer.java b/src/test/java/de/uhd/ifi/se/decision/management/jira/view/TestIssueTabPanelRenderer.java
@@ -1,26 +1,28 @@
 package de.uhd.ifi.se.decision.management.jira.view;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import com.atlassian.activeobjects.test.TestActiveObjects;
 import com.atlassian.jira.component.ComponentAccessor;
 import com.atlassian.jira.issue.Issue;
 import com.atlassian.jira.mock.issue.MockIssue;
 import com.atlassian.jira.project.Project;
 import com.atlassian.jira.user.ApplicationUser;
 import com.atlassian.jira.user.MockApplicationUser;
+
 import de.uhd.ifi.se.decision.management.jira.TestComponentGetter;
 import de.uhd.ifi.se.decision.management.jira.TestSetUp;
 import de.uhd.ifi.se.decision.management.jira.decXtract.view.IssueTabPanelRenderer;
 import de.uhd.ifi.se.decision.management.jira.mocks.MockDefaultUserManager;
 import de.uhd.ifi.se.decision.management.jira.mocks.MockTransactionTemplate;
 import net.java.ao.EntityManager;
 import net.java.ao.test.junit.ActiveObjectsJUnitRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 @RunWith(ActiveObjectsJUnitRunner.class)
 public class TestIssueTabPanelRenderer extends TestSetUp {
@@ -84,7 +86,6 @@ public void testShowPanelFilledFilled() {
 		((MockIssue) issue).setProjectObject(project);
 		((MockIssue) issue).setKey("TEST-1");
 		ApplicationUser user = new MockApplicationUser("NoFails");
-		// Tab panel is currently disabled
-		//assertFalse(renderer.showPanel(issue, user));
+		assertTrue(renderer.showPanel(issue, user));
 	}
 }
diff --git a/src/test/java/de/uhd/ifi/se/decision/management/jira/view/treant/TestTreant.java b/src/test/java/de/uhd/ifi/se/decision/management/jira/view/treant/TestTreant.java
@@ -1,13 +1,8 @@
 package de.uhd.ifi.se.decision.management.jira.view.treant;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
 
-import de.uhd.ifi.se.decision.management.jira.model.DecisionKnowledgeElement;
-import de.uhd.ifi.se.decision.management.jira.model.DecisionKnowledgeElementImpl;
-import de.uhd.ifi.se.decision.management.jira.model.Link;
-import de.uhd.ifi.se.decision.management.jira.model.LinkImpl;
-import de.uhd.ifi.se.decision.management.jira.persistence.AbstractPersistenceStrategy;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,6 +13,11 @@
 import de.uhd.ifi.se.decision.management.jira.TestSetUp;
 import de.uhd.ifi.se.decision.management.jira.mocks.MockDefaultUserManager;
 import de.uhd.ifi.se.decision.management.jira.mocks.MockTransactionTemplate;
+import de.uhd.ifi.se.decision.management.jira.model.DecisionKnowledgeElement;
+import de.uhd.ifi.se.decision.management.jira.model.DecisionKnowledgeElementImpl;
+import de.uhd.ifi.se.decision.management.jira.model.Link;
+import de.uhd.ifi.se.decision.management.jira.model.LinkImpl;
+import de.uhd.ifi.se.decision.management.jira.persistence.AbstractPersistenceStrategy;
 import de.uhd.ifi.se.decision.management.jira.persistence.StrategyProvider;
 import net.java.ao.EntityManager;
 import net.java.ao.test.junit.ActiveObjectsJUnitRunner;
@@ -72,7 +72,7 @@ public void testSetNodeStructure() {
 	public void testConstructor() {
 		initialization();
 		this.treant = new Treant("TEST", "14", 3);
-		assertTrue(true);
+		assertNotNull(this.treant);
 	}