summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwilk2012-03-15 11:33:58 (EDT)
committer Ryan D. Brooks2012-03-15 11:33:58 (EDT)
commitd66cc75afa17bce8f77508724a2ff4fd5bc8525b (patch)
tree50c90d07bcf39ac886cc214a988ce74cc8d9d9be
parentb7bc50bc92539bb9f14d2fb1e3b2deaa06918879 (diff)
downloadorg.eclipse.osee-d66cc75afa17bce8f77508724a2ff4fd5bc8525b.zip
org.eclipse.osee-d66cc75afa17bce8f77508724a2ff4fd5bc8525b.tar.gz
org.eclipse.osee-d66cc75afa17bce8f77508724a2ff4fd5bc8525b.tar.bz2
refinement: Comment adjustments
-rw-r--r--plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/CoreServerTestSuite.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/CoreServerInternalTestSuite.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java3
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/dbHealth/RelationIntegrityCheckTest.java11
4 files changed, 8 insertions, 10 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/CoreServerTestSuite.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/CoreServerTestSuite.java
index 297ba98..ef134f7 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/CoreServerTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/CoreServerTestSuite.java
@@ -22,5 +22,5 @@ CoreServerInternalTestSuite.class, //
* @author Roberto E. Escobar
*/
public class CoreServerTestSuite {
-
+ //
}
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/CoreServerInternalTestSuite.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/CoreServerInternalTestSuite.java
index f05374d..7e99b8a 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/CoreServerInternalTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/CoreServerInternalTestSuite.java
@@ -23,5 +23,5 @@ BuildTypeIdentifierTest.class, //
* @author Roberto E. Escobar
*/
public class CoreServerInternalTestSuite {
-
+ //
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
index 59b9b98..17b97bc 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/Change.java
@@ -80,7 +80,7 @@ public abstract class Change implements IAdaptable, Comparable<Change>, HasBranc
@Override
public int hashCode() {
- int hashCode = 0;
+ int hashCode = 7;
hashCode += 13 * getArtId();
hashCode += 13 * getGamma();
hashCode += getChangeArtifact() != null ? 13 * getChangeArtifact().hashCode() : 0;
@@ -161,7 +161,6 @@ public abstract class Change implements IAdaptable, Comparable<Change>, HasBranc
public abstract LoadChangeType getChangeType();
-
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
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 79fc218..ed3817a 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
@@ -36,6 +36,11 @@ import org.junit.Before;
import org.junit.Test;
/**
+ * Very SLOW, integration level test, using ConflictManagerExternal which must run on the client.
+ * <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>
* {@link RelationIntegrityCheck}
*
* @author Karol M. Wilk
@@ -46,12 +51,6 @@ 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);