Fixing (some) conntest

Evolveum · Sep 5, 2018 · 64510d3 · 64510d3
1 parent 6ed8e1b
commit 64510d3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/...g/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java b/...g/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
@@ -282,11 +282,15 @@ public void test151CountAllAccounts() throws Exception {
         displayWhen(TEST_NAME);
         Integer count = modelService.countObjects(ShadowType.class, query, null, task, result);
 
-        assertEquals("Wrong account count", (Integer)getNumberOfAllAccounts(), count);
+        assertCountAllAccounts(count);
 
         assertLdapConnectorInstances(1, 2);
     }
 
+	protected void assertCountAllAccounts(Integer count) {
+		assertEquals("Wrong account count", (Integer)getNumberOfAllAccounts(), count);
+	}
+
 	/**
 	 * Blocksize is 100, so this is in one block.
 	 */

diff --git a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2014-2017 Evolveum
+ * Copyright (c) 2014-2018 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ public class TestOpenDj extends AbstractLdapConnTest {
 
 	private static final String OPENDJ_TEMPLATE_NAME = "opendj-4000.template";
 
-	private static final int INITIAL_SYNC_TOKEN = 23;
+	private static final int INITIAL_SYNC_TOKEN = 22;
 
 	@Override
 	protected String getResourceOid() {

diff --git a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDjDumber.java b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDjDumber.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Evolveum
+ * Copyright (c) 2016-2018 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
  */
 public class TestOpenDjDumber extends TestOpenDj {
 
-	private static final int INITIAL_SYNC_TOKEN = 21;
+	private static final int INITIAL_SYNC_TOKEN = 20;
 
 	@Override
 	protected File getBaseDir() {

diff --git a/...ing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdapDumber.java b/...ing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdapDumber.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 Evolveum
+ * Copyright (c) 2017-2018 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.evolveum.midpoint.testing.conntest;
 
+import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertNull;
 
@@ -60,5 +61,11 @@ protected boolean hasAssociationShortcut() {
 	protected boolean isUsingGroupShortcutAttribute() {
 		return false;
 	}
+
+	// This is a dumb resource. It cannot count.
+	@Override
+	protected void assertCountAllAccounts(Integer count) {
+		assertEquals("Wrong account count", (Integer)null, count);
+	}
 
 }