remove tab characters from code

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

diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/testCleanup.java b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestCleanup.java
similarity index 50%
rename from datarouter-prov/src/test/java/datarouter/provisioning/testCleanup.java
rename to datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestCleanup.java
index bf991fd..fba7754 100644 (file)
--- a/datarouter-prov/src/test/java/datarouter/provisioning/testCleanup.java
+++ b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationTestCleanup.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.
@@ -37,48 +37,49 @@ import org.junit.Before;
 import org.junit.Test;
 import org.onap.dmaap.datarouter.provisioning.FeedServlet;
 
-public class testCleanup extends testBase {
-       @Before
-       public void setUp() throws Exception {
-               super.setUp();
-               getDBstate();
-       }
+public class IntegrationTestCleanup extends IntegrationTestBase {
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        getDBstate();
+    }
+
+    @Test
+    public void testNormal() {
+        // Delete all feeds w/JUnit as publisher
+        JSONArray ja = db_state.getJSONArray("feeds");
+        for (int i = 0; i < ja.length(); i++) {
+            JSONObject feed = ja.getJSONObject(i);
+            if (feed != null && !feed.getBoolean("deleted")) {
+                if (feed.getString("publisher").equals("JUnit")) {
+                    int feedid = feed.getInt("feedid");
+                    delete("/feed/" + feedid);
+                }
+            }
+        }
+        // Delete all subscriptions w/JUnit as subscriber
+        ja = db_state.getJSONArray("subscriptions");
+        for (int i = 0; i < ja.length(); i++) {
+            JSONObject sub = ja.getJSONObject(i);
+            if (sub != null && sub.getString("subscriber").equals("JUnit")) {
+                int subid = sub.getInt("subid");
+                delete("/subs/" + subid);
+            }
+        }
+    }
 
-       @Test
-       public void testNormal() {
-               // Delete all feeds w/JUnit as publisher
-               JSONArray ja = db_state.getJSONArray("feeds");
-               for (int i = 0; i < ja.length(); i++) {
-                       JSONObject feed = ja.getJSONObject(i);
-                       if (feed != null && !feed.getBoolean("deleted")) {
-                               if (feed.getString("publisher").equals("JUnit")) {
-                                       int feedid = feed.getInt("feedid");
-                                       delete("/feed/"+feedid);
-                               }
-                       }
-               }
-               // Delete all subscriptions w/JUnit as subscriber
-               ja = db_state.getJSONArray("subscriptions");
-               for (int i = 0; i < ja.length(); i++) {
-                       JSONObject sub = ja.getJSONObject(i);
-                       if (sub != null && sub.getString("subscriber").equals("JUnit")) {
-                               int subid = sub.getInt("subid");
-                               delete("/subs/"+subid);
-                       }
-               }
-       }
-       private void delete(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);
-                       HttpEntity entity = response.getEntity();
-                       EntityUtils.consume(entity);
-               } catch (IOException e) {
-                       fail(e.getMessage());
-               } finally {
-                       del.releaseConnection();
-               }
-       }
+    private void delete(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);
+            HttpEntity entity = response.getEntity();
+            EntityUtils.consume(entity);
+        } catch (IOException e) {
+            fail(e.getMessage());
+        } finally {
+            del.releaseConnection();
+        }
+    }
 }