X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.linuxtools.tmf.core.tests%2Fsrc%2Forg%2Feclipse%2Flinuxtools%2Ftmf%2Fcore%2Ftests%2Futil%2FPairTest.java;h=9230525f632ace52dffe598b971da5f5691e0ff9;hb=ccf2bbb4ed585a51076499e853c6227a81c9b471;hp=40138c933a3f9949af7519c73b69e1f862abd20a;hpb=06fcc8feb401aa6756ce53eb98c3dd6ea5d6f79d;p=deliverable%2Ftracecompass.git diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/PairTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/PairTest.java index 40138c933a..9230525f63 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/PairTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/PairTest.java @@ -31,8 +31,8 @@ public class PairTest { // Field(s) // ------------------------------------------------------------------------ - Pair fPair1 = new Pair("String 1", 1L); - Pair fPair2 = new Pair("String 2", 2L); + Pair fPair1 = new Pair<>("String 1", 1L); + Pair fPair2 = new Pair<>("String 2", 2L); // ------------------------------------------------------------------------ // to String @@ -50,7 +50,7 @@ public class PairTest { @Test public void testAccessors() { - Pair myPair = new Pair("String 1", 1L); + Pair myPair = new Pair<>("String 1", 1L); assertEquals("String 1", myPair.getFirst()); assertEquals(Long.valueOf(1L), myPair.getSecond()); @@ -76,8 +76,8 @@ public class PairTest { @Test public void testEqualsSymmetry() { - Pair info1 = new Pair(fPair1.getFirst(), fPair1.getSecond().longValue()); - Pair info2 = new Pair(fPair2.getFirst(), fPair2.getSecond().longValue()); + Pair info1 = new Pair<>(fPair1.getFirst(), fPair1.getSecond().longValue()); + Pair info2 = new Pair<>(fPair2.getFirst(), fPair2.getSecond().longValue()); assertTrue("equals", info1.equals(fPair1)); assertTrue("equals", fPair1.equals(info1)); @@ -88,9 +88,9 @@ public class PairTest { @Test public void testEqualsTransivity() { - Pair info1 = new Pair(fPair1.getFirst(), fPair1.getSecond().longValue()); - Pair info2 = new Pair(fPair1.getFirst(), fPair1.getSecond().longValue()); - Pair info3 = new Pair(fPair1.getFirst(), fPair1.getSecond().longValue()); + Pair info1 = new Pair<>(fPair1.getFirst(), fPair1.getSecond().longValue()); + Pair info2 = new Pair<>(fPair1.getFirst(), fPair1.getSecond().longValue()); + Pair info3 = new Pair<>(fPair1.getFirst(), fPair1.getSecond().longValue()); assertTrue("equals", info1.equals(info2)); assertTrue("equals", info2.equals(info3)); @@ -105,7 +105,7 @@ public class PairTest { @Test public void testEqualsDifferentObj() { - Pair info = new Pair(1L, "String1"); + Pair info = new Pair<>(1L, "String1"); assertTrue("equals", !fPair1.equals(info)); } @@ -115,8 +115,8 @@ public class PairTest { @Test public void testHashCode() { - Pair info1 = new Pair(fPair1.getFirst(), fPair1.getSecond().longValue()); - Pair info2 = new Pair(fPair2.getFirst(), fPair2.getSecond().longValue()); + Pair info1 = new Pair<>(fPair1.getFirst(), fPair1.getSecond().longValue()); + Pair info2 = new Pair<>(fPair2.getFirst(), fPair2.getSecond().longValue()); assertTrue("hashCode", fPair1.hashCode() == info1.hashCode()); assertTrue("hashCode", fPair2.hashCode() == info2.hashCode());