From 9ff52e8254a2511ff69a4c91b826ce437409decc Mon Sep 17 00:00:00 2001 From: Javen O'Neal Date: Sat, 2 Jan 2016 21:20:43 +0000 Subject: [PATCH] rearrange unit tests into more, smaller functions git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1722667 13f79535-47bb-0310-9956-ffa450edef68 --- .../usermodel/BaseTestSlideShowFactory.java | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java b/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java index 631cf37724..afffbf44f2 100644 --- a/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java +++ b/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java @@ -30,19 +30,24 @@ import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; public class BaseTestSlideShowFactory { private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance(); - public void testFactory(String file, String protectedFile, String password) - throws Exception { + private static void testFactoryFromFile(String file) throws Exception { SlideShow ss; // from file ss = SlideShowFactory.create(fromFile(file)); assertNotNull(ss); ss.close(); + } + private static void testFactoryFromStream(String file) throws Exception { + SlideShow ss; // from stream ss = SlideShowFactory.create(fromStream(file)); assertNotNull(ss); ss.close(); + } + private static void testFactoryFromNative(String file) throws Exception { + SlideShow ss; // from NPOIFS if (!file.contains("pptx")) { NPOIFSFileSystem npoifs = new NPOIFSFileSystem(fromFile(file)); @@ -51,17 +56,26 @@ public class BaseTestSlideShowFactory { npoifs.close(); ss.close(); } + } - // from protected file + private static void testFactoryFromProtectedFile(String protectedFile, String password) throws Exception { + SlideShow ss; + // from protected file ss = SlideShowFactory.create(fromFile(protectedFile), password); assertNotNull(ss); ss.close(); + } + private static void testFactoryFromProtectedStream(String protectedFile, String password) throws Exception { + SlideShow ss; // from protected stream ss = SlideShowFactory.create(fromStream(protectedFile), password); assertNotNull(ss); ss.close(); + } + private static void testFactoryFromProtectedNative(String protectedFile, String password) throws Exception { + SlideShow ss; // from protected NPOIFS NPOIFSFileSystem npoifs = new NPOIFSFileSystem(fromFile(protectedFile)); ss = SlideShowFactory.create(npoifs, password); @@ -69,6 +83,17 @@ public class BaseTestSlideShowFactory { npoifs.close(); ss.close(); } + + public static void testFactory(String file, String protectedFile, String password) + throws Exception { + testFactoryFromFile(file); + testFactoryFromStream(file); + testFactoryFromNative(file); + + testFactoryFromProtectedFile(protectedFile, password); + testFactoryFromProtectedStream(protectedFile, password); + testFactoryFromProtectedNative(protectedFile, password); + } private static File fromFile(String file) { return (file.contains("/") || file.contains("\\")) @@ -81,4 +106,5 @@ public class BaseTestSlideShowFactory { ? new FileInputStream(file) : _slTests.openResourceAsStream(file); } + } -- 2.39.5