Author: mir
Date: Mon Jan 11 10:54:26 2010
New Revision: 897835
URL: http://svn.apache.org/viewvc?rev=897835&view=rev
Log:
Removed deprecated dashbooard test
Removed:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/SimpleRootResource.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/GlobalMenuItemsProviderA.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java?rev=897835&r1=897834&r2=897835&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
Mon Jan 11 10:54:26 2010
@@ -94,15 +94,7 @@
private Dictionary<String, Object> jaxRsResourceProperty = new
Hashtable<String, Object>();
private String resourceLabel = "testResource";
- {
- jaxRsResourceProperty.put("javax.ws.rs", Boolean.TRUE);
- jaxRsResourceProperty.put("service.pid",
SimpleRootResource.class.getName());
-
jaxRsResourceProperty.put("org.apache.clerezza.platform.dashboard.visible",
Boolean.TRUE);
- jaxRsResourceProperty.put("dashboardLabel", resourceLabel);
- jaxRsResourceProperty.put("dashBoardMenuOrder", 0);
- jaxRsResourceProperty.put("dashBoardGroupLabel",
GlobalMenuItemsProviderA.groupAId);
- }
-
+
private boolean webServerExist;
@Before
@@ -110,8 +102,6 @@
webServerExist = waitForWebserver();
if (webServerExist) {
waitFor(Handler.class, 300000);
- bundleContext.registerService(Object.class.getName(),
- new SimpleRootResource(),
jaxRsResourceProperty);
bundleContext.registerService(GlobalMenuItemsProvider.class.getName(),
new GlobalMenuItemsProviderA(), null);
Thread.sleep(10000);
@@ -142,14 +132,13 @@
Assert.assertEquals(GlobalMenuItemsProviderA.groupAPath,
getPath(graph, list.get(0)));
RdfList children = getChildren(graph, list.get(0));
- Assert.assertEquals(3, children.size());
- Assert.assertEquals(resourceLabel, getLabel(graph,
children.get(0)));
+ Assert.assertEquals(2, children.size());
Assert.assertEquals(GlobalMenuItemsProviderA.itemA2Label,
- getLabel(graph, children.get(1)));
+ getLabel(graph, children.get(0)));
Assert.assertEquals(GlobalMenuItemsProviderA.itemA1Label,
- getLabel(graph, children.get(2)));
+ getLabel(graph, children.get(1)));
Assert.assertEquals(GlobalMenuItemsProviderA.itemA2Path,
- getPath(graph, children.get(1)));
+ getPath(graph, children.get(0)));
}
private String getLabel(TripleCollection graph, Resource res) {
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/GlobalMenuItemsProviderA.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/GlobalMenuItemsProviderA.java?rev=897835&r1=897834&r2=897835&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/GlobalMenuItemsProviderA.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/GlobalMenuItemsProviderA.java
Mon Jan 11 10:54:26 2010
@@ -1,4 +1,4 @@
-/*
+ /*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
