Update to tests which mock modelkeyparser

Author: alerman

core/utils/metadata-utils/src/main/java/datawave/query/model/ModelKeyParser.java

@@ -50,8 +50,8 @@ public class ModelKeyParser {
     public static final String NULL_BYTE = "\0";
     public static final Value NULL_VALUE = new Value(new byte[0]);
 
-    // Package-private to allow test override
-    static LongSupplier clock = System::currentTimeMillis;
+    /** Visible for testing. Override to control timestamps in tests. */
+    public static LongSupplier clock = System::currentTimeMillis;
 
     @Deprecated
     public static final String INDEX_ONLY = "index_only";

web-services/model/src/test/java/datawave/webservice/query/model/ModelBeanTest.java

@@ -113,7 +113,7 @@ public void setup() throws Exception {
         MODEL_TWO = (datawave.webservice.model.Model) u.unmarshal(m2Url);
 
         Logger.getLogger(ModelBean.class).setLevel(Level.OFF);
-        PowerMock.mockStatic(System.class, System.class.getMethod("currentTimeMillis"));
+        ModelKeyParser.clock = () -> TIMESTAMP;
     }
 
     public void printTable(String tableName) throws Exception {
@@ -125,6 +125,7 @@ public void printTable(String tableName) throws Exception {
 
     @After
     public void tearDown() {
+        ModelKeyParser.clock = System::currentTimeMillis;
         try {
             client.tableOperations().delete(ModelBean.DEFAULT_MODEL_TABLE_NAME);
         } catch (Exception e) {}
@@ -156,10 +157,7 @@ private void importModels() throws Exception {
         EasyMock.expect(connectionFactory.getTrackingMap((StackTraceElement[]) EasyMock.anyObject())).andReturn(trackingMap);
         EasyMock.expect(connectionFactory.getClient(EasyMock.eq(userDN.toLowerCase()), EasyMock.eq(null), EasyMock.eq(AccumuloConnectionFactory.Priority.LOW),
                         EasyMock.eq(trackingMap))).andReturn(client);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
         connectionFactory.returnClient(client);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
         cache.reloadTableCache(ModelBean.DEFAULT_MODEL_TABLE_NAME);
         PowerMock.replayAll();
 
@@ -175,11 +173,7 @@ private void importModels() throws Exception {
         EasyMock.expect(connectionFactory.getTrackingMap((StackTraceElement[]) EasyMock.anyObject())).andReturn(trackingMap);
         EasyMock.expect(connectionFactory.getClient(EasyMock.eq(userDN.toLowerCase()), EasyMock.eq(null), EasyMock.eq(AccumuloConnectionFactory.Priority.LOW),
                         EasyMock.eq(trackingMap))).andReturn(client);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
         connectionFactory.returnClient(client);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
         cache.reloadTableCache(ModelBean.DEFAULT_MODEL_TABLE_NAME);
         PowerMock.replayAll();
 
@@ -246,14 +240,8 @@ public void testModelDelete() throws Exception {
         EasyMock.expect(connectionFactory.getTrackingMap((StackTraceElement[]) EasyMock.anyObject())).andReturn(trackingMap);
         EasyMock.expect(connectionFactory.getClient(EasyMock.eq(userDN.toLowerCase()), EasyMock.eq(null), EasyMock.eq(AccumuloConnectionFactory.Priority.LOW),
                         EasyMock.eq(trackingMap))).andReturn(client);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
         connectionFactory.returnClient(client);
         cache.reloadTableCache(ModelBean.DEFAULT_MODEL_TABLE_NAME);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
         PowerMock.replayAll();
 
         bean.deleteModel(MODEL_TWO.getName(), (String) null);
@@ -326,10 +314,7 @@ public void testCloneModel() throws Exception {
         EasyMock.expect(connectionFactory.getClient(EasyMock.eq(userDN.toLowerCase()), EasyMock.eq(null), EasyMock.eq(AccumuloConnectionFactory.Priority.LOW),
                         EasyMock.eq(trackingMap))).andReturn(client);
         cache.reloadTableCache(ModelBean.DEFAULT_MODEL_TABLE_NAME);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
         connectionFactory.returnClient(client);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
-        EasyMock.expect(System.currentTimeMillis()).andReturn(TIMESTAMP);
         PowerMock.replayAll();
 
         bean.cloneModel(MODEL_ONE.getName(), "MODEL2", (String) null);