Fixed MID-2885 (missing repo annotation).

Evolveum · Apr 27, 2016 · cc1905d · cc1905d
1 parent 41e52c2
commit cc1905d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/...epo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java b/...epo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
@@ -3503,7 +3503,34 @@ public void testAdHoc100ProcessStartTimestamp() throws Exception {
 
 	}
 
-//    @Test
+	@Test
+	public void testAdHoc101AvailabilityStatus() throws Exception {
+		Session session = open();
+		try {
+			ObjectQuery query = QueryBuilder.queryFor(ResourceType.class, prismContext)
+					.item(ResourceType.F_OPERATIONAL_STATE, OperationalStateType.F_LAST_AVAILABILITY_STATUS).eq(AvailabilityStatusType.UP)
+					.build();
+			String real = getInterpretedQuery2(session, ResourceType.class, query);
+			String expected = "select\n"
+					+ "  r.fullObject,\n"
+					+ "  r.stringsCount,\n"
+					+ "  r.longsCount,\n"
+					+ "  r.datesCount,\n"
+					+ "  r.referencesCount,\n"
+					+ "  r.polysCount,\n"
+					+ "  r.booleansCount\n"
+					+ "from\n"
+					+ "  RResource r\n"
+					+ "where\n"
+					+ "  r.operationalState.lastAvailabilityStatus = :lastAvailabilityStatus\n";
+			assertEqualsIgnoreWhitespace(expected, real);
+		} finally {
+			close(session);
+		}
+
+	}
+
+	//    @Test
 //    public void test930OrganizationEqualsCostCenter() throws Exception {
 //        Session session = open();
 //

diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
@@ -476,4 +476,15 @@ public void testWildOwnerRef() throws SchemaException {
         }
     }
 
+	@Test
+	public void testResourceUp() throws SchemaException {
+		ObjectQuery query = QueryBuilder.queryFor(ResourceType.class, prismContext)
+				.item(ResourceType.F_OPERATIONAL_STATE, OperationalStateType.F_LAST_AVAILABILITY_STATUS).eq(AvailabilityStatusType.UP)
+				.build();
+		OperationResult result = new OperationResult("search");
+		List<PrismObject<ResourceType>> resources = repositoryService.searchObjects(ResourceType.class, query, null, result);
+		result.recomputeStatus();
+		assertTrue(result.isSuccess());
+		assertEquals("Should find one resource", 1, resources.size());
+	}
 }
diff --git a/repo/repo-sql-impl-test/src/test/resources/basic/objects.xml b/repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
@@ -206,6 +206,9 @@
                 </q:equal>
             </filter>
         </connectorRef>
+        <operationalState>
+            <lastAvailabilityStatus>up</lastAvailabilityStatus>
+        </operationalState>
 
         <connectorConfiguration
                 xmlns:icfcldap="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/org.forgerock.openicf.connectors.ldap.ldap/org.identityconnectors.ldap.LdapConnector"

diff --git a/.../src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/ROperationalState.java b/.../src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/ROperationalState.java
@@ -29,12 +29,15 @@
 import org.apache.commons.lang.builder.ToStringStyle;
 
 import javax.persistence.Embeddable;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 
 @Embeddable
 public class ROperationalState {
 
     RAvailabilityStatus lastAvailabilityStatus;
 
+	@Enumerated
     public RAvailabilityStatus getLastAvailabilityStatus() {
         return lastAvailabilityStatus;
     }