remove tab characters from code

[dmaap/datarouter.git] / datarouter-prov / src / test / java / datarouter / provisioning / IntegrationTestFeedDelete.java

diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testFeedDelete.java b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestFeedDelete.java
similarity index 51%
rename from datarouter-prov/src/test/java/datarouter/provisioning/testFeedDelete.java
rename to datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestFeedDelete.java
index 657da4e..f451f5a 100644 (file)
--- a/datarouter-prov/src/test/java/datarouter/provisioning/testFeedDelete.java
+++ b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestFeedDelete.java
@@ -7,9 +7,9 @@
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
  * * You may obtain a copy of the License at
- * * 
+ * *
  *  *      http://www.apache.org/licenses/LICENSE-2.0
- * * 
+ * *
  *  * Unless required by applicable law or agreed to in writing, software
  * * distributed under the License is distributed on an "AS IS" BASIS,
  * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,57 +41,60 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.dmaap.datarouter.provisioning.FeedServlet;
 
-public class testFeedDelete extends testBase {
-       @BeforeClass
-       public static void setUpBeforeClass() throws Exception {
-       }
+public class IntegrationTestFeedDelete extends IntegrationTestBase {
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+    }
+
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        getDBstate();
+    }
+
+    @Test
+    public void testDeleteNormal() {
+        // Delete the first non-deleted feed in the DB
+        JSONArray ja = db_state.getJSONArray("feeds");
+        for (int i = ja.length() - 1; i >= 0; i--) {
+            JSONObject feed = ja.getJSONObject(i);
+            if (!feed.getBoolean("deleted")) {
+                int feedid = feed.getInt("feedid");
+                testCommon(HttpServletResponse.SC_NO_CONTENT, "/feed/" + feedid);
+                return;
+            }
+        }
+    }
 
-       @AfterClass
-       public static void tearDownAfterClass() throws Exception {
-       }
+    @Test
+    public void testDeleteNoFeedId() {
+        testCommon(HttpServletResponse.SC_BAD_REQUEST, "/feed/");
+    }
 
-       @Before
-       public void setUp() throws Exception {
-               super.setUp();
-               getDBstate();
-       }
+    @Test
+    public void testDeleteNoFeed() {
+        testCommon(HttpServletResponse.SC_NOT_FOUND, "/feed/999999");
+    }
 
-       @Test
-       public void testDeleteNormal() {
-               // Delete the first non-deleted feed in the DB
-               JSONArray ja = db_state.getJSONArray("feeds");
-               for (int i = ja.length()-1; i >= 0; i--) {
-                       JSONObject feed = ja.getJSONObject(i);
-                       if (!feed.getBoolean("deleted")) {
-                               int feedid = feed.getInt("feedid");
-                               testCommon(HttpServletResponse.SC_NO_CONTENT, "/feed/"+feedid);
-                               return;
-                       }
-               }
-       }
-       @Test
-       public void testDeleteNoFeedID() {
-               testCommon(HttpServletResponse.SC_BAD_REQUEST, "/feed/");
-       }
-       @Test
-       public void testDeleteNoFeed() {
-               testCommon(HttpServletResponse.SC_NOT_FOUND, "/feed/999999");
-       }
-       private void testCommon(int expect, String uri) {
-               String url = props.getProperty("test.host") + uri;
-               HttpDelete del = new HttpDelete(url);
-               try {
-                       del.addHeader(FeedServlet.BEHALF_HEADER, "JUnit");
+    private void testCommon(int expect, String uri) {
+        String url = props.getProperty("test.host") + uri;
+        HttpDelete del = new HttpDelete(url);
+        try {
+            del.addHeader(FeedServlet.BEHALF_HEADER, "JUnit");
 
-                       HttpResponse response = httpclient.execute(del);
-                   ckResponse(response, expect);
+            HttpResponse response = httpclient.execute(del);
+            ckResponse(response, expect);
 
-                       HttpEntity entity = response.getEntity();
-                       EntityUtils.consume(entity);
-               } catch (IOException e) {
-                       fail(e.getMessage());
-               } finally {
-                       del.releaseConnection();
-               }
-       }
+            HttpEntity entity = response.getEntity();
+            EntityUtils.consume(entity);
+        } catch (IOException e) {
+            fail(e.getMessage());
+        } finally {
+            del.releaseConnection();
+        }
+    }
 }