# HG changeset patch
# User kcr
# Date 1525126575 25200
#      Mon Apr 30 15:16:15 2018 -0700
# Node ID 92569c275995ed810fbd90f8071675a528186c8d
# Parent  f2e7f7967966964ee88343d653e4ae630e77e972
8201619: [TESTBUG] Bad HG merge causes some web tests to be skipped by mistake
Reviewed-by:

diff --git a/modules/web/src/test/java/com/sun/webkit/SharedBufferTest.java b/modules/web/src/test/java/com/sun/webkit/SharedBufferTest.java
--- a/modules/web/src/test/java/com/sun/webkit/SharedBufferTest.java
+++ b/modules/web/src/test/java/com/sun/webkit/SharedBufferTest.java
@@ -30,7 +30,6 @@
 import java.util.Random;
 import org.junit.After;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -121,7 +120,7 @@
                 getSomeData(SEGMENT_SIZE - 10, 10));
     }
 
-    @Test @Ignore
+    @Test
     public void testGetSomeDataInteriorSegmentFirstTenBytes() {
         append(SEGMENT_SIZE * 2.5);
         assertArrayEquals(g(SEGMENT_SIZE, 10), getSomeData(SEGMENT_SIZE, 10));
@@ -143,7 +142,7 @@
                 getSomeData(SEGMENT_SIZE * 2 - 10, 10));
     }
 
-    @Test @Ignore
+    @Test
     public void testGetSomeDataLastSegmentFirstTenBytes() {
         append(SEGMENT_SIZE * 2.5);
         assertArrayEquals(
@@ -192,7 +191,7 @@
         assertArrayEquals(g(0, SEGMENT_SIZE), getSomeData(0, SEGMENT_SIZE));
     }
 
-    @Test @Ignore
+    @Test
     public void testGetSomeDataInteriorSegment() {
         append(SEGMENT_SIZE * 2.5);
         assertArrayEquals(
@@ -200,7 +199,7 @@
                 getSomeData(SEGMENT_SIZE, SEGMENT_SIZE));
     }
 
-    @Test @Ignore
+    @Test
     public void testGetSomeDataLastSegment() {
         append(SEGMENT_SIZE * 2.5);
         assertArrayEquals(
diff --git a/modules/web/src/test/java/com/sun/webkit/SimpleSharedBufferInputStreamTest.java b/modules/web/src/test/java/com/sun/webkit/SimpleSharedBufferInputStreamTest.java
--- a/modules/web/src/test/java/com/sun/webkit/SimpleSharedBufferInputStreamTest.java
+++ b/modules/web/src/test/java/com/sun/webkit/SimpleSharedBufferInputStreamTest.java
@@ -30,7 +30,6 @@
 import java.util.Random;
 import org.junit.After;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -163,7 +162,7 @@
         assertArrayEquals(g(SEGMENT_SIZE - 10, 10), read(10));
     }
 
-    @Test @Ignore
+    @Test
     public void testRead3InteriorSegmentFirstTenBytes() {
         append(SEGMENT_SIZE * 2.5);
         readOut(SEGMENT_SIZE);
@@ -184,7 +183,7 @@
         assertArrayEquals(g(SEGMENT_SIZE * 2 - 10, 10), read(10));
     }
 
-    @Test @Ignore
+    @Test
     public void testRead3LastSegmentFirstTenBytes() {
         append(SEGMENT_SIZE * 2.5);
         readOut(SEGMENT_SIZE * 2);
@@ -230,14 +229,14 @@
         assertArrayEquals(g(0, SEGMENT_SIZE), read(SEGMENT_SIZE));
     }
 
-    @Test @Ignore
+    @Test
     public void testRead3InteriorSegment() {
         append(SEGMENT_SIZE * 2.5);
         readOut(SEGMENT_SIZE);
         assertArrayEquals(g(SEGMENT_SIZE, SEGMENT_SIZE), read(SEGMENT_SIZE));
     }
 
-    @Test @Ignore
+    @Test
     public void testRead3LastSegment() {
         append(SEGMENT_SIZE * 2.5);
         readOut(SEGMENT_SIZE * 2);
@@ -361,7 +360,7 @@
         }
     }
 
-    @Test @Ignore
+    @Test
     public void testSkipZeroBytes() {
         testSkipSmallNumberOfBytes(0);
     }