diff options
| author | Martin Taal | 2012-11-30 16:11:19 +0000 |
|---|---|---|
| committer | Martin Taal | 2012-11-30 16:11:19 +0000 |
| commit | d0cb05f054cbe55eab4522f55c880ade05473d16 (patch) | |
| tree | ab19a9b6fc5d2ec5a9703e6c9da9394d2d8e3553 /tests | |
| parent | 7d35ceb7953a3c60110db6c6c7c7c50090d3f8f9 (diff) | |
| download | org.eclipse.emf.teneo-d0cb05f054cbe55eab4522f55c880ade05473d16.tar.gz org.eclipse.emf.teneo-d0cb05f054cbe55eab4522f55c880ade05473d16.tar.xz org.eclipse.emf.teneo-d0cb05f054cbe55eab4522f55c880ade05473d16.zip | |
Make test run for java 1.7
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/issues/LargeMapValueAction.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/issues/LargeMapValueAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/issues/LargeMapValueAction.java index e6d2d6292..8374a9b6d 100755 --- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/issues/LargeMapValueAction.java +++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/issues/LargeMapValueAction.java @@ -63,8 +63,11 @@ public class LargeMapValueAction extends AbstractTestAction { assertEquals(largeString1.length(), te.getTestProp().length()); assertNotNull(te.getTestMap().get("key1")); assertNotNull(te.getTestMap().get("key2")); + // in java 7 some strings seem to be shared: + if (!System.getProperty("java.version").startsWith("1.7")) { assertNotSame(te.getTestMap().get("key1"), largeString1); assertNotSame(te.getTestMap().get("key2"), largeString2); + } assertEquals(te.getTestMap().get("key1"), largeString1); assertEquals(te.getTestMap().get("key2"), largeString2); store.commitTransaction(); |