summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwilk2011-06-17 01:58:08 (EDT)
committer Ryan D. Brooks2011-06-17 01:58:08 (EDT)
commitc8f3fdb89e4a3af16c8848e8ded9c8401945f452 (patch)
tree0ef371265aa6552c7dfac3c8fc582375e420fb50
parent4e63eb79e7334f48fa3e8fe7ba8d930468682f2c (diff)
downloadorg.eclipse.osee-c8f3fdb89e4a3af16c8848e8ded9c8401945f452.zip
org.eclipse.osee-c8f3fdb89e4a3af16c8848e8ded9c8401945f452.tar.gz
org.eclipse.osee-c8f3fdb89e4a3af16c8848e8ded9c8401945f452.tar.bz2
refactor: Minor quality fixes0.9.9.v201106200029_RC
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java1
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java18
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java19
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/dbHealth/RelationIntegrityCheckTest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java19
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java1
6 files changed, 34 insertions, 34 deletions
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java
index 92a7e0f..2470472 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java
@@ -54,7 +54,6 @@ public class MergeManager {
Collection<? extends ICoverage> children = coverageImport.getChildren();
int count = 0;
for (ICoverage importCoverage : children) {
- // System.out.println(String.format("Get merge items from %d/%d - [%s]", count, children.size(), importCoverage));
processImportCoverage(importCoverage, mergeItems, resultData);
count++;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java
index 39d4349..1820d78 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordMlResolutionGuiTest.java
@@ -22,18 +22,18 @@ import org.junit.Assert;
import org.junit.Test;
/**
- * @formatter:off
- * Tests by inputing the whole requirements sample ICD file.
- * Tests:
- * - if user answers store as content vs store as an outline number,
- * depending on what user selects.
- *
- * THESE TESTS MUST RUN AS PART OF THE SUITE, RoughArtifact* classes need
- * the osee caching service.
+ * <p>
+ * Tests by inputing the whole requirements sample ICD file.<br/>
+ * Tests:<br/>
+ * <li>if user answers store as content vs store as an outline number, depending on what user selects.</li>
+ * </p>
+ * <p>
+ * <br/>
+ * THESE TESTS MUST RUN AS PART OF THE SUITE, RoughArtifact* classes need the osee caching service.<br/>
+ * </p>
*
* @author Karol M. Wilk
*/
-//@formatter:on
public class WordMlResolutionGuiTest {
private static final Pattern PARAGRAPH_REGEX = Pattern.compile("<w:p[ >].*?</w:p>", Pattern.DOTALL);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java
index 646f9ff..d8b0e37 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/RelationOrderRendererTest.java
@@ -71,7 +71,7 @@ public class RelationOrderRendererTest {
}
@Test
- public void testRenderingAllValid() {
+ public void testRenderingAllValid() throws OseeCoreException {
RelationOrderData orderData = new MockRelationOrderData();
List<Object[]> expectedData = new ArrayList<Object[]>();
@@ -87,8 +87,8 @@ public class RelationOrderRendererTest {
checkRelationOrderRenderer(getExpected(expectedData), orderData);
}
- @Test
- public void testRenderingOrderTypeNotFoud() {
+ @Test(expected = OseeCoreException.class)
+ public void testRenderingOrderTypeNotFound() throws OseeCoreException {
RelationOrderData orderData = new MockRelationOrderData();
List<Object[]> expectedData = new ArrayList<Object[]>();
addData(orderData, expectedData, "Relation 1", "Relation 1_A", RelationSide.SIDE_A, GUID.create(), "0", "1", "2");
@@ -96,7 +96,7 @@ public class RelationOrderRendererTest {
}
@Test
- public void testRenderingEmptyGuids() {
+ public void testRenderingEmptyGuids() throws OseeCoreException {
RelationOrderData orderData = new MockRelationOrderData();
List<Object[]> expectedData = new ArrayList<Object[]>();
addData(orderData, expectedData, "Relation 1", "Relation 1_A", RelationSide.SIDE_A,
@@ -111,7 +111,7 @@ public class RelationOrderRendererTest {
checkRelationOrderRenderer(getExpected(expectedData), orderData);
}
- private void addData(RelationOrderData orderData, List<Object[]> expectedData, String relationType, String relationSideName, RelationSide side, String relationOrderIdGuid, String... guids) {
+ private void addData(RelationOrderData orderData, List<Object[]> expectedData, String relationType, String relationSideName, RelationSide side, String relationOrderIdGuid, String... guids) throws OseeCoreException {
List<String> artGuids = new ArrayList<String>();
if (guids != null && guids.length > 0) {
artGuids.addAll(Arrays.asList(guids));
@@ -119,12 +119,9 @@ public class RelationOrderRendererTest {
orderData.addOrderList(relationType, side.name(), relationOrderIdGuid, artGuids);
String expectedOrderId = relationOrderIdGuid;
- try {
- IRelationSorter sorter = sorterProvider.getRelationOrder(relationOrderIdGuid);
- expectedOrderId = sorter.getSorterId().getName();
- } catch (Exception ex) {
- // Do Nothing
- }
+ IRelationSorter sorter = sorterProvider.getRelationOrder(relationOrderIdGuid);
+ expectedOrderId = sorter.getSorterId().getName();
+
expectedData.add(new Object[] {
relationType,
relationSideName,
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/dbHealth/RelationIntegrityCheckTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/dbHealth/RelationIntegrityCheckTest.java
index 01f0188..ef98314 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/dbHealth/RelationIntegrityCheckTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/dbHealth/RelationIntegrityCheckTest.java
@@ -39,10 +39,6 @@ import org.junit.Test;
/**
* {@link RelationIntegrityCheck}
- * <p>
- * Tests data integrity case where a new relation is persisted on a deleted artifact. Checks that if the situation
- * exists and runs <code>applyFix()</code> to resolve the issue.
- * </p>
*
* @author Karol M. Wilk
*/
@@ -52,6 +48,12 @@ public class RelationIntegrityCheckTest {
private Branch parentBranch;
private Branch workingBranch;
+ /**
+ * <p>
+ * Tests data integrity case where a new relation is persisted on a deleted artifact. Checks that if the situation
+ * exists and runs <code>applyFix()</code> to resolve the issue.
+ * </p>
+ */
@Test
public void testNewRelationOnDeletedArtifact() throws Exception {
runQuery(RelationIntegrityCheck.DELETED_A_ARTIFACTS);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java
index 88a84c1..ac76264 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/importer/ArtifactImportWizardTest.java
@@ -39,6 +39,7 @@ import org.eclipse.osee.framework.skynet.core.importing.operations.RoughArtifact
import org.eclipse.osee.framework.skynet.core.importing.parsers.ExcelArtifactExtractor;
import org.eclipse.osee.framework.skynet.core.importing.resolvers.IArtifactImportResolver;
import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportOperationFactory;
+import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportWizard;
import org.eclipse.osee.framework.ui.skynet.Import.MatchingStrategy;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.eclipse.osee.support.test.util.TestUtil;
@@ -50,7 +51,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
/**
- * @link ArtifactImportWizard
+ * @see ArtifactImportWizard
* @author Karol M. Wilk
*/
public final class ArtifactImportWizardTest {
@@ -155,13 +156,15 @@ public final class ArtifactImportWizardTest {
//@formatter:off
/*
setup artifact tree of this form:
- ArtifactImportWizardTest_Root
- |
- `--A
- |\.__ C
- | |
- | `._ D
- B
+ myRootArtifact
+ |
+ `--A
+ | \._ C
+ | |
+ | `._ D
+ |
+ `--B
+ Where myRootArtifact real name is "ArtifactImportWizardTest_Root"
*/
//@formatter:on
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
index c13e08e..1132a90 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java
@@ -67,7 +67,6 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende
private final IComparator comparator;
public WordTemplateRenderer() {
- super();
this.comparator = new WordTemplateCompare(this);
}