From 8fcd2257de999018d24fcfdb673892589c4ca62d Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sat, 24 Aug 2013 19:58:54 -0400
Subject: [PATCH] updated how initial test data is updated

Former-commit-id: ac09d75ec58b38514a8be7d309382d3ef533de02
---
 .../data/cpe/BaseIndexTestCase.java           | 97 ++-----------------
 1 file changed, 6 insertions(+), 91 deletions(-)

diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/BaseIndexTestCase.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/BaseIndexTestCase.java
index 84efe73fb..872fed583 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/BaseIndexTestCase.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/BaseIndexTestCase.java
@@ -18,30 +18,18 @@
  */
 package org.owasp.dependencycheck.data.cpe;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
+import junit.framework.TestCase;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase;
-import org.owasp.dependencycheck.utils.Settings;
 
 /**
  *
  * @author Jeremy Long (jeremy.long@owasp.org)
  */
-public abstract class BaseIndexTestCase {
-
-    protected static final int BUFFER_SIZE = 2048;
+public abstract class BaseIndexTestCase extends TestCase {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
@@ -52,88 +40,15 @@ public abstract class BaseIndexTestCase {
     }
 
     @Before
+    @Override
     public void setUp() throws Exception {
-        ensureIndexExists();
         BaseDBTestCase.ensureDBExists();
+        super.setUp();
     }
 
     @After
+    @Override
     public void tearDown() throws Exception {
-    }
-
-    protected static File getDataDirectory() throws IOException {
-        final String fileName = Settings.getString(Settings.KEYS.CPE_DATA_DIRECTORY);
-        final String dataDirectory = Settings.getString(Settings.KEYS.DATA_DIRECTORY);
-        return new File(dataDirectory, fileName);
-        //return FileUtils.getDataDirectory(fileName, Index.class);
-    }
-
-    public static void ensureIndexExists() throws Exception {
-        //String indexPath = Settings.getString(Settings.KEYS.CPE_DATA_DIRECTORY);
-        String indexPath = getDataDirectory().getCanonicalPath();
-        java.io.File f = new File(indexPath);
-
-        if (!f.exists() || (f.isDirectory() && f.listFiles().length == 0)) {
-            f.mkdirs();
-            FileInputStream fis = null;
-            ZipInputStream zin = null;
-            try {
-                File path = new File(BaseIndexTestCase.class.getClassLoader().getResource("index.cpe.zip").getPath());
-                fis = new FileInputStream(path);
-                zin = new ZipInputStream(new BufferedInputStream(fis));
-                ZipEntry entry;
-                while ((entry = zin.getNextEntry()) != null) {
-                    if (entry.isDirectory()) {
-                        continue;
-                    }
-                    FileOutputStream fos = null;
-                    BufferedOutputStream dest = null;
-                    try {
-                        File o = new File(indexPath, entry.getName());
-                        o.createNewFile();
-                        fos = new FileOutputStream(o, false);
-                        dest = new BufferedOutputStream(fos, BUFFER_SIZE);
-                        byte data[] = new byte[BUFFER_SIZE];
-                        int count;
-                        while ((count = zin.read(data, 0, BUFFER_SIZE)) != -1) {
-                            dest.write(data, 0, count);
-                        }
-                    } catch (Exception ex) {
-                        Logger.getLogger(BaseIndexTestCase.class.getName()).log(Level.FINEST, null, ex);
-                    } finally {
-                        if (dest != null) {
-                            try {
-                                dest.flush();
-                                dest.close();
-                            } catch (Throwable ex) {
-                                Logger.getLogger(BaseIndexTestCase.class.getName()).log(Level.FINEST, null, ex);
-                            }
-                        }
-                        if (fos != null) {
-                            try {
-                                fos.close();
-                            } catch (Throwable ex) {
-                                Logger.getLogger(BaseIndexTestCase.class.getName()).log(Level.FINEST, null, ex);
-                            }
-                        }
-                    }
-                }
-            } finally {
-                try {
-                    if (zin != null) {
-                        zin.close();
-                    }
-                } catch (Throwable ex) {
-                    Logger.getLogger(BaseIndexTestCase.class.getName()).log(Level.FINEST, null, ex);
-                }
-                try {
-                    if (fis != null) {
-                        fis.close();
-                    }
-                } catch (Throwable ex) {
-                    Logger.getLogger(BaseIndexTestCase.class.getName()).log(Level.FINEST, null, ex);
-                }
-            }
-        }
+        super.tearDown();
     }
 }