Changeset 5519

Timestamp:

Mar 31, 2020, 4:29:18 AM (2 years ago)

Author:

Christian Schulte

Message:

o Merged changes up to 5518 from 'trunk' into branch 'jomc-modlet-1.x'.

See #151

Location:

jomc-modlet/branches/jomc-modlet-1.x

Files:

• . (modified) (1 prop)
• src/test/java/org/jomc/modlet/test/DefaultServiceFactoryTest.java (modified) (2 diffs)

jomc-modlet/branches/jomc-modlet-1.x/src/test/java/org/jomc/modlet/test/DefaultServiceFactoryTest.java

@@ -34 +34 @@
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
@@ -100 +102 @@
     }
 
+    @Test
+    public final void testDefaultEnabled() throws Exception
+    {
+        System.clearProperty( "org.jomc.modlet.DefaultServiceFactory.defaultEnabled" );
+        DefaultServiceFactory.setDefaultEnabled( null );
+        assertTrue( DefaultServiceFactory.isDefaultEnabled() );
+        DefaultServiceFactory.setDefaultEnabled( null );
+        System.setProperty( "org.jomc.modlet.DefaultServiceFactory.defaultEnabled", "false" );
+        assertFalse( DefaultServiceFactory.isDefaultEnabled() );
+        System.clearProperty( "org.jomc.modlet.DefaultServiceFactory.defaultEnabled" );
+        DefaultServiceFactory.setDefaultEnabled( null );
+        assertTrue( DefaultServiceFactory.isDefaultEnabled() );
+    }
+
+    @Test
+    public final void testEnabled() throws Exception
+    {
+        DefaultServiceFactory.setDefaultEnabled( null );
+        this.getServiceFactory().setEnabled( null );
+        assertTrue( this.getServiceFactory().isEnabled() );
+
+        DefaultServiceFactory.setDefaultEnabled( false );
+        this.getServiceFactory().setEnabled( null );
+        assertFalse( this.getServiceFactory().isEnabled() );
+
+        DefaultServiceFactory.setDefaultEnabled( null );
+        this.getServiceFactory().setEnabled( null );
+    }
+
 }