commit 5bb59f28e5c00e1021d400c9f872908bf5df7694
author Carmelo Cascone <carmelo@opennetworking.org> Tue Jul 09 00:05:46 2019 +0000
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Jul 09 01:30:06 2019 +0000
tree 6bc1228e7e7a9acba75c01a9b32392f9e150f436
parent d5b9016346ee00f1f539075c2897eb7ed72f07b5

Revert "Corrections to getRegisteredApplications and CLI implementation"

ApplicationService is not available. For example, when using the ONOS CLI:

onos> apps -s -a
Service org.onosproject.app.ApplicationService not found

The issue seems to be a circular dependency, as ApplicationManager depends on CoreService, but CoreManager depends on ApplicationService.

Reverting for now.

This reverts commit 35ef3d3000f8b19608531dfd06f8e78482c45b32.

Change-Id: I298c3c7844df7f2395e092fbb89a8e9264883094

core/api/src/test/java/org/onosproject/core/DefaultApplicationTest.java

diff --git a/core/api/src/test/java/org/onosproject/core/DefaultApplicationTest.java b/core/api/src/test/java/org/onosproject/core/DefaultApplicationTest.java
index 98dccec..b523126 100644
--- a/core/api/src/test/java/org/onosproject/core/DefaultApplicationTest.java
+++ b/core/api/src/test/java/org/onosproject/core/DefaultApplicationTest.java
@@ -49,20 +49,20 @@
 
     public static final ApplicationId APP_ID = new DefaultApplicationId(2, APP_NAME);
     private Builder baseBuilder = DefaultApplication.builder()
-            .withAppId(APP_ID)
-            .withVersion(VER)
-            .withTitle(TITLE)
-            .withDescription(DESC)
-            .withOrigin(ORIGIN)
-            .withCategory(CATEGORY)
-            .withUrl(URL)
-            .withReadme(README)
-            .withIcon(ICON)
-            .withRole(ROLE)
-            .withPermissions(PERMS)
-            .withFeaturesRepo(Optional.of(FURL))
-            .withFeatures(FEATURES)
-            .withRequiredApps(APPS);
+                .withAppId(APP_ID)
+                .withVersion(VER)
+                .withTitle(TITLE)
+                .withDescription(DESC)
+                .withOrigin(ORIGIN)
+                .withCategory(CATEGORY)
+                .withUrl(URL)
+                .withReadme(README)
+                .withIcon(ICON)
+                .withRole(ROLE)
+                .withPermissions(PERMS)
+                .withFeaturesRepo(Optional.of(FURL))
+                .withFeatures(FEATURES)
+                .withRequiredApps(APPS);
 
     @Test
     public void basics() {
@@ -77,8 +77,8 @@
         assertEquals("incorrect URL", URL, app.url());
         assertEquals("incorrect readme", README, app.readme());
         assertArrayEquals("incorrect icon", ICON, app.icon());
-        assertEquals("incorrect permissions", PERMS, app.permissions());
         assertEquals("incorrect role", ROLE, app.role());
+        assertEquals("incorrect permissions", PERMS, app.permissions());
         assertEquals("incorrect features repo", FURL, app.featuresRepo().get());
         assertEquals("incorrect features", FEATURES, app.features());
         assertEquals("incorrect apps", APPS, app.requiredApps());
@@ -88,7 +88,7 @@
     @Test
     public void testEquality() {
         Application a1 = baseBuilder.build();
-         Application a2 = DefaultApplication.builder(a1)
+        Application a2 = DefaultApplication.builder(a1)
                 .build();
         Application a3 = DefaultApplication.builder(baseBuilder)
                 .withFeaturesRepo(Optional.empty())
@@ -227,4 +227,4 @@
         assertNotNull("null icon", icon);
         assertEquals("unexpected size", 0, icon.length);
     }
-}
\ No newline at end of file
+}