PY-19610 Create common ancestor for ipnb test files

diff --git a/python/ipnb/testSrc/CellOperationTest.java b/python/ipnb/testSrc/CellOperationTest.java
index b36f395b182e721b4cd6e4ba9e65bb829ff40ab8..dfd0171831366e1ecd255893a2b048a602bbbb4a 100644 (file)
--- a/python/ipnb/testSrc/CellOperationTest.java
+++ b/python/ipnb/testSrc/CellOperationTest.java
@@ -1,5 +1,4 @@
 import com.intellij.testFramework.LightVirtualFile;
-import junit.framework.TestCase;
 import org.jetbrains.plugins.ipnb.format.IpnbFile;
 import org.jetbrains.plugins.ipnb.format.IpnbParser;
 import org.jetbrains.plugins.ipnb.format.cells.IpnbCodeCell;
@@ -7,11 +6,11 @@ import org.jetbrains.plugins.ipnb.format.cells.IpnbCodeCell;
 import java.io.IOException;
 
 
-public class CellOperationTest extends TestCase {
+public class CellOperationTest extends IpnbTestCase {
   
   public void testAddCell() throws IOException {
     final String fileName = "testData/emptyFile.ipynb";
-    final String fileText = IpnbTestUtil.getFileText(fileName);
+    final String fileText = IpnbTestCase.getFileText(fileName);
 
     final IpnbFile ipnbFile = IpnbParser.parseIpnbFile(fileText, new LightVirtualFile());
     ipnbFile.addCell(IpnbCodeCell.createEmptyCodeCell(), ipnbFile.getCells().size());
@@ -23,12 +22,12 @@ public class CellOperationTest extends TestCase {
   
   public void testRemoveCell() throws IOException {
     final String fileName = "testData/emptyFile.ipynb";
-    final String fileText = IpnbTestUtil.getFileText(fileName);
+    final String fileText = IpnbTestCase.getFileText(fileName);
 
     final IpnbFile ipnbFile = IpnbParser.parseIpnbFile(fileText, new LightVirtualFile());
     ipnbFile.addCell(IpnbCodeCell.createEmptyCodeCell(), ipnbFile.getCells().size());
     ipnbFile.removeCell(ipnbFile.getCells().size() - 1);
     
-    assertEquals(fileText, IpnbTestUtil.getFileText(fileName));
+    assertEquals(fileText, IpnbTestCase.getFileText(fileName));
   }
 }

diff --git a/python/ipnb/testSrc/IpnbTestUtil.java b/python/ipnb/testSrc/IpnbTestCase.java
similarity index 88%
rename from python/ipnb/testSrc/IpnbTestUtil.java
rename to python/ipnb/testSrc/IpnbTestCase.java
index afa891e15d8c080bcdc69199015ed89ec283308c..bc4b5067088c9e7ecf55d5c62cf3e6f367592b65 100644 (file)
--- a/python/ipnb/testSrc/IpnbTestUtil.java
+++ b/python/ipnb/testSrc/IpnbTestCase.java
@@ -1,11 +1,13 @@
 import com.intellij.openapi.application.PathManager;
+import junit.framework.TestCase;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 
-public class IpnbTestUtil {
+public abstract class IpnbTestCase extends TestCase {
+  
   static String getFileText(@NotNull final String fileName) throws IOException {
     String fullPath = PathManager.getHomePath() + "/community/python/ipnb/" + fileName;
     final BufferedReader br = new BufferedReader(new FileReader(fullPath));

diff --git a/python/ipnb/testSrc/JsonParserTest.java b/python/ipnb/testSrc/JsonParserTest.java
index 4be097c53a82e1e00e0b543f132c19a58631ffb0..eef95f9103979c2e7c00a98d3bdff028685f4590 100644 (file)
--- a/python/ipnb/testSrc/JsonParserTest.java
+++ b/python/ipnb/testSrc/JsonParserTest.java
@@ -2,7 +2,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.testFramework.LightVirtualFile;
-import junit.framework.TestCase;
 import org.jetbrains.plugins.ipnb.format.IpnbFile;
 import org.jetbrains.plugins.ipnb.format.IpnbParser;
 import org.jetbrains.plugins.ipnb.format.cells.IpnbCell;
@@ -13,10 +12,10 @@ import org.jetbrains.plugins.ipnb.format.cells.output.IpnbOutputCell;
 import java.io.IOException;
 import java.util.List;
 
-public class JsonParserTest extends TestCase {
+public class JsonParserTest extends IpnbTestCase {
   public void testFile() throws IOException {
     final String fileName = "testData/SymPy.ipynb";
-    final String fileText = IpnbTestUtil.getFileText(fileName);
+    final String fileText = IpnbTestCase.getFileText(fileName);
 
     final IpnbFile ipnbFile = IpnbParser.parseIpnbFile(fileText, new LightVirtualFile());
     assertNotNull(ipnbFile);
@@ -25,7 +24,7 @@ public class JsonParserTest extends TestCase {
 
   public void testMarkdownCells() throws IOException {
     final String fileName = "testData/SymPy.ipynb";
-    final String fileText = IpnbTestUtil.getFileText(fileName);
+    final String fileText = IpnbTestCase.getFileText(fileName);
     final IpnbFile ipnbFile = IpnbParser.parseIpnbFile(fileText, new LightVirtualFile());
     assertNotNull(ipnbFile);
     final List<IpnbCell> cells = ipnbFile.getCells();
@@ -40,7 +39,7 @@ public class JsonParserTest extends TestCase {
 
   public void testMarkdownCell() throws IOException {
     final String fileName = "testData/markdown.ipynb";
-    final String fileText = IpnbTestUtil.getFileText(fileName);
+    final String fileText = IpnbTestCase.getFileText(fileName);
     final IpnbFile ipnbFile = IpnbParser.parseIpnbFile(fileText, new LightVirtualFile());
     assertNotNull(ipnbFile);
     final List<IpnbCell> cells = ipnbFile.getCells();
@@ -54,7 +53,7 @@ public class JsonParserTest extends TestCase {
 
   public void testCodeCell() throws IOException {
     final String fileName = "testData/code.ipynb";
-    final String fileText = IpnbTestUtil.getFileText(fileName);
+    final String fileText = IpnbTestCase.getFileText(fileName);
     final IpnbFile ipnbFile = IpnbParser.parseIpnbFile(fileText, new LightVirtualFile());
     assertNotNull(ipnbFile);
     final List<IpnbCell> cells = ipnbFile.getCells();
@@ -74,7 +73,7 @@ public class JsonParserTest extends TestCase {
 
   public void testOutputs() throws IOException {
     final String fileName = "testData/outputs.ipynb";
-    final String fileText = IpnbTestUtil.getFileText(fileName);
+    final String fileText = IpnbTestCase.getFileText(fileName);
     final IpnbFile ipnbFile = IpnbParser.parseIpnbFile(fileText, new LightVirtualFile());
     assertNotNull(ipnbFile);
     final List<IpnbCell> cells = ipnbFile.getCells();